ibiz4j 发布系统代码 [ibiz-rt，ibizlab-runtime]

config.xml

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

ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
 
-EXPOSE 30000
+EXPOSE 8080
 
 ADD ibzrt-app-web.jar /ibzrt-app-web.jar

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

@@ -3,23 +3,9 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "30000:30000"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243: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&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysDepartmentServiceImpl.java

@@ -169,9 +169,9 @@ public class SysDepartmentServiceImpl implements ISysDepartmentService {
             this.removeBatch(delIds);
     }
 
-    @Autowired
-    @Lazy
-    ISysDepartmentService proxyService;
+    public ISysDepartmentService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 	@Override
     public void saveByOrgid(String orgid,List<SysDepartment> list) {
         if(list==null)
@@ -194,11 +194,11 @@ public class SysDepartmentServiceImpl implements ISysDepartmentService {
                 _create.add(sub);
         }
         if(_update.size()>0)
-            proxyService.updateBatch(_update);
+            getProxyService().updateBatch(_update);
         if(_create.size()>0)
-            proxyService.createBatch(_create);
+            getProxyService().createBatch(_create);
         if(delIds.size()>0)
-            proxyService.removeBatch(delIds);
+            getProxyService().removeBatch(delIds);
 	}
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFMemberServiceImpl.java

@@ -139,9 +139,9 @@ public class WFMemberServiceImpl implements IWFMemberService {
             this.removeBatch(delIds);
     }
 
-    @Autowired
-    @Lazy
-    IWFMemberService proxyService;
+    public IWFMemberService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 	@Override
     public void saveByGroupid(String id,List<WFMember> list) {
         if(list==null)
@@ -164,11 +164,11 @@ public class WFMemberServiceImpl implements IWFMemberService {
                 _create.add(sub);
         }
         if(_update.size()>0)
-            proxyService.updateBatch(_update);
+            getProxyService().updateBatch(_update);
         if(_create.size()>0)
-            proxyService.createBatch(_create);
+            getProxyService().createBatch(_create);
         if(delIds.size()>0)
-            proxyService.removeBatch(delIds);
+            getProxyService().removeBatch(delIds);
 	}
 
 	@Override