rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

版本升级

dev
wxz 5 years ago
parent
6f208e1909
commit
8d3b39ab5b
4 changed files with 11 additions and 11 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. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  3. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
  4. 16
      epmet-module/data-statistical/data-statistical-server/pom.xml

2
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services: services:
data-statistical-server: data-statistical-server:
container_name: data-statistical-server-dev container_name: data-statistical-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.36 image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.37
ports: ports:
- "8108:8108" - "8108:8108"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services: services:
data-statistical-server: data-statistical-server:
container_name: data-statistical-server-prod container_name: data-statistical-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.36 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.37
ports: ports:
- "8108:8108" - "8108:8108"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services: services:
data-statistical-server: data-statistical-server:
container_name: data-statistical-server-test container_name: data-statistical-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.36 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.37
ports: ports:
- "8108:8108" - "8108:8108"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

16
epmet-module/data-statistical/data-statistical-server/pom.xml
View File

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.36</version> <version>0.3.37</version>
<parent> <parent>
<artifactId>data-statistical</artifactId> <artifactId>data-statistical</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
@ -280,43 +280,43 @@
<datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password> <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
<datasource.druid.org.url> <datasource.druid.org.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.org.url> </datasource.druid.org.url>
<datasource.druid.org.username>epmet_gov_org_user</datasource.druid.org.username> <datasource.druid.org.username>epmet_gov_org_user</datasource.druid.org.username>
<datasource.druid.org.password>EpmEt-db-UsEr</datasource.druid.org.password> <datasource.druid.org.password>EpmEt-db-UsEr</datasource.druid.org.password>
<datasource.druid.issue.url> <datasource.druid.issue.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.issue.url> </datasource.druid.issue.url>
<datasource.druid.issue.username>epmet_gov_voice_user</datasource.druid.issue.username> <datasource.druid.issue.username>epmet_gov_voice_user</datasource.druid.issue.username>
<datasource.druid.issue.password>EpmEt-db-UsEr</datasource.druid.issue.password> <datasource.druid.issue.password>EpmEt-db-UsEr</datasource.druid.issue.password>
<datasource.druid.project.url> <datasource.druid.project.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.project.url> </datasource.druid.project.url>
<datasource.druid.project.username>epmet_gov_project_user</datasource.druid.project.username> <datasource.druid.project.username>epmet_gov_project_user</datasource.druid.project.username>
<datasource.druid.project.password>EpmEt-db-UsEr</datasource.druid.project.password> <datasource.druid.project.password>EpmEt-db-UsEr</datasource.druid.project.password>
<datasource.druid.voice.url> <datasource.druid.voice.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.voice.url> </datasource.druid.voice.url>
<datasource.druid.voice.username>epmet_gov_voice_user</datasource.druid.voice.username> <datasource.druid.voice.username>epmet_gov_voice_user</datasource.druid.voice.username>
<datasource.druid.voice.password>EpmEt-db-UsEr</datasource.druid.voice.password> <datasource.druid.voice.password>EpmEt-db-UsEr</datasource.druid.voice.password>
<datasource.druid.crm.url> <datasource.druid.crm.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.crm.url> </datasource.druid.crm.url>
<datasource.druid.crm.username>epmet_oper_crm_user</datasource.druid.crm.username> <datasource.druid.crm.username>epmet_oper_crm_user</datasource.druid.crm.username>
<datasource.druid.crm.password>EpmEt-db-UsEr</datasource.druid.crm.password> <datasource.druid.crm.password>EpmEt-db-UsEr</datasource.druid.crm.password>
<datasource.druid.group.url> <datasource.druid.group.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.group.url> </datasource.druid.group.url>
<datasource.druid.group.username>epmet_resi_group_user</datasource.druid.group.username> <datasource.druid.group.username>epmet_resi_group_user</datasource.druid.group.username>
<datasource.druid.group.password>EpmEt-db-UsEr</datasource.druid.group.password> <datasource.druid.group.password>EpmEt-db-UsEr</datasource.druid.group.password>
<datasource.druid.user.url> <datasource.druid.user.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.user.url> </datasource.druid.user.url>
<datasource.druid.user.username>epmet_user_user</datasource.druid.user.username> <datasource.druid.user.username>epmet_user_user</datasource.druid.user.username>
<datasource.druid.user.password>EpmEt-db-UsEr</datasource.druid.user.password> <datasource.druid.user.password>EpmEt-db-UsEr</datasource.druid.user.password>

Write Preview
Loading…
Cancel
Save