From d564749fa7a06fd17b2a0339e4748f3d8daeae90 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 1 Jan 2024 10:40:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yshop-drink/http-client.env.json | 20 ----- yshop-drink/yshop-dependencies/pom.xml | 30 +++---- yshop-drink/yshop-framework/pom.xml | 6 -- .../yshop/framework/common/package-info.java | 6 -- .../yshop/framework/banner/package-info.java | 6 -- .../pom.xml | 37 --------- .../config/YshopFlowableConfiguration.java | 43 ---------- .../framework/flowable/core/package-info.java | 1 - .../flowable/core/util/FlowableUtils.java | 82 ------------------- .../flowable/core/web/FlowableWebFilter.java | 35 -------- .../framework/flowable/package-info.java | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - 12 files changed, 15 insertions(+), 253 deletions(-) delete mode 100644 yshop-drink/http-client.env.json delete mode 100644 yshop-drink/yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/package-info.java delete mode 100644 yshop-drink/yshop-framework/yshop-spring-boot-starter-banner/src/main/java/co/yixiang/yshop/framework/banner/package-info.java delete mode 100644 yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/pom.xml delete mode 100644 yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/config/YshopFlowableConfiguration.java delete mode 100644 yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/package-info.java delete mode 100644 yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/util/FlowableUtils.java delete mode 100644 yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/web/FlowableWebFilter.java delete mode 100644 yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/package-info.java delete mode 100644 yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/yshop-drink/http-client.env.json b/yshop-drink/http-client.env.json deleted file mode 100644 index 2a15377..0000000 --- a/yshop-drink/http-client.env.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "local": { - "baseUrl": "http://127.0.0.1:48081/admin-api", - "token": "test1", - "adminTenentId": "1", - - "appApi": "http://127.0.0.1:48081/app-api", - "appToken": "test247", - "appTenentId": "1" - }, - "gateway": { - "baseUrl": "http://127.0.0.1:8888/admin-api", - "token": "test1", - "adminTenentId": "1", - - "appApi": "http://127.0.0.1:8888/app-api", - "appToken": "test1", - "appTenantId": "1" - } -} diff --git a/yshop-drink/yshop-dependencies/pom.xml b/yshop-drink/yshop-dependencies/pom.xml index 412ecca..7f8a696 100644 --- a/yshop-drink/yshop-dependencies/pom.xml +++ b/yshop-drink/yshop-dependencies/pom.xml @@ -377,21 +377,21 @@ - - co.yixiang.boot - yshop-spring-boot-starter-flowable - ${revision} - - - org.flowable - flowable-spring-boot-starter-process - ${flowable.version} - - - org.flowable - flowable-spring-boot-starter-actuator - ${flowable.version} - + + + + + + + + + + + + + + + diff --git a/yshop-drink/yshop-framework/pom.xml b/yshop-drink/yshop-framework/pom.xml index 02950c5..cb89142 100644 --- a/yshop-drink/yshop-framework/pom.xml +++ b/yshop-drink/yshop-framework/pom.xml @@ -16,28 +16,22 @@ yshop-spring-boot-starter-redis yshop-spring-boot-starter-web yshop-spring-boot-starter-security - yshop-spring-boot-starter-file yshop-spring-boot-starter-monitor yshop-spring-boot-starter-protection yshop-spring-boot-starter-job yshop-spring-boot-starter-mq - yshop-spring-boot-starter-excel yshop-spring-boot-starter-test - yshop-spring-boot-starter-biz-operatelog yshop-spring-boot-starter-biz-dict yshop-spring-boot-starter-biz-sms - yshop-spring-boot-starter-biz-weixin yshop-spring-boot-starter-biz-social yshop-spring-boot-starter-biz-tenant yshop-spring-boot-starter-biz-data-permission yshop-spring-boot-starter-biz-error-code yshop-spring-boot-starter-biz-ip - - yshop-spring-boot-starter-flowable yshop-spring-boot-starter-captcha yshop-spring-boot-starter-websocket yshop-spring-boot-starter-desensitize diff --git a/yshop-drink/yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/package-info.java b/yshop-drink/yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/package-info.java deleted file mode 100644 index cee3bbe..0000000 --- a/yshop-drink/yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 基础的通用类，和框架无关 - * - * 例如说，CommonResult 为通用返回 - */ -package co.yixiang.yshop.framework.common; diff --git a/yshop-drink/yshop-framework/yshop-spring-boot-starter-banner/src/main/java/co/yixiang/yshop/framework/banner/package-info.java b/yshop-drink/yshop-framework/yshop-spring-boot-starter-banner/src/main/java/co/yixiang/yshop/framework/banner/package-info.java deleted file mode 100644 index e7cab57..0000000 --- a/yshop-drink/yshop-framework/yshop-spring-boot-starter-banner/src/main/java/co/yixiang/yshop/framework/banner/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Banner 用于在 console 控制台，打印开发文档、接口文档等 - * - * @author yshop - */ -package co.yixiang.yshop.framework.banner; diff --git a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/pom.xml b/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/pom.xml deleted file mode 100644 index 4f81ff6..0000000 --- a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - yshop-framework - co.yixiang.boot - ${revision} - - 4.0.0 - - yshop-spring-boot-starter-flowable - - - - co.yixiang.boot - yshop-common - - - - - co.yixiang.boot - yshop-spring-boot-starter-security - - - - - org.flowable - flowable-spring-boot-starter-process - - - org.flowable - flowable-spring-boot-starter-actuator - - - - diff --git a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/config/YshopFlowableConfiguration.java b/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/config/YshopFlowableConfiguration.java deleted file mode 100644 index c663632..0000000 --- a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/config/YshopFlowableConfiguration.java +++ /dev/null @@ -1,43 +0,0 @@ -package co.yixiang.yshop.framework.flowable.config; - -import co.yixiang.yshop.framework.common.enums.WebFilterOrderEnum; -import co.yixiang.yshop.framework.flowable.core.web.FlowableWebFilter; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.core.task.AsyncListenableTaskExecutor; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -@AutoConfiguration -public class YshopFlowableConfiguration { - - /** - * 参考 {@link org.flowable.spring.boot.FlowableJobConfiguration} 类，创建对应的 AsyncListenableTaskExecutor Bean - * - * 如果不创建，会导致项目启动时，Flowable 报错的问题 - */ - @Bean - public AsyncListenableTaskExecutor taskExecutor() { - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setCorePoolSize(8); - executor.setMaxPoolSize(8); - executor.setQueueCapacity(100); - executor.setThreadNamePrefix("flowable-task-Executor-"); - executor.setAwaitTerminationSeconds(30); - executor.setWaitForTasksToCompleteOnShutdown(true); - executor.setAllowCoreThreadTimeOut(true); - executor.initialize(); - return executor; - } - - /** - * 配置 flowable Web 过滤器 - */ - @Bean - public FilterRegistrationBean flowableWebFilter() { - FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); - registrationBean.setFilter(new FlowableWebFilter()); - registrationBean.setOrder(WebFilterOrderEnum.FLOWABLE_FILTER); - return registrationBean; - } -} diff --git a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/package-info.java b/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/package-info.java deleted file mode 100644 index 4a4f305..0000000 --- a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package co.yixiang.yshop.framework.flowable.core; diff --git a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/util/FlowableUtils.java b/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/util/FlowableUtils.java deleted file mode 100644 index 369d609..0000000 --- a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/util/FlowableUtils.java +++ /dev/null @@ -1,82 +0,0 @@ -package co.yixiang.yshop.framework.flowable.core.util; - -import org.flowable.bpmn.converter.BpmnXMLConverter; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.FlowElement; -import org.flowable.common.engine.impl.identity.Authentication; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Flowable 相关的工具方法 - * - * @author yshop - */ -public class FlowableUtils { - - // ========== User 相关的工具方法 ========== - - public static void setAuthenticatedUserId(Long userId) { - Authentication.setAuthenticatedUserId(String.valueOf(userId)); - } - - public static void clearAuthenticatedUserId() { - Authentication.setAuthenticatedUserId(null); - } - - // ========== BPMN 相关的工具方法 ========== - - /** - * 获得 BPMN 流程中，指定的元素们 - * - * @param model - * @param clazz 指定元素。例如说，{@link org.flowable.bpmn.model.UserTask}、{@link org.flowable.bpmn.model.Gateway} 等等 - * @return 元素们 - */ - public static List getBpmnModelElements(BpmnModel model, Class clazz) { - List result = new ArrayList<>(); - model.getProcesses().forEach(process -> { - process.getFlowElements().forEach(flowElement -> { - if (flowElement.getClass().isAssignableFrom(clazz)) { - result.add((T) flowElement); - } - }); - }); - return result; - } - - /** - * 比较 两个bpmnModel 是否相同 - * @param oldModel 老的bpmn model - * @param newModel 新的bpmn model - */ - public static boolean equals(BpmnModel oldModel, BpmnModel newModel) { - // 由于 BpmnModel 未提供 equals 方法，所以只能转成字节数组，进行比较 - return Arrays.equals(getBpmnBytes(oldModel), getBpmnBytes(newModel)); - } - - /** - * 把 bpmnModel 转换成 byte[] - * @param model bpmnModel - */ - public static byte[] getBpmnBytes(BpmnModel model) { - if (model == null) { - return new byte[0]; - } - BpmnXMLConverter converter = new BpmnXMLConverter(); - return converter.convertToXML(model); - } - - // ========== Execution 相关的工具方法 ========== - - public static String formatCollectionVariable(String activityId) { - return activityId + "_assignees"; - } - - public static String formatCollectionElementVariable(String activityId) { - return activityId + "_assignee"; - } - -} diff --git a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/web/FlowableWebFilter.java b/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/web/FlowableWebFilter.java deleted file mode 100644 index c0cbb80..0000000 --- a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/core/web/FlowableWebFilter.java +++ /dev/null @@ -1,35 +0,0 @@ -package co.yixiang.yshop.framework.flowable.core.web; - -import co.yixiang.yshop.framework.flowable.core.util.FlowableUtils; -import co.yixiang.yshop.framework.security.core.util.SecurityFrameworkUtils; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -/** - * flowable Web 过滤器，将 userId 设置到 {@link org.flowable.common.engine.impl.identity.Authentication} 中 - * - * @author jason - */ -public class FlowableWebFilter extends OncePerRequestFilter { - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException { - try { - // 设置工作流的用户 - Long userId = SecurityFrameworkUtils.getLoginUserId(); - if (userId != null) { - FlowableUtils.setAuthenticatedUserId(userId); - } - // 过滤 - chain.doFilter(request, response); - } finally { - // 清理 - FlowableUtils.clearAuthenticatedUserId(); - } - } -} diff --git a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/package-info.java b/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/package-info.java deleted file mode 100644 index fdf7d23..0000000 --- a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/java/co/yixiang/yshop/framework/flowable/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package co.yixiang.yshop.framework.flowable; diff --git a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index bb53259..0000000 --- a/yshop-drink/yshop-framework/yshop-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -co.yixiang.yshop.framework.flowable.config.YshopFlowableConfiguration \ No newline at end of file