ibizdev提交

config.xml

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

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

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

@@ -3,7 +3,7 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "8080:8080"
+      - "30002:30002"
     networks:
       - agent_network
     deploy:

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

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

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

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

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

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

ibzuaa-provider/ibzuaa-provider-uaaapi/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 /ibzuaa-provider-uaaapi.jar
 
-EXPOSE 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-uaaapi.jar /ibzuaa-provider-uaaapi.jar

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/docker/ibzuaa-provider-uaaapi.yaml

@@ -3,7 +3,7 @@ services:
   ibzuaa-provider-uaaapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-uaaapi:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
     deploy:

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/resources/application-uaaapi-dev.yml

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

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/resources/application-uaaapi-prod.yml

 server:
-  port: 40002
+  port: 8081

ibzuaa-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:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:EB948A46-DF8C-4BE3-8020-0ADA23440D31}")
     private String systemId;
 
     @Override

ibzuaa-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:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:EB948A46-DF8C-4BE3-8020-0ADA23440D31}")
     private String systemid;
 
 	@Autowired