zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-08 20:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ Upgrading dependencies.

Browse Source
This commit is contained in:
冷冷 committed 2018-11-29 17:31:45 +08:00
1 parent 079fbd1c27
commit 06b455d223
21 files changed
+88 -107
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-auth/pom.xml
+1
View File
@@ -87,6 +87,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<!--web 模块-->
<dependency>
pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
+2 -2
View File
@@ -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<String, String> 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() + "");
pigx-common/pigx-common-cache/src/main/java/com/pig4cloud/pigx/common/cache/RedisAutoCacheManager.java
Vendored
+3 -3
View File
@@ -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());
}
}
pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantUtils.java → pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantContextHolder.java
+2 -2
View File
@@ -24,7 +24,7 @@ import com.alibaba.ttl.TransmittableThreadLocal;
* @date 2018/10/4
* 租户工具类
*/
public class TenantUtils {
public class TenantContextHolder {
private static final ThreadLocal<Integer> 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();
}
}
pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/feign/PigxFeignTenantInterceptor.java
+3 -3
View File
@@ -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());
}
}
pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/TenantIdTtlFilter.java → pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/filter/TenantContextHolderFilter.java
+5 -5
View File
@@ -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();
}
}
pigx-common/pigx-common-security/src/main/resources/META-INF/spring.factories
+1 -1
View File
@@ -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
pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PigxRequestGlobalFilter.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class PigxRequestGlobalFilter implements GlobalFilter, Ordered {
public Mono<Void> 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
pigx-upms/pigx-upms-biz/pom.xml
+1
View File
@@ -89,6 +89,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<!--web 模块-->
<dependency>
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java
+2 -2
View File
@@ -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);
}
pigx-visual/pigx-activiti/pom.xml
+1
View File
@@ -51,6 +51,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<!--mybatis-->
<dependency>
pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java
+2 -2
View File
@@ -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);
}
pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java
+42 -40
View File
@@ -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<TaskDTO> 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<TaskDTO> 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<CommentDto> commentDtoList = new ArrayList<>();
List<Comment> 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<CommentDto> 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<String> 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<HistoricActivityInstance> 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<String> findOutFlagListByTaskId(Task task, ProcessInstance pi) {
//返回存放连线的名称集合
List<String> 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<String> nameList = activityImpl.getOutgoingTransitions().stream()
.map(pvm -> {
String name = (String) pvm.getProperty("name");
return StrUtil.isNotBlank(name) ? name : FLAG;
}).collect(Collectors.toList());
return nameList;
}
}
pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/EditorServiceImpl.java
+2 -2
View File
@@ -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));
pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java
-2
View File
@@ -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;
pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java
+3 -3
View File
@@ -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();
// 设置流程分类
pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java
+9 -8
View File
@@ -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<ProcessDefDTO> deploymentList = new ArrayList<>();
query.listPage((page - 1) * limit, limit)
List<ProcessDefDTO> 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;
}
pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml
+1
View File
@@ -1,3 +1,4 @@
server.session
server:
port: 5005
pigx-visual/pigx-codegen/pom.xml
+1
View File
@@ -29,6 +29,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<!--common-->
<dependency>
pigx-visual/pigx-daemon/pom.xml
+1
View File
@@ -52,6 +52,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<!--ZK 依赖-->
<dependency>
pom.xml
+5 -31
View File
@@ -49,17 +49,17 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-boot-admin.version>2.0.4</spring-boot-admin.version>
<hutool.version>4.1.21</hutool.version>
<hutool.version>4.2.1</hutool.version>
<mybatis-plus.version>3.0.6</mybatis-plus.version>
<kaptcha.version>0.0.9</kaptcha.version>
<swagger.version>2.9.2</swagger.version>
<elastic-job.version>2.0.0</elastic-job.version>
<curator.version>2.10.0</curator.version>
<velocity.version>1.7</velocity.version>
<lcn.version>4.1.0</lcn.version>
<jasypt.version>2.1.0</jasypt.version>
<ttl.version>2.6.1</ttl.version>
<ttl.version>2.10.1</ttl.version>
<elastic-job-lite.version>2.1.5</elastic-job-lite.version>
<mysql.connector.version>8.0.13</mysql.connector.version>
<security.oauth.version>2.3.3.RELEASE</security.oauth.version>
<jackson.modules>2.9.6</jackson.modules>
<activiti.version>5.22.0</activiti.version>
@@ -224,23 +224,11 @@
</build>
<repositories>
<!--阿里云主仓库，代理了maven central和jcenter仓库-->
<!--私服厂库-->
<repository>
<id>aliyun</id>
<name>aliyun</name>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!--阿里云代理Spring 官方仓库-->
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://maven.aliyun.com/repository/spring</url>
<url>http://nexus.gitee.wang/repository/maven-public</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -249,18 +237,4 @@
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<!--阿里云代理Spring 插件仓库-->
<pluginRepository>
<id>spring-plugin</id>
<name>spring-plugin</name>
<url>https://maven.aliyun.com/repository/spring-plugin</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>