ibizdev提交

config.xml

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

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

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

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

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

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

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

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

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

 server:
-  port: 8080
+  port: 40001
 

ibzou-core/src/main/resources/liquibase/h2_table.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[IBZORG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-410-1">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-411-1">
         <createTable tableName="IBZORG">
                 <column name="ORGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZORG_ORGID"/>
@@ -28,7 +28,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZEMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-583-2">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-588-2">
         <createTable tableName="IBZEMP">
                 <column name="USERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
@@ -106,7 +106,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-512-3">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-513-3">
         <createTable tableName="IBZDEPT">
                 <column name="DEPTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/>
@@ -137,21 +137,21 @@
     </changeSet>
 
         <!--输出实体[IBZORG]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-410-4">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-411-4">
        <addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_IBZORG_IBZORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZEMP]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-583-5">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-588-5">
        <addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZDEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-583-6">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-588-6">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZDEPT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-512-7">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-513-7">
        <addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZDEPT_PDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-512-8">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-513-8">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
 

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

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

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

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

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

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

 server:
-  port: 8081
+  port: 40001

ibzou-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:110B1A3E-4944-47C8-B4C4-EC15FB8982F3}")
+    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
     private String systemId;
 
     @Override

ibzou-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:110B1A3E-4944-47C8-B4C4-EC15FB8982F3}")
+    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
     private String systemid;
 
 	@Autowired