From 655fcff3fecd46023fc1fd3a5f4fb7b39a0b6204 Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 19 九月 2023 16:37:15 +0800
Subject: [PATCH] 配置放到nacos
---
hd/pipe/mobile/src/main/resources/application.yml | 4
hd/pipe/materialsManage/src/main/resources/application-dev.yml | 2
hd/pipe/materialsManage/src/main/resources/application-pro.yml | 68 ----
hd/pipe/screen/src/main/resources/application-pro.yml | 82 +-----
hd/pipe/engineeringManage/src/main/resources/application-pro.yml | 75 -----
hd/pipe/filectrl/src/main/resources/application-pro.yml | 48 --
hd/pipe/gateway/src/main/resources/application-pro.yml | 86 ------
hd/pipe/secure/src/main/resources/application.yml | 4
hd/pipe/StaffManage/src/main/resources/application.yml | 4
hd/pipe/ProjectManage/src/main/resources/application.yml | 2
hd/pipe/UserCore/src/main/resources/application.yml | 2
hd/pipe/mobile/src/main/resources/application-pro.yml | 78 +----
hd/pipe/mobile/src/main/resources/application-dev.yml | 2
hd/pipe/secure/src/main/resources/application-dev.yml | 2
hd/pipe/secure/src/main/resources/application-pro.yml | 80 +-----
hd/pipe/ProjectManage/src/main/resources/application-pro.yml | 80 +-----
hd/pipe/StaffManage/src/main/resources/application-pro.yml | 81 +-----
hd/pipe/UserCore/src/main/resources/application-dev.yml | 2
hd/pipe/ProjectManage/src/main/resources/application-dev.yml | 2
hd/pipe/StaffManage/src/main/resources/application-dev.yml | 2
hd/pipe/materialsManage/src/main/resources/application.yml | 4
hd/pipe/UserCore/src/main/resources/application-pro.yml | 68 ----
22 files changed, 140 insertions(+), 638 deletions(-)
diff --git a/hd/pipe/ProjectManage/src/main/resources/application-dev.yml b/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
index f5bd292..51ace43 100644
--- a/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/ProjectManage/src/main/resources/application-dev.yml
@@ -1,3 +1,5 @@
+server:
+ port: 8883
spring:
config:
activate:
diff --git a/hd/pipe/ProjectManage/src/main/resources/application-pro.yml b/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
index 7642b6c..51ace43 100644
--- a/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/ProjectManage/src/main/resources/application-pro.yml
@@ -1,70 +1,20 @@
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
- cloud:
- nacos:
- server-addr: 111.30.93.212:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
config:
activate:
- on-profile: pro
-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
+ 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: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ 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 22aedd2..9b6d1ce 100644
--- a/hd/pipe/ProjectManage/src/main/resources/application.yml
+++ b/hd/pipe/ProjectManage/src/main/resources/application.yml
@@ -3,5 +3,3 @@
name: pm
profiles:
active: dev
-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 48755ae..5ad14c2 100644
--- a/hd/pipe/StaffManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application-dev.yml
@@ -1,3 +1,5 @@
+server:
+ port: 8882
spring:
config:
activate:
diff --git a/hd/pipe/StaffManage/src/main/resources/application-pro.yml b/hd/pipe/StaffManage/src/main/resources/application-pro.yml
index 06fa84d..5ad14c2 100644
--- a/hd/pipe/StaffManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application-pro.yml
@@ -1,71 +1,22 @@
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
- cloud:
- nacos:
- server-addr: 111.30.93.212:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
config:
activate:
- on-profile: pro
-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
+ 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: supipe
+ config:
+ file-extension: yml
+ group: sunacos
global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
- filePrefix: https://111.30.93.212:8888/
-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.yml b/hd/pipe/StaffManage/src/main/resources/application.yml
index 31b6324..4167279 100644
--- a/hd/pipe/StaffManage/src/main/resources/application.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application.yml
@@ -2,6 +2,4 @@
application:
name: staff
profiles:
- active: dev
-server:
- port: 8882
\ No newline at end of file
+ active: dev
\ 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 3ba44a3..ddac89d 100644
--- a/hd/pipe/UserCore/src/main/resources/application-dev.yml
+++ b/hd/pipe/UserCore/src/main/resources/application-dev.yml
@@ -1,3 +1,5 @@
+server:
+ port: 8881
spring:
config:
activate:
diff --git a/hd/pipe/UserCore/src/main/resources/application-pro.yml b/hd/pipe/UserCore/src/main/resources/application-pro.yml
index 30b50c9..ddac89d 100644
--- a/hd/pipe/UserCore/src/main/resources/application-pro.yml
+++ b/hd/pipe/UserCore/src/main/resources/application-pro.yml
@@ -1,71 +1,23 @@
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: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: pro
+ 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.212:8848
+ server-addr: 111.30.93.215:8848
discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
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
-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
+ 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.yml b/hd/pipe/UserCore/src/main/resources/application.yml
index ddecb77..662a7d8 100644
--- a/hd/pipe/UserCore/src/main/resources/application.yml
+++ b/hd/pipe/UserCore/src/main/resources/application.yml
@@ -3,5 +3,3 @@
name: usercore
profiles:
active: dev
-server:
- port: 8881
diff --git a/hd/pipe/engineeringManage/src/main/resources/application-pro.yml b/hd/pipe/engineeringManage/src/main/resources/application-pro.yml
index 2cca517..1a1133a 100644
--- a/hd/pipe/engineeringManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/engineeringManage/src/main/resources/application-pro.yml
@@ -1,73 +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: pro
+ 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.212:8848
+ server-addr: 111.30.93.215: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://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/filectrl/src/main/resources/application-pro.yml b/hd/pipe/filectrl/src/main/resources/application-pro.yml
index 30aa23d..e8dc5f2 100644
--- a/hd/pipe/filectrl/src/main/resources/application-pro.yml
+++ b/hd/pipe/filectrl/src/main/resources/application-pro.yml
@@ -1,43 +1,17 @@
-server:
- port: 8885
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}
cloud:
nacos:
- server-addr: 111.30.93.212:8848
+ server-addr: 111.30.93.215:8848
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
- server-addr: ${spring.cloud.nacos.server-addr}
- config:
- activate:
- on-profile: pro
-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: /data/file/workspace
+ group: supipe
+ config:
+ file-extension: yml
+ group: sunacos
diff --git a/hd/pipe/gateway/src/main/resources/application-pro.yml b/hd/pipe/gateway/src/main/resources/application-pro.yml
index 745a726..0e5e88b 100644
--- a/hd/pipe/gateway/src/main/resources/application-pro.yml
+++ b/hd/pipe/gateway/src/main/resources/application-pro.yml
@@ -3,88 +3,16 @@
spring:
cloud:
nacos:
- server-addr: 111.30.93.212:8848
+ server-addr: 111.30.93.215: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:
+ file-extension: yml
+ group: sunacos
config:
activate:
- on-profile: pro
-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"
- - "/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
+ on-profile: dev
+ 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/materialsManage/src/main/resources/application-dev.yml b/hd/pipe/materialsManage/src/main/resources/application-dev.yml
index f5bd292..7b7de76 100644
--- a/hd/pipe/materialsManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/materialsManage/src/main/resources/application-dev.yml
@@ -1,3 +1,5 @@
+server:
+ port: 8892
spring:
config:
activate:
diff --git a/hd/pipe/materialsManage/src/main/resources/application-pro.yml b/hd/pipe/materialsManage/src/main/resources/application-pro.yml
index 33e8efc..7b7de76 100644
--- a/hd/pipe/materialsManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/materialsManage/src/main/resources/application-pro.yml
@@ -1,68 +1,20 @@
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
config:
activate:
- on-profile: pro
+ 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.212:8848
+ server-addr: 111.30.93.215: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://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
- 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.yml b/hd/pipe/materialsManage/src/main/resources/application.yml
index 30f9bb5..c3a6850 100644
--- a/hd/pipe/materialsManage/src/main/resources/application.yml
+++ b/hd/pipe/materialsManage/src/main/resources/application.yml
@@ -2,6 +2,4 @@
application:
name: materials
profiles:
- active: dev
-server:
- port: 8892
\ No newline at end of file
+ active: dev
\ 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 f5bd292..821bb43 100644
--- a/hd/pipe/mobile/src/main/resources/application-dev.yml
+++ b/hd/pipe/mobile/src/main/resources/application-dev.yml
@@ -1,3 +1,5 @@
+server:
+ port: 8884
spring:
config:
activate:
diff --git a/hd/pipe/mobile/src/main/resources/application-pro.yml b/hd/pipe/mobile/src/main/resources/application-pro.yml
index 2295c4a..821bb43 100644
--- a/hd/pipe/mobile/src/main/resources/application-pro.yml
+++ b/hd/pipe/mobile/src/main/resources/application-pro.yml
@@ -1,68 +1,20 @@
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
- cloud:
- nacos:
- server-addr: 111.30.93.212:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
config:
activate:
- on-profile: pro
-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
+ 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: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ 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 aa51a9f..70c2ee2 100644
--- a/hd/pipe/mobile/src/main/resources/application.yml
+++ b/hd/pipe/mobile/src/main/resources/application.yml
@@ -2,6 +2,4 @@
application:
name: mobile
profiles:
- active: dev
-server:
- port: 8884
\ No newline at end of file
+ active: dev
\ No newline at end of file
diff --git a/hd/pipe/screen/src/main/resources/application-pro.yml b/hd/pipe/screen/src/main/resources/application-pro.yml
index 8021082..f5bd292 100644
--- a/hd/pipe/screen/src/main/resources/application-pro.yml
+++ b/hd/pipe/screen/src/main/resources/application-pro.yml
@@ -1,70 +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
- cloud:
- nacos:
- server-addr: 111.30.93.212:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
config:
activate:
- on-profile: pro
-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
- 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
+ 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: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ 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 f5bd292..b8519ec 100644
--- a/hd/pipe/secure/src/main/resources/application-dev.yml
+++ b/hd/pipe/secure/src/main/resources/application-dev.yml
@@ -1,3 +1,5 @@
+server:
+ port: 8886
spring:
config:
activate:
diff --git a/hd/pipe/secure/src/main/resources/application-pro.yml b/hd/pipe/secure/src/main/resources/application-pro.yml
index 566c688..b8519ec 100644
--- a/hd/pipe/secure/src/main/resources/application-pro.yml
+++ b/hd/pipe/secure/src/main/resources/application-pro.yml
@@ -1,70 +1,20 @@
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
- cloud:
- nacos:
- server-addr: 111.30.93.212:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
config:
activate:
- on-profile: pro
-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
+ 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: supipe
+ config:
+ file-extension: yml
+ group: sunacos
\ 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 2b44dd1..143094c 100644
--- a/hd/pipe/secure/src/main/resources/application.yml
+++ b/hd/pipe/secure/src/main/resources/application.yml
@@ -2,6 +2,4 @@
application:
name: secure
profiles:
- active: dev
-server:
- port: 8886
\ No newline at end of file
+ active: dev
\ No newline at end of file
--
Gitblit v1.9.3