From e72dc2bce5b723f3fd30ff2cee7a796e64505afa Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Mon, 8 Aug 2022 12:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=84=E7=A7=8D=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8Adockercompose=E9=83=A8=E7=BD=B2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/docker-compose-prod.yml          | 10 +++++-----
 deploy/docker-compose-test.yml          | 10 +++++-----
 src/main/resources/application-dev.yml  |  7 +++++++
 src/main/resources/application-prod.yml |  7 +++++++
 src/main/resources/application-test.yml |  7 +++++++
 src/main/resources/application.yml      |  6 +++---
 6 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 src/main/resources/application-dev.yml
 create mode 100644 src/main/resources/application-prod.yml
 create mode 100644 src/main/resources/application-test.yml

diff --git a/deploy/docker-compose-prod.yml b/deploy/docker-compose-prod.yml
index ba0dd38..98de180 100644
--- a/deploy/docker-compose-prod.yml
+++ b/deploy/docker-compose-prod.yml
@@ -1,15 +1,15 @@
 version: "3.7"
 services:
-  epmet-admin-server:
-    container_name: epmet-admin-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:version_placeholder
+  epmet-jmreport:
+    container_name: epmet-jmreport
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-jmreport:version_placeholder
     ports:
-      - "8082:8082"
+      - "8118:8118"
     network_mode: host # 使用现有网络
     volumes:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-admin.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-jmreport.jar"
     restart: "unless-stopped"
     logging:
       driver: local
diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml
index 7e83d1c..17e9995 100644
--- a/deploy/docker-compose-test.yml
+++ b/deploy/docker-compose-test.yml
@@ -1,15 +1,15 @@
 version: "3.7"
 services:
-  epmet-admin-server:
-    container_name: epmet-admin-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:version_placeholder
+  epmet-jmreport:
+    container_name: epmet-jmreport
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-jmreport:version_placeholder
     ports:
-      - "8082:8082"
+      - "8118:8118"
     network_mode: host # 使用现有网络
     volumes:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-admin.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-jmreport.jar"
     restart: "unless-stopped"
     logging:
       driver: local
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..5a4d828
--- /dev/null
+++ b/src/main/resources/application-dev.yml
@@ -0,0 +1,7 @@
+# 项目启动的时候，会根据环境，取这个配置
+mysql:
+  host: 192.168.1.140
+  port: 3306
+  db: epmet_jmreport
+  username: root
+  password: root
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..e5a99a0
--- /dev/null
+++ b/src/main/resources/application-prod.yml
@@ -0,0 +1,7 @@
+# 项目启动的时候，会根据环境，取这个配置
+mysql:
+  host: rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com
+  port: 3306
+  db: epmet_jmreport
+  username: epmet_jmreport_user
+  password: EpmEt-db-UsEr
\ No newline at end of file
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
new file mode 100644
index 0000000..02ca04b
--- /dev/null
+++ b/src/main/resources/application-test.yml
@@ -0,0 +1,7 @@
+# 项目启动的时候，会根据环境，取这个配置
+mysql:
+  host: rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com
+  port: 3306
+  db: epmet_jmreport
+  username: epmet
+  password: elink@833066
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3259321..1ef558c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,9 +3,9 @@ server:
 spring:
   #数据库
   datasource:
-    url: jdbc:mysql://${MYSQL-HOST:192.168.1.140}:${MYSQL-PORT:3306}/${MYSQL-DB:epmet_jmreport}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: root
+    url: jdbc:mysql://${mysql.host:192.168.1.140}:${mysql.port:3306}/${mysql.db:epmet_jmreport}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    username: ${mysql.username:root}
+    password: ${mysql.password:root}
     driver-class-name: com.mysql.cj.jdbc.Driver
 jeecg :
   # local|minio|alioss