ibizdev提交

README.md

-# 系统概览
+# 系统概览 iBiz4j Spring R7 dev

config.xml

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

ibzwf-app/ibzwf-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 /ibzwf-app-web.jar
 
-EXPOSE 30003
+EXPOSE 8080
 
 ADD ibzwf-app-web.jar /ibzwf-app-web.jar

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

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

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

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

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

 server:
-  port: 30003
+  port: 8080
 
 #zuul网关路由设置
 zuul:
@@ -27,6 +27,6 @@ zuul:
     wfcore:
       path: /wfcore/**
       serviceId: ibzwf-api
-      stripPrefix: false
+      stripPrefix: true
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

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

 server:
-  port: 8080
+  port: 40003
 

ibzwf-provider/ibzwf-provider-api/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 /ibzwf-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40003
 
 ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar

ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml

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

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-dev.yml

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

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 8081
+  port: 40003

ibzwf-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
+    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
     private String systemId;
 
     @Override

ibzwf-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java

@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
 	@Value("${ibiz.enablePermissionValid:false}")
 	boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
+    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
     private String systemid;
 
 	@Autowired