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

Merge remote-tracking branch 'origin/dev_youhua' into dev_youhua

feature/dangjian
尹作梅 6 years ago
parent
1a0d90ed6c 7bc0a72b63
commit
b74fb82f54
4 changed files with 111 additions and 144 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml
  2. 131
      esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
  3. 91
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml
  4. 31
      esua-epdc/pom.xml

2
esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml
View File

@ -31,4 +31,4 @@
</dependency>
</dependencies>
</project>
</project>

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

@ -51,6 +51,10 @@
<artifactId>feign-httpclient</artifactId>
<version>10.3.0</version>
</dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-config-spring-boot-starter</artifactId>
</dependency>
</dependencies>
<build>
@ -74,10 +78,10 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
</plugin>
<!-- <plugin>-->
<!-- <groupId>com.spotify</groupId>-->
<!-- <artifactId>dockerfile-maven-plugin</artifactId>-->
<!-- </plugin>-->
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
@ -107,77 +111,108 @@
<profiles>
<!-- <profile>-->
<!-- <id>dev</id>-->
<!-- <activation>-->
<!-- <activeByDefault>true</activeByDefault>-->
<!-- </activation>-->
<!-- <properties>-->
<!-- <spring.profiles.active>dev</spring.profiles.active>-->
<!-- <server.port>9063</server.port>-->
<!-- <spring.redis.index>2</spring.redis.index>-->
<!-- <spring.redis.host>47.104.224.45</spring.redis.host>-->
<!-- <spring.redis.port>6379</spring.redis.port>-->
<!-- <spring.redis.password>elink@888</spring.redis.password>-->
<!-- <spring.datasource.druid.url>-->
<!-- <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>-->
<!-- </spring.datasource.druid.url>-->
<!-- <spring.datasource.druid.username>epdc</spring.datasource.druid.username>-->
<!-- <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>-->
<!-- <nacos.register-enabled>false</nacos.register-enabled>-->
<!-- <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>-->
<!-- </properties>-->
<!-- </profile>-->
<profile>
<id>dev</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<spring.profiles.active>dev</spring.profiles.active>
<server.port>9063</server.port>
<spring.redis.index>2</spring.redis.index>
<spring.redis.host>47.104.224.45</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>elink@888</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
<nacos.register-enabled>false</nacos.register-enabled>
<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_GROUP</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties>
</profile>
<profile>
<id>test</id>
<properties>
<spring.profiles.active>test</spring.profiles.active>
<!-- <properties>-->
<!-- <spring.profiles.active>test</spring.profiles.active>-->
<server.port>9063</server.port>
<!-- <server.port>9063</server.port>-->
<spring.redis.index>2</spring.redis.index>
<spring.redis.host>47.104.224.45</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>elink@888</spring.redis.password>
<!-- <spring.redis.index>2</spring.redis.index>-->
<!-- <spring.redis.host>47.104.224.45</spring.redis.host>-->
<!-- <spring.redis.port>6379</spring.redis.port>-->
<!-- <spring.redis.password>elink@888</spring.redis.password>-->
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
<!-- <spring.datasource.druid.url>-->
<!-- <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>-->
<!-- </spring.datasource.druid.url>-->
<!-- <spring.datasource.druid.username>epdc</spring.datasource.druid.username>-->
<!-- <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>-->
<!-- <nacos.register-enabled>true</nacos.register-enabled>-->
<!-- <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>-->
<!-- </properties>-->
<properties>
<server.port>9063</server.port>
<nacos.register-enabled>true</nacos.register-enabled>
<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_GROUP</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties>
</profile>
<profile>
<id>prod</id>
<!-- <properties>-->
<!-- <spring.profiles.active>prod</spring.profiles.active>-->
<!-- <docker.tag>prod</docker.tag>-->
<!-- <server.port>9063</server.port>-->
<!-- &lt;!&ndash; redis配置 &ndash;&gt;-->
<!-- <spring.redis.index>0</spring.redis.index>-->
<!-- <spring.redis.host>10.5.34.164</spring.redis.host>-->
<!-- <spring.redis.port>6379</spring.redis.port>-->
<!-- <spring.redis.password>Elink@833066</spring.redis.password>-->
<!-- <spring.datasource.druid.url>-->
<!-- <![CDATA[jdbc:mysql://10.5.34.164:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>-->
<!-- </spring.datasource.druid.url>-->
<!-- <spring.datasource.druid.username>epdc</spring.datasource.druid.username>-->
<!-- <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>-->
<!-- &lt;!&ndash; nacos &ndash;&gt;-->
<!-- <nacos.register-enabled>true</nacos.register-enabled>-->
<!-- <nacos.server-addr>10.5.34.164:8848</nacos.server-addr>-->
<!-- </properties>-->
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9063</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>10.5.34.164</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink@833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://10.5.34.164:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>10.5.34.164: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.group>EPDC_GROUP</nacos.config.group>
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties>
</profile>
</profiles>

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

@ -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'

31
esua-epdc/pom.xml
View File

@ -38,6 +38,7 @@
<docker.tag>prod</docker.tag>
<docker.repository.prefix>registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/</docker.repository.prefix>
<server.port>9508</server.port>
<nacos-config-spring-boot.version>0.2.3</nacos-config-spring-boot.version>
</properties>
<dependencies>
@ -71,6 +72,12 @@
<artifactId>seata-all</artifactId>
<version>${seata.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-config-spring-boot-starter</artifactId>
<version>${nacos-config-spring-boot.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -116,22 +123,6 @@
</build>
<repositories>
<!-- <repository>-->
<!-- <id>public</id>-->
<!-- <name>aliyun nexus</name>-->
<!-- <url>http://47.104.85.99:9002/repository/maven-public/</url>-->
<!-- <releases>-->
<!-- <enabled>true</enabled>-->
<!-- </releases>-->
<!-- </repository>-->
<!-- <repository>-->
<!-- <id>elink-release</id>-->
<!-- <name>aliyun nexus</name>-->
<!-- <url>http://47.104.224.45:9002/repository/elink-release/</url>-->
<!-- <releases>-->
<!-- <enabled>true</enabled>-->
<!-- </releases>-->
<!-- </repository>-->
<repository>
<id>elink-release</id>
<name>aliyun nexus</name>
@ -140,6 +131,14 @@
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>centerl-release</id>
<name>centerl</name>
<url>https://repo1.maven.org/maven2/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>sonatype</id>
<name>sonatype nexus</name>

Write Preview
Loading…
Cancel
Save