diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index 13c2b3bc7..40f83de43 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -144,36 +144,36 @@
true
-
-
+
+ 9040
-
-
-
-
+ 2
+ 47.104.224.45
+ 6379
+ elink@888
-
-
-
-
-
+
+
+
+ epdc
+ elink833066
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ false
+ 47.104.224.45:8848
+ <!–公众号配置–>
+ wx3ef8f2cd12a19fcb
+ 948aa2f21dbaa3943288ea5b119ac6f2
+ 111
+ 111
+ <!–小程序配置–>
+ wxdd8530c5f4926766
+ 5bf4fb813145431b3493a10aa7e041e9
+ <!–工作端小程序–>
+ wx29b074840ef4bfd9
+ 4adb1afccc69f205cdf5b521d74e2aca
+ -->
9040
47.104.224.45:8848
@@ -185,7 +185,7 @@
test
-
+
+ <!–公众号配置–>
wx3ef8f2cd12a19fcb
948aa2f21dbaa3943288ea5b119ac6f2
111
111
-
+ <!–小程序配置–>
wxdd8530c5f4926766
5bf4fb813145431b3493a10aa7e041e9
-
+ <!–工作端小程序–>
wx29b074840ef4bfd9
4adb1afccc69f205cdf5b521d74e2aca
+ -->
+
+ 9040
+ 47.104.224.45:8848
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ EPDC_API
+ true
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index 6a2876035..0edf6d5da 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -62,6 +62,10 @@
1.0.0
compile
+
+ com.alibaba.boot
+ nacos-config-spring-boot-starter
+
@@ -123,7 +127,7 @@
true
-
+
+ <!–小程序配置–>
wxdd8530c5f4926766
5bf4fb813145431b3493a10aa7e041e9
-
+ <!–工作端小程序–>
wx29b074840ef4bfd9
4adb1afccc69f205cdf5b521d74e2aca
+ -->
+
+ 9066
+ 47.104.224.45:8848
+ 513d6635-3cfe-401f-b8b6-a04417288f47
+ EPDC_EVENTS
+ true
+ dev
test
-
+
+ <!–小程序配置–>
wxdd8530c5f4926766
5bf4fb813145431b3493a10aa7e041e9
-
+ <!–工作端小程序–>
wx29b074840ef4bfd9
4adb1afccc69f205cdf5b521d74e2aca
+ -->
+
+ 9066
+ 47.104.224.45:8848
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ EPDC_EVENTS
+ true
+ test
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
index acc1334b0..9e560ac0a 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
@@ -3,105 +3,18 @@ server:
servlet:
context-path: /events
+nacos:
+ config:
+ server-addr: @nacos.server-addr@
+ type: YAML
+ namespace: @nacos.config.namespace@
+ group: @nacos.config.group@
+ dataId: epdc-events-server
+ bootstrap:
+ enable: true
+ log:
+ enable: @nacos.config.bootstrap.log.enable@
+
spring:
- main:
- allow-bean-definition-overriding: true
application:
- name: epdc-events-server
- # 环境 dev|test|prod
- profiles:
- active: @spring.profiles.active@
- messages:
- encoding: UTF-8
- basename: i18n/messages,i18n/messages_common
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
- redis:
- database: @spring.redis.index@
- host: @spring.redis.host@
- timeout: 30s
- port: @spring.redis.port@
- password: @spring.redis.password@
- cloud:
- nacos:
- discovery:
- server-addr: @nacos.server-addr@
- register-enabled: @nacos.register-enabled@
- ip: @nacos.register.ip@
- alibaba:
- seata:
- tx-service-group: epdc-events-server-fescar-service-group
- datasource:
- druid:
- driver-class-name: com.mysql.jdbc.Driver
- url: @spring.datasource.druid.url@
- username: @spring.datasource.druid.username@
- password: @spring.datasource.druid.password@
-
-feign:
- hystrix:
- enabled: true
- httpclient:
- enabled: true
-
-hystrix:
- command:
- default:
- execution:
- isolation:
- thread:
- timeoutInMilliseconds: 60000 #缺省为1000
-
-ribbon:
- ReadTimeout: 300000
- ConnectTimeout: 300000
-
-management:
- endpoints:
- web:
- exposure:
- include: "*"
- endpoint:
- health:
- show-details: ALWAYS
-
-mybatis-plus:
- mapper-locations: classpath:/mapper/**/*.xml
- #实体扫描,多个package用逗号或者分号分隔
- typeAliasesPackage: com.elink.esua.epdc.modules.*.entity
- global-config:
- #数据库相关配置
- db-config:
- #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: UUID
- #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
- field-strategy: NOT_NULL
- #驼峰下划线转换
- column-underline: true
- banner: false
- #原生配置
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- call-setters-on-nulls: true
- jdbc-type-for-null: 'null'
-
-wx:
- ma:
- configs:
- - appid: @wx.ma.appId@
- secret: @wx.ma.secret@
- token: #微信小程序消息服务器配置的token
- aesKey: #微信小程序消息服务器配置的EncodingAESKey
- msgDataFormat: JSON
- - appid: @work.wx.ma.appId@
- secret: @work.wx.ma.secret@
- token: #微信小程序消息服务器配置的token
- aesKey: #微信小程序消息服务器配置的EncodingAESKey
- msgDataFormat: JSON
- appId:
- # 普通居民端的appId
- normal: @wx.ma.appId@
- # 工作端的appId
- work: @work.wx.ma.appId@
+ name:epdc-events-server
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
index 693251785..cbd0567ff 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
@@ -177,7 +177,7 @@
9063
47.104.224.45:8848
- 513d6635-3cfe-401f-b8b6-a04417288f47
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
EPDC_GROUP
true
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
index e789cc7c8..8b71debba 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -62,6 +62,10 @@
1.0.0
compile
+
+ com.alibaba.boot
+ nacos-config-spring-boot-starter
+
@@ -123,7 +127,7 @@
true
-
+
+
+ 9060
+ 47.104.224.45:8848
+ 513d6635-3cfe-401f-b8b6-a04417288f47
+ EPDC_HEART
+ true
test
-
+
+
+ 9060
+ 47.104.224.45:8848
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ EPDC_HEART
+ true
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
index 56d9c74f8..c4484369e 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
@@ -3,74 +3,17 @@ server:
servlet:
context-path: /heart
+nacos:
+ config:
+ server-addr: @nacos.server-addr@
+ type: YAML
+ namespace: @nacos.config.namespace@
+ group: @nacos.config.group@
+ dataId: epdc-heart-server
+ bootstrap:
+ enable: true
+ log:
+ enable: @nacos.config.bootstrap.log.enable@
spring:
application:
name: epdc-heart-server
- # 环境 dev|test|prod
- profiles:
- active: @spring.profiles.active@
- messages:
- encoding: UTF-8
- basename: i18n/messages,i18n/messages_common
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
- redis:
- database: @spring.redis.index@
- host: @spring.redis.host@
- timeout: 30s
- port: @spring.redis.port@
- password: @spring.redis.password@
- cloud:
- nacos:
- discovery:
- server-addr: @nacos.server-addr@
- register-enabled: @nacos.register-enabled@
- namespace: public
- alibaba:
- seata:
- tx-service-group: epdc-heart-server-fescar-service-group
- datasource:
- druid:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: @spring.datasource.druid.url@
- username: @spring.datasource.druid.username@
- password: @spring.datasource.druid.password@
- zipkin:
- # 指定了 zipkin 服务器的地址
- base-url: @spring.zipkin.base-url@
- sleuth:
- sampler:
- # 将采样比例设置为 1.0,也就是全部都需要。默认是 0.1
- probability: 1.0
-
-
-management:
- endpoints:
- web:
- exposure:
- include: "*"
- endpoint:
- health:
- show-details: ALWAYS
-
-mybatis-plus:
- mapper-locations: classpath:/mapper/**/*.xml
- #实体扫描,多个package用逗号或者分号分隔
- typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
- global-config:
- #数据库相关配置
- db-config:
- #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: ID_WORKER
- #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
- field-strategy: NOT_NULL
- #驼峰下划线转换
- column-underline: true
- banner: false
- #原生配置
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- call-setters-on-nulls: true
- jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
index ac7bb8a4f..ecaa1220b 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
@@ -145,7 +145,7 @@
test
-
+
+
+ 9061
+ 47.104.224.45:8848
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ EPDC_JOB
+ true
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
index bae63c87b..c58476e0b 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
@@ -50,7 +50,10 @@
spring-boot-admin-starter-client
${spring.boot.admin.version}
-
+
+ com.alibaba.boot
+ nacos-config-spring-boot-starter
+
@@ -112,7 +115,7 @@
true
-
+
+
+ 9987
+ 47.104.224.45:8848
+ 513d6635-3cfe-401f-b8b6-a04417288f47
+ EPDC_KPI
+ true
test
-
+
+
+ 9987
+ 47.104.224.45:8848
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ EPDC_KPI
+ true
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml
index f754286a1..14d28db9b 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml
@@ -3,86 +3,17 @@ server:
servlet:
context-path: /kpi
+nacos:
+ config:
+ server-addr: @nacos.server-addr@
+ type: YAML
+ namespace: @nacos.config.namespace@
+ group: @nacos.config.group@
+ dataId: epdc-kpi-server
+ bootstrap:
+ enable: true
+ log:
+ enable: @nacos.config.bootstrap.log.enable@
spring:
- main:
- allow-bean-definition-overriding: true
application:
name: epdc-kpi-server
- # 环境 dev|test|prod
- profiles:
- active: dev
- messages:
- encoding: UTF-8
- basename: i18n/messages,i18n/messages_common
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
- redis:
- database: @spring.redis.index@
- host: @spring.redis.host@
- timeout: 30s
- port: @spring.redis.port@
- password: @spring.redis.password@
- datasource:
- druid:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: @spring.datasource.druid.url@
- username: @spring.datasource.druid.username@
- password: @spring.datasource.druid.password@
- cloud:
- nacos:
- discovery:
- server-addr: @nacos.server-addr@
- register-enabled: @nacos.register-enabled@
- alibaba:
- seata:
- tx-service-group: epdc-kpi-server-fescar-service-group
-
-management:
- endpoints:
- web:
- exposure:
- include: "*"
- endpoint:
- health:
- show-details: ALWAYS
-
-feign:
- hystrix:
- enabled: true
- httpclient:
- enabled: true
-
-hystrix:
- command:
- default:
- execution:
- isolation:
- thread:
- timeoutInMilliseconds: 60000 #缺省为1000
-
-ribbon:
- ReadTimeout: 300000
- ConnectTimeout: 300000
-
-mybatis-plus:
- mapper-locations: classpath:/mapper/**/*.xml
- #实体扫描,多个package用逗号或者分号分隔
- typeAliasesPackage: com.elink.esua.epdc.entity
- global-config:
- #数据库相关配置
- db-config:
- #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: ID_WORKER
- #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
- field-strategy: NOT_NULL
- #驼峰下划线转换
- column-underline: true
- banner: false
- #原生配置
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- call-setters-on-nulls: true
- jdbc-type-for-null: 'null'
-
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
index f261ef80e..82649af83 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
@@ -45,7 +45,10 @@
epdc-admin-client
1.0.0
-
+
+ com.alibaba.boot
+ nacos-config-spring-boot-starter
+
@@ -107,7 +110,7 @@
true
-
+
+
+ 9064
+ 47.104.224.45:8848
+ 513d6635-3cfe-401f-b8b6-a04417288f47
+ EPDC_NEWS
+ true
test
-
+
+
+ 9064
+ 47.104.224.45:8848
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ EPDC_NEWS
+ true
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
index 5e6f0761b..9905ec16b 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
@@ -3,85 +3,18 @@ server:
servlet:
context-path: /news
+nacos:
+ config:
+ server-addr: @nacos.server-addr@
+ type: YAML
+ namespace: @nacos.config.namespace@
+ group: @nacos.config.group@
+ dataId: epdc-news-server
+ bootstrap:
+ enable: true
+ log:
+ enable: @nacos.config.bootstrap.log.enable@
+
spring:
- main:
- allow-bean-definition-overriding: true
application:
name: epdc-news-server
- # 环境 dev|test|prod
- profiles:
- active: @spring.profiles.active@
- messages:
- encoding: UTF-8
- basename: i18n/messages,i18n/messages_common
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
- redis:
- database: @spring.redis.index@
- host: @spring.redis.host@
- timeout: 30s
- port: @spring.redis.port@
- password: @spring.redis.password@
- cloud:
- nacos:
- discovery:
- server-addr: @nacos.server-addr@
- register-enabled: @nacos.register-enabled@
- alibaba:
- seata:
- tx-service-group: epdc-news-server-fescar-service-group
- datasource:
- druid:
- driver-class-name: com.mysql.jdbc.Driver
- url: @spring.datasource.druid.url@
- username: @spring.datasource.druid.username@
- password: @spring.datasource.druid.password@
-
-feign:
- hystrix:
- enabled: true
- httpclient:
- enabled: true
-
-hystrix:
- command:
- default:
- execution:
- isolation:
- thread:
- timeoutInMilliseconds: 60000 #缺省为1000
-
-ribbon:
- ReadTimeout: 300000
- ConnectTimeout: 300000
-
-management:
- endpoints:
- web:
- exposure:
- include: "*"
- endpoint:
- health:
- show-details: ALWAYS
-
-mybatis-plus:
- mapper-locations: classpath:/mapper/**/*.xml
- #实体扫描,多个package用逗号或者分号分隔
- typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
- global-config:
- #数据库相关配置
- db-config:
- #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: ID_WORKER
- #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
- field-strategy: NOT_NULL
- #驼峰下划线转换
- column-underline: true
- banner: false
- #原生配置
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- call-setters-on-nulls: true
- jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index 8ca3ac1be..5320dcb29 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -94,6 +94,10 @@
gson
2.8.5
+
+ com.alibaba.boot
+ nacos-config-spring-boot-starter
+
@@ -154,7 +158,7 @@
true
-
+
+
+ 9065
+ 47.104.224.45:8848
+ 513d6635-3cfe-401f-b8b6-a04417288f47
+ EPDC_OSS
+ true
test
-
+
+
+ 9065
+ 47.104.224.45:8848
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ EPDC_OSS
+ true
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
index d304db221..963cace2e 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
@@ -3,77 +3,18 @@ server:
servlet:
context-path: /oss
+nacos:
+ config:
+ server-addr: @nacos.server-addr@
+ type: YAML
+ namespace: @nacos.config.namespace@
+ group: @nacos.config.group@
+ dataId: epdc-oss-server
+ bootstrap:
+ enable: true
+ log:
+ enable: @nacos.config.bootstrap.log.enable@
+
spring:
application:
name: epdc-oss-server
- # 环境 dev|test|prod
- profiles:
- active: @spring.profiles.active@
- messages:
- encoding: UTF-8
- basename: i18n/messages,i18n/messages_common
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
- servlet:
- multipart:
- max-file-size: 1024MB
- max-request-size: 1024MB
- enabled: true
- redis:
- database: @spring.redis.index@
- host: @spring.redis.host@
- timeout: 30s
- port: @spring.redis.port@
- password: @spring.redis.password@
- cloud:
- nacos:
- discovery:
- server-addr: @nacos.server-addr@
- register-enabled: @nacos.register-enabled@
- alibaba:
- seata:
- tx-service-group: epdc-oss-server-fescar-service-group
- datasource:
- druid:
- driver-class-name: com.mysql.jdbc.Driver
- url: @spring.datasource.druid.url@
- username: @spring.datasource.druid.username@
- password: @spring.datasource.druid.password@
-
-fdfs:
- so-timeout: 600000
- connect-timeout: 6000
- tracker-list: #TrackerList参数,支持多个
- - 10.5.34.165:22122
-
-management:
- endpoints:
- web:
- exposure:
- include: "*"
- endpoint:
- health:
- show-details: ALWAYS
-
-
-mybatis-plus:
- mapper-locations: classpath:/mapper/**/*.xml
- #实体扫描,多个package用逗号或者分号分隔
- typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
- global-config:
- #数据库相关配置
- db-config:
- #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: ID_WORKER
- #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
- field-strategy: NOT_NULL
- #驼峰下划线转换
- column-underline: true
- banner: false
- #原生配置
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- call-setters-on-nulls: true
- jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index 3125a55c5..075f3d715 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -56,6 +56,10 @@
1.0.0
compile
+
+ com.alibaba.boot
+ nacos-config-spring-boot-starter
+
@@ -117,7 +121,7 @@
true
-
+
+
+ 9068
+ 47.104.224.45:8848
+ 513d6635-3cfe-401f-b8b6-a04417288f47
+ EPDC_USER
+ true
test
-
+
+
+ 9068
+ 47.104.224.45:8848
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ EPDC_USER
+ true
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
index 4bde8c8cb..ef7249654 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
@@ -1,77 +1,20 @@
server:
- tomcat:
- max-swallow-size: 100MB
port: @server.port@
servlet:
context-path: /app-user
+nacos:
+ config:
+ server-addr: @nacos.server-addr@
+ type: YAML
+ namespace: @nacos.config.namespace@
+ group: @nacos.config.group@
+ dataId: epdc-user-server
+ bootstrap:
+ enable: true
+ log:
+ enable: @nacos.config.bootstrap.log.enable@
+
spring:
- main:
- allow-bean-definition-overriding: true
- servlet:
- multipart:
- enabled: true
- file-size-threshold: 0
- max-file-size: 100MB
- max-request-size: 100MB
application:
name: epdc-user-server
- # 环境 dev|test|prod
- profiles:
- active: @spring.profiles.active@
- messages:
- encoding: UTF-8
- basename: i18n/messages,i18n/messages_common
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
- redis:
- database: @spring.redis.index@
- host: @spring.redis.host@
- timeout: 30s
- port: @spring.redis.port@
- password: @spring.redis.password@
- cloud:
- nacos:
- discovery:
- server-addr: @nacos.server-addr@
- register-enabled: @nacos.register-enabled@
- alibaba:
- seata:
- tx-service-group: epdc-user-server-fescar-service-group
- datasource:
- druid:
- driver-class-name: com.mysql.jdbc.Driver
- url: @spring.datasource.druid.url@
- username: @spring.datasource.druid.username@
- password: @spring.datasource.druid.password@
-
-management:
- endpoints:
- web:
- exposure:
- include: "*"
- endpoint:
- health:
- show-details: ALWAYS
-
-mybatis-plus:
- mapper-locations: classpath:/mapper/**/*.xml
- #实体扫描,多个package用逗号或者分号分隔
- typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
- global-config:
- #数据库相关配置
- db-config:
- #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: ID_WORKER
- #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
- field-strategy: NOT_NULL
- #驼峰下划线转换
- column-underline: true
- banner: false
- #原生配置
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- call-setters-on-nulls: true
- jdbc-type-for-null: 'null'