Merge branch 'develop_tzs_dev_nacos' into develop_tzs_dev_nacos_jyjc

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.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=12000
+
+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
+
 #DB properties:
 spring.datasource.url=jdbc:postgresql://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
@@ -14,16 +32,8 @@ spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 spring.datasource.hikari.register-mbeans=true
 
-## eureka properties:
-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://${spring.cloud.client.ip-address}:${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://${spring.cloud.client.ip-address}:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://${spring.cloud.client.ip-address}:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=${spring.cloud.client.ip-address}
 
 #redis properties:
 spring.redis.database=1

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

@@ -15,11 +15,6 @@ spring.liquibase.enabled= false
 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.lease-expiration-duration-in-seconds=10
-eureka.instance.lease-renewal-interval-in-seconds=5
-
 knife4j.production=false
 knife4j.enable=true
 knife4j.basic.enable=true
@@ -42,6 +37,9 @@ spring.main.allow-bean-definition-overriding=true
 # rule config
 rule.definition.model-package=com.yeejoin.amos.boot.module.jyjc.biz.rule
 
-eureka.instance.metadata-map.user.name=${spring.security.user.name}
-eureka.instance.metadata-map.user.password=${spring.security.user.password}
-spring.cloud.loadbalancer.ribbon.enabled=false
\ No newline at end of file
+spring.cloud.loadbalancer.ribbon.enabled=false
+
+# 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