From 06b455d2235ee91347f4f4b44f53d778af7cd101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 29 Nov 2018 17:31:45 +0800 Subject: [PATCH] :arrow_up: Upgrading dependencies. --- pigx-auth/pom.xml | 1 + .../pigx/auth/endpoint/PigxTokenEndpoint.java | 4 +- .../common/cache/RedisAutoCacheManager.java | 6 +- ...antUtils.java => TenantContextHolder.java} | 4 +- .../feign/PigxFeignTenantInterceptor.java | 6 +- ...er.java => TenantContextHolderFilter.java} | 10 +-- .../main/resources/META-INF/spring.factories | 2 +- .../filter/PigxRequestGlobalFilter.java | 2 +- pigx-upms/pigx-upms-biz/pom.xml | 1 + .../admin/config/MybatisPlusConfigurer.java | 4 +- pigx-visual/pigx-activiti/pom.xml | 1 + .../act/config/MybatisPlusConfigurer.java | 4 +- .../act/service/impl/ActTaskServiceImpl.java | 82 ++++++++++--------- .../act/service/impl/EditorServiceImpl.java | 4 +- .../service/impl/LeaveBillServiceImpl.java | 2 - .../act/service/impl/ModelServiceImpl.java | 6 +- .../act/service/impl/ProcessServiceImpl.java | 17 ++-- .../src/main/resources/bootstrap.yml | 1 + pigx-visual/pigx-codegen/pom.xml | 1 + pigx-visual/pigx-daemon/pom.xml | 1 + pom.xml | 36 ++------ 21 files changed, 88 insertions(+), 107 deletions(-) rename pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/{TenantUtils.java => TenantContextHolder.java} (95%) rename pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/{TenantIdTtlFilter.java => TenantContextHolderFilter.java} (88%) diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index dbe084f18..85284cce5 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -87,6 +87,7 @@ mysql mysql-connector-java + ${mysql.connector.version} diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index bd87d86a8..a7c4b2bb7 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.constant.PaginationConstant; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import com.pig4cloud.pigx.common.security.service.PigxUser; import lombok.AllArgsConstructor; import org.springframework.cache.CacheManager; @@ -171,7 +171,7 @@ public class PigxTokenEndpoint { private boolean extractToken(Map map, Object principal) { if (principal instanceof PigxUser) { PigxUser user = (PigxUser) principal; - if (!user.getTenantId().equals(TenantUtils.getTenantId())) { + if (!user.getTenantId().equals(TenantContextHolder.getTenantId())) { return true; } map.put("user_id", user.getId() + ""); diff --git a/pigx-common/pigx-common-cache/src/main/java/com/pig4cloud/pigx/common/cache/RedisAutoCacheManager.java b/pigx-common/pigx-common-cache/src/main/java/com/pig4cloud/pigx/common/cache/RedisAutoCacheManager.java index 3f93936ca..3d0b02bac 100644 --- a/pigx-common/pigx-common-cache/src/main/java/com/pig4cloud/pigx/common/cache/RedisAutoCacheManager.java +++ b/pigx-common/pigx-common-cache/src/main/java/com/pig4cloud/pigx/common/cache/RedisAutoCacheManager.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.common.cache; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.Cache; import org.springframework.data.redis.cache.RedisCache; @@ -57,7 +57,7 @@ public class RedisAutoCacheManager extends RedisCacheManager { if (cacheArray.length < CACHE_LENGTH) { return super.createRedisCache(name, cacheConfig); } - String cacheName = cacheArray[0] + ":" + TenantUtils.getTenantId(); + String cacheName = cacheArray[0] + ":" + TenantContextHolder.getTenantId(); if (cacheConfig != null) { long cacheAge = Long.getLong(cacheArray[1], -1); cacheConfig = cacheConfig.entryTtl(Duration.ofSeconds(cacheAge)); @@ -67,6 +67,6 @@ public class RedisAutoCacheManager extends RedisCacheManager { @Override public Cache getCache(String name) { - return super.getCache(name + ":" + TenantUtils.getTenantId()); + return super.getCache(name + ":" + TenantContextHolder.getTenantId()); } } diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantUtils.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantContextHolder.java similarity index 95% rename from pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantUtils.java rename to pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantContextHolder.java index 8c2595be8..cf7cdf3c3 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantUtils.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantContextHolder.java @@ -24,7 +24,7 @@ import com.alibaba.ttl.TransmittableThreadLocal; * @date 2018/10/4 * 租户工具类 */ -public class TenantUtils { +public class TenantContextHolder { private static final ThreadLocal THREAD_LOCAL_TENANT = new TransmittableThreadLocal<>(); @@ -47,7 +47,7 @@ public class TenantUtils { return THREAD_LOCAL_TENANT.get(); } - public static void clear(){ + public static void clear() { THREAD_LOCAL_TENANT.remove(); } } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignTenantInterceptor.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignTenantInterceptor.java index c9f3dde17..453827e28 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignTenantInterceptor.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignTenantInterceptor.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.common.security.feign; import com.pig4cloud.pigx.common.core.constant.CommonConstant; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import feign.RequestInterceptor; import feign.RequestTemplate; import lombok.extern.slf4j.Slf4j; @@ -31,10 +31,10 @@ import lombok.extern.slf4j.Slf4j; public class PigxFeignTenantInterceptor implements RequestInterceptor { @Override public void apply(RequestTemplate requestTemplate) { - if (TenantUtils.getTenantId() == null) { + if (TenantContextHolder.getTenantId() == null) { log.error("TTL 中的 租户ID为空，feign拦截器 >> 增强失败"); return; } - requestTemplate.header(CommonConstant.TENANT_ID, TenantUtils.getTenantId().toString()); + requestTemplate.header(CommonConstant.TENANT_ID, TenantContextHolder.getTenantId().toString()); } } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/TenantIdTtlFilter.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/TenantContextHolderFilter.java similarity index 88% rename from pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/TenantIdTtlFilter.java rename to pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/TenantContextHolderFilter.java index 1b6a51cc6..a9adc0dbc 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/TenantIdTtlFilter.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/TenantContextHolderFilter.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.common.security.filter; import cn.hutool.core.util.StrUtil; import com.pig4cloud.pigx.common.core.constant.CommonConstant; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; @@ -41,7 +41,7 @@ import java.io.IOException; @Slf4j @Component @Order(Ordered.HIGHEST_PRECEDENCE) -public class TenantIdTtlFilter extends GenericFilterBean { +public class TenantContextHolderFilter extends GenericFilterBean { @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { @@ -52,12 +52,12 @@ public class TenantIdTtlFilter extends GenericFilterBean { log.debug("获取header中的租户ID为:{}", tenantId); if (StrUtil.isNotBlank(tenantId)) { - TenantUtils.setTenantId(Integer.parseInt(tenantId)); + TenantContextHolder.setTenantId(Integer.parseInt(tenantId)); } else { - TenantUtils.setTenantId(1); + TenantContextHolder.setTenantId(1); } filterChain.doFilter(request, response); - TenantUtils.clear(); + TenantContextHolder.clear(); } } diff --git a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories index 6f1efb378..72cd2a9cd 100644 --- a/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.pig4cloud.pigx.common.security.filter.TenantIdTtlFilter,\ + com.pig4cloud.pigx.common.security.filter.TenantContextHolderFilter,\ com.pig4cloud.pigx.common.security.feign.PigxFeignClientConfiguration,\ com.pig4cloud.pigx.common.security.feign.PigxFeignTenantConfiguration,\ com.pig4cloud.pigx.common.security.service.PigxUserDetailsServiceImpl diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java index ad9355503..3af948f10 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java @@ -60,7 +60,7 @@ public class PigxRequestGlobalFilter implements GlobalFilter, Ordered { public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { // 1. 清洗请求头中from 参数 ServerHttpRequest request = exchange.getRequest().mutate() - .headers(httpHeaders -> httpHeaders.remove(SecurityConstants.FROM)) + .headers(httpHeaders -> {httpHeaders.remove(SecurityConstants.FROM);}) .build(); // 2. 重写StripPrefix diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index ed1715b36..4bec94c1a 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -89,6 +89,7 @@ mysql mysql-connector-java + ${mysql.connector.version} diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java index a1ed9f111..04ddf2708 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java @@ -27,7 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; import com.pig4cloud.pigx.common.core.datascope.DataScopeInterceptor; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; @@ -61,7 +61,7 @@ public class MybatisPlusConfigurer { tenantSqlParser.setTenantHandler(new TenantHandler() { @Override public Expression getTenantId() { - Integer tenantId = TenantUtils.getTenantId(); + Integer tenantId = TenantContextHolder.getTenantId(); log.debug("当前租户为 >> {}", tenantId); return new LongValue(tenantId); } diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml index 3f2f1394d..4a8baa225 100644 --- a/pigx-visual/pigx-activiti/pom.xml +++ b/pigx-visual/pigx-activiti/pom.xml @@ -51,6 +51,7 @@ mysql mysql-connector-java + ${mysql.connector.version} diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java index d35c07be4..9b7c69e48 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java @@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; @@ -56,7 +56,7 @@ public class MybatisPlusConfigurer { tenantSqlParser.setTenantHandler(new TenantHandler() { @Override public Expression getTenantId() { - Integer tenantId = TenantUtils.getTenantId(); + Integer tenantId = TenantContextHolder.getTenantId(); log.debug("当前租户为 >> {}", tenantId); return new LongValue(tenantId); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java index a66c11af6..f9e09606b 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java @@ -42,7 +42,6 @@ import org.activiti.engine.impl.identity.Authentication; import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity; import org.activiti.engine.impl.pvm.process.ActivityImpl; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Comment; import org.activiti.engine.task.Task; import org.activiti.engine.task.TaskQuery; import org.activiti.image.ProcessDiagramGenerator; @@ -52,6 +51,7 @@ import org.springframework.stereotype.Service; import java.io.InputStream; import java.util.*; +import java.util.stream.Collectors; /** * @author lengleng @@ -80,17 +80,18 @@ public class ActTaskServiceImpl implements ActTaskService { IPage result = new Page(page, limit); result.setTotal(taskQuery.count()); - List taskDTOList = new ArrayList<>(); - taskQuery.list().forEach(task -> { - TaskDTO dto = new TaskDTO(); - dto.setTaskId(task.getId()); - dto.setTaskName(task.getName()); - dto.setProcessInstanceId(task.getProcessInstanceId()); - dto.setNodeKey(task.getTaskDefinitionKey()); - dto.setCategory(task.getCategory()); - dto.setTime(task.getCreateTime()); - taskDTOList.add(dto); - }); + + List taskDTOList = taskQuery.list().stream() + .map(task -> { + TaskDTO dto = new TaskDTO(); + dto.setTaskId(task.getId()); + dto.setTaskName(task.getName()); + dto.setProcessInstanceId(task.getProcessInstanceId()); + dto.setNodeKey(task.getTaskDefinitionKey()); + dto.setCategory(task.getCategory()); + dto.setTime(task.getCreateTime()); + return dto; + }).collect(Collectors.toList()); result.setRecords(taskDTOList); return result; } @@ -174,20 +175,20 @@ public class ActTaskServiceImpl implements ActTaskService { .taskId(taskId) .singleResult(); //获取流程实例ID - List commentDtoList = new ArrayList<>(); - List commentList = taskService.getProcessInstanceComments(task.getProcessInstanceId()); - - commentList.forEach(comment -> { - CommentDto commentDto = new CommentDto(); - commentDto.setId(comment.getId()); - commentDto.setTime(comment.getTime()); - commentDto.setType(comment.getType()); - commentDto.setTaskId(comment.getTaskId()); - commentDto.setUserId(comment.getUserId()); - commentDto.setFullMessage(comment.getFullMessage()); - commentDto.setProcessInstanceId(comment.getProcessInstanceId()); - commentDtoList.add(commentDto); - }); + List commentDtoList = taskService + .getProcessInstanceComments(task.getProcessInstanceId()) + .stream().map(comment -> { + CommentDto commentDto = new CommentDto(); + commentDto.setId(comment.getId()); + commentDto.setTime(comment.getTime()); + commentDto.setType(comment.getType()); + commentDto.setTaskId(comment.getTaskId()); + commentDto.setUserId(comment.getUserId()); + commentDto.setFullMessage(comment.getFullMessage()); + commentDto.setProcessInstanceId(comment.getProcessInstanceId()); + return commentDto; + } + ).collect(Collectors.toList()); return commentDtoList; } @@ -204,9 +205,11 @@ public class ActTaskServiceImpl implements ActTaskService { .singleResult(); String processInstanceId = task.getProcessInstanceId(); - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() + .processInstanceId(processInstanceId).singleResult(); HistoricProcessInstance historicProcessInstance = - historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); + historyService.createHistoricProcessInstanceQuery() + .processInstanceId(processInstanceId).singleResult(); String processDefinitionId = null; List executedActivityIdList = new ArrayList<>(); if (processInstance != null) { @@ -214,11 +217,11 @@ public class ActTaskServiceImpl implements ActTaskService { executedActivityIdList = this.runtimeService.getActiveActivityIds(processInstance.getId()); } else if (historicProcessInstance != null) { processDefinitionId = historicProcessInstance.getProcessDefinitionId(); - List historicActivityInstanceList = - historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId).orderByHistoricActivityInstanceId().asc().list(); - for (HistoricActivityInstance activityInstance : historicActivityInstanceList) { - executedActivityIdList.add(activityInstance.getActivityId()); - } + executedActivityIdList = historyService.createHistoricActivityInstanceQuery() + .processInstanceId(processInstanceId) + .orderByHistoricActivityInstanceId().asc().list() + .stream().map(HistoricActivityInstance::getActivityId) + .collect(Collectors.toList()); } BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId); @@ -237,18 +240,17 @@ public class ActTaskServiceImpl implements ActTaskService { } private List findOutFlagListByTaskId(Task task, ProcessInstance pi) { - //返回存放连线的名称集合 - List list = new ArrayList<>(); //查询ProcessDefinitionEntiy对象 ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) repositoryService .getProcessDefinition(task.getProcessDefinitionId()); ActivityImpl activityImpl = processDefinitionEntity.findActivity(pi.getActivityId()); //获取当前活动完成之后连线的名称 - activityImpl.getOutgoingTransitions().forEach(pvm -> { - String name = (String) pvm.getProperty("name"); - list.add(StrUtil.isNotBlank(name) ? name : FLAG); - }); - return list; + List nameList = activityImpl.getOutgoingTransitions().stream() + .map(pvm -> { + String name = (String) pvm.getProperty("name"); + return StrUtil.isNotBlank(name) ? name : FLAG; + }).collect(Collectors.toList()); + return nameList; } } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java index a0a1f05e6..4dc5481b1 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java @@ -21,7 +21,7 @@ import cn.hutool.core.util.CharsetUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.pig4cloud.pigx.act.service.EditorService; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.ActivitiException; @@ -112,7 +112,7 @@ public class EditorServiceImpl implements EditorService { modelJson.put(MODEL_DESCRIPTION, description); model.setMetaInfo(modelJson.toString()); model.setName(name); - model.setTenantId(String.valueOf(TenantUtils.getTenantId())); + model.setTenantId(String.valueOf(TenantContextHolder.getTenantId())); repositoryService.saveModel(model); repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes(CharsetUtil.UTF_8)); diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java index d9ed4e32a..752cc8016 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java @@ -17,8 +17,6 @@ package com.pig4cloud.pigx.act.service.impl; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.mapper.LeaveBillMapper; diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java index cd0c80ab6..13bc060db 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.pig4cloud.pigx.act.service.ModelService; import com.pig4cloud.pigx.common.core.constant.PaginationConstant; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.activiti.bpmn.model.BpmnModel; @@ -90,7 +90,7 @@ public class ModelServiceImpl implements ModelService { modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion()); modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, desc); model.setMetaInfo(modelObjectNode.toString()); - model.setTenantId(String.valueOf(TenantUtils.getTenantId())); + model.setTenantId(String.valueOf(TenantContextHolder.getTenantId())); repositoryService.saveModel(model); repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes("utf-8")); @@ -159,7 +159,7 @@ public class ModelServiceImpl implements ModelService { Deployment deployment = repositoryService .createDeployment().name(model.getName()) .addBpmnModel(processName, bpmnModel) - .tenantId(String.valueOf(TenantUtils.getTenantId())) + .tenantId(String.valueOf(TenantContextHolder.getTenantId())) .deploy(); // 设置流程分类 diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java index 08c8f94c7..d26d02df2 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java @@ -29,7 +29,7 @@ import com.pig4cloud.pigx.common.core.constant.PaginationConstant; import com.pig4cloud.pigx.common.core.constant.enums.ProcessStatusEnum; import com.pig4cloud.pigx.common.core.constant.enums.ResourceTypeEnum; import com.pig4cloud.pigx.common.core.constant.enums.TaskStatusEnum; -import com.pig4cloud.pigx.common.core.util.TenantUtils; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import lombok.AllArgsConstructor; import org.activiti.engine.RepositoryService; import org.activiti.engine.RuntimeService; @@ -38,11 +38,12 @@ import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.repository.ProcessDefinitionQuery; import org.activiti.engine.runtime.ProcessInstance; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.InputStream; -import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author lengleng @@ -75,14 +76,13 @@ public class ProcessServiceImpl implements ProcessService { IPage result = new Page(page, limit); result.setTotal(query.count()); - List deploymentList = new ArrayList<>(); - query.listPage((page - 1) * limit, limit) + List deploymentList = query.listPage((page - 1) * limit, limit) .stream() - .forEach(processDefinition -> { + .map(processDefinition -> { Deployment deployment = repositoryService.createDeploymentQuery() .deploymentId(processDefinition.getDeploymentId()).singleResult(); - deploymentList.add(ProcessDefDTO.toProcessDefDTO(processDefinition, deployment)); - }); + return ProcessDefDTO.toProcessDefDTO(processDefinition, deployment); + }).collect(Collectors.toList()); result.setRecords(deploymentList); return result; } @@ -158,13 +158,14 @@ public class ProcessServiceImpl implements ProcessService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean saveStartProcess(Integer leaveId) { LeaveBill leaveBill = leaveBillMapper.selectById(leaveId); leaveBill.setState(TaskStatusEnum.CHECK.getStatus()); String key = leaveBill.getClass().getSimpleName(); String businessKey = key + "_" + leaveBill.getLeaveId(); - runtimeService.startProcessInstanceByKeyAndTenantId(key, businessKey, String.valueOf(TenantUtils.getTenantId())); + runtimeService.startProcessInstanceByKeyAndTenantId(key, businessKey, String.valueOf(TenantContextHolder.getTenantId())); leaveBillMapper.updateById(leaveBill); return Boolean.TRUE; } diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml index 881d420d0..9f3cf45c9 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml @@ -1,3 +1,4 @@ +server.session server: port: 5005 diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 6773aee26..5b9aaff27 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -29,6 +29,7 @@ mysql mysql-connector-java + ${mysql.connector.version} diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml index 03efc0b93..870c7c8bf 100644 --- a/pigx-visual/pigx-daemon/pom.xml +++ b/pigx-visual/pigx-daemon/pom.xml @@ -52,6 +52,7 @@ mysql mysql-connector-java + ${mysql.connector.version} diff --git a/pom.xml b/pom.xml index 5fff8a20f..0262eaf33 100644 --- a/pom.xml +++ b/pom.xml @@ -49,17 +49,17 @@ 1.8 1.8 2.0.4 - 4.1.21 + 4.2.1 3.0.6 0.0.9 2.9.2 - 2.0.0 2.10.0 1.7 4.1.0 2.1.0 - 2.6.1 + 2.10.1 2.1.5 + 8.0.13 2.3.3.RELEASE 2.9.6 5.22.0 @@ -224,23 +224,11 @@ - + aliyun aliyun - https://maven.aliyun.com/repository/public - - true - - - false - - - - - spring-milestones - Spring Milestones - https://maven.aliyun.com/repository/spring + http://nexus.gitee.wang/repository/maven-public true @@ -249,18 +237,4 @@ - - - - spring-plugin - spring-plugin - https://maven.aliyun.com/repository/spring-plugin - - true - - - false - - -