Merge remote-tracking branch 'origin/master'

deploy/prod/winsun-docker-application-list/gateway/Dockerfile

@@ -3,5 +3,5 @@ LABEL maintainer="Liph <liph@gzwinsun.com>" app="gateway"
 ENV JAR_NAME=gateway \
 ENV JAR_NAME=gateway \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
-EXPOSE 11001
+EXPOSE 10001
 CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
 CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

deploy/prod/winsun-docker-application-list/gdtel-gztel-school-center/renewaluser/Dockerfile

@@ -3,5 +3,5 @@ LABEL maintainer="Liph <liph@gzwinsun.com>" app="renewaluser"
 ENV JAR_NAME=renewaluser \
 ENV JAR_NAME=renewaluser \
     TZ=Asia/Shanghai
     TZ=Asia/Shanghai
 COPY $JAR_NAME.jar $JAR_NAME.jar
 COPY $JAR_NAME.jar $JAR_NAME.jar
-EXPOSE 11094
+EXPOSE 11095
 CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
 CMD java -jar $JAR_NAME.jar --spring.profiles.active=prod
\ No newline at end of file

pom.xml

@@ -25,7 +25,7 @@
     <parent>
     <parent>
         <groupId>com.winsun.framework</groupId>
         <groupId>com.winsun.framework</groupId>
         <artifactId>winsun-parent</artifactId>
         <artifactId>winsun-parent</artifactId>
-        <version>0.1.49</version>
+        <version>0.1.50</version>
     </parent>
     </parent>
 
 
     <properties>
     <properties>

renewal-user/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     serviceUrl:
     serviceUrl:
       defaultZone: http://eureka:20000/eureka/
       defaultZone: http://eureka:20000/eureka/
 server:
 server:
-  port: 11094
+  port: 11095
   servlet:
   servlet:
     context-path: /ciop
     context-path: /ciop
   tomcat:
   tomcat:

renewal-user/src/main/resources/application.yml

@@ -10,7 +10,7 @@ eureka:
     serviceUrl:
     serviceUrl:
       defaultZone: http://localhost:20000/eureka/
       defaultZone: http://localhost:20000/eureka/
 server:
 server:
-  port: 11094
+  port: 11095
   servlet:
   servlet:
     context-path: /ciop
     context-path: /ciop
   tomcat:
   tomcat: