Skip to content

A
amos-boot-biz
Commit 57f58042 authored by tianbo's avatar tianbo
Browse files
Options

feat(config): 迁移配置中心从Eureka到Nacos并修复SpringBoot兼容性问题

- 移除所有模块中的Eureka配置，替换为Nacos服务发现和配置管理 - 添加spring.main.allow-circular-references=true解决SpringBoot 2.6循环依赖问题 - 添加spring.mvc.pathmatch.matching-strategy=ant_path_matcher解决Swagger2兼容性问题 - 在多个模块的application-dev.properties中配置Nacos连接参数 - 修改数据库查询语句语法错误，修复原生SQL查询问题 - 添加XStream和DOM4J依赖支持XML序列化功能 - 移除amos-component-config组件依赖，统一使用Nacos配置管理 - 实现Pageable接口的withPage方法，修复分页功能缺失问题
parent 6dff9653
Hide whitespace changes
Inline Side-by-side
Showing with 222 additions and 154 deletions
amos-boot-data/amos-boot-data-accessapi/pom.xml
View file @ 57f58042
......@@ -94,12 +94,6 @@
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-config</artifactId>
<version>${amos.version}</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-rdbms</artifactId>
<version>${tyboot-version}</version>
......
amos-boot-data/amos-boot-data-accessapi/src/main/resources/application-dev.properties
View file @ 57f58042
spring.application.name=AMOS-API-ACCESSAPI
server.servlet.context-path=/accessapi
server.port=11005
##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=11005
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
# jdbc_config
spring.datasource.driver-class-name=org.postgresql.Driver
spring.datasource.url=jdbc:postgresql://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_data_accessapi&allowMultiQueries=true
......@@ -28,17 +47,8 @@ spring.redis.lettuce.pool.min-idle=0
localhost=${spring.cloud.client.ip-address}
#注册中心地址
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}/swagger-ui.html
eureka.instance.ip-address=${localhost}
eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
##emqx
emqx.clean-session=true
......
amos-boot-data/amos-boot-data-accessapi/src/main/resources/application.properties
View file @ 57f58042
......@@ -3,10 +3,10 @@ server.compression.enabled=true
spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
logging.config=classpath:logback-${spring.profiles.active}.xml
#设置文件上传的大小限制
#\u8BBE\u7F6E\u6587\u4EF6\u4E0A\u4F20\u7684\u5927\u5C0F\u9650\u5236
spring.servlet.multipart.maxFileSize=3MB
spring.servlet.multipart.maxRequestSize=3MB
## redis失效时间
## redis\u5931\u6548\u65F6\u95F4
redis.cache.failure.time=10800
# mybatis-plus
mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml
......@@ -15,4 +15,9 @@ mybatis-plus.global-config.db-config.id-type=ID_WORKER
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.roles=SBA_ADMIN
\ No newline at end of file
spring.security.user.roles=SBA_ADMIN
# 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-data/amos-boot-data-openapi/pom.xml
View file @ 57f58042
......@@ -101,12 +101,6 @@
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-config</artifactId>
<version>${amos.version}</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-rdbms</artifactId>
<version>${tyboot-version}</version>
......
amos-boot-data/amos-boot-data-openapi/src/main/resources/application-vb.properties
View file @ 57f58042
spring.application.name=AMOS-API-OPENAPI
server.servlet.context-path=/openapi
server.port=11001
##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
# jdbc_config
spring.datasource.dynamic.primary=openapi
......@@ -43,16 +62,8 @@ spring.redis.expire.time=300
localhost=${spring.cloud.client.ip-address}
#注册中心地址
eureka.client.service-url.defaultZone =http://admin:a1234560@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}
##emqx
emqx.clean-session=true
......
amos-boot-data/amos-boot-data-openapi/src/main/resources/application.properties
View file @ 57f58042
......@@ -4,10 +4,10 @@ spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=Asia/Shanghai
logging.config=classpath:logback-${spring.profiles.active}.xml
#设置文件上传的大小限制
#\u8BBE\u7F6E\u6587\u4EF6\u4E0A\u4F20\u7684\u5927\u5C0F\u9650\u5236
spring.servlet.multipart.maxFileSize=3MB
spring.servlet.multipart.maxRequestSize=3MB
## redis失效时间
## redis\u5931\u6548\u65F6\u95F4
redis.cache.failure.time=10800
# mybatis-plus
mybatis-plus.mapper-locations=classpath*:mapper/*Mapper.xml
......@@ -18,4 +18,9 @@ spring.main.allow-bean-definition-overriding=true
amos.system.user.user-name=jg_admin
amos.system.user.password=a1234560
amos.system.user.product=AMOS_STUDIO_WEB
amos.system.user.app-key=AMOS_STUDIO
\ No newline at end of file
amos.system.user.app-key=AMOS_STUDIO
# 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-96333/amos-boot-module-96333-biz/src/main/resources/application-dev.properties
View file @ 57f58042
#DB properties:
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://172.16.3.70:${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://172.16.3.70:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.70:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address=172.16.3.70
##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=11004
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-96333/amos-boot-module-96333-biz/src/main/resources/application.properties
View file @ 57f58042
......@@ -16,17 +16,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
......@@ -144,4 +136,9 @@ tzs.WxApp.appId=wx48a1b1915b10d14b
tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
tzs.WxApp.grant-type=authorization_code
global-config.worker-id=2
\ No newline at end of file
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-app/amos-boot-module-app-biz/src/main/resources/application-dev.properties
View file @ 57f58042
#DB properties:
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://172.16.3.89:${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://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.89:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address=172.16.3.89
##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=11006
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-app/amos-boot-module-app-biz/src/main/resources/application.properties
View file @ 57f58042
......@@ -16,17 +16,9 @@ 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.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
......@@ -163,4 +155,9 @@ tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
tzs.WxApp.grant-type=authorization_code
amos.wechat.robot.user=we_robot
amos.wechat.robot.password=a1234567
\ No newline at end of file
amos.wechat.robot.password=a1234567
# 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-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-cyl.properties
View file @ 57f58042
##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=11003
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:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
spring.datasource.username=admin
......@@ -15,16 +33,6 @@ spring.datasource.dynamic.datasource.cyl.username=admin
spring.datasource.dynamic.datasource.cyl.password=Yeejoin@2023
spring.datasource.dynamic.datasource.cyl.driver-class-name=cn.com.vastbase.Driver
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://172.16.3.17:${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://172.16.3.17:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.17:${server.port}${server.servlet.context-path}/doc\
.html
eureka.instance.ip-address=172.16.3.17
## ES properties:
elasticsearch.username=elastic
elasticsearch.password=a123456
......
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application.properties
View file @ 57f58042
......@@ -17,17 +17,9 @@ 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.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
......@@ -163,4 +155,9 @@ tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
tzs.WxApp.grant-type=authorization_code
spring.task.scheduling.pool.size=15
spring.task.scheduling.thread-name-prefix=taskExecutor-
\ No newline at end of file
spring.task.scheduling.thread-name-prefix=taskExecutor-
# 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-statistics/amos-boot-module-statistics-biz/src/main/resources/application-dev.properties
View file @ 57f58042
##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=12001
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.dynamic.primary=tzs
......@@ -31,16 +49,6 @@ spring.datasource.dynamic.datasource.cyl.hikari.connection-test-query=SELECT 1
localhost=${spring.cloud.client.ip-address}
## 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://${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}
#redis properties:
spring.redis.database=1
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/application.properties
View file @ 57f58042
......@@ -8,17 +8,8 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
logging.config=classpath:logback-${spring.profiles.active}.xml
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
## 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
knife4j.production=false
knife4j.enable=true
......@@ -32,3 +23,8 @@ spring.security.user.roles=SBA_ADMIN
spring.main.allow-bean-definition-overriding=true
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
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-dev.properties
View file @ 57f58042
......@@ -13,7 +13,7 @@ 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.discovery.port=11002
spring.cloud.nacos.config.server-addr=172.16.10.243:8848
spring.cloud.nacos.config.context-path=/nacos
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/request/CommonPageable.java
View file @ 57f58042
......@@ -83,6 +83,11 @@ public class CommonPageable implements Pageable {
return null;
}
@Override
public Pageable withPage(int pageNumber) {
return null;
}
public boolean hasPrevious() {
return false;
}
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/PointResponse.java
View file @ 57f58042
package com.yeejoin.amos.patrol.core.common.response;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import com.yeejoin.amos.patrol.dao.entity.PointConfig;
import javax.xml.bind.annotation.XmlElement;
......@@ -61,7 +60,6 @@ public class PointResponse {
private String phone;
@XmlElement
@XStreamImplicit(itemFieldName=" pointConfig")
private List<PointConfig> pointConfigs;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/pom.xml
View file @ 57f58042
......@@ -141,6 +141,17 @@
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
</dependency>
<!-- XStream for XML serialization -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.20</version>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.3</version>
</dependency>
</dependencies>
<build>
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IInputItemDao.java
View file @ 57f58042
......@@ -20,7 +20,7 @@ public interface IInputItemDao extends BaseDao<InputItem, Long> {
InputItem findByOriginalId(String originalId);
@Query(value = "select * from p_input_item where original_id in ?1 and is_delete =0", nativeQuery = true)
@Query(value = "select * from p_input_item where original_id in (?1) and is_delete =0", nativeQuery = true)
List<InputItem> listByOriginalIds(List<String> originalIds);
@Query(value = "select * from p_input_item where item_no = ?1 and equipment_name = ?2 and is_delete =0", nativeQuery = true)
......@@ -32,7 +32,7 @@ public interface IInputItemDao extends BaseDao<InputItem, Long> {
@Query(value = "select * from p_input_item where equipment_name =?1 and is_delete =0 and input_type = 1", nativeQuery = true)
List<InputItem> findByEquipmentName(String equipmentName);
@Query(value = "delete * from p_input_item where is not null and is_delete =0", nativeQuery = true)
@Query(value = "delete from p_input_item where equipment_name is not null and is_delete =0", nativeQuery = true)
void deleteAllByEquipmentNameIsNotNull();
@Query(value = "select count(1) from p_input_item where item_no = :itemNo and is_delete = 0 ", nativeQuery = true)
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPointDao.java
View file @ 57f58042
......@@ -22,7 +22,7 @@ public interface IPointDao extends BaseDao<Point, Long> {
Point findByOriginalId(String originalId);
@Query(value = "select * from p_point where original_id in ?1 and is_delete =0", nativeQuery = true)
@Query(value = "select * from p_point where original_id in (?1) and is_delete =0", nativeQuery = true)
List<Point> listByOriginalIds(List<String> originalIds);
Optional<Point> findById(Long id);
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IRouteDao.java
View file @ 57f58042
......@@ -20,7 +20,7 @@ public interface IRouteDao extends BaseDao<Route, Long> {
Route findByOriginalId(String originalId);
@Query(value = "select * from p_route where original_id in ?1 and is_delete =0", nativeQuery = true)
@Query(value = "select * from p_route where original_id in (?1) and is_delete =0", nativeQuery = true)
List<Route> listByOriginalIds(List<String> originalIds);
@Query(value = "select * from p_route where `name` = ?1 and is_delete =0", nativeQuery = true)
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/PageParam.java
View file @ 57f58042
......@@ -75,6 +75,11 @@ public class PageParam<K, V> extends HashMap<K, V> implements Pageable {
return null;
}
@Override
public Pageable withPage(int pageNumber) {
return null;
}
public boolean hasPrevious() {
return false;
}
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/application-dev.properties
View file @ 57f58042
eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
eureka.client.registry-fetch-interval-seconds=5
##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=8082
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
spring.security.user.name=admin
spring.security.user.password=a1234560
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
ribbon.eureka.enabled = true
ribbon.ConnectTimeout = 5000
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/application.properties
View file @ 57f58042
......@@ -81,4 +81,9 @@ spring.security.user.password=a1234560
generator.worker_id=1
#\u96EA\u82B1\u7B97\u6CD5\u53C2\u6570 \u6570\u636E\u4E2D\u5FC3id
generator.datacenter_id=1
spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
spring.main.allow-bean-definition-overriding=true
# 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/pom.xml
View file @ 57f58042
......@@ -26,18 +26,6 @@
<amos.version.tzs>1.10.8-TZS</amos.version.tzs>
</properties>
<dependencies>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-biz-common</artifactId>
......
pom.xml
View file @ 57f58042
......@@ -35,6 +35,18 @@
<dependencies>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment