平台升级nacos适配

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-cluster.properties

-
-
 spring.datasource.url=jdbc:vastbase://${POSTGRESQL_IP_port}/${POSTGRESQL_NAME}?currentSchema=${TZS_IDX_BIZ_DATABASE}&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&noAccessToProcedureBodies=true&allowMultiQueries=true
 spring.datasource.username=${POSTGRESQL_USER}
 spring.datasource.password=${POSTGRESQL_PASSWORD}
 
-
-
-
-#注册中心地址
 eureka.client.service-url.defaultZone =http://admin:a1234560@192.168.249.13:10001/eureka/,http://admin:a1234560@192.168.249.139:10001/eureka/
 eureka.instance.prefer-ip-address=true
 eureka.instance.ip-address = 192.168.249.139
@@ -18,7 +12,6 @@ eureka.instance.metadata-map.management.context-path=${server.servlet.context-pa
 eureka.instance.status-page-url=http://elevator:${server.port}${server.servlet.context-path}/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://elevator:${server.port}${server.servlet.context-path}/doc.html
 
-
 ## ES properties:
 spring.elasticsearch.rest.uris=${ELASTICSEARCH_REST_URIS}
 elasticsearch.username=${ELASTICSEARCH_USERNAME}
@@ -36,13 +29,12 @@ spring.redis.cluster.max-redirects=3
 spring.redis.timeout=10000
 spring.redis.lettuce.cluster.refresh.adaptive=true
 spring.redis.lettuce.cluster.refresh.period=2000
-#默认配置，生产时需要调优
+
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.min-idle=0
 
-#springboot指标显示器不使用默认的，使用自定义的MyRedisHealthIndicator
 management.health.redis.enabled=false
 
 
@@ -97,12 +89,12 @@ flc.sms.tempCode=SMS_TZS_0001
 
 
 
-## 预警通知模板id
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##督查整改通知
+
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 
-## 公众号测试用户id（平台userId）
+
 tzs.wechat.test.userId=3413513
 
 
@@ -111,7 +103,7 @@ org.filter.group.seq=1564150103147573249
 
 duty.seats.role.ids=1585956200472674305,1585956257590706177
 
-## 规则配置 properties:
+
 rule.definition.load=false
 ##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
 rule.definition.default-agency=tzs
@@ -123,20 +115,19 @@ tzs.auth.user.photo=/public/common/userPic.png
 minio.url.path=${MINIO_FILESERVER_DOMAIN}/
 
 
-#### 管理员变更机器人账号
+
 tzs.admin.name=tzs_robot
 tzs.admin.pwd=a1234567
 
-##小程序appid
+
 tzs.WxApp.appId=wx48a1b1915b10d14b
 tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
 tzs.WxApp.grant-type=authorization_code
 
 
 
-#气瓶充装信息定时同步至es
+
 tzs.cylinder.fill.cron=0 0 12 * * ?
-#气瓶基本信息定时同步至es
 tzs.cylinder.info.cron=0 0 1 * * ?
 
 outSystem.user.password=a1234560
@@ -144,5 +135,4 @@ amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=STUDIO_APP_WEB
 
 
-##生成监管码前缀域名
 regulatory_code_prefix=https://nav.sspai.top/tzs?code=

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-dev.properties

@@ -62,18 +62,17 @@ mqtt.topic.cti.push=/cti/record
 cti.user.name=tzs_cti
 cti.user.pwd=a1234567
 flc.sms.tempCode=SMS_TZS_0001
-## ??????id
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##??????
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
-## ???????id???userId?
 tzs.wechat.test.userId=3413513
+
 ##new properties
 org.filter.group.seq=1564150103147573249
 fileserver.domain=http://172.16.10.243:19000/
 log.level=INFO
 duty.seats.role.ids=1585956200472674305,1585956257590706177
-## ???? properties:
+
 rule.definition.load=false
 ##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
 rule.definition.default-agency=tzs
@@ -82,9 +81,9 @@ rule.definition.local-ip=172.16.10.243
 tzs.cylinder.fill.cron=0 0 12 * * ?
 #\u6C14\u74F6\u57FA\u672C\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
 tzs.cylinder.info.cron=0 0 1 * * ?
-# ??????????
+
 minio.url.path=http://172.16.10.243:9000/
-## ɼǰ׺
+
 regulatory_code_prefix=https://nav.sspai.top/tzs?code=
 outSystem.user.password=a1234560
 amos.system.user.app-key=AMOS_STUDIO

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application.properties

@@ -50,27 +50,22 @@ security.systemctl.name=AMOS-API-SYSTEMCTL
 
 jcs.company.topic.add=jcs/company/topic/add
 jcs.company.topic.delete=jcs/company/topic/delete
-## \uFFFD\u8C78\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uD94E\uDE33\uFFFD\uFFFD\uFFFD\uFFFD\u0161\uFFFD\uFFFD\u3CA5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u58E9
+
 control.fegin.name=JCS-API-CONTROL
-## redis\uFFFD\uFFFD\u02B1\u02B1\uFFFD\uFFFD
+
 redis.cache.failure.time=10800
 failure.work.flow.processDefinitionKey=malfunction_repair
 video.fegin.name=video
 latentDanger.feign.name=AMOS-LATENT-DANGER
 Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
 
-
-## \uFFFD\u8C78\uFFFD\uFFFD\u05AA\uFFFD\uFFFD\uFFFD\uFFFDv1
 inform.work.flow.processDefinitionKey=equipment_inform_process_v1
 
-## \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u052E\uFFFD\uFFFD\uFFFD\u03F2\uFFFDID
 fire-rescue=1432549862557130753
 
-
 tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
 tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
 
-
 tzs.wechat.url=https://api.weixin.qq.com
 tzs.wechat.appid=wx79aca5bb1cb4af92
 tzs.wechat.secret=f3a12323ba731d282c3d4698c27c3e97
@@ -93,37 +88,24 @@ tzs.wechat.tempId.ts=VWqgY-lXFt4dg2EL4pLjfDCBAU49Z0mRxVaQhAMMW8Q
 tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
 
 mqtt.topic.task.newtask=tzs-task-newtask
-
 mqtt.topic.task.personinfo=tzs-task-personinfo
-
 mqtt.topic.elevator.push=/tzs/tcb_elevator
-
 mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
-
 mqtt.topic.alertReport.push=/tzs/tcb_alertReport
-
 mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
-
 mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix
-
 mqtt.topic.cti.push=/cti/record
-
 mqtt.topic.cyl.warning.push=/tzs/cyl_cyl_warning
 
 cti.user.name=tzs_cti
-
 cti.user.pwd=a1234567
 
 flc.sms.tempCode=SMS_TZS_0001
 ### \u7BA1\u7406\u5458\u53D8\u66F4\u673A\u5668\u4EBA\u8D26\u53F7
 #tzs.admin.name=tzs_admin
 
-## \u0524\uFFFD\uFFFD\u0368\u05AA\u0123\uFFFD\uFFFDid
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0368\u05AA
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
-
-## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
 tzs.wechat.test.userId=3393279
 
 
@@ -145,11 +127,9 @@ amos.system.user.password=a1234567
 amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=AMOS_STUDIO_WEB
 
-## ??????????????topic
 amos.operation.log=$share/${spring.application.name}//amos/operation/log
 amos.agency.code=tzs
 
-## ?????orgCode
 regulator.unit.code=50
 
 spring.main.allow-bean-definition-overriding=true

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/utils/RedisUtil.java

@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.app.biz.utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/application-cluster.properties

@@ -7,7 +7,7 @@ spring.datasource.password=${POSTGRESQL_PASSWORD}
 
 
 
-#注册中心地址
+
 eureka.client.service-url.defaultZone =http://admin:a1234560@192.168.249.13:10001/eureka/,http://admin:a1234560@192.168.249.139:10001/eureka/
 eureka.instance.prefer-ip-address=true
 eureka.instance.ip-address = 192.168.249.139
@@ -38,7 +38,7 @@ spring.redis.lettuce.cluster.refresh.period=2000
 
 spring.redis.mode=cluster
 
-#springboot指标显示器不使用默认的，使用自定义的MyRedisHealthIndicator
+
 management.health.redis.enabled=false
 
 
@@ -93,12 +93,12 @@ flc.sms.tempCode=SMS_TZS_0001
 
 
 
-## 预警通知模板id
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##督查整改通知
+
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 
-## 公众号测试用户id（平台userId）
+
 tzs.wechat.test.userId=3413513
 
 
@@ -107,7 +107,7 @@ org.filter.group.seq=1564150103147573249
 
 duty.seats.role.ids=1585956200472674305,1585956257590706177
 
-## 规则配置 properties:
+
 rule.definition.load=false
 ##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
 rule.definition.default-agency=tzs
@@ -119,20 +119,20 @@ tzs.auth.user.photo=/public/common/userPic.png
 minio.url.path=${MINIO_FILESERVER_DOMAIN}/
 
 
-#### 管理员变更机器人账号
+
 tzs.admin.name=tzs_robot
 tzs.admin.pwd=a1234567
 
-##小程序appid
+
 tzs.WxApp.appId=wx48a1b1915b10d14b
 tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
 tzs.WxApp.grant-type=authorization_code
 
 
 
-#气瓶充装信息定时同步至es
+
 tzs.cylinder.fill.cron=0 0 12 * * ?
-#气瓶基本信息定时同步至es
+
 tzs.cylinder.info.cron=0 0 1 * * ?
 
 outSystem.user.password=a1234560
@@ -140,5 +140,5 @@ amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=STUDIO_APP_WEB
 
 
-##生成监管码前缀域名
+
 regulatory_code_prefix=https://nav.sspai.top/tzs?code=

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/application-dev.properties

@@ -61,18 +61,18 @@ mqtt.topic.cti.push=/cti/record
 cti.user.name=tzs_cti
 cti.user.pwd=a1234567
 flc.sms.tempCode=SMS_TZS_0001
-## ??????id
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##??????
+
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
-## ???????id???userId?
+
 tzs.wechat.test.userId=3413513
 ##new properties
 org.filter.group.seq=1564150103147573249
 fileserver.domain=http://172.16.10.243:19000/
 log.level=INFO
 duty.seats.role.ids=1585956200472674305,1585956257590706177
-## ???? properties:
+
 rule.definition.load=false
 ##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
 rule.definition.default-agency=tzs
@@ -81,13 +81,13 @@ rule.definition.local-ip=172.16.10.243
 tzs.cylinder.fill.cron=0 0 12 * * ?
 #\u6C14\u74F6\u57FA\u672C\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
 tzs.cylinder.info.cron=0 0 1 * * ?
-# ??????????
+
 minio.url.path=http://172.16.10.243:9000/
-## ɼǰ׺
+
 regulatory_code_prefix=https://sxtzsb.sxsei.com:19435/tzs?code=
 outSystem.user.password=a1234560
 amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=STUDIO_APP_WEB
 
-##??????????appCode
+
 amos.biz.appCode=studio_normalapp_9112044
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/application.properties

@@ -50,9 +50,9 @@ security.systemctl.name=AMOS-API-SYSTEMCTL
 
 jcs.company.topic.add=jcs/company/topic/add
 jcs.company.topic.delete=jcs/company/topic/delete
-## \uFFFD\u8C78\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uD94E\uDE33\uFFFD\uFFFD\uFFFD\uFFFD\u0161\uFFFD\uFFFD\u3CA5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u58E9
+
 control.fegin.name=JCS-API-CONTROL
-## redis\uFFFD\uFFFD\u02B1\u02B1\uFFFD\uFFFD
+
 redis.cache.failure.time=10800
 failure.work.flow.processDefinitionKey=malfunction_repair
 video.fegin.name=video
@@ -60,10 +60,10 @@ latentDanger.feign.name=AMOS-LATENT-DANGER
 Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
 
 
-## \uFFFD\u8C78\uFFFD\uFFFD\u05AA\uFFFD\uFFFD\uFFFD\uFFFDv1
+
 inform.work.flow.processDefinitionKey=equipment_inform_process_v1
 
-## \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u052E\uFFFD\uFFFD\uFFFD\u03F2\uFFFDID
+
 fire-rescue=1432549862557130753
 
 
@@ -116,12 +116,12 @@ flc.sms.tempCode=SMS_TZS_0001
 ### \u7BA1\u7406\u5458\u53D8\u66F4\u673A\u5668\u4EBA\u8D26\u53F7
 #tzs.admin.name=tzs_admin
 
-## \u0524\uFFFD\uFFFD\u0368\u05AA\u0123\uFFFD\uFFFDid
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0368\u05AA
+
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 
-## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
+
 tzs.wechat.test.userId=3393279
 
 
@@ -143,11 +143,11 @@ amos.system.user.password=a1234567
 amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=AMOS_STUDIO_WEB
 
-## ??????????????topic
+
 amos.operation.log=$share/${spring.application.name}//amos/operation/log
 amos.agency.code=tzs
 
-## ?????orgCode
+
 regulator.unit.code=50
 
 spring.main.allow-bean-definition-overriding=true

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/pom.xml

@@ -9,8 +9,8 @@
   <artifactId>amos-boot-module-common-api</artifactId>
   <dependencies>
       <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+          <groupId>org.springframework.data</groupId>
+          <artifactId>spring-data-elasticsearch</artifactId>
       </dependency>
       <dependency>
           <groupId>com.yeejoin</groupId>

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ESOrgUsrService.java

@@ -9,6 +9,7 @@ import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.SearchHit;
@@ -41,6 +42,7 @@ public class ESOrgUsrService {
     private ElasticsearchRestTemplate elasticsearchRestTemplate;
 
     @Autowired
+    @Lazy
     private OrgUsrServiceImpl orgUsrServiceImpl;
 
     public void init() throws Exception {

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/utils/RedisUtil.java

@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.cylinder.biz.utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-cluster.properties

@@ -6,7 +6,7 @@ spring.datasource.password=${POSTGRESQL_PASSWORD}
 
 
 
-#注册中心地址
+
 eureka.client.service-url.defaultZone =http://admin:a1234560@192.168.249.13:10001/eureka/,http://admin:a1234560@192.168.249.139:10001/eureka/
 eureka.instance.prefer-ip-address=true
 eureka.instance.ip-address = 192.168.249.139
@@ -35,13 +35,13 @@ spring.redis.cluster.max-redirects=3
 spring.redis.timeout=10000
 spring.redis.lettuce.cluster.refresh.adaptive=true
 spring.redis.lettuce.cluster.refresh.period=2000
-#默认配置，生产时需要调优
+
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.min-idle=0
 
-#springboot指标显示器不使用默认的，使用自定义的MyRedisHealthIndicator
+
 management.health.redis.enabled=false
 
 ##emqx
@@ -95,12 +95,12 @@ flc.sms.tempCode=SMS_TZS_0001
 
 
 
-## 预警通知模板id
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##督查整改通知
+
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 
-## 公众号测试用户id（平台userId）
+
 tzs.wechat.test.userId=3413513
 
 
@@ -109,7 +109,7 @@ org.filter.group.seq=1564150103147573249
 
 duty.seats.role.ids=1585956200472674305,1585956257590706177
 
-## 规则配置 properties:
+
 rule.definition.load=false
 ##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
 rule.definition.default-agency=tzs
@@ -121,20 +121,20 @@ tzs.auth.user.photo=/public/common/userPic.png
 minio.url.path=${MINIO_FILESERVER_DOMAIN}/
 
 
-#### 管理员变更机器人账号
+
 tzs.admin.name=tzs_robot
 tzs.admin.pwd=a1234567
 
-##小程序appid
+
 tzs.WxApp.appId=wx48a1b1915b10d14b
 tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
 tzs.WxApp.grant-type=authorization_code
 
 
 
-#气瓶充装信息定时同步至es
+
 tzs.cylinder.fill.cron=0 0 0 * * ?
-#气瓶基本信息定时同步至es
+
 tzs.cylinder.info.cron=0 0 1 * * ?
 
 outSystem.user.password=a1234560
@@ -142,5 +142,5 @@ amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=STUDIO_APP_WEB
 
 
-##生成监管码前缀域名
+
 regulatory_code_prefix=https://nav.sspai.top/tzs?code=

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-cyl.properties

@@ -75,18 +75,18 @@ mqtt.topic.cti.push=/cti/record
 cti.user.name=tzs_cti
 cti.user.pwd=a1234567
 flc.sms.tempCode=SMS_TZS_0001
-## ??????id
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##??????
+
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
-## ???????id???userId?
+
 tzs.wechat.test.userId=3413513
 ##new properties
 org.filter.group.seq=1564150103147573249
 fileserver.domain=http://172.16.10.243:19000/
 log.level=INFO
 duty.seats.role.ids=1585956200472674305,1585956257590706177
-## ???? properties:
+
 rule.definition.load=false
 ##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
 rule.definition.default-agency=tzs
@@ -95,9 +95,9 @@ rule.definition.local-ip=172.16.10.243
 tzs.cylinder.fill.cron=0 0 0 * * ?
 #\u6C14\u74F6\u57FA\u672C\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
 tzs.cylinder.info.cron=0 0 1 * * ?
-# ??????????
+
 minio.url.path=http://172.16.10.243:9000/
-## ɼǰ׺
+
 regulatory_code_prefix=https://nav.sspai.top/tzs?code=
 outSystem.user.password=a1234560
 amos.system.user.app-key=AMOS_STUDIO

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-dev.properties

@@ -61,11 +61,11 @@ mqtt.topic.cti.push=/cti/record
 cti.user.name=tzs_cti
 cti.user.pwd=a1234567
 flc.sms.tempCode=SMS_TZS_0001
-## ??????id
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##??????
+
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
-## ???????id???userId?
+
 tzs.wechat.test.userId=3413513
 ##new properties
 org.filter.group.seq=1564150103147573249
@@ -81,9 +81,9 @@ rule.definition.local-ip=172.16.10.210
 tzs.cylinder.fill.cron=0 0 0 * * ?
 #\u6C14\u74F6\u57FA\u672C\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
 tzs.cylinder.info.cron=0 0 1 * * ?
-# ??????????
+
 minio.url.path=http://172.16.10.210:9000/
-## ɼǰ׺
+
 regulatory_code_prefix=https://nav.sspai.top/tzs?code=
 outSystem.user.password=a1234560
 amos.system.user.app-key=AMOS_STUDIO

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application.properties

@@ -50,9 +50,9 @@ security.systemctl.name=AMOS-API-SYSTEMCTL
 
 jcs.company.topic.add=jcs/company/topic/add
 jcs.company.topic.delete=jcs/company/topic/delete
-## \uFFFD\u8C78\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uD94E\uDE33\uFFFD\uFFFD\uFFFD\uFFFD\u0161\uFFFD\uFFFD\u3CA5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u58E9
+
 control.fegin.name=JCS-API-CONTROL
-## redis\uFFFD\uFFFD\u02B1\u02B1\uFFFD\uFFFD
+
 redis.cache.failure.time=10800
 failure.work.flow.processDefinitionKey=malfunction_repair
 video.fegin.name=video
@@ -60,10 +60,10 @@ latentDanger.feign.name=AMOS-LATENT-DANGER
 Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
 
 
-## \uFFFD\u8C78\uFFFD\uFFFD\u05AA\uFFFD\uFFFD\uFFFD\uFFFDv1
+
 inform.work.flow.processDefinitionKey=equipment_inform_process_v1
 
-## \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u052E\uFFFD\uFFFD\uFFFD\u03F2\uFFFDID
+
 fire-rescue=1432549862557130753
 
 
@@ -116,12 +116,12 @@ flc.sms.tempCode=SMS_TZS_0001
 ### \u7BA1\u7406\u5458\u53D8\u66F4\u673A\u5668\u4EBA\u8D26\u53F7
 #tzs.admin.name=tzs_admin
 
-## \u0524\uFFFD\uFFFD\u0368\u05AA\u0123\uFFFD\uFFFDid
+
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0368\u05AA
+
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 
-## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
+
 tzs.wechat.test.userId=3393279
 
 
@@ -143,11 +143,11 @@ amos.system.user.password=a1234567
 amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=AMOS_STUDIO_WEB
 
-## ??????????????topic
+
 amos.operation.log=$share/${spring.application.name}//amos/operation/log
 amos.agency.code=tzs
 
-## ?????orgCode
+
 regulator.unit.code=50
 
 spring.main.allow-bean-definition-overriding=true

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/bootstrap.properties

+##nacos
+spring.cloud.nacos.discovery.server-addr=172.16.10.243:8848
+spring.cloud.nacos.discovery.namespace=qa
+spring.cloud.nacos.discovery.username=nacos
+spring.cloud.nacos.discovery.password=nacos
+spring.cloud.nacos.discovery.group=DEFAULT_GROUP
+
+spring.cloud.nacos.discovery.ip=172.16.3.89
+spring.cloud.nacos.discovery.port=${server.port}
+
+spring.cloud.nacos.config.server-addr=172.16.10.243:8848
+spring.cloud.nacos.config.context-path=/nacos
+spring.cloud.nacos.config.username=nacos
+spring.cloud.nacos.config.password=nacos
+spring.cloud.nacos.config.namespace=qa
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+spring.cloud.nacos.config.file-extension=properties
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

@@ -52,10 +52,10 @@ elasticsearch.password= a123456
 seata.tx-service-group= tzs-seata
 seata.service.grouplist.tzs-seata= 172.16.10.243:8091
 
-#检验检测流程KEY
+#\u68C0\u9A8C\u68C0\u6D4B\u6D41\u7A0BKEY
 process-definition-key.jyjc.openapplication=inspectionBusinessOpened
 
-# 监管端feign调用服务
+# \u76D1\u7BA1\u7AEFfeign\u8C03\u7528\u670D\u52A1
 tzsJg.feign.name=TZS-JG
 
 # rule config
@@ -65,21 +65,21 @@ spring.kafka.bootstrap-servers=172.16.10.243:9092
 spring.kafka.security.protocol=SASL_PLAINTEXT
 spring.kafka.properties.sasl.mechanism=PLAIN
 
-#定期检验是否启用规则：true-启用，false-不启用，默认不配置时不启动规则
+#\u5B9A\u671F\u68C0\u9A8C\u662F\u5426\u542F\u7528\u89C4\u5219\uFF1Atrue-\u542F\u7528\uFF0Cfalse-\u4E0D\u542F\u7528\uFF0C\u9ED8\u8BA4\u4E0D\u914D\u7F6E\u65F6\u4E0D\u542F\u52A8\u89C4\u5219
 inspection.rule.enabled.DQJY=true
-#安装监督检验是否启用规则：true-启用，false-不启用
+#\u5B89\u88C5\u76D1\u7763\u68C0\u9A8C\u662F\u5426\u542F\u7528\u89C4\u5219\uFF1Atrue-\u542F\u7528\uFF0Cfalse-\u4E0D\u542F\u7528
 inspection.rule.enabled.AZJDJY=true
-#改造监督检验是否启用规则：true-启用，false-不启用
+#\u6539\u9020\u76D1\u7763\u68C0\u9A8C\u662F\u5426\u542F\u7528\u89C4\u5219\uFF1Atrue-\u542F\u7528\uFF0Cfalse-\u4E0D\u542F\u7528
 inspection.rule.enabled.GZJDJY=true
-#维修监督检验是否启用规则：true-启用，false-不启用
+#\u7EF4\u4FEE\u76D1\u7763\u68C0\u9A8C\u662F\u5426\u542F\u7528\u89C4\u5219\uFF1Atrue-\u542F\u7528\uFF0Cfalse-\u4E0D\u542F\u7528
 inspection.rule.enabled.WXJDJY=true
-#电梯检测是否启用规则：true-启用，false-不启用
+#\u7535\u68AF\u68C0\u6D4B\u662F\u5426\u542F\u7528\u89C4\u5219\uFF1Atrue-\u542F\u7528\uFF0Cfalse-\u4E0D\u542F\u7528
 inspection.rule.enabled.DTJC=true
 inspection.rule.enabled.WTJY=true
 inspection.rule.enabled.SCJY=true
 inspection.rule.enabled.DQRBI=true
 
-# ??????(0<=datacenter-id<=31)
+#(0<=datacenter-id<=31)
 mybatis-plus.global-config.datacenter-id=1
-# ??????(0<=worker-id<=31)
+#(0<=worker-id<=31)
 mybatis-plus.global-config.worker-id=3
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/pom.xml

@@ -24,6 +24,10 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/UnitInfoChangeServiceImpl.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.tcm.flc.api.mapper.UnitInfoChangeMapper;
 import com.yeejoin.amos.boot.module.tcm.flc.api.service.IUnitInfoChangeService;
 import com.yeejoin.amos.boot.module.tcm.flc.api.service.IUnitInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -25,6 +26,7 @@ import java.util.List;
 public class UnitInfoChangeServiceImpl extends BaseService<UnitInfoChangeDto, UnitInfoChange, UnitInfoChangeMapper> implements IUnitInfoChangeService {
 
     @Autowired
+    @Lazy
     IUnitInfoService iUnitInfoService;
 
     /**

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-dev.properties

@@ -4,21 +4,33 @@ localhost=${spring.cloud.client.ip-address}
 spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
 spring.datasource.password=Yeejoin@2023
-eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
-eureka.instance.prefer-ip-address=true
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/health
-eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://${localhost}:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=${localhost}
+
+##nacos
+spring.cloud.nacos.discovery.server-addr=172.16.10.243:8848
+spring.cloud.nacos.discovery.namespace=qa
+spring.cloud.nacos.discovery.username=nacos
+spring.cloud.nacos.discovery.password=nacos
+spring.cloud.nacos.discovery.group=DEFAULT_GROUP
+
+spring.cloud.nacos.discovery.ip=172.16.3.89
+spring.cloud.nacos.discovery.port=11001
+
+spring.cloud.nacos.config.server-addr=172.16.10.243:8848
+spring.cloud.nacos.config.context-path=/nacos
+spring.cloud.nacos.config.username=nacos
+spring.cloud.nacos.config.password=nacos
+spring.cloud.nacos.config.namespace=qa
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+spring.cloud.nacos.config.file-extension=properties
+
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456
 spring.elasticsearch.rest.uris=http://172.16.10.243:9200
+
 ## unit(h)
 alertcall.es.synchrony.time=48
+
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.243
@@ -65,10 +77,9 @@ cti.user.pwd=a1234567
 flc.sms.tempCode=SMS_TZS_0001
 
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
-
 tzs.wechat.test.userId=3413513
+
 ##new properties
 org.filter.group.seq=1564150103147573249
 fileserver.domain=http://172.16.10.243:19000/

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application.properties

@@ -4,11 +4,8 @@ server.port=11002
 spring.profiles.active=dev
 
 server.tomcat.accept-count=1000
-
 server.tomcat.max-connections=10000
-
 server.tomcat.threads.max=800
-
 server.tomcat.threads.min-spare=100
 
 logging.level.net.javacrumbs.shedlock=DEBUG
@@ -25,17 +22,9 @@ spring.liquibase.enabled= true
 feign.client.config.default.connect-timeout=30000
 feign.client.config.default.read-timeout=30000
 
-## eureka properties:
-eureka.client.registry-fetch-interval-seconds=5
-eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url-path=/actuator/health
-eureka.instance.lease-expiration-duration-in-seconds=10
-eureka.instance.lease-renewal-interval-in-seconds=5
-eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url-path=/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
+
 #DB properties:
 spring.datasource.driver-class-name=cn.com.vastbase.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -174,3 +163,8 @@ tzs.WxApp.grant-type=authorization_code
 mybatis-plus.global-config.datacenter-id=1
 # (0<=worker-id<=31)
 mybatis-plus.global-config.worker-id=2
+
+# SpringBoot 2.6\u4EE5\u540E\u9ED8\u8BA4\u4E0D\u5141\u8BB8\u5FAA\u73AF\u4F9D\u8D56\uFF08\u9879\u76EE\u4E0D\u62A5\u9519\uFF0C\u53EF\u4E0D\u52A0\uFF09
+spring.main.allow-circular-references=true
+# SpringBoot 2.6\u4EE5\u4E0A\uFF0Cswagger2\u4E0D\u517C\u5BB9\u95EE\u9898
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/application-dev.properties

@@ -38,7 +38,7 @@ security.productWeb=STUDIO_APP_WEB
 security.productApp=STUDIO_APP_MOBILE
 security.appKey=studio_normalapp_3056965
 
-#redis 配置
+#redis \u914D\u7F6E
 spring.redis.database=1
 spring.redis.host=172.16.10.243
 spring.redis.port=6379
@@ -49,12 +49,12 @@ spring.redis.jedis.pool.max-idle=10
 spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
 
-#巡检计划定时任务
+#\u5DE1\u68C0\u8BA1\u5212\u5B9A\u65F6\u4EFB\u52A1
 jobs.cron = 0 0 22 * * ?
 jobs.cron.static = 0 0 1 * * ?
 jobs.cron.bak= -
 
-#邮件配置
+#\u90AE\u4EF6\u914D\u7F6E
 #params.mailPush = false
 #spring.mail.host:
 #spring.mail.username:
@@ -67,10 +67,10 @@ jobs.cron.bak= -
 #spring.mail.properties.mail.smtp.starttls.required: true
 #spring.mail.properties.mail.smtp.ssl.enable:true
 
-#jpush 推送配置项
+#jpush \u63A8\u9001\u914D\u7F6E\u9879
 params.isPush = false
 
-#巡检消息同步开关
+#\u5DE1\u68C0\u6D88\u606F\u540C\u6B65\u5F00\u5173
 emq.patrol.sync.switch=true
 
 params.work.flow.normalProcessDefinitionKey=normalHazardManagement
@@ -83,7 +83,7 @@ params.remoteWebsocketUrl=http://172.16.10.243:8080/
 #websocket send message url
 params.remoteWebSocketSendMsgUrl=http://172.16.10.243:10601/
 
-#上传文件配置
+#\u4E0A\u4F20\u6587\u4EF6\u914D\u7F6E
 spring.http.multipart.maxFileSize = 80480000
 spring.http.multipart.MaxRequestSize = 80480000
 windows.img.path = D:\\
@@ -99,13 +99,13 @@ emqx.keepAliveInterval=1000
 
 file.url=http://172.16.10.243:9000/
 
-##代码中有部分逻辑冲突需要处理  为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑
+##\u4EE3\u7801\u4E2D\u6709\u90E8\u5206\u903B\u8F91\u51B2\u7A81\u9700\u8981\u5904\u7406  \u4E3A\u533A\u5206\u673A\u573A\u548C\u7535\u529B\u903B\u8F91 \u589E\u52A0\u5F00\u5173 \u82E5\u4E3Atrue \u5219\u4E3A\u673A\u573A\u903B\u8F91 \u4E3Afalse \u5219\u4E3A\u7535\u529B\u903B\u8F91
 logic=false
 
-#是否为中心级系统  true-中心级系统  false-站端系统
+#\u662F\u5426\u4E3A\u4E2D\u5FC3\u7EA7\u7CFB\u7EDF  true-\u4E2D\u5FC3\u7EA7\u7CFB\u7EDF  false-\u7AD9\u7AEF\u7CFB\u7EDF
 is.zxj=true
 
-## \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u052E\uFFFD\uFFFD\uFFFD\u03F2\uFFFDID
+
 fire-rescue=1432549862557130753
 
 ## ES properties:
@@ -144,9 +144,9 @@ spring.jpa.properties.hibernate.order_updates =true
 #spring.shardingsphere.datasource.ds0.maximum-pool-size=50
 #
 #
-##数据源名称，多数据源以逗号分隔
+##\u6570\u636E\u6E90\u540D\u79F0\uFF0C\u591A\u6570\u636E\u6E90\u4EE5\u9017\u53F7\u5206\u9694
 #spring.shardingsphere.datasource.names=ds0
-## 这里由于分库分表字段不相同配置，不然会导致使用user_id 查询找不到相应的表，如果我们分库分表都使用 user_id 则不需要这个配置
+## \u8FD9\u91CC\u7531\u4E8E\u5206\u5E93\u5206\u8868\u5B57\u6BB5\u4E0D\u76F8\u540C\u914D\u7F6E\uFF0C\u4E0D\u7136\u4F1A\u5BFC\u81F4\u4F7F\u7528user_id \u67E5\u8BE2\u627E\u4E0D\u5230\u76F8\u5E94\u7684\u8868\uFF0C\u5982\u679C\u6211\u4EEC\u5206\u5E93\u5206\u8868\u90FD\u4F7F\u7528 user_id \u5219\u4E0D\u9700\u8981\u8FD9\u4E2A\u914D\u7F6E
 #spring.shardingsphere.rules.sharding.tables.p_plan_task_history.actual-data-nodes = ds0.p_plan_task_history_$->{1..2}
 #spring.shardingsphere.rules.sharding.tables.p_plan_task_detail_history.actual-data-nodes = ds0.p_plan_task_detail_history_$->{1..2}
 #spring.shardingsphere.rules.sharding.tables.p_check_history.actual-data-nodes = ds0.p_check_history_$->{1..2}
@@ -156,8 +156,8 @@ spring.jpa.properties.hibernate.order_updates =true
 #spring.shardingsphere.sharding.default-data.source-name=ds0
 #spring.main.allow-bean-definition-overriding=true
 #
-## -----分表开始
-## 分片键位sequence_nbr,每个库分为两表，所以取模2
+## -----\u5206\u8868\u5F00\u59CB
+## \u5206\u7247\u952E\u4F4Dsequence_nbr,\u6BCF\u4E2A\u5E93\u5206\u4E3A\u4E24\u8868\uFF0C\u6240\u4EE5\u53D6\u6A212
 #spring.shardingsphere.rules.sharding.tables.p_plan_task_history.table-strategy.standard.sharding-column=id
 #spring.shardingsphere.rules.sharding.tables.p_plan_task_history.table-strategy.standard.sharding-algorithm-name=task-inline
 #
@@ -173,7 +173,7 @@ spring.jpa.properties.hibernate.order_updates =true
 #spring.shardingsphere.rules.sharding.tables.p_check_shot_history.table-strategy.standard.sharding-column=id
 #spring.shardingsphere.rules.sharding.tables.p_check_shot_history.table-strategy.standard.sharding-algorithm-name=check-shot-inline
 #
-##行表达式分片算法
+##\u884C\u8868\u8FBE\u5F0F\u5206\u7247\u7B97\u6CD5
 #spring.shardingsphere.rules.sharding.sharding-algorithms.task-inline.type=INLINE
 #spring.shardingsphere.rules.sharding.sharding-algorithms.task-inline.props.algorithm-expression=p_plan_task_history_$->{id % 2 + 1}
 #
@@ -188,9 +188,9 @@ spring.jpa.properties.hibernate.order_updates =true
 #
 #spring.shardingsphere.rules.sharding.sharding-algorithms.check-shot-inline.type=INLINE
 #spring.shardingsphere.rules.sharding.sharding-algorithms.check-shot-inline.props.algorithm-expression=p_check_shot_history_$->{id % 2 + 1}
-## -----分表结束
+## -----\u5206\u8868\u7ED3\u675F
 #
-##是否开启SQL显示，默认值: false
+##\u662F\u5426\u5F00\u542FSQL\u663E\u793A\uFF0C\u9ED8\u8BA4\u503C: false
 #spring.shardingsphere.props.sql-show= false
 #spring.shardingsphere.props.max-connections-size-per-query=5
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/application.properties

@@ -8,7 +8,7 @@ spring.jackson.serialization.write-dates-as-timestamps=true
 feign.httpclient.enabled= true
 
 logging.config=classpath:logback-${spring.profiles.active}.xml
-#\u93C3\u5815\u68FF\u6769\u65BF\u6D16\u7EEB\u8BF2\u7037\u95B0\u5D87\u7586
+
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone = Asia/Shanghai
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/utils/RedisUtil.java

@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.ymt.biz.utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application-dev.properties

@@ -4,15 +4,25 @@ localhost=${spring.cloud.client.ip-address}
 spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
 spring.datasource.password=Yeejoin@2023
-eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
-eureka.instance.prefer-ip-address=true
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/health
-eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://${localhost}:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=${localhost}
+
+##nacos
+spring.cloud.nacos.discovery.server-addr=172.16.10.243:8848
+spring.cloud.nacos.discovery.namespace=qa
+spring.cloud.nacos.discovery.username=nacos
+spring.cloud.nacos.discovery.password=nacos
+spring.cloud.nacos.discovery.group=DEFAULT_GROUP
+
+spring.cloud.nacos.discovery.ip=172.16.3.89
+spring.cloud.nacos.discovery.port=11000
+
+spring.cloud.nacos.config.server-addr=172.16.10.243:8848
+spring.cloud.nacos.config.context-path=/nacos
+spring.cloud.nacos.config.username=nacos
+spring.cloud.nacos.config.password=nacos
+spring.cloud.nacos.config.namespace=qa
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+spring.cloud.nacos.config.file-extension=properties
+
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application.properties

@@ -15,17 +15,9 @@ spring.liquibase.enabled= true
 feign.client.config.default.connect-timeout=30000
 feign.client.config.default.read-timeout=30000
 
-## eureka properties:
-eureka.client.registry-fetch-interval-seconds=5
-eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url-path=/actuator/health
-eureka.instance.lease-expiration-duration-in-seconds=10
-eureka.instance.lease-renewal-interval-in-seconds=5
-eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url-path=/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
+
 #DB properties:
 spring.datasource.driver-class-name=cn.com.vastbase.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -86,25 +78,16 @@ tzs.wechat.tempId.ts=VWqgY-lXFt4dg2EL4pLjfDCBAU49Z0mRxVaQhAMMW8Q
 tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
 
 mqtt.topic.task.newtask=tzs-task-newtask
-
 mqtt.topic.task.personinfo=tzs-task-personinfo
-
 mqtt.topic.elevator.push=/tzs/tcb_elevator
-
 mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
-
 mqtt.topic.alertReport.push=/tzs/tcb_alertReport
-
 mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
-
 mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix
-
 mqtt.topic.cti.push=/cti/record
-
 mqtt.topic.cyl.warning.push=/tzs/cyl_cyl_warning
 
 cti.user.name=tzs_cti
-
 cti.user.pwd=a1234567
 
 flc.sms.tempCode=SMS_TZS_0001
@@ -151,3 +134,8 @@ tzs.auth.user.photo=/public/common/userPic.png
 tzs.WxApp.appId=wx48a1b1915b10d14b
 tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
 tzs.WxApp.grant-type=authorization_code
+
+# SpringBoot 2.6\u4EE5\u540E\u9ED8\u8BA4\u4E0D\u5141\u8BB8\u5FAA\u73AF\u4F9D\u8D56\uFF08\u9879\u76EE\u4E0D\u62A5\u9519\uFF0C\u53EF\u4E0D\u52A0\uFF09
+spring.main.allow-circular-references=true
+# SpringBoot 2.6\u4EE5\u4E0A\uFF0Cswagger2\u4E0D\u517C\u5BB9\u95EE\u9898
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/utils/RedisUtil.java

@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.ys.biz.utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

pom.xml

@@ -198,6 +198,11 @@
 				<scope>import</scope>
 			</dependency>
 			<dependency>
+				<groupId>org.springframework.data</groupId>
+				<artifactId>spring-data-elasticsearch</artifactId>
+				<version>4.3.4</version>
+			</dependency>
+			<dependency>
 				<!-- Import dependency management from Spring Boot -->
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>