ibizdev提交

config.xml

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

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java

@@ -141,10 +141,7 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
         this.enable = enable ;
         this.modify("enable",enable);
     }
-}
-
-
-
 
+}
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSAPPMENUITEM.java

@@ -174,10 +174,7 @@ public class SYS_PSAPPMENUITEM extends EntityMP implements Serializable {
         this.pssystemid = pssystemid ;
         this.modify("pssystemid",pssystemid);
     }
-}
-
-
-
 
+}
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSDEOPPRIV.java

@@ -216,10 +216,7 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable {
         this.pssourcetype = pssourcetype ;
         this.modify("pssourcetype",pssourcetype);
     }
-}
-
-
-
 
+}
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSTEM.java

@@ -57,10 +57,7 @@ public class SYS_PSSYSTEM extends EntityMP implements Serializable {
         this.pssystemname = pssystemname ;
         this.modify("pssystemname",pssystemname);
     }
-}
-
-
-
 
+}
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSUNIRES.java

@@ -90,10 +90,7 @@ public class SYS_PSSYSUNIRES extends EntityMP implements Serializable {
         this.unirescode = unirescode ;
         this.modify("unirescode",unirescode);
     }
-}
-
-
-
 
+}
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE.java

@@ -106,10 +106,7 @@ public class SYS_ROLE extends EntityMP implements Serializable {
         this.memo = memo ;
         this.modify("memo",memo);
     }
-}
-
-
-
 
+}
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE_PERMISSION.java

@@ -166,10 +166,7 @@ public class SYS_ROLE_PERMISSION extends EntityMP implements Serializable {
         this.systemid = systemid ;
         this.modify("systemid",systemid);
     }
-}
-
-
-
 
+}
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_USER.java

@@ -93,10 +93,7 @@ public class SYS_USER extends EntityMP implements Serializable {
         this.password = password ;
         this.modify("password",password);
     }
-}
-
-
-
 
+}
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_USER_ROLE.java

@@ -152,10 +152,7 @@ public class SYS_USER_ROLE extends EntityMP implements Serializable {
         this.personname = personname ;
         this.modify("sys_username",personname);
     }
-}
-
-
-
 
+}
 
 

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

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

@@ -3,21 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1