ibizdev提交

config.xml

@@ -38,6 +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      
       </command>
     </hudson.tasks.Shell>
   </builders>

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

 server:
-  port: 8080
+  port: 5080
 
 
 

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 8081
+EXPOSE 5080
 
 ADD ehr-provider-parttimeperson.jar /ehr-provider-parttimeperson.jar

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

@@ -3,9 +3,11 @@ services:
   ehr-provider-parttimeperson:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-parttimeperson:latest
     ports:
-      - "8081:8081"
+      - "5080:5080"
     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: 8081
\ No newline at end of file
+  port: 5080
\ No newline at end of file

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

 server:
-  port: 8081
+  port: 5080

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 8081
+EXPOSE 5080
 
 ADD ehr-provider-saasadmin.jar /ehr-provider-saasadmin.jar

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

@@ -3,9 +3,11 @@ services:
   ehr-provider-saasadmin:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-saasadmin:latest
     ports:
-      - "8081:8081"
+      - "5080:5080"
     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: 8081
\ No newline at end of file
+  port: 5080
\ No newline at end of file

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

 server:
-  port: 8081
+  port: 5080

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 8081
+EXPOSE 5080
 
 ADD ehr-provider-specialrole.jar /ehr-provider-specialrole.jar

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

@@ -3,9 +3,11 @@ services:
   ehr-provider-specialrole:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-specialrole:latest
     ports:
-      - "8081:8081"
+      - "5080:5080"
     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: 8081
\ No newline at end of file
+  port: 5080
\ No newline at end of file

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

 server:
-  port: 8081
+  port: 5080

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 8081
+EXPOSE 5080
 
 ADD ehr-provider-webapi.jar /ehr-provider-webapi.jar

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

@@ -3,9 +3,11 @@ services:
   ehr-provider-webapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-webapi:latest
     ports:
-      - "8081:8081"
+      - "5080:5080"
     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: 8081
\ No newline at end of file
+  port: 5080
\ No newline at end of file

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

 server:
-  port: 8081
+  port: 5080

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 8081
+EXPOSE 5080
 
 ADD ehr-provider-wfcallback.jar /ehr-provider-wfcallback.jar

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

@@ -3,9 +3,11 @@ services:
   ehr-provider-wfcallback:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-provider-wfcallback:latest
     ports:
-      - "8081:8081"
+      - "5080:5080"
     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: 8081
\ No newline at end of file
+  port: 5080
\ No newline at end of file

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

 server:
-  port: 8081
+  port: 5080

ehr-util/src/main/resources/application-sys.yml

@@ -3,7 +3,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.16.102.211:8848
+        server-addr: 172.16.240.110:8848
   cache:
     redis:
       time-to-live: 3600
@@ -20,6 +20,32 @@ spring:
         max-wait: 300ms
         max-idle: 16
         min-idle: 8
+  datasource:
+    username: BPMEHR
+    password: 'sys'
+    url: jdbc:oracle:thin:@172.16.170.71:1521:localorcl
+    driver-class-name: oracle.jdbc.driver.OracleDriver
+    filters: stat,wall,log4j2
+    #配置初始化大小/最小/最大
+    initial-size: 1
+    min-idle: 1
+    max-active: 20
+    #获取连接等待超时时间
+    max-wait: 60000
+    #间隔多久进行一次检测，检测需要关闭的空闲连接
+    time-between-eviction-runs-millis: 60000
+    #一个连接在池中最小生存的时间
+    min-evictable-idle-time-millis: 300000
+    validation-query: SELECT 1 FROM DUAL
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+    pool-prepared-statements: false
+    max-pool-prepared-statement-per-connection-size: 20
+    isSyncDBSchema: false
+    defaultSchema: BPMEHR
+    conf: classpath:liquibase/master.xml
 
 #Mybatis-plus配置
 mybatis-plus: