ibizdev提交

config.xml

@@ -37,6 +37,11 @@
 	  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-boot/src/main/resources/application-dev.yml

 server:
-  port: 8080
+  port: 40002
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PERMISSIONServiceImpl.java

@@ -84,8 +84,8 @@ public class SYS_PERMISSIONServiceImpl extends ServiceImpl<SYS_PERMISSIONMapper,
     @Transactional
     public boolean remove(String key) {
         sysRolePermissionService.removeByPermissionid(key) ;
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSAPPMENUITEMServiceImpl.java

@@ -113,8 +113,8 @@ public class SYS_PSAPPMENUITEMServiceImpl extends ServiceImpl<SYS_PSAPPMENUITEMM
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSDEOPPRIVServiceImpl.java

@@ -50,8 +50,8 @@ public class SYS_PSDEOPPRIVServiceImpl extends ServiceImpl<SYS_PSDEOPPRIVMapper,
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSSYSTEMServiceImpl.java

@@ -87,8 +87,8 @@ public class SYS_PSSYSTEMServiceImpl extends ServiceImpl<SYS_PSSYSTEMMapper, SYS
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSSYSUNIRESServiceImpl.java

@@ -94,8 +94,8 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_ROLEServiceImpl.java

@@ -130,8 +130,8 @@ public class SYS_ROLEServiceImpl extends ServiceImpl<SYS_ROLEMapper, SYS_ROLE> i
     public boolean remove(String key) {
         sysRolePermissionService.removeByRoleid(key) ;
         sysUserRoleService.removeByRoleid(key) ;
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_ROLE_PERMISSIONServiceImpl.java

@@ -69,8 +69,8 @@ public class SYS_ROLE_PERMISSIONServiceImpl extends ServiceImpl<SYS_ROLE_PERMISS
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_USERServiceImpl.java

@@ -54,8 +54,8 @@ public class SYS_USERServiceImpl extends ServiceImpl<SYS_USERMapper, SYS_USER> i
     @Transactional
     public boolean remove(String key) {
         sysUserRoleService.removeByUserid(key) ;
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_USER_ROLEServiceImpl.java

@@ -83,8 +83,8 @@ public class SYS_USER_ROLEServiceImpl extends ServiceImpl<SYS_USER_ROLEMapper, S
     @Override
     @Transactional
     public boolean remove(String key) {
-        if(!removeById(key)) return false;
-        return true ;
+        boolean result=removeById(key);
+        return result ;
     }
 
     @Override

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

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

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

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

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

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

 server:
-  port: 8081
+  port: 40002