zhouweidong 部署微服务应用 [ibz-wf，统一工作流]

config.xml

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

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

ibzwf-app/ibzwf-app-web/src/main/docker/ibzwf-app-web-k8s.yaml

@@ -22,7 +22,34 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 8080
+        - containerPort: 30003
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.180.237"      
+        - name: SERVER_PORT
+          value: "30003"
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
+          value: "172.16.100.243:8848"
+        - name: SPRING_REDIS_HOST
+          value: "172.16.100.243"
+        - name: SPRING_REDIS_PORT
+          value: "6379"
+        - name: SPRING_REDIS_DATABASE
+          value: "0"
+        - name: SPRING_DATASOURCE_USERNAME
+          value: "a_A_5d9d78509"
+        - name: SPRING_DATASOURCE_PASSWORD
+          value: "@6dEfb3@"
+        - name: SPRING_DATASOURCE_URL
+          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
+        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
+          value: "com.mysql.jdbc.Driver"
+        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
+          value: "a_A_5d9d78509"
+        - name: NACOS
+          value: "172.16.100.243:8848"      
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
+          value: "ibizdev"      
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -42,9 +69,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 8080
-    targetPort: 8080
-    nodePort: 8080
+    port: 30003
+    targetPort: 30003
+    nodePort: 30003
     protocol: TCP
   selector:
     app: ibzwf-app-web

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

@@ -3,9 +3,23 @@ services:
   ibzwf-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
     ports:
-      - "8080:8080"
+      - "30003:30003"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30003
+      - 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:

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFGroupMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.workflow.domain.WFGroup;
 import cn.ibizlab.core.workflow.filter.WFGroupSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFMemberMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.workflow.domain.WFMember;
 import cn.ibizlab.core.workflow.filter.WFMemberSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFProcessDefinitionMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.workflow.domain.WFProcessDefinition;
 import cn.ibizlab.core.workflow.filter.WFProcessDefinitionSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFSystemMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.workflow.domain.WFSystem;
 import cn.ibizlab.core.workflow.filter.WFSystemSearchContext;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/mapper/WFUserMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.workflow.domain.WFUser;
 import cn.ibizlab.core.workflow.filter.WFUserSearchContext;

ibzwf-dependencies/pom.xml

@@ -85,7 +85,6 @@
 
         <oracle.version>19.8.0.0</oracle.version>
         <postgresql.version>42.2.6</postgresql.version>
-
     </properties>
 
     <dependencyManagement>

ibzwf-util/src/main/java/cn/ibizlab/util/cache/RedisCacheConfig.java

@@ -124,6 +124,7 @@ public class RedisCacheConfig {
         container.setConnectionFactory(redisConnectionFactory);
         container.addMessageListener(messageListener, RedisChannelTopic.REDIS_CACHE_DELETE_TOPIC.getChannelTopic());
         container.addMessageListener(messageListener, RedisChannelTopic.REDIS_CACHE_CLEAR_TOPIC.getChannelTopic());
+        container.addMessageListener(messageListener, RedisChannelTopic.REDIS_CACHE_DYNAMICMODEL_TOPIC.getChannelTopic());
         return container;
     }
 }
\ No newline at end of file

ibzwf-util/src/main/java/cn/ibizlab/util/client/IBZLiteFallback.java

@@ -2,6 +2,8 @@ package cn.ibizlab.util.client;
 
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Component;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class IBZLiteFallback implements IBZLiteFeignClient {
@@ -10,4 +12,5 @@ public class IBZLiteFallback implements IBZLiteFeignClient {
 	public Boolean syncSysModel(JSONObject system) {
 		return null;
 	}
+
 }

ibzwf-util/src/main/java/cn/ibizlab/util/client/IBZLiteFeignClient.java

@@ -3,6 +3,8 @@ package cn.ibizlab.util.client;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import java.util.Map;
 
 @FeignClient(value = "${ibiz.ref.service.lite:ibzlite-api}",contextId = "lite",fallback = IBZLiteFallback.class)
 public interface IBZLiteFeignClient
@@ -14,4 +16,5 @@ public interface IBZLiteFeignClient
 	 */
 	@PostMapping("/lite/syncsysmodel")
 	Boolean syncSysModel(@RequestBody JSONObject system);
+
 }

ibzwf-util/src/main/java/cn/ibizlab/util/enums/RedisChannelTopic.java

@@ -6,7 +6,8 @@ import org.springframework.data.redis.listener.ChannelTopic;
  */
 public enum RedisChannelTopic {
     REDIS_CACHE_DELETE_TOPIC("redis:cache:delete:topic1", "删除redis缓存消息频道"),
-    REDIS_CACHE_CLEAR_TOPIC("redis:cache:clear:topic2", "清空redis缓存消息频道");
+    REDIS_CACHE_CLEAR_TOPIC("redis:cache:clear:topic2", "清空redis缓存消息频道"),
+    REDIS_CACHE_DYNAMICMODEL_TOPIC("redis:cache:dynamicmodel:topic3", "动态模型频道");
 
     String channelTopic;
     String label;