1.升级，创建130dev环境

epmet-module/resi-partymember/resi-partymember-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
 
 EXPOSE 8096
 
-ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]
+ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]

epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml → epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml

@@ -2,12 +2,14 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.17
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.18
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
     deploy:
       resources:
         limits:

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.17</version>
+    <version>0.3.18</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>
@@ -121,9 +121,9 @@
     <profiles>
         <profile>
             <id>dev-local</id>
-            <activation>
+            <!--<activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>
+            </activation>-->
             <properties>
                 <server.port>8096</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -151,28 +151,28 @@
         </profile>
         <profile>
             <id>dev</id>
-            <!--<activation>
+            <activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>-->
+            </activation>
             <properties>
                 <server.port>8096</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_resi_partymember_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.1.130</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
+                <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
-                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
+                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
+                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -190,19 +190,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.248</spring.redis.host>
+                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>123456</spring.redis.password>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-user/epmet-user-server/Dockerfile

@@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
 
 EXPOSE 8087
 
-ENTRYPOINT ["java","-Xms32m","-Xmx250m","-jar","./app.jar"]
+ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]

epmet-user/epmet-user-server/docker-compose.yml → epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,12 +2,14 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.25
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.26
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
-    volumes:
+    volumes:`
       - "/opt/epmet-cloud-logs/dev:/logs"
+    environment:
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
     deploy:
       resources:
         limits:

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.25</version>
+    <version>0.3.26</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
@@ -106,9 +106,9 @@
     <profiles>
         <profile>
             <id>dev-local</id>
-            <activation>
+            <!--<activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>
+            </activation>-->
             <properties>
                 <server.port>8087</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -136,28 +136,28 @@
         </profile>
         <profile>
             <id>dev</id>
-            <!--<activation>
+            <activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>-->
+            </activation>
             <properties>
                 <server.port>8087</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epmet_user_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.host>192.168.1.130</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
+                <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
-                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
+                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
+                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -175,19 +175,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.248</spring.redis.host>
+                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>123456</spring.redis.password>
+                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
-                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
+                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
+                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>