新增各种环境的配置文件，以及dockercompose部署文件

deploy/docker-compose-prod.yml

@@ -1,15 +1,15 @@
 version: "3.7"
 services:
-  epmet-admin-server:
+  epmet-jmreport:
-    container_name: epmet-admin-server-prod
+    container_name: epmet-jmreport
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:version_placeholder
+    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

deploy/docker-compose-test.yml

@@ -1,15 +1,15 @@
 version: "3.7"
 services:
-  epmet-admin-server:
+  epmet-jmreport:
-    container_name: epmet-admin-server-test
+    container_name: epmet-jmreport
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:version_placeholder
+    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

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

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

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

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
+    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
+    username: ${mysql.username:root}
-    password: root
+    password: ${mysql.password:root}
     driver-class-name: com.mysql.cj.jdbc.Driver
 jeecg :
   # local|minio|alioss