diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index ce1fb2d..2bb7947 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -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: diff --git a/cloud-common-enterprise-operation/pom.xml b/cloud-common-enterprise-operation/pom.xml new file mode 100644 index 0000000..8d9fd24 --- /dev/null +++ b/cloud-common-enterprise-operation/pom.xml @@ -0,0 +1,19 @@ + + + + cloud-server + com.muyu + 3.6.3 + + 4.0.0 + + cloud-common-enterprise-operation + + + 17 + 17 + + + diff --git a/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/SSS.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/SSS.java new file mode 100644 index 0000000..a37eaa4 --- /dev/null +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/SSS.java @@ -0,0 +1,4 @@ +package com.muyu.enterpise; + +public class SSS { +} diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index aa98013..78b147b 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -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: diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt index 0dd5eee..8b13789 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt +++ b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt @@ -1,2 +1 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} + diff --git a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml index 00342f2..501d4c9 100644 --- a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml @@ -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} # 配置文件格式 diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index c21b371..ad5b4a5 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -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: diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java index be833e0..a2ce7dd 100644 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java @@ -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); +} + } diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/R.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/R.java new file mode 100644 index 0000000..e45b60d --- /dev/null +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/R.java @@ -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; + +} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java index dc11dbd..0380422 100644 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java @@ -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; } diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/mapper/RailMapper.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/mapper/RailMapper.java new file mode 100644 index 0000000..7f3b965 --- /dev/null +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/mapper/RailMapper.java @@ -0,0 +1,7 @@ +package com.zhangyi.rail.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RailMapper { +} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailService.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailService.java new file mode 100644 index 0000000..8c1d6b4 --- /dev/null +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailService.java @@ -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); +} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailServiceImpl.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailServiceImpl.java new file mode 100644 index 0000000..a401fb5 --- /dev/null +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailServiceImpl.java @@ -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; + } +} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml index 388015e..4b53c92 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml @@ -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: diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index a5dd953..e4c42e3 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -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: diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 15e2f80..70a8ff4 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -15,6 +15,8 @@ cloud-modules-system-saas cloud-breakdown cloud-modules-warn + cloud-modules-rail + cloud-modules-car cloud-modules diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index a62e359..2bf0d80 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -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: diff --git a/pom.xml b/pom.xml index addb590..8d1e4bd 100644 --- a/pom.xml +++ b/pom.xml @@ -287,6 +287,7 @@ cloud-visual cloud-modules cloud-common + cloud-common-enterprise-operation pom