sqlParserList = new ArrayList<>();
- TenantSqlParser tenantSqlParser = new TenantSqlParser();
- tenantSqlParser.setTenantHandler(new TenantHandler() {
- @Override
- public Expression getTenantId() {
- Integer tenantId = TenantContextHolder.getTenantId();
- log.debug("当前租户为 >> {}", tenantId);
- return new LongValue(tenantId);
- }
-
- @Override
- public String getTenantIdColumn() {
- return "tenant_id";
- }
-
- @Override
- public boolean doTableFilter(String tableName) {
- return ArrayUtil.contains(IGNORETABLES, tableName);
- }
- });
- sqlParserList.add(tenantSqlParser);
- paginationInterceptor.setSqlParserList(sqlParserList);
- return paginationInterceptor;
- }
-
- /**
- * 数据权限插件
- *
- * @return DataScopeInterceptor
- */
- @Bean
- public DataScopeInterceptor dataScopeInterceptor() {
- return new DataScopeInterceptor();
- }
-
- /**
- * 逻辑删除插件
- *
- * @return LogicSqlInjector
- */
- @Bean
- public ISqlInjector sqlInjector() {
- return new LogicSqlInjector();
- }
-}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/FileController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/FileController.java
new file mode 100644
index 000000000..d70702119
--- /dev/null
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/FileController.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.admin.controller;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.pig4cloud.common.minio.service.MinioTemplate;
+import com.pig4cloud.pigx.common.core.constant.CommonConstants;
+import com.pig4cloud.pigx.common.core.util.R;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author lengleng
+ * @date 2018-12-30
+ *
+ * 文件管理
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/file")
+public class FileController {
+ private final MinioTemplate minioTemplate;
+
+ /**
+ * 上传文件
+ * 文件名采用uuid,避免原始文件名中带"-"符号导致下载的时候解析出现异常
+ * @param file 资源
+ * @return R(bucketName, filename)
+ */
+ @PostMapping("/upload")
+ public R upload(@RequestParam("file") MultipartFile file) {
+ String fileName = IdUtil.simpleUUID()+StrUtil.DOT+ FileUtil.extName(file.getOriginalFilename());
+ Map resultMap = new HashMap<>(4);
+ resultMap.put("bucketName", CommonConstants.BUCKET_NAME);
+ resultMap.put("fileName", fileName);
+
+ try {
+ minioTemplate.putObject(CommonConstants.BUCKET_NAME, fileName, file.getInputStream());
+ } catch (Exception e) {
+ log.error("上传失败", e);
+ return R.builder().code(CommonConstants.FAIL)
+ .msg(e.getLocalizedMessage()).build();
+ }
+ return R.builder().data(resultMap).build();
+ }
+
+ /**
+ * 获取文件
+ *
+ * @param fileName 文件空间/名称
+ * @param response
+ * @return
+ */
+ @GetMapping("/{fileName}")
+ public void file(@PathVariable String fileName, HttpServletResponse response) {
+ String[] nameArray = StrUtil.split(fileName, StrUtil.DASHED);
+
+ try (InputStream inputStream = minioTemplate.getObject(nameArray[0], nameArray[1])) {
+ response.setContentType("application/octet-stream; charset=UTF-8");
+ IoUtil.copy(inputStream, response.getOutputStream());
+ } catch (Exception e) {
+ log.error("文件读取异常", e);
+ }
+ }
+}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java
index 029f2978b..c2bca98e1 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java
@@ -62,12 +62,12 @@ public class MenuController {
// 获取符合条件的菜单
Set all = new HashSet<>();
SecurityUtils.getRoles()
- .forEach(roleId -> all.addAll(sysMenuService.findMenuByRoleId(roleId)));
+ .forEach(roleId -> all.addAll(sysMenuService.findMenuByRoleId(roleId)));
List menuTreeList = all.stream()
- .filter(menuVo -> CommonConstants.MENU.equals(menuVo.getType()))
- .map(MenuTree::new)
- .sorted(Comparator.comparingInt(MenuTree::getSort))
- .collect(Collectors.toList());
+ .filter(menuVo -> CommonConstants.MENU.equals(menuVo.getType()))
+ .map(MenuTree::new)
+ .sorted(Comparator.comparingInt(MenuTree::getSort))
+ .collect(Collectors.toList());
return new R<>(TreeUtil.bulid(menuTreeList, -1));
}
@@ -90,9 +90,9 @@ public class MenuController {
@GetMapping("/tree/{roleId}")
public List getRoleTree(@PathVariable Integer roleId) {
return sysMenuService.findMenuByRoleId(roleId)
- .stream()
- .map(MenuVO::getMenuId)
- .collect(Collectors.toList());
+ .stream()
+ .map(MenuVO::getMenuId)
+ .collect(Collectors.toList());
}
/**
@@ -129,7 +129,7 @@ public class MenuController {
@DeleteMapping("/{id}")
@PreAuthorize("@pms.hasPermission('sys_menu_del')")
public R removeById(@PathVariable Integer id) {
- return new R<>(sysMenuService.removeMenuById(id));
+ return sysMenuService.removeMenuById(id);
}
/**
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java
index cf42d5438..a477b90df 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java
@@ -31,6 +31,8 @@ import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+
/**
* @author lengleng
* @date 2017/11/5
@@ -63,7 +65,7 @@ public class RoleController {
@SysLog("添加角色")
@PostMapping
@PreAuthorize("@pms.hasPermission('sys_role_add')")
- public R save(@RequestBody SysRole sysRole) {
+ public R save(@Valid @RequestBody SysRole sysRole) {
return new R<>(sysRoleService.save(sysRole));
}
@@ -76,7 +78,7 @@ public class RoleController {
@SysLog("修改角色")
@PutMapping
@PreAuthorize("@pms.hasPermission('sys_role_edit')")
- public R update(@RequestBody SysRole sysRole) {
+ public R update(@Valid @RequestBody SysRole sysRole) {
return new R<>(sysRoleService.updateById(sysRole));
}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java
index bf832570e..df1395bfa 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java
@@ -40,7 +40,7 @@ import javax.validation.Valid;
/**
* @author lengleng
- * @date 2017/10/28
+ * @date 2018/12/16
*/
@RestController
@AllArgsConstructor
@@ -57,12 +57,12 @@ public class UserController {
@GetMapping(value = {"/info"})
public R info() {
String username = SecurityUtils.getUser().getUsername();
- SysUser sysUser = userService.getOne(Wrappers.query()
- .lambda().eq(SysUser::getUsername, username));
- if (sysUser == null) {
+ SysUser user = userService.getOne(Wrappers.query()
+ .lambda().eq(SysUser::getUsername, username));
+ if (user == null) {
return new R<>(Boolean.FALSE, "获取当前用户信息失败");
}
- return new R<>(userService.findUserInfo(sysUser));
+ return new R<>(userService.findUserInfo(user));
}
/**
@@ -74,7 +74,7 @@ public class UserController {
@GetMapping("/info/{username}")
public R info(@PathVariable String username) {
SysUser user = userService.getOne(Wrappers.query()
- .lambda().eq(SysUser::getUsername, username));
+ .lambda().eq(SysUser::getUsername, username));
if (user == null) {
return new R<>(Boolean.FALSE, String.format("用户信息为空 %s", username));
}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java
index d8ce7c842..62b3616e0 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java
@@ -55,14 +55,14 @@ public class SmsLoginHandler extends AbstractLoginHandler {
*/
@Override
public UserInfo info(String identify) {
- SysUser sysUser = sysUserService
- .getOne(Wrappers.query()
- .lambda().eq(SysUser::getPhone, identify));
+ SysUser user = sysUserService
+ .getOne(Wrappers.query()
+ .lambda().eq(SysUser::getPhone, identify));
- if (sysUser == null) {
+ if (user == null) {
log.info("手机号未注册:{}", identify);
return null;
}
- return sysUserService.findUserInfo(sysUser);
+ return sysUserService.findUserInfo(user);
}
}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java
index 831e80242..02e7d11a2 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java
@@ -75,14 +75,14 @@ public class WeChatLoginHandler extends AbstractLoginHandler {
*/
@Override
public UserInfo info(String openId) {
- SysUser sysUser = sysUserService
+ SysUser user = sysUserService
.getOne(Wrappers.query()
.lambda().eq(SysUser::getWxOpenid, openId));
- if (sysUser == null) {
+ if (user == null) {
log.info("微信未绑定:{}", openId);
return null;
}
- return sysUserService.findUserInfo(sysUser);
+ return sysUserService.findUserInfo(user);
}
}
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java
index bb02e618b..16cd4ad83 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java
@@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pig4cloud.pigx.admin.api.dto.UserDTO;
import com.pig4cloud.pigx.admin.api.entity.SysUser;
import com.pig4cloud.pigx.admin.api.vo.UserVO;
-import com.pig4cloud.pigx.common.core.datascope.DataScope;
+import com.pig4cloud.pigx.common.data.datascope.DataScope;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java
index 22f2930bb..747049dca 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java
@@ -23,6 +23,7 @@ package com.pig4cloud.pigx.admin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.pig4cloud.pigx.admin.api.entity.SysMenu;
import com.pig4cloud.pigx.admin.api.vo.MenuVO;
+import com.pig4cloud.pigx.common.core.util.R;
import java.util.List;
@@ -49,7 +50,7 @@ public interface SysMenuService extends IService {
* @param id 菜单ID
* @return 成功、失败
*/
- Boolean removeMenuById(Integer id);
+ R removeMenuById(Integer id);
/**
* 更新菜单信息
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java
index 0db5a86f8..fb4ec98c3 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java
@@ -19,6 +19,7 @@
package com.pig4cloud.pigx.admin.service.impl;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pig4cloud.pigx.admin.api.entity.SysMenu;
@@ -27,6 +28,8 @@ import com.pig4cloud.pigx.admin.api.vo.MenuVO;
import com.pig4cloud.pigx.admin.mapper.SysMenuMapper;
import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper;
import com.pig4cloud.pigx.admin.service.SysMenuService;
+import com.pig4cloud.pigx.common.core.constant.CommonConstants;
+import com.pig4cloud.pigx.common.core.util.R;
import lombok.AllArgsConstructor;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
@@ -34,7 +37,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-import java.util.stream.Collectors;
/**
*
@@ -58,20 +60,22 @@ public class SysMenuServiceImpl extends ServiceImpl impl
@Override
@Transactional(rollbackFor = Exception.class)
@CacheEvict(value = "menu_details", allEntries = true)
- public Boolean removeMenuById(Integer id) {
+ public R removeMenuById(Integer id) {
// 查询父节点为当前节点的节点
- List menuIdList = this.list(Wrappers.query()
- .lambda().eq(SysMenu::getParentId, id))
- .stream().map(SysMenu::getMenuId)
- .collect(Collectors.toList());
+ List menuList = this.list(Wrappers.query()
+ .lambda().eq(SysMenu::getParentId, id));
+ if (CollUtil.isNotEmpty(menuList)) {
+ return R.builder()
+ .code(CommonConstants.FAIL)
+ .msg("菜单含有下级不能删除").build();
+ }
+
+ sysRoleMenuMapper
+ .delete(Wrappers.query()
+ .lambda().eq(SysRoleMenu::getMenuId, id));
- //删除关联ROLE_MENU 数据
- menuIdList.add(id);
- menuIdList.forEach(menu -> sysRoleMenuMapper
- .delete(Wrappers.query()
- .lambda().eq(SysRoleMenu::getMenuId, menu)));
//删除当前菜单及其子菜单
- return this.removeByIds(menuIdList);
+ return new R(this.removeById(id));
}
@Override
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java
index 10360c9e3..555cfba0a 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java
@@ -33,15 +33,14 @@ import com.pig4cloud.pigx.admin.api.vo.UserVO;
import com.pig4cloud.pigx.admin.mapper.SysUserMapper;
import com.pig4cloud.pigx.admin.service.*;
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
-import com.pig4cloud.pigx.common.core.datascope.DataScope;
import com.pig4cloud.pigx.common.core.util.R;
+import com.pig4cloud.pigx.common.data.datascope.DataScope;
import com.pig4cloud.pigx.common.security.util.SecurityUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
@@ -83,12 +82,12 @@ public class SysUserServiceImpl extends ServiceImpl impl
sysUser.setPassword(ENCODER.encode(userDto.getPassword()));
baseMapper.insert(sysUser);
List userRoleList = userDto.getRole()
- .stream().map(roleId -> {
- SysUserRole userRole = new SysUserRole();
- userRole.setUserId(sysUser.getUserId());
- userRole.setRoleId(roleId);
- return userRole;
- }).collect(Collectors.toList());
+ .stream().map(roleId -> {
+ SysUserRole userRole = new SysUserRole();
+ userRole.setUserId(sysUser.getUserId());
+ userRole.setRoleId(roleId);
+ return userRole;
+ }).collect(Collectors.toList());
return sysUserRoleService.saveBatch(userRoleList);
}
@@ -99,29 +98,24 @@ public class SysUserServiceImpl extends ServiceImpl impl
* @return
*/
@Override
- @Cacheable(value = "user_details", key = "#sysUser.username", unless = "#result == null")
public UserInfo findUserInfo(SysUser sysUser) {
- if (sysUser == null) {
- return null;
- }
-
UserInfo userInfo = new UserInfo();
userInfo.setSysUser(sysUser);
//设置角色列表 （ID）
List roleIds = sysRoleService.findRolesByUserId(sysUser.getUserId())
- .stream()
- .map(SysRole::getRoleId)
- .collect(Collectors.toList());
+ .stream()
+ .map(SysRole::getRoleId)
+ .collect(Collectors.toList());
userInfo.setRoles(ArrayUtil.toArray(roleIds, Integer.class));
//设置权限列表（menu.permission）
Set permissions = new HashSet<>();
roleIds.forEach(roleId -> {
List permissionList = sysMenuService.findMenuByRoleId(roleId)
- .stream()
- .filter(menuVo -> StringUtils.isNotEmpty(menuVo.getPermission()))
- .map(MenuVO::getPermission)
- .collect(Collectors.toList());
+ .stream()
+ .filter(menuVo -> StringUtils.isNotEmpty(menuVo.getPermission()))
+ .map(MenuVO::getPermission)
+ .collect(Collectors.toList());
permissions.addAll(permissionList);
});
userInfo.setPermissions(ArrayUtil.toArray(permissions, String.class));
@@ -137,11 +131,7 @@ public class SysUserServiceImpl extends ServiceImpl impl
*/
@Override
public IPage getUsersWithRolePage(Page page, UserDTO userDTO) {
- DataScope dataScope = new DataScope();
- dataScope.setScopeName("deptId");
- dataScope.setIsOnly(true);
- dataScope.setDeptIds(getChildDepts());
- return baseMapper.getUserVosPage(page, userDTO, dataScope);
+ return baseMapper.getUserVosPage(page, userDTO, new DataScope());
}
/**
@@ -175,7 +165,7 @@ public class SysUserServiceImpl extends ServiceImpl impl
UserVO userVO = baseMapper.getUserVoByUsername(userDto.getUsername());
SysUser sysUser = new SysUser();
if (StrUtil.isNotBlank(userDto.getPassword())
- && StrUtil.isNotBlank(userDto.getNewpassword1())) {
+ && StrUtil.isNotBlank(userDto.getNewpassword1())) {
if (ENCODER.matches(userDto.getPassword(), userVO.getPassword())) {
sysUser.setPassword(ENCODER.encode(userDto.getNewpassword1()));
} else {
@@ -202,7 +192,7 @@ public class SysUserServiceImpl extends ServiceImpl impl
this.updateById(sysUser);
sysUserRoleService.remove(Wrappers.update().lambda()
- .eq(SysUserRole::getUserId, userDto.getUserId()));
+ .eq(SysUserRole::getUserId, userDto.getUserId()));
userDto.getRole().forEach(roleId -> {
SysUserRole userRole = new SysUserRole();
userRole.setUserId(sysUser.getUserId());
@@ -221,7 +211,7 @@ public class SysUserServiceImpl extends ServiceImpl impl
@Override
public List listAncestorUsers(String username) {
SysUser sysUser = this.getOne(Wrappers.query().lambda()
- .eq(SysUser::getUsername, username));
+ .eq(SysUser::getUsername, username));
SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
if (sysDept == null) {
@@ -230,7 +220,7 @@ public class SysUserServiceImpl extends ServiceImpl impl
Integer parentId = sysDept.getParentId();
return this.list(Wrappers.query().lambda()
- .eq(SysUser::getDeptId, parentId));
+ .eq(SysUser::getDeptId, parentId));
}
/**
@@ -242,11 +232,11 @@ public class SysUserServiceImpl extends ServiceImpl impl
Integer deptId = SecurityUtils.getUser().getDeptId();
//获取当前部门的子部门
return sysDeptRelationService
- .list(Wrappers.query().lambda()
- .eq(SysDeptRelation::getAncestor, deptId))
- .stream()
- .map(SysDeptRelation::getDescendant)
- .collect(Collectors.toList());
+ .list(Wrappers.query().lambda()
+ .eq(SysDeptRelation::getAncestor, deptId))
+ .stream()
+ .map(SysDeptRelation::getDescendant)
+ .collect(Collectors.toList());
}
}
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml
index 596e8518f..a89d0707f 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml
@@ -32,7 +32,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml
index 020f05257..b48488340 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml
@@ -27,6 +27,8 @@
+
+
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml
index 75af495eb..2542b4faa 100755
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRouteConfMapper.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index a3fddcffd..de0cb70cf 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -21,21 +21,25 @@
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -135,22 +139,34 @@
`user`.user_id = #{id}
-
diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml
index 388a9859e..7f78826fb 100644
--- a/pigx-upms/pom.xml
+++ b/pigx-upms/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.0.0
+ 2.1.0
pigx-upms
diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml
index 7394d89ef..4f3a274b1 100644
--- a/pigx-visual/pigx-activiti/pom.xml
+++ b/pigx-visual/pigx-activiti/pom.xml
@@ -23,7 +23,7 @@
com.pig4cloud
pigx-visual
- 2.0.0
+ 2.1.0
pigx-activiti
@@ -41,22 +41,18 @@
com.pig4cloud
pigx-common-core
- 2.0.0
+ 2.1.0
+
+
+
+ com.pig4cloud
+ pigx-common-data
+ 2.1.0
com.pig4cloud
pigx-upms-api
- 2.0.0
-
-
- com.pig4cloud
- pigx-common-swagger
- 2.0.0
-
-
- mysql
- mysql-connector-java
- ${mysql.connector.version}
+ 2.1.0
@@ -64,13 +60,28 @@
mybatis-plus-boot-starter
${mybatis-plus.version}
+
+ com.pig4cloud
+ pigx-common-swagger
+ 2.1.0
+
org.activiti
activiti-spring-boot-starter-basic
${activiti.version}
+
+
+ org.mybatis
+ mybatis
+
+
+
+
+ mysql
+ mysql-connector-java
+ ${mysql.connector.version}
-
org.activiti
activiti-modeler
@@ -117,12 +128,12 @@
com.pig4cloud
pigx-common-swagger
- 2.0.0
+ 2.1.0
com.pig4cloud
pigx-common-security
- 2.0.0
+ 2.1.0
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 8c820df98..4ec7215f6 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
@@ -29,7 +29,7 @@ import com.pig4cloud.pigx.act.mapper.LeaveBillMapper;
import com.pig4cloud.pigx.act.service.ActTaskService;
import com.pig4cloud.pigx.common.core.constant.PaginationConstants;
import com.pig4cloud.pigx.common.core.constant.enums.TaskStatusEnum;
-import com.pig4cloud.pigx.common.core.util.TenantContextHolder;
+import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import com.pig4cloud.pigx.common.security.util.SecurityUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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 4dc5481b1..771f92f92 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.TenantContextHolder;
+import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.ActivitiException;
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 4b621e95f..f358ebca8 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.PaginationConstants;
import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
-import com.pig4cloud.pigx.common.core.util.TenantContextHolder;
+import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.activiti.bpmn.model.BpmnModel;
@@ -82,8 +82,8 @@ public class ModelServiceImpl implements ModelService {
model.setName(name);
model.setCategory(category);
model.setVersion(Integer.parseInt(
- String.valueOf(repositoryService.createModelQuery()
- .modelKey(model.getKey()).count() + 1)));
+ String.valueOf(repositoryService.createModelQuery()
+ .modelKey(model.getKey()).count() + 1)));
ObjectNode modelObjectNode = objectMapper.createObjectNode();
modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, name);
@@ -110,8 +110,8 @@ public class ModelServiceImpl implements ModelService {
@Override
public IPage getModelPage(Map params) {
ModelQuery modelQuery = repositoryService.createModelQuery()
- .modelTenantId(String.valueOf(TenantContextHolder.getTenantId()))
- .latestVersion().orderByLastUpdateTime().desc();
+ .modelTenantId(String.valueOf(TenantContextHolder.getTenantId()))
+ .latestVersion().orderByLastUpdateTime().desc();
String category = (String) params.get("category");
if (StrUtil.isNotBlank(category)) {
modelQuery.modelCategory(category);
@@ -158,18 +158,18 @@ public class ModelServiceImpl implements ModelService {
}
// 部署流程
Deployment deployment = repositoryService
- .createDeployment().name(model.getName())
- .addBpmnModel(processName, bpmnModel)
- .tenantId(String.valueOf(TenantContextHolder.getTenantId()))
- .deploy();
+ .createDeployment().name(model.getName())
+ .addBpmnModel(processName, bpmnModel)
+ .tenantId(String.valueOf(TenantContextHolder.getTenantId()))
+ .deploy();
// 设置流程分类
List list = repositoryService.createProcessDefinitionQuery()
- .deploymentId(deployment.getId())
- .list();
+ .deploymentId(deployment.getId())
+ .list();
list.stream().forEach(processDefinition ->
- repositoryService.setProcessDefinitionCategory(processDefinition.getId(), model.getCategory()));
+ repositoryService.setProcessDefinitionCategory(processDefinition.getId(), model.getCategory()));
} catch (Exception e) {
log.error("部署失败，异常", e);
}
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 215e37446..1a0ab5010 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.PaginationConstants;
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.TenantContextHolder;
+import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import lombok.AllArgsConstructor;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService;
diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index ff7537063..4ea65ece1 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -6,7 +6,7 @@
com.pig4cloud
pigx-visual
- 2.0.0
+ 2.1.0
pigx-codegen
@@ -20,6 +20,12 @@
org.springframework.cloud
spring-cloud-starter-config
+
+
+ com.pig4cloud
+ pigx-common-data
+ 2.1.0
+
com.baomidou
@@ -35,19 +41,19 @@
com.pig4cloud
pigx-common-core
- 2.0.0
+ 2.1.0
com.pig4cloud
pigx-common-swagger
- 2.0.0
+ 2.1.0
com.pig4cloud
pigx-common-security
- 2.0.0
+ 2.1.0
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
index 958d72980..9bd08062c 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm
@@ -16,8 +16,7 @@
*/
package ${package}.${moduleName}.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pig4cloud.pigx.common.core.util.R;
import com.pig4cloud.pigx.common.log.annotation.SysLog;
@@ -26,8 +25,6 @@ import ${package}.${moduleName}.service.${className}Service;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import java.util.Map;
-
/**
* ${comments}
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
index 0b2d23611..dfcc4a293 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
@@ -34,8 +34,8 @@ import java.time.LocalDateTime;
* @date ${datetime}
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("${tableName}")
+@EqualsAndHashCode(callSuper = true)
public class ${className} extends Model<${className}> {
private static final long serialVersionUID = 1L;
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm
index 5ef3ca60e..ed44ab231 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm
@@ -17,10 +17,7 @@
package ${package}.${moduleName}.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import ${package}.${moduleName}.entity.${className};
-import org.apache.ibatis.annotations.Param;
/**
* ${comments}
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm
index d1ca0db44..b5c347de6 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm
@@ -16,8 +16,6 @@
*/
package ${package}.${moduleName}.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import ${package}.${moduleName}.entity.${className};
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm
index e0f7181fe..bce38eeea 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm
@@ -16,10 +16,9 @@
*/
package ${package}.${moduleName}.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 ${package}.${moduleName}.entity.${className};
+import ${package}.${moduleName}.mapper.${className}Mapper;
import ${package}.${moduleName}.service.${className}Service;
import org.springframework.stereotype.Service;
@@ -29,7 +28,7 @@ import org.springframework.stereotype.Service;
* @author ${author}
* @date ${datetime}
*/
-@Service("${classname}Service")
+@Service
public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements ${className}Service {
}
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm b/pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm
index 16394d48b..c9e692c4b 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm
@@ -25,7 +25,6 @@ export const tableOption = {
editBtn: false,
delBtn: false,
addBtn: false,
- dic: [],
column: [
#foreach ($column in $columns)
{
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm b/pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm
index bb76c5b6f..44ac11a3d 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/menu.sql.vm
@@ -1,13 +1,13 @@
-- 该脚本不要执行，请完善 ID 对应关系,注意层级关系 !!!!
-- 菜单SQL
-insert into `pigx`.`sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '父菜单ID', 'views/${moduleName}/${pathName}/index', '', '0', '${pathName}', 'icon-bangzhushouji', '菜单ID', '0', '2018-01-20 13:17:19', '8', '2018-07-29 13:38:19', '${comments}管理');
-- 菜单对应按钮SQL
-insert into `pigx`.`sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '菜单ID', null, '${moduleName}_${pathName}_add', '1', null, '1', '子按钮ID1', '0', '2018-05-15 21:35:18', '0', '2018-07-29 13:38:59', '${comments}新增');
-insert into `pigx`.`sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '菜单ID', null, '${moduleName}_${pathName}_edit', '1', null, '1', '子按钮ID2', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '${comments}修改');
-insert into `pigx`.`sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
values ( '菜单ID', null, '${moduleName}_${pathName}_del', '1', null, '1', '子按钮ID3', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '${comments}删除');
diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml
index 8a2644420..18745ba11 100644
--- a/pigx-visual/pigx-daemon/pom.xml
+++ b/pigx-visual/pigx-daemon/pom.xml
@@ -23,7 +23,7 @@
com.pig4cloud
pigx-visual
- 2.0.0
+ 2.1.0
pigx-daemon
@@ -41,12 +41,18 @@
com.pig4cloud
pigx-common-job
- 2.0.0
+ 2.1.0
com.pig4cloud
pigx-common-swagger
- 2.0.0
+ 2.1.0
+
+
+
+ com.pig4cloud
+ pigx-common-data
+ 2.1.0
@@ -74,13 +80,13 @@
com.pig4cloud
pigx-common-swagger
- 2.0.0
+ 2.1.0
com.pig4cloud
pigx-common-security
- 2.0.0
+ 2.1.0
diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml
index b8c63db0e..bf786adcd 100644
--- a/pigx-visual/pigx-monitor/pom.xml
+++ b/pigx-visual/pigx-monitor/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-visual
- 2.0.0
+ 2.1.0
pigx-monitor
@@ -36,12 +36,11 @@
com.pig4cloud
pigx-common-core
- 2.0.0
+ 2.1.0
- com.pig4cloud
- pigx-common-cache
- 2.0.0
+ org.springframework.boot
+ spring-boot-starter-data-redis
diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java
index 20ad272ed..7edd3f960 100644
--- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java
+++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
import reactor.core.publisher.Mono;
import java.util.List;
@@ -47,6 +48,7 @@ public class RedisEventStore extends InMemoryEventStore {
events.forEach(event -> {
String key = event.getInstance().getValue() + "_" + event.getTimestamp().toString();
log.info("保存实例事件的KEY：{},EVENT: {}", key, event.getType());
+ redisTemplate.setKeySerializer(new StringRedisSerializer());
redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(InstanceEvent.class));
redisTemplate.opsForHash().put(CommonConstants.EVENT_KEY, key, event);
});
diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml
index 3fbe8212d..263fcfe3d 100644
--- a/pigx-visual/pigx-sso-client-demo/pom.xml
+++ b/pigx-visual/pigx-sso-client-demo/pom.xml
@@ -29,7 +29,7 @@
com.pig4cloud
pigx-visual
- 2.0.0
+ 2.1.0
diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml
index 0f8755dcc..e743f0eff 100644
--- a/pigx-visual/pigx-tx-manager/pom.xml
+++ b/pigx-visual/pigx-tx-manager/pom.xml
@@ -5,7 +5,7 @@
com.pig4cloud
pigx-visual
- 2.0.0
+ 2.1.0
pigx-tx-manager
@@ -63,7 +63,7 @@
com.pig4cloud
pigx-common-core
- 2.0.0
+ 2.1.0
diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml
index 42d9634b4..0260ed23c 100644
--- a/pigx-visual/pom.xml
+++ b/pigx-visual/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.0.0
+ 2.1.0
pigx-visual
diff --git a/pom.xml b/pom.xml
index 1bf361b1b..872020a61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.0.0
+ 2.1.0
${project.artifactId}
pom
@@ -49,7 +49,7 @@
1.8
1.8
2.0.4
- 4.3.0
+ 4.3.2
3.0.6
0.0.9
2.9.2
@@ -58,6 +58,7 @@
4.1.0
2.1.0
2.10.1
+ 3.0.12
2.1.5
8.0.13
2.3.3.RELEASE