From f2aa56a0b880afcbc568c2d4b27c96ab23e01c73 Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 19 九月 2023 16:32:46 +0800
Subject: [PATCH] 配置放到nacos
---
hd/pipe/mobile/src/main/resources/application.yml | 5
hd/pipe/pom.xml | 5
hd/pipe/gateway/src/main/resources/application.yml | 2
hd/pipe/materialsManage/src/main/resources/application-dev.yml | 68 ----
hd/pipe/engineeringManage/src/main/resources/application.yml | 8
hd/pipe/secure/src/main/resources/application.yml | 5
hd/pipe/StaffManage/src/main/resources/application.yml | 5
hd/pipe/ProjectManage/src/main/resources/application.yml | 5
hd/pipe/UserCore/src/main/resources/application.yml | 5
/dev/null | 69 -----
hd/pipe/mobile/src/main/resources/application-dev.yml | 71 ----
hd/pipe/secure/src/main/resources/application-dev.yml | 68 ----
hd/pipe/UserCore/src/main/resources/application-dev.yml | 60 ----
hd/pipe/ProjectManage/src/main/resources/application-dev.yml | 68 ----
hd/pipe/StaffManage/src/main/resources/application-dev.yml | 70 ----
hd/pipe/materialsManage/src/main/resources/application.yml | 5
hd/pipe/filectrl/src/main/resources/application-dev.yml | 30 -
hd/pipe/screen/src/main/resources/application-dev.yml | 77 -----
hd/pipe/screen/src/main/resources/application.yml | 5
hd/pipe/gateway/src/main/resources/application-dev.yml | 74 -----
hd/pipe/filectrl/src/main/resources/application.yml | 3
hd/pipe/engineeringManage/src/main/resources/application-dev.yml | 70 ----
22 files changed, 113 insertions(+), 665 deletions(-)
diff --git a/hd/pipe/ProjectManage/src/main/resources/application-dev.yml b/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
index b11be88..f5bd292 100644
--- a/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
@@ -1,70 +1,18 @@
-server:
- port: 8883
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- idleTimeOut: 90000
config:
activate:
on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ No newline at end of file
diff --git a/hd/pipe/ProjectManage/src/main/resources/application-qingdao.yml b/hd/pipe/ProjectManage/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 669004c..0000000
--- a/hd/pipe/ProjectManage/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-server:
- port: 8893
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: qingdao
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 127.0.0.1:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/ProjectManage/src/main/resources/application-su.yml b/hd/pipe/ProjectManage/src/main/resources/application-su.yml
deleted file mode 100644
index fb1f25f..0000000
--- a/hd/pipe/ProjectManage/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-server:
- port: 11105
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: su
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: sufile
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/ProjectManage/src/main/resources/application.yml b/hd/pipe/ProjectManage/src/main/resources/application.yml
index 3b13929..22aedd2 100644
--- a/hd/pipe/ProjectManage/src/main/resources/application.yml
+++ b/hd/pipe/ProjectManage/src/main/resources/application.yml
@@ -3,6 +3,5 @@
name: pm
profiles:
active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
+server:
+ port: 8883
diff --git a/hd/pipe/StaffManage/src/main/resources/application-dev.yml b/hd/pipe/StaffManage/src/main/resources/application-dev.yml
index 52a6f39..48755ae 100644
--- a/hd/pipe/StaffManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application-dev.yml
@@ -1,66 +1,20 @@
-server:
- port: 8882
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- idleTimeOut: 180000
+ config:
+ activate:
+ on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: dev
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
- filePrefix: https://pipe.thhy-tj.com/
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
+ filePrefix: https://pipe.thhy-tj.com/
\ No newline at end of file
diff --git a/hd/pipe/StaffManage/src/main/resources/application-qingdao.yml b/hd/pipe/StaffManage/src/main/resources/application-qingdao.yml
deleted file mode 100644
index ea3cf81..0000000
--- a/hd/pipe/StaffManage/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-server:
- port: 8882
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: qingdao
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
- filePrefix: https://pipe.thhy-tj.com/
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 127.0.0.1:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/StaffManage/src/main/resources/application-su.yml b/hd/pipe/StaffManage/src/main/resources/application-su.yml
deleted file mode 100644
index cfd49db..0000000
--- a/hd/pipe/StaffManage/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-server:
- port: 11109
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: su
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: sufile
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/StaffManage/src/main/resources/application.yml b/hd/pipe/StaffManage/src/main/resources/application.yml
index 1b027c5..31b6324 100644
--- a/hd/pipe/StaffManage/src/main/resources/application.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application.yml
@@ -3,6 +3,5 @@
name: staff
profiles:
active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
\ No newline at end of file
+server:
+ port: 8882
\ No newline at end of file
diff --git a/hd/pipe/UserCore/src/main/resources/application-dev.yml b/hd/pipe/UserCore/src/main/resources/application-dev.yml
index 2ca41e4..3ba44a3 100644
--- a/hd/pipe/UserCore/src/main/resources/application-dev.yml
+++ b/hd/pipe/UserCore/src/main/resources/application-dev.yml
@@ -1,65 +1,21 @@
-server:
- port: 8881
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
config:
activate:
on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- access-key: rocketty
- secret-key: Thhy@2023
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
wemp:
appId: wx993e9d4056f0f44e
secret: 87f19fa7f1e6898fb143396283e733b8
\ No newline at end of file
diff --git a/hd/pipe/UserCore/src/main/resources/application-qingdao.yml b/hd/pipe/UserCore/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 1fcd3f9..0000000
--- a/hd/pipe/UserCore/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-server:
- port: 8881
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- config:
- activate:
- on-profile: qingdao
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: RocketMq
- secret-key: Thhy@2023
- name-server: 127.0.0.1:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: RocketMq
- secret-key: Thhy@2023
-wemp:
- appId: wx993e9d4056f0f44e
- secret: 87f19fa7f1e6898fb143396283e733b8
\ No newline at end of file
diff --git a/hd/pipe/UserCore/src/main/resources/application-su.yml b/hd/pipe/UserCore/src/main/resources/application-su.yml
deleted file mode 100644
index ac49750..0000000
--- a/hd/pipe/UserCore/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-server:
- port: 11108
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- config:
- activate:
- on-profile: su
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: sufile
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
-wemp:
- appId: wx993e9d4056f0f44e
- secret: 87f19fa7f1e6898fb143396283e733b8
\ No newline at end of file
diff --git a/hd/pipe/UserCore/src/main/resources/application.yml b/hd/pipe/UserCore/src/main/resources/application.yml
index 74acedd..ddecb77 100644
--- a/hd/pipe/UserCore/src/main/resources/application.yml
+++ b/hd/pipe/UserCore/src/main/resources/application.yml
@@ -3,6 +3,5 @@
name: usercore
profiles:
active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
+server:
+ port: 8881
diff --git a/hd/pipe/engineeringManage/src/main/resources/application-dev.yml b/hd/pipe/engineeringManage/src/main/resources/application-dev.yml
index 2eba3c9..1a1133a 100644
--- a/hd/pipe/engineeringManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/engineeringManage/src/main/resources/application-dev.yml
@@ -1,72 +1,18 @@
-server:
- port: 8891
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
config:
activate:
on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
-file-upload:
- upload-folder: D:\test\upload/image/
- static-access-path: /file/
- template: D:\test\template\
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
diff --git a/hd/pipe/engineeringManage/src/main/resources/application-qingdao.yml b/hd/pipe/engineeringManage/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 74357a1..0000000
--- a/hd/pipe/engineeringManage/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-server:
- port: 8891
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- config:
- activate:
- on-profile: qingdao
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- server-addr: ${spring.cloud.nacos.server-addr}
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
-file-upload:
- upload-folder: D:\test\upload/image/
- static-access-path: /file/
- template: D:\test\template\
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 127.0.0.1:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/engineeringManage/src/main/resources/application-su.yml b/hd/pipe/engineeringManage/src/main/resources/application-su.yml
deleted file mode 100644
index fd0b48e..0000000
--- a/hd/pipe/engineeringManage/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-server:
- port: 11100
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- config:
- activate:
- on-profile: su
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
-file-upload:
- upload-folder: D:\test\upload/image/
- static-access-path: /file/
- template: D:\test\template\
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/engineeringManage/src/main/resources/application.yml b/hd/pipe/engineeringManage/src/main/resources/application.yml
index ac8cf49..6d9a350 100644
--- a/hd/pipe/engineeringManage/src/main/resources/application.yml
+++ b/hd/pipe/engineeringManage/src/main/resources/application.yml
@@ -2,10 +2,4 @@
application:
name: engineering
profiles:
- active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
- cloud:
- inetutils:
- ignored-interfaces: 'lo'
\ No newline at end of file
+ active: dev
\ No newline at end of file
diff --git a/hd/pipe/filectrl/src/main/resources/application-dev.yml b/hd/pipe/filectrl/src/main/resources/application-dev.yml
index 3536781..e8dc5f2 100644
--- a/hd/pipe/filectrl/src/main/resources/application-dev.yml
+++ b/hd/pipe/filectrl/src/main/resources/application-dev.yml
@@ -1,27 +1,17 @@
-server:
- port: 8885
spring:
+ config:
+ activate:
+ on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: dev
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-file:
- prekey: file
- workspace: D:\\file
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
diff --git a/hd/pipe/filectrl/src/main/resources/application-qingdao.yml b/hd/pipe/filectrl/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 23b72e1..0000000
--- a/hd/pipe/filectrl/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-server:
- port: 8885
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- server-addr: ${spring.cloud.nacos.server-addr}
- config:
- activate:
- on-profile: qingdao
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-file:
- prekey: file
- workspace: /data/file/workspace
diff --git a/hd/pipe/filectrl/src/main/resources/application-su.yml b/hd/pipe/filectrl/src/main/resources/application-su.yml
deleted file mode 100644
index d8d0d0d..0000000
--- a/hd/pipe/filectrl/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-server:
- port: 11101
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: su
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-file:
- prekey: sufile
- workspace: /data/file/workspace
diff --git a/hd/pipe/filectrl/src/main/resources/application.yml b/hd/pipe/filectrl/src/main/resources/application.yml
index a56ef9a..929357d 100644
--- a/hd/pipe/filectrl/src/main/resources/application.yml
+++ b/hd/pipe/filectrl/src/main/resources/application.yml
@@ -3,9 +3,6 @@
name: filectrl
profiles:
active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
servlet:
multipart:
max-file-size: 600MB
diff --git a/hd/pipe/gateway/src/main/resources/application-dev.yml b/hd/pipe/gateway/src/main/resources/application-dev.yml
index 99b3744..0e5e88b 100644
--- a/hd/pipe/gateway/src/main/resources/application-dev.yml
+++ b/hd/pipe/gateway/src/main/resources/application-dev.yml
@@ -8,75 +8,11 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: pipe
- gateway:
- filter:
- strip-prefix:
- enabled: true
- application:
- name: gateway
+ config:
+ file-extension: yml
+ group: sunacos
config:
activate:
on-profile: dev
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
-excludeurls:
- - "/login"
- - "/sysUser/findList"
- - "/platUser/export"
- - "/depart/export"
- - "/group/export"
- - "/group/groupUserExport"
- - "/dorm/viewcode"
- - "/spare/export"
- - "/city/cities"
- - "/rsbMaterialPlan/export"
- - "/file/upload"
- - "/file/down"
- - "/file/preview"
- - "/projectInfo/export"
- - "/pipeInfo/export"
- - "/steelPrint/test"
- - "/hardware/outMod"
- - "/secureGood/viewcode"
- - "/rsbMaterialPlan/statExport"
- - "/mixingstationstorage/statExport"
- - "/pro/protest"
- - "/platUser/register"
- - "/company/pulldown"
- - "/company/findAll"
- - "/position/findall"
- - "/mpLogin"
- - "/mpLogin/getOpenId"
- - "/platUser/checkuser"
- - "/exam/examRecordDown"
- - "/pl/prolisten"
- - "/screen/display"
- - "/prolistenserver/"
- - "/mixMaterial/export"
- - "/bigDevice/bigDeviceInfo"
- - "/pipeInfo/h5PipeList"
- - "/pipeInfo/checkHistory"
- - "/waterCultivated/getH5WaterRecord"
- - "/modcheck/getH5MouldInfo"
- - "/steelProduce/getH5SteelProduce"
- - "/steel/steelThingJsList"
- - "/record/recordThingJsList"
- - "/project/projectSizeThingJsList"
- - "/pipecreen/pipeThingJsInfo"
- - "/video/videoList"
- - "/video/videoListPath"
- - "/steelProduce/produceLoopingThingJs"
- - "/steel/restDataByOne"
\ No newline at end of file
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
\ No newline at end of file
diff --git a/hd/pipe/gateway/src/main/resources/application-qingdao.yml b/hd/pipe/gateway/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 2945006..0000000
--- a/hd/pipe/gateway/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-server:
- port: 8879
-spring:
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- gateway:
- filter:
- strip-prefix:
- enabled: true
- application:
- name: gateway
- config:
- activate:
- on-profile: qingdao
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
-excludeurls:
- - "/login"
- - "/sysUser/findList"
- - "/platUser/export"
- - "/depart/export"
- - "/group/export"
- - "/group/groupUserExport"
- - "/dorm/viewcode"
- - "/spare/export"
- - "/city/cities"
- - "/rsbMaterialPlan/export"
- - "/file/upload"
- - "/file/down"
- - "/file/preview"
- - "/projectInfo/export"
- - "/pipeInfo/export"
- - "/steelPrint/test"
- - "/hardware/outMod"
- - "/secureGood/viewcode"
- - "/rsbMaterialPlan/statExport"
- - "/mixingstationstorage/statExport"
- - "/platUser/register"
- - "/company/pulldown"
- - "/company/findAll"
- - "/position/findall"
- - "/mpLogin"
- - "/mpLogin/getOpenId"
- - "/platUser/checkuser"
- - "/exam/examRecordDown"
- - "/pl/prolisten"
- - "/screen/display"
- - "/prolistenserver/"
- - "/mixMaterial/export"
- - "/bigDevice/bigDeviceInfo"
- - "/pipeInfo/h5PipeList"
- - "/pipeInfo/checkHistory"
- - "/waterCultivated/getH5WaterRecord"
- - "/modcheck/getH5MouldInfo"
- - "/steelProduce/getH5SteelProduce"
- - "/steel/steelThingJsList"
- - "/record/recordThingJsList"
- - "/project/projectSizeThingJsList"
- - "/pipecreen/pipeThingJsInfo"
- - "/platUser/doorlis"
- - "/pipecreen/pipePlanProduct"
- - "/platUser/isuplis"
- - "/video/videoList"
- - "/video/videoListPath"
- - "/platUser/faceRecord"
- - "/pl/agv"
- - "/pipecreen/materialRecord"
- - "/pl/monthProductRingByPro"
- - "/steelProduce/produceLoopingThingJs"
- - "/platUser/doorlisWithPic"
- - "/steel/restDataByOne"
\ No newline at end of file
diff --git a/hd/pipe/gateway/src/main/resources/application-su.yml b/hd/pipe/gateway/src/main/resources/application-su.yml
deleted file mode 100644
index 0fad134..0000000
--- a/hd/pipe/gateway/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-server:
- port: 11102
-spring:
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- gateway:
- filter:
- strip-prefix:
- enabled: true
- application:
- name: gateway
- config:
- activate:
- on-profile: su
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
-excludeurls:
- - "/login"
- - "/sysUser/findList"
- - "/platUser/export"
- - "/depart/export"
- - "/group/export"
- - "/group/groupUserExport"
- - "/dorm/viewcode"
- - "/spare/export"
- - "/city/cities"
- - "/rsbMaterialPlan/export"
- - "/file/upload"
- - "/file/down"
- - "/file/preview"
- - "/projectInfo/export"
- - "/pipeInfo/export"
- - "/steelPrint/test"
- - "/hardware/outMod"
- - "/secureGood/viewcode"
- - "/rsbMaterialPlan/statExport"
- - "/mixingstationstorage/statExport"
- - "/platUser/register"
- - "/company/pulldown"
- - "/company/findAll"
- - "/position/findall"
- - "/mpLogin"
- - "/mpLogin/getOpenId"
- - "/platUser/checkuser"
- - "/exam/examRecordDown"
- - "/pl/prolisten"
- - "/screen/display"
- - "/prolistenserver/"
- - "/mixMaterial/export"
- - "/bigDevice/bigDeviceInfo"
- - "/pipeInfo/h5PipeList"
- - "/pipeInfo/checkHistory"
- - "waterCultivated/getH5WaterRecord"
- - "/modcheck/getH5MouldInfo"
- - "/steelProduce/getH5SteelProduce"
- - "/steel/steelThingJsList"
- - "/record/recordThingJsList"
- - "/project/projectSizeThingJsList"
- - "/pipecreen/pipeThingJsInfo"
- - "/video/videoList"
- - "/video/videoListPath"
- - "/steelProduce/produceLoopingThingJs"
- - "/steel/restDataByOne"
\ No newline at end of file
diff --git a/hd/pipe/gateway/src/main/resources/application.yml b/hd/pipe/gateway/src/main/resources/application.yml
index 3d7808a..6c4627c 100644
--- a/hd/pipe/gateway/src/main/resources/application.yml
+++ b/hd/pipe/gateway/src/main/resources/application.yml
@@ -1,3 +1,5 @@
spring:
profiles:
active: dev
+ application:
+ name: gateway
diff --git a/hd/pipe/materialsManage/src/main/resources/application-dev.yml b/hd/pipe/materialsManage/src/main/resources/application-dev.yml
index 53a1548..f5bd292 100644
--- a/hd/pipe/materialsManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/materialsManage/src/main/resources/application-dev.yml
@@ -1,70 +1,18 @@
-server:
- port: 8892
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- idleTimeOut: 170000
config:
activate:
on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ No newline at end of file
diff --git a/hd/pipe/materialsManage/src/main/resources/application-qingdao.yml b/hd/pipe/materialsManage/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 44d35c1..0000000
--- a/hd/pipe/materialsManage/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-server:
- port: 8892
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- config:
- activate:
- on-profile: qingdao
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 127.0.0.1:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/materialsManage/src/main/resources/application-su.yml b/hd/pipe/materialsManage/src/main/resources/application-su.yml
deleted file mode 100644
index feb81c0..0000000
--- a/hd/pipe/materialsManage/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-server:
- port: 11103
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/su_pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- config:
- activate:
- on-profile: su
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: sufile
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/materialsManage/src/main/resources/application.yml b/hd/pipe/materialsManage/src/main/resources/application.yml
index 2b70b47..30f9bb5 100644
--- a/hd/pipe/materialsManage/src/main/resources/application.yml
+++ b/hd/pipe/materialsManage/src/main/resources/application.yml
@@ -3,6 +3,5 @@
name: materials
profiles:
active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
\ No newline at end of file
+server:
+ port: 8892
\ No newline at end of file
diff --git a/hd/pipe/mobile/src/main/resources/application-dev.yml b/hd/pipe/mobile/src/main/resources/application-dev.yml
index 5e3fe99..f5bd292 100644
--- a/hd/pipe/mobile/src/main/resources/application-dev.yml
+++ b/hd/pipe/mobile/src/main/resources/application-dev.yml
@@ -1,67 +1,18 @@
-server:
- port: 8884
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
+ config:
+ activate:
+ on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: dev
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ No newline at end of file
diff --git a/hd/pipe/mobile/src/main/resources/application-qingdao.yml b/hd/pipe/mobile/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 96fe407..0000000
--- a/hd/pipe/mobile/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-server:
- port: 8884
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7002/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: qingdao
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 127.0.0.1:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/mobile/src/main/resources/application-su.yml b/hd/pipe/mobile/src/main/resources/application-su.yml
deleted file mode 100644
index 7f02eee..0000000
--- a/hd/pipe/mobile/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-server:
- port: 11104
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/su_pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: su
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: sufile
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/mobile/src/main/resources/application.yml b/hd/pipe/mobile/src/main/resources/application.yml
index e041ec7..aa51a9f 100644
--- a/hd/pipe/mobile/src/main/resources/application.yml
+++ b/hd/pipe/mobile/src/main/resources/application.yml
@@ -3,6 +3,5 @@
name: mobile
profiles:
active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
\ No newline at end of file
+server:
+ port: 8884
\ No newline at end of file
diff --git a/hd/pipe/pom.xml b/hd/pipe/pom.xml
index 2527638..7bbfc17 100644
--- a/hd/pipe/pom.xml
+++ b/hd/pipe/pom.xml
@@ -43,6 +43,11 @@
</dependency>
<dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.14</version>
diff --git a/hd/pipe/screen/src/main/resources/application-dev.yml b/hd/pipe/screen/src/main/resources/application-dev.yml
index 633ee9b..f5bd292 100644
--- a/hd/pipe/screen/src/main/resources/application-dev.yml
+++ b/hd/pipe/screen/src/main/resources/application-dev.yml
@@ -1,73 +1,18 @@
-server:
- port: 8887
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
+ config:
+ activate:
+ on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: dev
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- name-server: 111.30.93.212:9876
- consumer:
- access-key: rocketty
- secret-key: Thhy@2023
- pull-consumer:
- group: pipe
- topic: inits
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- enable-msg-trace: on
- access-key: rocketty
- secret-key: Thhy@2023
-mqtt:
- pubTopic:
- subTopic: agvmqtt
- broker: tcp://111.30.93.213:1883
- clientId: qingdaoAgv
- username: agvadmin
- password: Thhy123456
-netty:
- port: 8899
\ No newline at end of file
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ No newline at end of file
diff --git a/hd/pipe/screen/src/main/resources/application-qingdao.yml b/hd/pipe/screen/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 5b8d23b..0000000
--- a/hd/pipe/screen/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-server:
- port: 8887
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7002/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: qingdao
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- name-server: 127.0.0.1:9876
- consumer:
- access-key: rocketty
- secret-key: Thhy@2023
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
-mqtt:
- pubTopic:
- subTopic: agvmqtt
- broker: tcp://111.30.93.213:1883
- clientId: qingdaoAgv
- username: agvadmin
- password: Thhy123456
-netty:
- port: 8899
\ No newline at end of file
diff --git a/hd/pipe/screen/src/main/resources/application-su.yml b/hd/pipe/screen/src/main/resources/application-su.yml
deleted file mode 100644
index 94ea535..0000000
--- a/hd/pipe/screen/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-server:
- port: 11106
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/su_pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: su
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: sufile
-rocketmq:
- enable: true
- name-server: 111.30.93.212:9876
- consumer:
- access-key: rocketty
- secret-key: Thhy@2023
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
-mqtt:
- pubTopic:
- subTopic: agvmqtt
- broker: tcp://111.30.93.213:1883
- clientId: qingdaoAgv
- username: agvadmin
- password: Thhy123456
\ No newline at end of file
diff --git a/hd/pipe/screen/src/main/resources/application.yml b/hd/pipe/screen/src/main/resources/application.yml
index fc88f54..5f5b1b4 100644
--- a/hd/pipe/screen/src/main/resources/application.yml
+++ b/hd/pipe/screen/src/main/resources/application.yml
@@ -2,7 +2,4 @@
application:
name: screen
profiles:
- active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
\ No newline at end of file
+ active: dev
\ No newline at end of file
diff --git a/hd/pipe/secure/src/main/resources/application-dev.yml b/hd/pipe/secure/src/main/resources/application-dev.yml
index 6b2f6bf..f5bd292 100644
--- a/hd/pipe/secure/src/main/resources/application-dev.yml
+++ b/hd/pipe/secure/src/main/resources/application-dev.yml
@@ -1,64 +1,18 @@
-server:
- port: 8886
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
+ config:
+ activate:
+ on-profile: dev
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:supipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
cloud:
nacos:
server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: dev
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ No newline at end of file
diff --git a/hd/pipe/secure/src/main/resources/application-qingdao.yml b/hd/pipe/secure/src/main/resources/application-qingdao.yml
deleted file mode 100644
index 782a5ab..0000000
--- a/hd/pipe/secure/src/main/resources/application-qingdao.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-server:
- port: 8886
-spring:
- datasource:
- master:
- url: jdbc:mysql://60.205.226.79:7001/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://60.205.226.79:7002/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 127.0.0.1:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: qingdao
-redisson:
- enable: true
- address: redis://127.0.0.1:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 127.0.0.1:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/secure/src/main/resources/application-su.yml b/hd/pipe/secure/src/main/resources/application-su.yml
deleted file mode 100644
index f6d3b64..0000000
--- a/hd/pipe/secure/src/main/resources/application-su.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-server:
- port: 11107
-spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/su_pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/su_pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 111.30.93.212:8878
- discovery:
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
- config:
- activate:
- on-profile: su
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: supipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: sufile
-feign:
- enable: true
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
\ No newline at end of file
diff --git a/hd/pipe/secure/src/main/resources/application.yml b/hd/pipe/secure/src/main/resources/application.yml
index de2d82a..2b44dd1 100644
--- a/hd/pipe/secure/src/main/resources/application.yml
+++ b/hd/pipe/secure/src/main/resources/application.yml
@@ -3,6 +3,5 @@
name: secure
profiles:
active: dev
- jackson:
- date-format: "yyyy-MM-dd HH:mm:ss"
- time-zone: GMT+8
\ No newline at end of file
+server:
+ port: 8886
\ No newline at end of file
--
Gitblit v1.9.3