elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

api、job、events、news、oss、user、kpi、heart、group改为从nacos获取配置文件信息

feature/dangjian
尹作梅 6 years ago
parent
2819edd9f9
commit
f59a852a23
15 changed files with 243 additions and 517 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  2. 32
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
  3. 111
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
  4. 2
      esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
  5. 22
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
  6. 79
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
  7. 9
      esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
  8. 23
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
  9. 91
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml
  10. 23
      esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
  11. 91
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
  12. 22
      esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
  13. 83
      esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
  14. 22
      esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
  15. 81
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml

67
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
View File

@ -144,36 +144,36 @@
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<!-- <properties>--> <!--<properties>
<!-- <spring.profiles.active>dev</spring.profiles.active>--> <spring.profiles.active>dev</spring.profiles.active>
<!-- <server.port>9040</server.port>--> <server.port>9040</server.port>
<!-- <spring.redis.index>2</spring.redis.index>--> <spring.redis.index>2</spring.redis.index>
<!-- <spring.redis.host>47.104.224.45</spring.redis.host>--> <spring.redis.host>47.104.224.45</spring.redis.host>
<!-- <spring.redis.port>6379</spring.redis.port>--> <spring.redis.port>6379</spring.redis.port>
<!-- <spring.redis.password>elink@888</spring.redis.password>--> <spring.redis.password>elink@888</spring.redis.password>
<!-- <spring.datasource.druid.url>--> <spring.datasource.druid.url>
<!-- <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>--> <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<!-- </spring.datasource.druid.url>--> </spring.datasource.druid.url>
<!-- <spring.datasource.druid.username>epdc</spring.datasource.druid.username>--> <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<!-- <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>--> <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
<!-- <nacos.register-enabled>false</nacos.register-enabled>--> <nacos.register-enabled>false</nacos.register-enabled>
<!-- <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>--> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<!-- &lt;!&ndash;公众号配置&ndash;&gt;--> &lt;!&ndash;公众号配置&ndash;&gt;
<!-- <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>--> <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<!-- <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>--> <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<!-- <wx.mp.configs.token>111</wx.mp.configs.token>--> <wx.mp.configs.token>111</wx.mp.configs.token>
<!-- <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>--> <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
<!-- &lt;!&ndash;小程序配置&ndash;&gt;--> &lt;!&ndash;小程序配置&ndash;&gt;
<!-- <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>--> <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<!-- <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>--> <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!-- &lt;!&ndash;工作端小程序&ndash;&gt;--> &lt;!&ndash;工作端小程序&ndash;&gt;
<!-- <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>--> <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
<!-- <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>--> <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
<!-- </properties>--> </properties>-->
<properties> <properties>
<server.port>9040</server.port> <server.port>9040</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@ -185,7 +185,7 @@
<profile> <profile>
<id>test</id> <id>test</id>
<properties> <!--<properties>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<server.port>9040</server.port> <server.port>9040</server.port>
@ -203,17 +203,24 @@
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<!--公众号配置--> &lt;!&ndash;公众号配置&ndash;&gt;
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId> <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret> <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token> <wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey> <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
<!--小程序配置--> &lt;!&ndash;小程序配置&ndash;&gt;
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId> <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret> <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!--工作端小程序--> &lt;!&ndash;工作端小程序&ndash;&gt;
<work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId> <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
<work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret> <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
</properties>-->
<properties>
<server.port>9040</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_API</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>

32
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
View File

@ -62,6 +62,10 @@
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-config-spring-boot-starter</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -123,7 +127,7 @@
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <!--<properties>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<server.port>9066</server.port> <server.port>9066</server.port>
@ -145,18 +149,26 @@
<docker.tag>dev</docker.tag> <docker.tag>dev</docker.tag>
<!--小程序配置--> &lt;!&ndash;小程序配置&ndash;&gt;
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId> <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret> <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!--工作端小程序--> &lt;!&ndash;工作端小程序&ndash;&gt;
<work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId> <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
<work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret> <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
</properties>-->
<properties>
<server.port>9066</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
<nacos.config.group>EPDC_EVENTS</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
<docker.tag>dev</docker.tag>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>test</id> <id>test</id>
<properties> <!--<properties>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<server.port>9066</server.port> <server.port>9066</server.port>
@ -178,12 +190,20 @@
<docker.tag>test</docker.tag> <docker.tag>test</docker.tag>
<!--小程序配置--> &lt;!&ndash;小程序配置&ndash;&gt;
<wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId> <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
<wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret> <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
<!--工作端小程序--> &lt;!&ndash;工作端小程序&ndash;&gt;
<work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId> <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
<work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret> <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
</properties>-->
<properties>
<server.port>9066</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_EVENTS</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
<docker.tag>test</docker.tag>
</properties> </properties>
</profile> </profile>

111
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
View File

@ -3,105 +3,18 @@ server:
servlet: servlet:
context-path: /events context-path: /events
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: nacos:
discovery: config:
server-addr: @nacos.server-addr@ server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@ type: YAML
ip: @nacos.register.ip@ namespace: @nacos.config.namespace@
alibaba: group: @nacos.config.group@
seata: dataId: epdc-events-server
tx-service-group: epdc-events-server-fescar-service-group bootstrap:
datasource: enable: true
druid: log:
driver-class-name: com.mysql.jdbc.Driver enable: @nacos.config.bootstrap.log.enable@
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: spring:
endpoints: application:
web: name:epdc-events-server
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@

2
esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
View File

@ -177,7 +177,7 @@
<server.port>9063</server.port> <server.port>9063</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace> <nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_GROUP</nacos.config.group> <nacos.config.group>EPDC_GROUP</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable> <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>

22
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
View File

@ -62,6 +62,10 @@
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-config-spring-boot-starter</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -123,7 +127,7 @@
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <!--<properties>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<server.port>9060</server.port> <server.port>9060</server.port>
@ -143,12 +147,19 @@
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url> <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
</properties>-->
<properties>
<server.port>9060</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
<nacos.config.group>EPDC_HEART</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>test</id> <id>test</id>
<properties> <!--<properties>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<server.port>9060</server.port> <server.port>9060</server.port>
@ -168,6 +179,13 @@
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url> <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
</properties>-->
<properties>
<server.port>9060</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_HEART</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>

79
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
View File

@ -3,74 +3,17 @@ server:
servlet: servlet:
context-path: /heart 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: spring:
application: application:
name: epdc-heart-server 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'

9
esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
View File

@ -145,7 +145,7 @@
<profile> <profile>
<id>test</id> <id>test</id>
<properties> <!--<properties>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<server.port>9061</server.port> <server.port>9061</server.port>
@ -163,6 +163,13 @@
<nacos.register-enabled>false</nacos.register-enabled> <nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9061</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_JOB</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>

23
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
View File

@ -50,7 +50,10 @@
<artifactId>spring-boot-admin-starter-client</artifactId> <artifactId>spring-boot-admin-starter-client</artifactId>
<version>${spring.boot.admin.version}</version> <version>${spring.boot.admin.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-config-spring-boot-starter</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -112,7 +115,7 @@
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <!--<properties>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<server.port>9987</server.port> <server.port>9987</server.port>
@ -130,12 +133,19 @@
<nacos.register-enabled>false</nacos.register-enabled> <nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9987</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
<nacos.config.group>EPDC_KPI</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>test</id> <id>test</id>
<properties> <!--<properties>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<server.port>9987</server.port> <server.port>9987</server.port>
@ -153,6 +163,13 @@
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9987</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_KPI</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>

91
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml
View File

@ -3,86 +3,17 @@ server:
servlet: servlet:
context-path: /kpi 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: spring:
main:
allow-bean-definition-overriding: true
application: application:
name: epdc-kpi-server 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'

23
esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
View File

@ -45,7 +45,10 @@
<artifactId>epdc-admin-client</artifactId> <artifactId>epdc-admin-client</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-config-spring-boot-starter</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -107,7 +110,7 @@
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <!--<properties>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<server.port>9064</server.port> <server.port>9064</server.port>
@ -125,12 +128,19 @@
<nacos.register-enabled>false</nacos.register-enabled> <nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9064</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
<nacos.config.group>EPDC_NEWS</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>test</id> <id>test</id>
<properties> <!--<properties>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<server.port>9064</server.port> <server.port>9064</server.port>
@ -148,6 +158,13 @@
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9064</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_NEWS</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>

91
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
View File

@ -3,85 +3,18 @@ server:
servlet: servlet:
context-path: /news context-path: /news
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: nacos:
discovery: config:
server-addr: @nacos.server-addr@ server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@ type: YAML
alibaba: namespace: @nacos.config.namespace@
seata: group: @nacos.config.group@
tx-service-group: epdc-news-server-fescar-service-group dataId: epdc-news-server
datasource: bootstrap:
druid: enable: true
driver-class-name: com.mysql.jdbc.Driver log:
url: @spring.datasource.druid.url@ enable: @nacos.config.bootstrap.log.enable@
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: spring:
ReadTimeout: 300000 application:
ConnectTimeout: 300000 name: epdc-news-server
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'

22
esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
View File

@ -94,6 +94,10 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.5</version> <version>2.8.5</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-config-spring-boot-starter</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -154,7 +158,7 @@
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <!--<properties>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<server.port>9065</server.port> <server.port>9065</server.port>
@ -172,12 +176,19 @@
<nacos.register-enabled>false</nacos.register-enabled> <nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9065</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
<nacos.config.group>EPDC_OSS</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>test</id> <id>test</id>
<properties> <!--<properties>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<server.port>9065</server.port> <server.port>9065</server.port>
@ -195,6 +206,13 @@
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9065</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_OSS</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>

83
esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
View File

@ -3,77 +3,18 @@ server:
servlet: servlet:
context-path: /oss context-path: /oss
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: nacos:
discovery: config:
server-addr: @nacos.server-addr@ server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@ type: YAML
alibaba: namespace: @nacos.config.namespace@
seata: group: @nacos.config.group@
tx-service-group: epdc-oss-server-fescar-service-group dataId: epdc-oss-server
datasource: bootstrap:
druid: enable: true
driver-class-name: com.mysql.jdbc.Driver log:
url: @spring.datasource.druid.url@ enable: @nacos.config.bootstrap.log.enable@
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: spring:
endpoints: application:
web: name: epdc-oss-server
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'

22
esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
View File

@ -56,6 +56,10 @@
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-config-spring-boot-starter</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -117,7 +121,7 @@
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<properties> <!--<properties>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<server.port>9068</server.port> <server.port>9068</server.port>
@ -135,12 +139,19 @@
<nacos.register-enabled>false</nacos.register-enabled> <nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9068</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
<nacos.config.group>EPDC_USER</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>test</id> <id>test</id>
<properties> <!--<properties>
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<server.port>9068</server.port> <server.port>9068</server.port>
@ -158,6 +169,13 @@
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
</properties>-->
<properties>
<server.port>9068</server.port>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.config.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.config.namespace>
<nacos.config.group>EPDC_USER</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties> </properties>
</profile> </profile>

81
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
View File

@ -1,77 +1,20 @@
server: server:
tomcat:
max-swallow-size: 100MB
port: @server.port@ port: @server.port@
servlet: servlet:
context-path: /app-user context-path: /app-user
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: nacos:
discovery: config:
server-addr: @nacos.server-addr@ server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@ type: YAML
alibaba: namespace: @nacos.config.namespace@
seata: group: @nacos.config.group@
tx-service-group: epdc-user-server-fescar-service-group dataId: epdc-user-server
datasource: bootstrap:
druid: enable: true
driver-class-name: com.mysql.jdbc.Driver log:
url: @spring.datasource.druid.url@ enable: @nacos.config.bootstrap.log.enable@
username: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@
management: spring:
endpoints: application:
web: name: epdc-user-server
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'

Write Preview
Loading…
Cancel
Save