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

1.升级，创建130dev环境

dev
wxz 5 years ago
parent
d802350431
commit
df9fc4ac93
6 changed files with 37 additions and 33 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/resi-hall/resi-hall-server/Dockerfile
  2. 4
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
  3. 24
      epmet-module/resi-hall/resi-hall-server/pom.xml
  4. 2
      epmet-module/resi-mine/resi-mine-server/Dockerfile
  5. 4
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  6. 34
      epmet-module/resi-mine/resi-mine-server/pom.xml

2
epmet-module/resi-hall/resi-hall-server/Dockerfile
View File

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

4
epmet-module/resi-hall/resi-hall-server/docker-compose.yml → epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
View File

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

24
epmet-module/resi-hall/resi-hall-server/pom.xml
View File

@ -73,9 +73,9 @@
<profiles> <profiles>
<profile> <profile>
<id>dev-local</id> <id>dev-local</id>
<activation> <!--<activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>-->
<properties> <properties>
<server.port>8100</server.port> <server.port>8100</server.port>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
@ -97,22 +97,22 @@
</profile> </profile>
<profile> <profile>
<id>dev</id> <id>dev</id>
<!--<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation>--> </activation>
<properties> <properties>
<server.port>8100</server.port> <server.port>8100</server.port>
<spring.profiles.active>dev</spring.profiles.active> <spring.profiles.active>dev</spring.profiles.active>
<!-- redis配置 --> <!-- redis配置 -->
<spring.redis.index>0</spring.redis.index> <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.port>6379</spring.redis.port>
<spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password> <spring.redis.password>123456</spring.redis.password>
<!-- nacos --> <!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>192.168.10.150:8848</nacos.server-addr> <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace> <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace> <nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group> <nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled> <nacos.config-enabled>false</nacos.config-enabled>
@ -130,13 +130,13 @@
<!-- redis配置 --> <!-- redis配置 -->
<spring.redis.index>0</spring.redis.index> <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.port>6379</spring.redis.port>
<spring.redis.password>123456</spring.redis.password> <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
<!-- nacos --> <!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr> <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace> <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace> <nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group> <nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled> <nacos.config-enabled>false</nacos.config-enabled>

2
epmet-module/resi-mine/resi-mine-server/Dockerfile
View File

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

4
epmet-module/resi-mine/resi-mine-server/docker-compose.yml → epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
View File

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

34
epmet-module/resi-mine/resi-mine-server/pom.xml
View File

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

Write Preview
Loading…
Cancel
Save