ibizdev提交

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzou/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzou/
+      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 ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

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

 server:
-  port: 8080
+  port: 40001
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZDepartmentServiceImpl.java

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

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZEmployeeServiceImpl.java

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

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZOrganizationServiceImpl.java

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

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