diff --git a/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml b/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml index b427bed4b..e7e900877 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml +++ b/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml @@ -31,4 +31,4 @@ - \ No newline at end of file + 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 5826002cb..693251785 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 @@ -51,6 +51,10 @@ feign-httpclient 10.3.0 + + com.alibaba.boot + nacos-config-spring-boot-starter + @@ -74,10 +78,10 @@ true - - com.spotify - dockerfile-maven-plugin - + + + + ${project.basedir}/src/main/java @@ -107,77 +111,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + dev true - dev - 9063 - 2 - 47.104.224.45 - 6379 - elink@888 - - - - - epdc - elink833066 - - false 47.104.224.45:8848 + 513d6635-3cfe-401f-b8b6-a04417288f47 + EPDC_GROUP + true test - - test + + - 9063 + - 2 - 47.104.224.45 - 6379 - elink@888 + + + + - - - - epdc - elink833066 + + + + + + + + + + + 9063 - true 47.104.224.45:8848 + 513d6635-3cfe-401f-b8b6-a04417288f47 + EPDC_GROUP + true prod + + + + + + + + + + + + + + + + + + + + + - prod - prod - 9063 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 + 47.104.224.45:8848 + 513d6635-3cfe-401f-b8b6-a04417288f47 + EPDC_GROUP + true diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml index ebf9e2d72..86ffa81f9 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml @@ -3,85 +3,18 @@ server: servlet: context-path: /group +nacos: + config: + server-addr: @nacos.server-addr@ + type: YAML + namespace: @nacos.config.namespace@ + group: @nacos.config.group@ + dataId: epdc-group-server + bootstrap: + enable: true + log: + enable: @nacos.config.bootstrap.log.enable@ + spring: - main: - allow-bean-definition-overriding: true application: name: epdc-group-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-group-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' diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index dd49e5c39..a7687eddc 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -38,6 +38,7 @@ prod registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/ 9508 + 0.2.3 @@ -71,6 +72,12 @@ seata-all ${seata.version} + + + com.alibaba.boot + nacos-config-spring-boot-starter + ${nacos-config-spring-boot.version} + @@ -116,22 +123,6 @@ - - - - - - - - - - - - - - - - elink-release aliyun nexus @@ -140,6 +131,14 @@ true + + centerl-release + centerl + https://repo1.maven.org/maven2/ + + true + + sonatype sonatype nexus