diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..1cdb12c --- /dev/null +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -0,0 +1,47 @@ +# Tomcat +server: + port: 9500 + +# nacos线上地址 +nacos: + addr: 159.75.188.178:8848 + user-name: nacos + password: nacos + namespace: eight +# Spring +spring: + application: + # 应用名称 + name: cloud-auth + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + 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} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java index 5369142..dc7b7bb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java @@ -34,7 +34,7 @@ import java.util.function.Supplier; @SuperBuilder @Tag(name = "企业车辆管理实体类") @TableName(value = "car_information",autoResultMap = true) -public class CarInformation extends BaseEntity { +public class CarInformation { /** * 车辆ID diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformation1Controller.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformation1Controller.java deleted file mode 100644 index 1296f65..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformation1Controller.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.muyu.server.controller; - -import com.muyu.common.core.domain.Result; -import com.muyu.domain.CarInformation; -import com.muyu.server.service.CarInformation1Service; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.extern.log4j.Log4j2; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * - * @Author:yang - * @Package:com.muyu.server.controller - * @Project:cloud-server-8 - * @name:CarInformationController - * @Date:2024/9/22 22:20 - */ -@RequestMapping("/carInformation") -@RestController -@AllArgsConstructor -@Tag(name = "查询数据",description = "从围栏信息表中查询数据") -@Log4j2 -public class CarInformation1Controller { - - private final CarInformation1Service carInformationService; - - /** - * 查询围栏业务信息 - */ - @PostMapping("/selectCarInformation") - @Operation(summary = "查询数据",description = "查询数据") - public Result> selectConnect(){ - List connects = carInformationService.list() - .stream() - .map(CarInformation::carInformationBuilder) - .toList(); - return Result.success( - connects, "操作成功" - ); - } -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java index a40ac1f..9f502de 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarInformation; import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationListReq; import com.muyu.domain.req.CarInformationUpdReq; @@ -20,6 +21,7 @@ import java.util.List; /** * 车辆信息管理控制层 + * @author 17353 */ @Log4j2 @RestController @@ -29,6 +31,22 @@ public class CarInformationController { @Resource private CarInformationService carInformationService; + + /** + * 查询围栏业务信息 + */ + @PostMapping("/selectCarInformation") + @Operation(summary = "查询数据",description = "查询数据") + public Result> selectConnect(){ + List connects = carInformationService.list() + .stream() + .map(CarInformation::carInformationBuilder) + .toList(); + return Result.success( + connects, "操作成功" + ); + } + /** * 企业车辆管理列表 * 联查--> 车辆管理--车辆类型表--车辆电子围栏 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformation1Mapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformation1Mapper.java deleted file mode 100644 index d0faca8..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformation1Mapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.domain.CarInformation; -import org.apache.ibatis.annotations.Mapper; - -/** - * @Author:yang - * @Package:com.muyu.server.mapper - * @Project:cloud-server-8 - * @name:CarInformationMapper - * @Date:2024/9/22 22:24 - */ -@Mapper -public interface CarInformation1Mapper extends BaseMapper { -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformation1Service.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformation1Service.java deleted file mode 100644 index d1676ee..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformation1Service.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.CarInformation; - -/** - * @Author:yang - * @Package:com.muyu.server.service - * @Project:cloud-server-8 - * @name:CarInformationService - * @Date:2024/9/22 22:22 - */ -public interface CarInformation1Service extends IService { -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java index ba39498..8775c51 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java @@ -43,7 +43,7 @@ public class CarFenceServiceImpl @Autowired private CarMiddleSerivce carMiddleSerivce; @Autowired - private CarInformation1Service carInformationService; + private CarInformationService carInformationService; /** * 查询围栏信息 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformation1ServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformation1ServiceImpl.java deleted file mode 100644 index ec2335f..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformation1ServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.CarInformation; -import com.muyu.server.mapper.CarInformation1Mapper; -import com.muyu.server.service.CarInformation1Service; -import org.springframework.stereotype.Service; - -/** - * @Author:yang - * @Package:com.muyu.server.service.impl - * @Project:cloud-server-8 - * @name:CarInformationServiceImpl - * @Date:2024/9/22 22:22 - */ -@Service -public class CarInformation1ServiceImpl - extends ServiceImpl - implements CarInformation1Service { -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..0616949 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml @@ -0,0 +1,47 @@ +# Tomcat +server: + port: 9111 + +# nacos线上地址 +nacos: + addr: 159.75.188.178:8848 + user-name: nacos + password: nacos + namespace: eight + +# Spring +spring: + application: + # 应用名称 + name: cloud-electronic + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + 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} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..a02fcfb --- /dev/null +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -0,0 +1,47 @@ +# Tomcat +server: + port: 9300 + +# nacos线上地址 +nacos: + addr: 159.75.188.178:8848 + user-name: nacos + password: nacos + namespace: eight + +# Spring +spring: + application: + # 应用名称 + name: cloud-file + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + 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} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..91799f9 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -0,0 +1,60 @@ +# Tomcat +server: + port: 9701 + +# nacos线上地址 +nacos: + addr: 159.75.188.178:8848 + user-name: nacos + password: nacos + namespace: eight +# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all +# Spring +spring: + amqp: + deserialization: + trust: + all: true + main: + allow-bean-definition-overriding: true + application: + # 应用名称 + name: cloud-system + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + 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} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # xxl-job 配置文件 + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # rabbit 配置文件 + - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..ae51cac --- /dev/null +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -0,0 +1,47 @@ +# Tomcat +server: + port: 9100 + +# nacos线上地址 +nacos: + addr: 159.75.188.178:8848 + user-name: nacos + password: nacos + namespace: eight + +# Spring +spring: + application: + # 应用名称 + name: cloud-monitor + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + 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} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}