From 3a8bd3361c2cb63b7cf2d10ee1c749e3692d2a99 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Mon, 9 Mar 2026 11:44:40 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=97=A8=E7=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/bootstrap.yml | 3 +- start/src/main/resources/prodnacos.yml | 42 ++++++ start/src/main/resources/sdk.yml | 6 +- start/src/main/resources/templates/risk.html | 23 --- .../static/css/main.40fc518bb0818fe8b8ea.css | 1 - .../templates/risk/static/jjb.babel.js | 1 - .../templates/risk/static/jjb.config.js | 1 - .../static/js/295.21df88c875577274cecb.js | 2 - .../295.21df88c875577274cecb.js.LICENSE.txt | 135 ------------------ .../static/js/main.4c0885586ad9a06ab444.js | 2 - .../main.4c0885586ad9a06ab444.js.LICENSE.txt | 1 - .../templates/risk/static/package.json | 44 ------ .../zcloud/primeport/web/MkmjController.java | 36 ++--- .../primeport/web/MkmjGateController.java | 29 ++-- .../primeport/web/MkmjPassageController.java | 41 +++--- .../zcloud/primeport/web/VideoController.java | 14 -- .../command/MkmjPassageRemoveExe.java | 17 ++- .../primeport/command/MkmjRemoveExe.java | 21 +-- .../convertor/MkmjGateCoConvertor.java | 2 + .../convertor/MkmjPassageCoConvertor.java | 13 +- .../command/query/MkmjGateQueryExe.java | 9 ++ .../command/query/MkmjPassageQueryExe.java | 21 +-- .../service/MkmjGateServiceImpl.java | 10 ++ .../service/MkmjPassageServiceImpl.java | 20 +-- .../primeport/service/MkmjServiceImpl.java | 17 ++- .../primeport/api/MkmjGateServiceI.java | 4 + .../primeport/api/MkmjPassageServiceI.java | 11 +- .../zcloud/primeport/api/MkmjServiceI.java | 8 +- .../zcloud/primeport/dto/MkmjGateAddCmd.java | 4 +- .../zcloud/primeport/dto/MkmjGatePageQry.java | 32 ++--- .../primeport/dto/MkmjGateUpdateCmd.java | 8 +- .../primeport/dto/MkmjPassageAddCmd.java | 10 +- .../primeport/dto/MkmjPassagePageQry.java | 27 ++-- .../primeport/dto/clientobject/MkmjCO.java | 3 +- .../dto/clientobject/MkmjGateCO.java | 31 ++-- .../dto/clientobject/MkmjPassageCO.java | 27 ++-- .../primeport/domain/enums/MenuEnum.java | 5 +- .../primeport/domain/gateway/MkmjGateway.java | 21 +-- .../domain/gateway/MkmjPassageGateway.java | 20 +-- .../domain/model/MkmjApprovalUserE.java | 2 - .../zcloud/primeport/domain/model/MkmjE.java | 2 - .../primeport/domain/model/MkmjGateE.java | 2 - .../primeport/domain/model/MkmjPassageE.java | 7 +- .../primeport/domain/model/PersonApplyE.java | 2 - .../domain/model/PersonMessageE.java | 2 - .../primeport/domain/model/VehicleApplyE.java | 2 - .../primeport/domain/model/VehicleAuditE.java | 2 - .../primeport/domain/model/VehicleBlackE.java | 2 - .../domain/model/VehicleMessageE.java | 3 +- .../domain/model/VehicleViolationsE.java | 3 +- .../zcloud/primeport/domain/model/VideoE.java | 4 +- .../gatewayimpl/MkmjGatewayImpl.java | 32 ++++- .../gatewayimpl/MkmjPassageGatewayImpl.java | 31 ++-- .../persistence/dataobject/MkmjGateDO.java | 35 ++--- .../persistence/dataobject/MkmjPassageDO.java | 28 ++-- .../persistence/mapper/MkmjGateMapper.java | 5 + .../persistence/mapper/MkmjPassageMapper.java | 12 +- .../MkmjApprovalUserRepository.java | 8 +- .../repository/MkmjGateRepository.java | 12 +- .../repository/MkmjPassageRepository.java | 8 +- .../repository/MkmjRepository.java | 8 +- .../repository/VideoRepository.java | 10 +- .../impl/MkmjApprovalUserRepositoryImpl.java | 15 +- .../impl/MkmjGateRepositoryImpl.java | 51 +++++-- .../impl/MkmjPassageRepositoryImpl.java | 33 +++-- .../repository/impl/MkmjRepositoryImpl.java | 19 ++- .../repository/impl/VideoRepositoryImpl.java | 23 ++- .../src/main/resources/mapper/MkmjDO.xml | 2 +- .../src/main/resources/mapper/MkmjGateDO.xml | 44 ++++++ .../main/resources/mapper/MkmjPassageDO.xml | 33 +++++ 70 files changed, 508 insertions(+), 656 deletions(-) create mode 100644 start/src/main/resources/prodnacos.yml delete mode 100644 start/src/main/resources/templates/risk.html delete mode 100644 start/src/main/resources/templates/risk/static/css/main.40fc518bb0818fe8b8ea.css delete mode 100644 start/src/main/resources/templates/risk/static/jjb.babel.js delete mode 100644 start/src/main/resources/templates/risk/static/jjb.config.js delete mode 100644 start/src/main/resources/templates/risk/static/js/295.21df88c875577274cecb.js delete mode 100644 start/src/main/resources/templates/risk/static/js/295.21df88c875577274cecb.js.LICENSE.txt delete mode 100644 start/src/main/resources/templates/risk/static/js/main.4c0885586ad9a06ab444.js delete mode 100644 start/src/main/resources/templates/risk/static/js/main.4c0885586ad9a06ab444.js.LICENSE.txt delete mode 100644 start/src/main/resources/templates/risk/static/package.json diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index 198d9ab..c0bc004 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -1,7 +1,8 @@ spring: config: import: - - classpath:nacos.yml +# - classpath:nacos.yml + - classpath:prodnacos.yml - classpath:sdk.yml - classpath:swagger.yml # - classpath:ds.yml diff --git a/start/src/main/resources/prodnacos.yml b/start/src/main/resources/prodnacos.yml new file mode 100644 index 0000000..bb8382c --- /dev/null +++ b/start/src/main/resources/prodnacos.yml @@ -0,0 +1,42 @@ +nacos: + url: prod-nacos:8848 + namespace: jjb-dragon +application: + name: zcloud-gbs-primeport + version: + gateway: primeport + cn-name: 一级口门管理 +spring: + application: + name: ${application.name}${application.version} + profiles: + # 环境配置 + active: prod + cloud: + nacos: + config: + namespace: ${nacos.namespace} + server-addr: ${nacos.url} + username: nacos + password: u9Hc7tLFBY + file-extension: yml + shared-configs: + - config-common.yml + - config-port.yml + - config-mq.yml + - config-log.yml + - config-sdk-server.yml + - config-actuator.yml + - config-job.yml + - config-mysql.yml + - config-redis.yml + - config-cache.yml + - config-spring.yml + - config-mybatis.yml + - config-sdk.yml + - config-flyway.yml + discovery: + server-addr: ${spring.cloud.nacos.config.server-addr} + namespace: ${spring.cloud.nacos.config.namespace} + username: nacos + password: u9Hc7tLFBY diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index cffc4f1..c722eb2 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -1,6 +1,6 @@ sdk: server: - app-key: 722091ff53dd4abba078c2a00efd4a42 + app-key: bbab676d39e443cfacc037ee15fdad37 client: gateway: url: ${common.gateway.network.http.external} @@ -14,7 +14,7 @@ sdk: name: ${application.cn-name}-后端 group-code: public_api strip-prefix: 0 - uri: lb://${application.name} + uri: http://${application.name} path: /${application.gateway}/** - client: system-code: ${application.name}-container @@ -25,7 +25,7 @@ sdk: name: ${application.cn-name}-前端 group-code: public_api strip-prefix: 0 - uri: lb://jjb-saas-base + uri: http://jjb-saas-base path: /${application.gateway}/container/** order: -2 openapi: diff --git a/start/src/main/resources/templates/risk.html b/start/src/main/resources/templates/risk.html deleted file mode 100644 index 01d0760..0000000 --- a/start/src/main/resources/templates/risk.html +++ /dev/null @@ -1,23 +0,0 @@ -