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

Merge branches 'dev' and 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice

master
handaolin 5 years ago
parent
410a077337 d4f11c0b40
commit
3667f8324b
12 changed files with 25 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  3. 2
      epmet-module/gov-voice/gov-voice-server/Dockerfile
  4. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  5. 10
      epmet-module/gov-voice/gov-voice-server/pom.xml
  6. 2
      epmet-module/resi-voice/resi-voice-server/Dockerfile
  7. 2
      epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
  8. 4
      epmet-module/resi-voice/resi-voice-server/pom.xml
  9. 11
      epmet-openapi/epmet-openapi-scan/Dockerfile
  10. 4
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
  11. 2
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
  12. 2
      epmet-openapi/epmet-openapi-scan/pom.xml

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.61
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.62
ports:
- "8092:8092"
network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-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"
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.61</version>
<version>0.3.62</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

2
epmet-module/gov-voice/gov-voice-server/Dockerfile
View File

@ -6,6 +6,6 @@ RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8102
EXPOSE 8105
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]

2
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-voice-server:
container_name: gov-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.3
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.6
ports:
- "8105:8105"
network_mode: host # 使用现有网络

10
epmet-module/gov-voice/gov-voice-server/pom.xml
View File

@ -3,7 +3,7 @@
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.3</version>
<version>0.3.6</version>
<parent>
<artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId>
@ -76,12 +76,6 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-user-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
@ -146,7 +140,7 @@
<activeByDefault>true</activeByDefault>
</activation>-->
<properties>
<server.port>8104</server.port>
<server.port>8105</server.port>
<spring.profiles.active>test</spring.profiles.active>
<!-- 数据库配置-->

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

@ -6,6 +6,6 @@ RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8102
EXPOSE 8106
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]

2
epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-voice-server:
container_name: resi-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.3
image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:0.3.5
ports:
- "8106:8106"
network_mode: host # 使用现有网络

4
epmet-module/resi-voice/resi-voice-server/pom.xml
View File

@ -3,7 +3,7 @@
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.3</version>
<version>0.3.5</version>
<parent>
<artifactId>resi-voice</artifactId>
<groupId>com.epmet</groupId>
@ -113,7 +113,7 @@
<activeByDefault>true</activeByDefault>
</activation>-->
<properties>
<server.port>8104</server.port>
<server.port>8106</server.port>
<spring.profiles.active>test</spring.profiles.active>
<!-- redis配置 -->

11
epmet-openapi/epmet-openapi-scan/Dockerfile
View File

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8107
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]

4
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
View File

@ -1,8 +1,8 @@
version: "3.7"
services:
epmet-user-server:
epmet-openapi-scan:
container_name: epmet-openapi-scan-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.1
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.3
ports:
- "8107:8107"
network_mode: host # 不会创建新的网络

2
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
View File

@ -1,6 +1,6 @@
version: "3.7"
services:
epmet-user-server:
epmet-openapi-scan:
container_name: epmet-openapi-scan-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-scan:0.3.1
ports:

2
epmet-openapi/epmet-openapi-scan/pom.xml
View File

@ -8,7 +8,7 @@
<version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<version>0.3.3</version>
<artifactId>epmet-openapi-scan</artifactId>
<packaging>jar</packaging>
<dependencies>

Write Preview
Loading…
Cancel
Save