zhangyi
/
cloud-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改合并前的分支

cloud-master
张毅大神 2024-09-27 19:24:34 +08:00
parent 85aff5c847
commit e161bed5f2
18 changed files with 165 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloud-auth/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 110.42.213.184:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: public
# Spring
spring:
application:

19
cloud-common-enterprise-operation/pom.xml 100644
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>cloud-server</artifactId>
<groupId>com.muyu</groupId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cloud-common-enterprise-operation</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
</project>

4
cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/SSS.java 100644
View File

@ -0,0 +1,4 @@
package com.muyu.enterpise;
public class SSS {
}

6
cloud-gateway/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 110.42.213.184:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: public
# Spring
spring:
@ -50,7 +50,7 @@ spring:
eager: true
transport:
# 控制台地址
dashboard: 127.0.0.1:8718
dashboard: 110.42.213.184:8718
# nacos配置持久化
datasource:
ds1:

3
cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt
View File

@ -1,2 +1 @@
Spring Boot Version: ${spring-boot.version}
Spring Application Name: ${spring.application.name}

18
cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
View File

@ -1,13 +1,13 @@
# Tomcat
server:
port: 10011
port: 10012
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 110.42.213.184:8848
user-name: nacos
password: nacos
namespace: public
namespace: pubilc
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:
@ -29,18 +29,18 @@ spring:
# 服务注册地址
server-addr: ${nacos.addr}
# nacos用户名
username: ${nacos.user-name}
# nacos密码
password: ${nacos.password}
# username: ${nacos.user-name}
# # nacos密码
# password: ${nacos.password}
# 命名空间
namespace: ${nacos.namespace}
config:
# 服务注册地址
server-addr: ${nacos.addr}
# nacos用户名
username: ${nacos.user-name}
# nacos密码
password: ${nacos.password}
# username: ${nacos.user-name}
# # nacos密码
# password: ${nacos.password}
# 命名空间
namespace: ${nacos.namespace}
# 配置文件格式

4
cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 110.42.213.184:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: public
# Spring
spring:

40
cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java
View File

@ -1,4 +1,44 @@
package com.zhangyi.rail.controller;
import com.zhangyi.rail.domain.R;
import com.zhangyi.rail.domain.SysFenceRail;
import com.zhangyi.rail.service.RailService;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.ApplicationArguments;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertyResolver;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.WebApplicationContext;
@RestController
@RequestMapping("/raill")
public class RailController {
@Autowired
RailService railService;
@PostMapping("rail")
public R RailListCode(SysFenceRail sysFenceRail){
return railService.RailListCode(sysFenceRail);
}
public R Railadd(SysFenceRail sysFenceRail){
return railService.RailListAdd(sysFenceRail);
}
public R RailEdit(SysFenceRail sysFenceRail){
return railService.RailListEdit(sysFenceRail);
}
}

16
cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/R.java 100644
View File

@ -0,0 +1,16 @@
package com.zhangyi.rail.domain;
import lombok.*;
@Data
@Setter
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class R {
private Integer code;
private Object data;
private String msg;
}

18
cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java
View File

@ -7,6 +7,8 @@ import com.muyu.common.core.annotation.Excel;
import lombok.*;
import lombok.experimental.SuperBuilder;
import java.util.Date;
@Data
@Setter
@Getter
@ -31,8 +33,24 @@ private static final long seriaversionUID =1L;
@Excel(name = "围栏类型")
private Long fenceType;
@Excel(name = "围栏类型")
private String fenceTypeName;
@Excel(name = "围栏状态")
private String state;
@Excel(name = "创建人")
private String createBy;
@Excel(name = "创建时间")
private Date createTime;
@Excel(name = "更新人")
private String updateBy;
@Excel(name = "更新时间")
private Date updateTime;
@Excel(name = "备注")
private String remark;
}

7
cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/mapper/RailMapper.java 100644
View File

@ -0,0 +1,7 @@
package com.zhangyi.rail.mapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface RailMapper {
}

12
cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailService.java 100644
View File

@ -0,0 +1,12 @@
package com.zhangyi.rail.service;
import com.zhangyi.rail.domain.R;
import com.zhangyi.rail.domain.SysFenceRail;
public interface RailService {
R RailListCode(SysFenceRail sysFenceRail);
R RailListAdd(SysFenceRail sysFenceRail);
R RailListEdit(SysFenceRail sysFenceRail);
}

23
cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailServiceImpl.java 100644
View File

@ -0,0 +1,23 @@
package com.zhangyi.rail.service;
import com.zhangyi.rail.domain.R;
import com.zhangyi.rail.domain.SysFenceRail;
import org.springframework.stereotype.Service;
@Service
public class RailServiceImpl implements RailService{
@Override
public R RailListCode(SysFenceRail sysFenceRail) {
return null;
}
@Override
public R RailListAdd(SysFenceRail sysFenceRail) {
return null;
}
@Override
public R RailListEdit(SysFenceRail sysFenceRail) {
return null;
}
}

4
cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 110.42.213.184:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: public
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

4
cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 110.42.213.184:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: public
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

2
cloud-modules/pom.xml
View File

@ -15,6 +15,8 @@
<module>cloud-modules-system-saas</module>
<module>cloud-breakdown</module>
<module>cloud-modules-warn</module>
<module>cloud-modules-rail</module>
<module>cloud-modules-car</module>
</modules>
<artifactId>cloud-modules</artifactId>

4
cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 110.42.213.184:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: public
# Spring
spring:

1
pom.xml
View File

@ -287,6 +287,7 @@
<module>cloud-visual</module>
<module>cloud-modules</module>
<module>cloud-common</module>
<module>cloud-common-enterprise-operation</module>
</modules>
<packaging>pom</packaging>