ibizdev提交

app_EHRPim/src/codelist/ormcl-level2-org.ts

@@ -57,7 +57,7 @@ export default class ORMCL_LEVEL2ORG {
      * @memberof ORMCL_LEVEL2ORG
      */
     public queryParamNames:any ={
-        sort: 'px,asc'
+        sort: 'px,desc'
     }
 
     /**

app_EHRPim/src/mock/entity/pimeducations/pimeducations.ts

@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 11:43:35","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 11:43:35","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 11:43:35","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 11:43:35","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 11:43:35","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 11:43:35","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 11:43:35","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 11:43:35","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 11:43:35","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 11:43:35","createman":"示例操作者","pimpersonname":null},
-    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 11:43:35","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 11:43:35","createman":"示例操作者","pimpersonname":null}
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 12:00:04","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 12:00:04","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 12:00:04","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 12:00:04","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 12:00:04","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 12:00:04","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 12:00:04","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 12:00:04","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 12:00:04","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 12:00:04","createman":"示例操作者","pimpersonname":null},
+    {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-15 12:00:04","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-15 12:00:04","createman":"示例操作者","pimpersonname":null}
 ];
 
 

config.xml

@@ -38,11 +38,11 @@
 	  git clone -b master $para2 ehr/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ehr/
-      mvn clean package -Pwebapi
-      cd ehr-provider/ehr-provider-webapi
-      mvn -Pwebapi docker:build
-      mvn -Pwebapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-provider-webapi.yaml iBizEE --with-registry-auth      
+      mvn clean package -Pehrpim
+      cd ehr-app/ehr-app-ehrpim
+      mvn -Pehrpim docker:build
+      mvn -Pehrpim docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-app-ehrpim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ehr-app/ehr-app-ehr/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehr.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehr.jar /ehr-app-ehr.jar

ehr-app/ehr-app-ehr/src/main/docker/ehr-app-ehr.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehr:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehr/src/main/resources/application-ehr-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehr/src/main/resources/application-ehr-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrapp/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrapp.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrapp.jar /ehr-app-ehrapp.jar

ehr-app/ehr-app-ehrapp/src/main/docker/ehr-app-ehrapp.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrapp:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrapp/src/main/resources/application-ehrapp-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrapp/src/main/resources/application-ehrapp-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrhelp/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrhelp.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar

ehr-app/ehr-app-ehrhelp/src/main/docker/ehr-app-ehrhelp.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrhelp:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrhelp/src/main/resources/application-ehrhelp-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrhelp/src/main/resources/application-ehrhelp-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrmob/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrmob.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar

ehr-app/ehr-app-ehrmob/src/main/docker/ehr-app-ehrmob.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrmob:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrmob/src/main/resources/application-ehrmob-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrmob/src/main/resources/application-ehrmob-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrorm/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrorm.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar

ehr-app/ehr-app-ehrorm/src/main/docker/ehr-app-ehrorm.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrorm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrorm/src/main/resources/application-ehrorm-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrorm/src/main/resources/application-ehrorm-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrpcm/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar

ehr-app/ehr-app-ehrpcm/src/main/docker/ehr-app-ehrpcm.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrpcm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrpcm/src/main/resources/application-ehrpcm-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrpcm/src/main/resources/application-ehrpcm-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrpcm2/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm2.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar

ehr-app/ehr-app-ehrpcm2/src/main/docker/ehr-app-ehrpcm2.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrpcm2:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrpcm2/src/main/resources/application-ehrpcm2-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrpcm2/src/main/resources/application-ehrpcm2-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrpim/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpim.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar

ehr-app/ehr-app-ehrpim/src/main/docker/ehr-app-ehrpim.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrpim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrpim/src/main/resources/application-ehrpim-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrpim/src/main/resources/application-ehrpim-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-ehrweb/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrweb.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-ehrweb.jar /ehr-app-ehrweb.jar

ehr-app/ehr-app-ehrweb/src/main/docker/ehr-app-ehrweb.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-ehrweb:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-ehrweb/src/main/resources/application-ehrweb-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-ehrweb/src/main/resources/application-ehrweb-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-app/ehr-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-web.jar
 
-EXPOSE 8080
+EXPOSE 6092
 
 ADD ehr-app-web.jar /ehr-app-web.jar

ehr-app/ehr-app-web/src/main/docker/ehr-app-web.yaml

@@ -3,9 +3,11 @@ services:
   ehr-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest
     ports:
-      - "8080:8080"
+      - "6092:6092"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-app/ehr-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
+  port: 6092
\ No newline at end of file

ehr-app/ehr-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 6092
 
 #zuul网关路由设置
 zuul:

ehr-boot/src/main/resources/application-dev.yml

 server:
-  port: 5080
+  port: 8080
 
 
 

ehr-provider/ehr-provider-parttimeperson/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-parttimeperson.jar
 
-EXPOSE 5080
+EXPOSE 8081
 
 ADD ehr-provider-parttimeperson.jar /ehr-provider-parttimeperson.jar

ehr-provider/ehr-provider-parttimeperson/src/main/docker/ehr-provider-parttimeperson.yaml

@@ -3,11 +3,9 @@ services:
   ehr-provider-parttimeperson:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-parttimeperson:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-provider/ehr-provider-parttimeperson/src/main/resources/application-parttimeperson-dev.yml

 server:
-  port: 5080
+  port: 8081
\ No newline at end of file

ehr-provider/ehr-provider-parttimeperson/src/main/resources/application-parttimeperson-prod.yml

 server:
-  port: 5080
+  port: 8081

ehr-provider/ehr-provider-saasadmin/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-saasadmin.jar
 
-EXPOSE 5080
+EXPOSE 8081
 
 ADD ehr-provider-saasadmin.jar /ehr-provider-saasadmin.jar

ehr-provider/ehr-provider-saasadmin/src/main/docker/ehr-provider-saasadmin.yaml

@@ -3,11 +3,9 @@ services:
   ehr-provider-saasadmin:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-saasadmin:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-provider/ehr-provider-saasadmin/src/main/resources/application-saasadmin-dev.yml

 server:
-  port: 5080
+  port: 8081
\ No newline at end of file

ehr-provider/ehr-provider-saasadmin/src/main/resources/application-saasadmin-prod.yml

 server:
-  port: 5080
+  port: 8081

ehr-provider/ehr-provider-specialrole/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-specialrole.jar
 
-EXPOSE 5080
+EXPOSE 8081
 
 ADD ehr-provider-specialrole.jar /ehr-provider-specialrole.jar

ehr-provider/ehr-provider-specialrole/src/main/docker/ehr-provider-specialrole.yaml

@@ -3,11 +3,9 @@ services:
   ehr-provider-specialrole:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-specialrole:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-provider/ehr-provider-specialrole/src/main/resources/application-specialrole-dev.yml

 server:
-  port: 5080
+  port: 8081
\ No newline at end of file

ehr-provider/ehr-provider-specialrole/src/main/resources/application-specialrole-prod.yml

 server:
-  port: 5080
+  port: 8081

ehr-provider/ehr-provider-webapi/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-webapi.jar
 
-EXPOSE 5080
+EXPOSE 8081
 
 ADD ehr-provider-webapi.jar /ehr-provider-webapi.jar

ehr-provider/ehr-provider-webapi/src/main/docker/ehr-provider-webapi.yaml

@@ -3,11 +3,9 @@ services:
   ehr-provider-webapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-webapi:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-provider/ehr-provider-webapi/src/main/resources/application-webapi-dev.yml

 server:
-  port: 5080
+  port: 8081
\ No newline at end of file

ehr-provider/ehr-provider-webapi/src/main/resources/application-webapi-prod.yml

 server:
-  port: 5080
+  port: 8081

ehr-provider/ehr-provider-wfcallback/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-provider-wfcallback.jar
 
-EXPOSE 5080
+EXPOSE 8081
 
 ADD ehr-provider-wfcallback.jar /ehr-provider-wfcallback.jar

ehr-provider/ehr-provider-wfcallback/src/main/docker/ehr-provider-wfcallback.yaml

@@ -3,11 +3,9 @@ services:
   ehr-provider-wfcallback:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-wfcallback:latest
     ports:
-      - "5080:5080"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
     deploy:
       mode: replicated
       replicas: 1

ehr-provider/ehr-provider-wfcallback/src/main/resources/application-wfcallback-dev.yml

 server:
-  port: 5080
+  port: 8081
\ No newline at end of file

ehr-provider/ehr-provider-wfcallback/src/main/resources/application-wfcallback-prod.yml

 server:
-  port: 5080
+  port: 8081