roles;
/** 角色组 */
- @TableField(exist = false)
private Long[] roleIds;
/** 岗位组 */
- @TableField(exist = false)
private Long[] postIds;
/** 角色ID */
- @TableField(exist = false)
private Long roleId;
private String remark;
public SysUser()
diff --git a/bs-common/src/main/java/com/bs/common/core/domain/entity/TenantConfig.java b/bs-common/src/main/java/com/bs/common/core/domain/entity/TenantConfig.java
deleted file mode 100644
index d091d14..0000000
--- a/bs-common/src/main/java/com/bs/common/core/domain/entity/TenantConfig.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.bs.common.core.domain.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.bs.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 租户配置对象 tenant_config
- *
- * @author ruoyi
- * @date 2023-04-02
- */
-@Accessors(chain = true)
-@TableName("tenant_config")
-@Data
-public class TenantConfig
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "ID",type = IdType.AUTO)
- @ApiModelProperty(value = "${column.columnComment}")
- private Long id;
-
- /**
- * 创建部门
- */
- @TableField(fill = FieldFill.INSERT)
- private Long createDept;
- @TableField(exist = false)
- private Long tenantId;
-
- /**
- * 创建者
- */
- @TableField(fill = FieldFill.INSERT)
- private Long createBy;
-
- /**
- * 创建时间
- */
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- /**
- * 更新者
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Long updateBy;
-
- /**
- * 更新时间
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
- /**
- * 逻辑删除标示
- */
- //做删除操作的时候，会变成update，del_flag = '2'
- @TableLogic(value = "0", delval = "2")
- @TableField(fill = FieldFill.INSERT)
- @JsonIgnore
- private String delFlag;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
- @ApiModelProperty(value = "开始时间")
- private Date startData;
-
- /** 结束时间 */
-
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
- @ApiModelProperty(value = "结束时间")
- private Date stopData;
-
- /** 是否限制用户数 */
-
- @Excel(name = "是否限制用户数")
- @ApiModelProperty(value = "是否限制用户数")
- private String isUserAstrict;
-
- @Excel(name = "首页类型")
- @ApiModelProperty(value = "首页类型")
- private String homeType;
-
- /** 用户数 */
-
- @Excel(name = "用户数")
- @ApiModelProperty(value = "用户数")
- private Integer userQuantity;
-
- /** 是否限制在线数 */
-
- @Excel(name = "是否限制在线数")
- @ApiModelProperty(value = "是否限制在线数")
- private String isOnLine;
-
- /** 在线数 */
-
- @Excel(name = "在线数")
- @ApiModelProperty(value = "在线数")
- private Integer onLineUserQuantity;
-
- /** 是否定义系统名称 */
-
- @Excel(name = "是否定义系统名称")
- @ApiModelProperty(value = "是否定义系统名称")
- private String isDefinitionName;
-
- /** 系统名称 */
-
- @Excel(name = "系统名称")
- @ApiModelProperty(value = "系统名称")
- private String sysName;
-
- /** 是否定义系统logo */
-
- @Excel(name = "是否定义系统logo")
- @ApiModelProperty(value = "是否定义系统logo")
- private String isDefinitionLogo;
-
- /** 系统log */
-
- @Excel(name = "系统log")
- @ApiModelProperty(value = "系统log")
- private String sysLog;
-
- /** 是否定义系统色调 */
-
- @Excel(name = "是否定义系统色调")
- @ApiModelProperty(value = "是否定义系统色调")
- private String isDefinitionHue;
-
- /** 系统色调 */
-
- @Excel(name = "系统色调")
- @ApiModelProperty(value = "系统色调")
- private String sysHue;
-
- /** 定制化数据，键值对{key:{type1:"",type2:"",value:""},key2:{type1:"",type2:"",value:""}}具体操作时候，做具体说明 */
-
- @ApiModelProperty(value = "定制化数据，键值对{key:{type1:'',type2:'',value:''},key2:{type1:'',type2:'',value:''}}具体操作时候，做具体说明")
- private String customizationFields;
-
-
-
-}
diff --git a/bs-common/src/main/java/com/bs/common/core/domain/model/LoginUser.java b/bs-common/src/main/java/com/bs/common/core/domain/model/LoginUser.java
index 096e578..daa4af5 100644
--- a/bs-common/src/main/java/com/bs/common/core/domain/model/LoginUser.java
+++ b/bs-common/src/main/java/com/bs/common/core/domain/model/LoginUser.java
@@ -9,7 +9,7 @@ import java.util.Set;
/**
* 登录用户身份权限
- *
+ *
* @author bs
*/
public class LoginUser implements UserDetails
@@ -71,49 +71,6 @@ public class LoginUser implements UserDetails
*/
private SysUser user;
- /**
- * 租户id
- */
- private Long tenantId;
- /**
- * 是否租户
- */
- private String isTenant;
- /** 是否租户管理员 */
- /**
- * 是否租户admin
- * Y 是 N 否
- *
- * @return
- */
- private String isTenantAdmin;
-
- public Long getTenantId()
- {
- return tenantId;
- }
-
- public void setTenantId(Long tenantId)
- {
- this.tenantId = tenantId;
- }
-
- public String getIsTenant() {
- return isTenant;
- }
-
- public void setIsTenant(String isTenant) {
- this.isTenant = isTenant;
- }
-
- public String getIsTenantAdmin() {
- return isTenantAdmin;
- }
-
- public void setIsTenantAdmin(String isTenantAdmin) {
- this.isTenantAdmin = isTenantAdmin;
- }
-
public LoginUser()
{
}
@@ -128,9 +85,6 @@ public class LoginUser implements UserDetails
{
this.userId = userId;
this.deptId = deptId;
- this.tenantId = user.getTenantId();
- this.isTenant = user.getIsTenant();
- this.isTenantAdmin = user.getIsTenantAdmin();
this.user = user;
this.permissions = permissions;
}
@@ -190,7 +144,7 @@ public class LoginUser implements UserDetails
/**
* 指定用户是否解锁,锁定的用户无法进行身份验证
- *
+ *
* @return
*/
@JSONField(serialize = false)
@@ -202,7 +156,7 @@ public class LoginUser implements UserDetails
/**
* 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
- *
+ *
* @return
*/
@JSONField(serialize = false)
@@ -214,7 +168,7 @@ public class LoginUser implements UserDetails
/**
* 是否可用 ,禁用的用户不能身份验证
- *
+ *
* @return
*/
@JSONField(serialize = false)
diff --git a/bs-common/src/main/java/com/bs/common/filter/XssFilter.java b/bs-common/src/main/java/com/bs/common/filter/XssFilter.java
index a4b65d3..1ce2501 100644
--- a/bs-common/src/main/java/com/bs/common/filter/XssFilter.java
+++ b/bs-common/src/main/java/com/bs/common/filter/XssFilter.java
@@ -1,18 +1,22 @@
package com.bs.common.filter;
-import com.bs.common.enums.HttpMethod;
-import com.bs.common.utils.StringUtils;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.bs.common.utils.StringUtils;
+import com.bs.common.enums.HttpMethod;
/**
* 防止XSS攻击的过滤器
- *
+ *
* @author bs
*/
public class XssFilter implements Filter
diff --git a/bs-common/src/main/java/com/bs/common/mybatis/handler/DefaultDBFieldHandler.java b/bs-common/src/main/java/com/bs/common/mybatis/handler/DefaultDBFieldHandler.java
index 4c25141..04088a6 100644
--- a/bs-common/src/main/java/com/bs/common/mybatis/handler/DefaultDBFieldHandler.java
+++ b/bs-common/src/main/java/com/bs/common/mybatis/handler/DefaultDBFieldHandler.java
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.bs.common.utils.SecurityUtils;
import org.apache.ibatis.reflection.MetaObject;
-import java.time.LocalDateTime;
-import java.util.Objects;
+import java.time.ZonedDateTime;
+import java.util.Date;
/**
* 通用参数填充实现类
@@ -31,7 +31,7 @@ public class DefaultDBFieldHandler implements MetaObjectHandler {
*/
boolean createTime = metaObject.hasSetter("createTime");
if(createTime){
- this.setFieldValByName("createTime", LocalDateTime.now() , metaObject);
+ this.setFieldValByName("createTime", Date.from(ZonedDateTime.now().toInstant()), metaObject);
}
/**
* createDate 创建时间
@@ -58,19 +58,15 @@ public class DefaultDBFieldHandler implements MetaObjectHandler {
*/
boolean updateByOf = metaObject.hasSetter("updateBy");
if(updateByOf){
- if (Objects.nonNull(SecurityUtils.getUsername())) {
- this.setFieldValByName("updateBy", SecurityUtils.getUsername(), metaObject);
- }
+ this.setFieldValByName("updateBy",SecurityUtils.getUsername(), metaObject);
}
-
-
/**
* updateDate 更新时间
*/
boolean updateTimeOf = metaObject.hasSetter("updateTime");
if(updateTimeOf){
- this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
+ this.setFieldValByName("updateTime", Date.from(ZonedDateTime.now().toInstant()), metaObject);
}
}
}
diff --git a/bs-common/src/main/java/com/bs/common/utils/DictUtils.java b/bs-common/src/main/java/com/bs/common/utils/DictUtils.java
index 9157b6a..84fed6a 100644
--- a/bs-common/src/main/java/com/bs/common/utils/DictUtils.java
+++ b/bs-common/src/main/java/com/bs/common/utils/DictUtils.java
@@ -1,17 +1,16 @@
package com.bs.common.utils;
+import java.util.Collection;
+import java.util.List;
import com.alibaba.fastjson2.JSONArray;
import com.bs.common.constant.CacheConstants;
import com.bs.common.core.domain.entity.SysDictData;
import com.bs.common.core.redis.RedisCache;
import com.bs.common.utils.spring.SpringUtils;
-import java.util.Collection;
-import java.util.List;
-
/**
* 字典工具类
- *
+ *
* @author bs
*/
public class DictUtils
@@ -23,7 +22,7 @@ public class DictUtils
/**
* 设置字典缓存
- *
+ *
* @param key 参数键
* @param dictDatas 字典数据列表
*/
@@ -34,7 +33,7 @@ public class DictUtils
/**
* 获取字典缓存
- *
+ *
* @param key 参数键
* @return dictDatas 字典数据列表
*/
@@ -50,7 +49,7 @@ public class DictUtils
/**
* 根据字典类型和字典值获取字典标签
- *
+ *
* @param dictType 字典类型
* @param dictValue 字典值
* @return 字典标签
@@ -62,7 +61,7 @@ public class DictUtils
/**
* 根据字典类型和字典标签获取字典值
- *
+ *
* @param dictType 字典类型
* @param dictLabel 字典标签
* @return 字典值
@@ -74,7 +73,7 @@ public class DictUtils
/**
* 根据字典类型和字典值获取字典标签
- *
+ *
* @param dictType 字典类型
* @param dictValue 字典值
* @param separator 分隔符
@@ -117,7 +116,7 @@ public class DictUtils
/**
* 根据字典类型和字典标签获取字典值
- *
+ *
* @param dictType 字典类型
* @param dictLabel 字典标签
* @param separator 分隔符
@@ -157,7 +156,7 @@ public class DictUtils
/**
* 删除指定字典缓存
- *
+ *
* @param key 字典键
*/
public static void removeDictCache(String key)
@@ -176,7 +175,7 @@ public class DictUtils
/**
* 设置cache key
- *
+ *
* @param configKey 参数键
* @return 缓存键key
*/
diff --git a/bs-common/src/main/java/com/bs/common/utils/FileUtil.java b/bs-common/src/main/java/com/bs/common/utils/FileUtil.java
deleted file mode 100644
index 4faf5f6..0000000
--- a/bs-common/src/main/java/com/bs/common/utils/FileUtil.java
+++ /dev/null
@@ -1,939 +0,0 @@
-package com.bs.common.utils;
-
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.poi.excel.BigExcelWriter;
-import cn.hutool.poi.excel.ExcelUtil;
-import com.bs.common.constant.Constants;
-import com.bs.common.core.domain.AjaxResult;
-import com.bs.common.exception.ServiceException;
-import com.bs.common.utils.uuid.IdUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFSheet;
-import org.apache.tools.zip.ZipEntry;
-import org.apache.tools.zip.ZipOutputStream;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * File工具类，扩展 hutool 工具包
- */
-@Slf4j
-public class FileUtil extends cn.hutool.core.io.FileUtil {
-
- /**
- * 定义GB的计算常量
- */
- private static final int GB = 1024 * 1024 * 1024;
- /**
- * 定义MB的计算常量
- */
- private static final int MB = 1024 * 1024;
- /**
- * 定义KB的计算常量
- */
- private static final int KB = 1024;
-
- /**
- * 格式化小数
- */
- private static final DecimalFormat DF = new DecimalFormat("0.00");
- /**
- * 系统临时目录
- *
- * windows 包含路径分割符，但Linux 不包含,
- * 在windows \\==\ 前提下，
- * 为安全起见 同意拼装 路径分割符，
- *
- * java.io.tmpdir
- * windows : C:\Users/xxx\AppData\Local\Temp\
- * linux: /temp
- *
- */
- public static final String SYS_TEM_DIR = System.getProperty("java.io.tmpdir") + File.separator;
-
- private static final int FILE_READ_BTYE = 1024;
-
- /**
- * MultipartFile转File
- */
- public static File toFile(MultipartFile multipartFile) {
- // 获取文件名
- String fileName = multipartFile.getOriginalFilename();
- // 获取文件后缀
- String prefix = "." + getExtensionName(fileName);
- File file = null;
- try {
- // 用uuid作为文件名，防止生成的临时文件重复
- file = File.createTempFile(IdUtil.simpleUUID(), prefix);
- // MultipartFile to File
- multipartFile.transferTo(file);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return file;
- }
-
- /**
- * 获取文件扩展名，不带 .
- */
- public static String getExtensionName(String filename) {
- if ((filename != null) && (filename.length() > 0)) {
- int dot = filename.lastIndexOf('.');
- if ((dot > -1) && (dot < (filename.length() - 1))) {
- return filename.substring(dot + 1);
- }
- }
- return filename;
- }
-
- public static String getExtensionNameBase64(String filename) {
- if (filename.contains("data:image/png;base64")) {
- return "png";
- }else if(filename.contains("data:image/jpg;base64")){
- return "jpg";
- }else if(filename.contains("data:image/jpeg;base64")){
- return "jpeg";
- }
- return "bmp";
- }
- /**
- * Java文件操作 获取不带扩展名的文件名
- */
- public static String getFileNameNoEx(String filename) {
- if ((filename != null) && (filename.length() > 0)) {
- int dot = filename.lastIndexOf('.');
- if ((dot > -1) && (dot < (filename.length()))) {
- return filename.substring(0, dot);
- }
- }
- return filename;
- }
-
- /**
- * 文件大小转换
- */
- public static String getSize(long size) {
- String resultSize;
- if (size / GB >= 1) {
- //如果当前Byte的值大于等于1GB
- resultSize = DF.format(size / (float) GB) + "GB ";
- } else if (size / MB >= 1) {
- //如果当前Byte的值大于等于1MB
- resultSize = DF.format(size / (float) MB) + "MB ";
- } else if (size / KB >= 1) {
- //如果当前Byte的值大于等于1KB
- resultSize = DF.format(size / (float) KB) + "KB ";
- } else {
- resultSize = size + "B ";
- }
- return resultSize;
- }
-
-
- /**
- * 将文件名解析成文件的上传路径
- */
- public static File upload(MultipartFile file, String filePath) {
- //String name = getFileNameNoEx(file.getOriginalFilename());
- String suffix = getExtensionName(file.getOriginalFilename());
- StringBuffer nowStr = fileRename();
- try {
- String fileName = nowStr + "." + suffix;
- String path = filePath + fileName;
- // getCanonicalFile 可解析正确各种路径
- File dest = new File(path).getCanonicalFile();
- // 检测是否存在目录
- if (!dest.getParentFile().exists()) {
- dest.getParentFile().mkdirs();
- }
- // 文件写入
- file.transferTo(dest);
- return dest;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static String fileToBase64(File file) throws Exception {
- FileInputStream inputFile = new FileInputStream(file);
- String base64;
- byte[] buffer = new byte[(int) file.length()];
- inputFile.read(buffer);
- inputFile.close();
- base64 = Base64.encode(buffer);
- return base64.replaceAll("[\\s*\t\n\r]", "");
- }
-
-
- public static String getFileType(String type) {
- String documents = "txt doc pdf ppt pps xlsx xls docx";
- String music = "mp3 wav wma mpa ram ra aac aif m4a";
- String video = "avi mpg mpe mpeg asf wmv mov qt rm mp4 flv m4v webm ogv ogg";
- String image = "bmp dib pcp dif wmf gif jpg tif eps psd cdr iff tga pcd mpt png jpeg";
- if (image.contains(type)) {
- return "pic";
- } else if (documents.contains(type)) {
- return "txt";
- } else if (music.contains(type)) {
- return "music";
- } else if (video.contains(type)) {
- return "vedio";
- } else {
- return "other";
- }
- }
-
-
- public static void checkSize(long maxSize, long size) {
- // 1M
- int len = 1024 * 1024;
- if (size > (maxSize * len)) {
- throw new ServiceException("文件超出规定大小");
-
- }
- }
-
- /**
- * 判断两个文件是否相同
- */
- public static boolean check(File file1, File file2) {
- String img1Md5 = getMd5(file1);
- String img2Md5 = getMd5(file2);
- return img1Md5.equals(img2Md5);
- }
-
- /**
- * 判断两个文件是否相同
- */
- public static boolean check(String file1Md5, String file2Md5) {
- return file1Md5.equals(file2Md5);
- }
-
- private static byte[] getByte(File file) {
- // 得到文件长度
- byte[] b = new byte[(int) file.length()];
- try {
- InputStream in = new FileInputStream(file);
- try {
- in.read(b);
- } catch (IOException e) {
- e.printStackTrace();
- }
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- return null;
- }
- return b;
- }
-
- private static String getMd5(byte[] bytes) {
- // 16进制字符
- char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
- try {
- MessageDigest mdTemp = MessageDigest.getInstance("MD5");
- mdTemp.update(bytes);
- byte[] md = mdTemp.digest();
- int j = md.length;
- char[] str = new char[j * 2];
- int k = 0;
- // 移位 输出字符串
- for (byte byte0 : md) {
- str[k++] = hexDigits[byte0 >>> 4 & 0xf];
- str[k++] = hexDigits[byte0 & 0xf];
- }
- return new String(str);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- /**
- * 下载文件
- *
- * @param request /
- * @param response /
- * @param file /
- */
- public static void downloadFile(HttpServletRequest request, HttpServletResponse response, File file, boolean deleteOnExit) {
- response.setCharacterEncoding(request.getCharacterEncoding());
- response.setContentType("application/octet-stream");
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(file);
- response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
- IOUtils.copy(fis, response.getOutputStream());
- response.flushBuffer();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (fis != null) {
- try {
- fis.close();
- if (deleteOnExit) {
- file.deleteOnExit();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
-
- public static String getMd5(File file) {
- return getMd5(getByte(file));
- }
-
- /**
- * 读取json文件，返回json串
- *
- * @param fileName
- * @return
- */
- public static String readJsonFile(String fileName) {
- String jsonStr = "";
- try {
- File jsonFile = new File(fileName);
- FileReader fileReader = new FileReader(jsonFile);
-
- Reader reader = new InputStreamReader(new FileInputStream(jsonFile), "utf-8");
- int ch = 0;
- StringBuffer sb = new StringBuffer();
- while ((ch = reader.read()) != -1) {
- sb.append((char) ch);
- }
- fileReader.close();
- reader.close();
- jsonStr = sb.toString();
- return jsonStr;
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public static BufferedImage inputImage(MultipartFile file) {
- BufferedImage srcImage = null;
- try {
- FileInputStream in = (FileInputStream) file.getInputStream();
- srcImage = javax.imageio.ImageIO.read(in);
- } catch (IOException e) {
- System.out.println("读取图片文件出错！" + e.getMessage());
- }
- return srcImage;
- }
-
- /**
- * 自动调节精度(经验数值)
- *
- * @param size 源图片大小
- * @return 图片压缩质量比
- */
- public static float getAccuracy(long size) {
- float accuracy;
- if (size < 400) {
- accuracy = 0.85f;
- } else if (size < 900) {
- accuracy = 0.75f;
- } else if (size < 2047) {
- accuracy = 0.6f;
- } else if (size < 3275) {
- accuracy = 0.44f;
- } else {
- accuracy = 0.4f;
- }
- return accuracy;
- }
-
- /**
- * 上传文件重命名
- *
- * @return 新的文件名
- */
- public static StringBuffer fileRename() {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String time = sdf.format(new Date());
- StringBuffer buf = new StringBuffer(time);
- SecureRandom r = new SecureRandom();
- //循环取得三个不大于10的随机整数
- for (int x = 0; x < 3; x++) {
- buf.append(r.nextInt(10));
- }
- return buf;
- }
-
- /**
- * 对中文字符进行UTF-8编码
- *
- * @param source 要转义的字符串
- * @return
- * @throws UnsupportedEncodingException
- */
- public static String transformStyle(String source) throws UnsupportedEncodingException {
- char[] arr = source.toCharArray();
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < arr.length; i++) {
- char temp = arr[i];
- if (isChinese(temp)) {
- sb.append(URLEncoder.encode("" + temp, Constants.UTF8));
- continue;
- }
- sb.append(arr[i]);
- }
- return sb.toString();
- }
-
- /**
- * 判断是不是中文字符
- *
- * @param c
- * @return
- */
- public static boolean isChinese(char c) {
-
- Character.UnicodeBlock ub = Character.UnicodeBlock.of(c);
-
- if (ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
-
- || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
-
- || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A
-
- || ub == Character.UnicodeBlock.GENERAL_PUNCTUATION
-
- || ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION
-
- || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS) {
-
- return true;
-
- }
-
- return false;
-
- }
-
-
- /**
- * 上传文件重命名Mos系统
- *
- * @return 新的文件名
- */
- public static String fileRenameMos(String prefix, String suffix) {
- // 生成唯一的文件名[带前缀以及后缀]
- String fileName = (prefix == null ? ""
- : prefix.trim()) + IdUtils.simpleUUID() + (suffix == null ? ""
- : suffix.trim());
- return fileName;
- }
-
- /**
- * 上传文件Mos系统
- */
- public static File uploadMos(MultipartFile file, String path) {
- try {
- // getCanonicalFile 可解析正确各种路径
- File dest = new File(path).getCanonicalFile();
- // 检测是否存在目录
- if (!dest.getParentFile().exists()) {
- dest.getParentFile().mkdirs();
- }
- // 文件写入
- file.transferTo(dest);
- return dest;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static File uploadMosBase64(String imageStr, String path) {
- try {
- // getCanonicalFile 可解析正确各种路径
- File dest = new File(path).getCanonicalFile();
- // 检测是否存在目录
- if (!dest.getParentFile().exists()) {
- dest.getParentFile().mkdirs();
- }
- byte[] bytes=Base64.decode(imageStr); //imageStr.getBytes();
- FileOutputStream fos = new FileOutputStream(dest);
- try{
- // 文件写入
- fos.write(bytes,0,bytes.length);
- fos.flush();
- }catch (IOException e){
- e.printStackTrace();
- }finally {
- fos.close();
- }
- return dest;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
- /**
- * 读取文件，返回文件字符串.
- *
- * @param in 文件输入流
- * @param encoding 文件编码
- * @return String
- */
- public static String readFile(InputStream in, String encoding) {
- if (in == null) {
- return null;
- }
-
- StringBuffer sb = new StringBuffer();
- InputStreamReader reader = null;
- try {
- reader = new InputStreamReader(in, encoding);
- int tmp = -1;
- char temp;
- while ((tmp = reader.read()) != -1) {
- temp = (char) tmp;
- sb.append(temp);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- return sb.toString();
- }
-
- /**
- * 将inputStream写入文件并关闭inputStream.
- *
- * @param is 文件输入流
- * @param filePath 文件路径
- * @param append true为追加，false为覆盖
- * @return 是否成功
- */
- public static boolean writeFile(InputStream is, String filePath,
- boolean append) {
- FileOutputStream fos = null;
- try {
- if (makeDir(filePath) && is != null) {
- fos = new FileOutputStream(filePath, append);
- byte[] buffer = new byte[FILE_READ_BTYE * FILE_READ_BTYE];
- // int bytesum = 0;
- int byteread = 0;
- while ((byteread = is.read(buffer)) != -1) {
- // bytesum+=byteread;
- fos.write(buffer, 0, byteread);
- fos.flush();
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (fos != null) {
- try {
- fos.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- if (is != null) {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return true;
- }
-
- /**
- * 将字符串写入到文件.
- *
- * @param str 字符串
- * @param filePath 文件路径
- * @param encoding 编码
- * @param append 是否累加
- * @return 是否成功
- */
- public static boolean writeFile(String str, String filePath,
- String encoding, boolean append) {
- FileOutputStream fos = null;
- Writer out = null;
- boolean isSucc = false;
- try {
- if (makeDir(filePath)) {
- fos = new FileOutputStream(new File(filePath), append);
- out = new OutputStreamWriter(fos, encoding);
- out.write(str);
-
- out.flush();
- out.close();
-
- fos.flush();
- fos.close();
- } else {
- isSucc = false;
- }
- isSucc = true;
- } catch (IOException e) {
- e.printStackTrace();
- isSucc = false;
- } finally {
- if (fos != null) {
- try {
- fos.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- if (out != null) {
- try {
- out.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return isSucc;
- }
-
- /**
- * 创建文件夹。
- *
- * @param destDirName 目标文件夹
- * @return 是否创建成功
- */
- public static boolean createDir(String destDirName) {
- if (validateEmail(destDirName)) {
- return false;
- }
- File dir = new File(destDirName);
- if (dir.exists()) { // 目录已经存在，不用创建
- return true;
- }
- // 创建单个目录
- if (dir.mkdirs()) { // 创建目录成功
- return true;
- }
- return true;
- }
-
- public static boolean validateEmail(String s) {
- return StringUtils.isEmpty(s)
- || s.matches("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a"
- + "-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$");
- }
-
-
- /**
- * 根据文件创建目录.
- *
- * @param file 文件
- * @return 是否成功
- */
- public static boolean makeDir(File file) {
- if (!file.exists()) {
- makeDir(file.getAbsolutePath());
- }
- return true;
- }
-
- /**
- * 根据文件名创建目录
- *
- * @param fileName
- * @return
- */
- public static boolean makeDir(String fileName) {
- int index = 0;
- int index1 = fileName.lastIndexOf("/");
- int index2 = fileName.lastIndexOf("\\");
- if (index1 > index2) {
- index = index1;
- } else {
- index = index2;
- }
- fileName = fileName.substring(0, index);
- File file = new File(fileName);
- file.setWritable(true, false);
- if (!file.exists()) {
- if (!file.mkdirs()) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * 删除单个文件 。
- *
- * @param sPath 被删除文件的文件名
- * @return 单个文件删除成功返回true，否则返回false
- */
- public static boolean deleteFile(String sPath) {
- Boolean flag = false;
- File file = new File(sPath);
- // 路径为文件且不为空则进行删除
- if (file.isFile() && file.exists()) {
- file.delete();
- flag = true;
- }
- return flag;
- }
-
- /**
- * 删除单个文件 。
- *
- * @param file 被删除文件
- * @return 单个文件删除成功返回true，否则返回false
- */
- public static boolean deleteFile(File file) {
- Boolean flag = false;
- // 路径为文件且不为空则进行删除
- if (file.isFile() && file.exists()) {
- file.delete();
- flag = true;
- }
- return flag;
- }
-
- /**
- * 删除文件夹。
- *
- * @param sPath 文件夹路径
- * @param flags true删除文件夹，false只删除文件夹下的文件
- * @return 是否删除成功
- */
- public static boolean deleteDirectory(String sPath, Boolean flags) {
- // 如果sPath不以文件分隔符结尾，自动添加文件分隔符
- if (!sPath.endsWith(File.separator)) {
- sPath = sPath + File.separator;
- }
- File dirFile = new File(sPath);
- // 如果dir对应的文件不存在，或者不是一个目录，则退出
- if (!dirFile.exists() || !dirFile.isDirectory()) {
- return false;
- }
- Boolean flag = true;
- // 删除文件夹下的所有文件(包括子目录)
- File[] files = dirFile.listFiles();
- for (int i = 0; i < files.length; i++) {
- // 删除子文件
- if (files[i].isFile()) {
- flag = deleteFile(files[i].getAbsolutePath());
- if (!flag) {
- break;
- }
- } else {
- // 删除子目录
- flag = deleteDirectory(files[i].getAbsolutePath(), true);
- if (!flag) {
- break;
- }
- }
- }
- if (!flag) {
- return false;
- }
- if (flags) {
- // 删除当前目录
- return dirFile.delete();
- }
- return true;
- }
-
- /**
- * 文件打包（指定文件）.
- *
- * @param zipFilePath 打包后压缩包的路径
- * @param files 需要打包的文件
- * @param targetFileNames 打包后文件的名称
- * @param encoding 文件名编码
- * @return flag 是否打包成功
- */
- public static Boolean zipFile(String zipFilePath, File[] files,
- String[] targetFileNames, String encoding) {
- Boolean flag = false;
- if (StringUtils.isEmpty(zipFilePath) || files == null
- || files.length == 0) {
- return flag;
- }
- if (targetFileNames != null && targetFileNames.length != files.length) {
- return flag;
- }
- byte[] buffer = new byte[FILE_READ_BTYE];
- try {
- ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
- zipFilePath));
- for (int i = 0; i < files.length; i++) {
- FileInputStream fis = new FileInputStream(files[i]);
- if (targetFileNames != null) {
- if (String.valueOf(targetFileNames[i].toCharArray()[0])
- .equals("/")) {
- out.putNextEntry(new ZipEntry(targetFileNames[i]
- .substring(1, targetFileNames[i].length())));
- } else {
- out.putNextEntry(new ZipEntry(targetFileNames[i]));
- }
- } else {
- out.putNextEntry(new ZipEntry(files[i].getName()));
- }
- if (StringUtils.isNotEmpty(encoding)) {
- out.setEncoding(encoding);
- }
- int len;
- while ((len = fis.read(buffer)) > 0) {
- out.write(buffer, 0, len);
- }
- out.closeEntry();
- fis.close();
- }
- out.close();
- flag = true;
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return flag;
- }
-
- /**
- * inputStream 转 File
- */
- static File inputStreamToFile(InputStream ins, String name) throws Exception {
- File file = new File(SYS_TEM_DIR + name);
- if (file.exists()) {
- return file;
- }
- OutputStream os = new FileOutputStream(file);
- int bytesRead;
- int len = 8192;
- byte[] buffer = new byte[len];
- while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
- os.write(buffer, 0, bytesRead);
- }
- os.close();
- ins.close();
- return file;
- }
-
- /**
- * 导出excel
- */
- public static void downloadExcel(List> list, HttpServletResponse response) throws IOException {
- String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx";
- File file = new File(tempPath);
- BigExcelWriter writer = ExcelUtil.getBigWriter(file);
- // 一次性写出内容，使用默认样式，强制输出标题
- writer.write(list, true);
- SXSSFSheet sheet = (SXSSFSheet) writer.getSheet();
- //上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法
- sheet.trackAllColumnsForAutoSizing();
- //列宽自适应
- writer.autoSizeColumnAll();
- //response为HttpServletResponse对象
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
- //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
- response.setHeader("Content-Disposition", "attachment;filename=file.xlsx");
- ServletOutputStream out = response.getOutputStream();
- // 终止后删除临时文件
- file.deleteOnExit();
- writer.flush(out, true);
- //此处记得关闭输出Servlet流
- IoUtil.close(out);
- }
-
-
- /**
- * 下载项目根目录下doc下的文件
- *
- * @param response response
- * @param fileName 文件名
- * @return 返回结果 成功或者文件不存在
- */
- public static AjaxResult downloadFile(HttpServletResponse response, String fileName) {
- ClassPathResource classPathResource = new ClassPathResource(File.separator+"import_template"+File.separator+"material_export"+File.separator+fileName);
- InputStream stream = null;
- try {
- stream = classPathResource.getInputStream();
- if (stream == null) {
- log.error("文件没有找到");
- }
- response.setHeader("content-type", "application/octet-stream");
- response.setContentType("application/octet-stream");
- String name = URLEncoder.encode(fileName, "UTF-8");
- response.setHeader("Content-Disposition", "attachment;filename=" + java.net.URLDecoder.decode(name, "ISO-8859-1"));
- } catch (UnsupportedEncodingException e) {
- log.error("文件名转换编码出现问题:" + e.getMessage());
- }catch (Exception e){
- log.error( e.getMessage());
- }
- byte[] buff = new byte[1024];
- BufferedInputStream bis = null;
- OutputStream os = null;
- try {
- os = response.getOutputStream();
- bis = new BufferedInputStream(stream);
- int i = bis.read(buff);
- while (i != -1) {
- os.write(buff, 0, buff.length);
- os.flush();
- i = bis.read(buff);
- }
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- log.error("系统找不到指定的文件:" + e.getMessage());
- return AjaxResult.error("500", "系统找不到指定的文件");
- } catch (IOException e) {
- e.printStackTrace();
- log.error("Io流写入出现错误:" + e.getMessage());
- return AjaxResult.error("500", "Io流写入出现错误");
- } finally {
- if (bis != null) {
- try {
- bis.close();
- } catch (IOException e) {
- e.printStackTrace();
- log.error("关闭流出现错误:" + e.getMessage());
- return AjaxResult.error("500", "关闭流出现错误");
- }
- }
- }
- return AjaxResult.success();
- }
-
-
-}
diff --git a/bs-common/src/main/java/com/bs/common/utils/OsInfoUtil.java b/bs-common/src/main/java/com/bs/common/utils/OsInfoUtil.java
deleted file mode 100644
index ed5601e..0000000
--- a/bs-common/src/main/java/com/bs/common/utils/OsInfoUtil.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.bs.common.utils;
-
-
-public class OsInfoUtil {
- private static String OS = System.getProperty("os.name").toLowerCase();
-
- private static OsInfoUtil _instance = new OsInfoUtil();
-
- private SystemEnum platform;
-
- private OsInfoUtil() {
- }
-
- public static boolean isLinux() {
- return OS.indexOf("linux") >= 0;
- }
-
- public static boolean isMacOS() {
- return OS.indexOf("mac") >= 0 && OS.indexOf("os") > 0 && OS.indexOf("x") < 0;
- }
-
- public static boolean isMacOSX() {
- return OS.indexOf("mac") >= 0 && OS.indexOf("os") > 0 && OS.indexOf("x") > 0;
- }
-
- public static boolean isWindows() {
- return OS.indexOf("windows") >= 0;
- }
-
- public static boolean isOS2() {
- return OS.indexOf("os/2") >= 0;
- }
-
- public static boolean isSolaris() {
- return OS.indexOf("solaris") >= 0;
- }
-
- public static boolean isSunOS() {
- return OS.indexOf("sunos") >= 0;
- }
-
- public static boolean isMPEiX() {
- return OS.indexOf("mpe/ix") >= 0;
- }
-
- public static boolean isHPUX() {
- return OS.indexOf("hp-ux") >= 0;
- }
-
- public static boolean isAix() {
- return OS.indexOf("aix") >= 0;
- }
-
- public static boolean isOS390() {
- return OS.indexOf("os/390") >= 0;
- }
-
- public static boolean isFreeBSD() {
- return OS.indexOf("freebsd") >= 0;
- }
-
- public static boolean isIrix() {
- return OS.indexOf("irix") >= 0;
- }
-
- public static boolean isDigitalUnix() {
- return OS.indexOf("digital") >= 0 && OS.indexOf("unix") > 0;
- }
-
- public static boolean isNetWare() {
- return OS.indexOf("netware") >= 0;
- }
-
- public static boolean isOSF1() {
- return OS.indexOf("osf1") >= 0;
- }
-
- public static boolean isOpenVMS() {
- return OS.indexOf("openvms") >= 0;
- }
-
- /**
- * 获取操作系统名字
- *
- * @return 操作系统名
- */
- public static SystemEnum getOSname() {
- if (isAix()) {
- _instance.platform = SystemEnum.AIX;
- } else if (isDigitalUnix()) {
- _instance.platform = SystemEnum.DIGITAL_UNIX;
- } else if (isFreeBSD()) {
- _instance.platform = SystemEnum.FreeBSD;
- } else if (isHPUX()) {
- _instance.platform = SystemEnum.HP_UX;
- } else if (isIrix()) {
- _instance.platform = SystemEnum.IRIX;
- } else if (isLinux()) {
- _instance.platform = SystemEnum.LINUX;
- } else if (isMacOS()) {
- _instance.platform = SystemEnum.MAC_OS;
- } else if (isMacOSX()) {
- _instance.platform = SystemEnum.MAC_OS_X;
- } else if (isMPEiX()) {
- _instance.platform = SystemEnum.MPEiX;
- } else if (isNetWare()) {
- _instance.platform = SystemEnum.NETWARE_411;
- } else if (isOpenVMS()) {
- _instance.platform = SystemEnum.OPENVMS;
- } else if (isOS2()) {
- _instance.platform = SystemEnum.OS2;
- } else if (isOS390()) {
- _instance.platform = SystemEnum.OS390;
- } else if (isOSF1()) {
- _instance.platform = SystemEnum.OSF1;
- } else if (isSolaris()) {
- _instance.platform = SystemEnum.SOLARIS;
- } else if (isSunOS()) {
- _instance.platform = SystemEnum.SUNOS;
- } else if (isWindows()) {
- _instance.platform = SystemEnum.WINDOWS;
- } else {
- _instance.platform = SystemEnum.OTHERS;
- }
- return _instance.platform;
- }
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- System.out.println(OsInfoUtil.getOSname());// 获取系统类型
- System.out.println(OsInfoUtil.isMacOSX());// 判断是否为windows系统
- }
-
-
-}
diff --git a/bs-common/src/main/java/com/bs/common/utils/SecurityUtils.java b/bs-common/src/main/java/com/bs/common/utils/SecurityUtils.java
index 31984f7..5126916 100644
--- a/bs-common/src/main/java/com/bs/common/utils/SecurityUtils.java
+++ b/bs-common/src/main/java/com/bs/common/utils/SecurityUtils.java
@@ -29,30 +29,6 @@ public class SecurityUtils
}
}
- /**
- * 获取租户id
- **/
- public static Long getTenantId() {
- try {
- return getLoginUser().getTenantId();
- } catch (Exception e) {
- //e.printStackTrace();
- //throw new ServiceException("获取租户id异常", HttpStatus.UNAUTHORIZED);
- //log.info("此异常只有在获取不到的场景才会触发（此时不用理会err），如果当前场景下应当获取到信息，应及时处理（全局搜索这段话）");
- //log.error("获取租户id异常",e.getMessage());
- return null;
-
- }
- }
- /**
- * 是否租户账号
- **/
- public static Boolean isTenant() {
- if(getTenantId()!=0L){
- return true;
- }
- return false;
- }
/**
* 获取部门ID
**/
@@ -79,7 +55,7 @@ public class SecurityUtils
}
catch (Exception e)
{
- return null;
+ throw new ServiceException("获取用户账户异常", HttpStatus.UNAUTHORIZED);
}
}
diff --git a/bs-common/src/main/java/com/bs/common/utils/SystemEnum.java b/bs-common/src/main/java/com/bs/common/utils/SystemEnum.java
deleted file mode 100644
index c3c7d9c..0000000
--- a/bs-common/src/main/java/com/bs/common/utils/SystemEnum.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.bs.common.utils;
-
-public enum SystemEnum {
-
- ANY("any"),
- LINUX("Linux"),
- MAC_OS("Mac OS"),
- MAC_OS_X("Mac OS X"),
- WINDOWS("Windows"),
- OS2("OS/2"),
- SOLARIS("Solaris"),
- SUNOS("SunOS"),
- MPEiX("MPE/iX"),
- HP_UX("HP-UX"),
- AIX("AIX"),
- OS390("OS/390"),
- FreeBSD("FreeBSD"),
- IRIX("Irix"),
- DIGITAL_UNIX("Digital Unix"),
- NETWARE_411("NetWare"),
- OSF1("OSF1"),
- OPENVMS("OpenVMS"),
- OTHERS("Others");
-
- SystemEnum(String desc) {
- this.description = desc;
- }
-
- @Override
- public String toString() {
- return description;
- }
-
- private String description;
-
-}
diff --git a/bs-common/src/main/java/com/bs/common/utils/collection/CollectionUtils.java b/bs-common/src/main/java/com/bs/common/utils/collection/CollectionUtils.java
deleted file mode 100644
index 95d8c2a..0000000
--- a/bs-common/src/main/java/com/bs/common/utils/collection/CollectionUtils.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.bs.common.utils.collection;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.google.common.collect.ImmutableMap;
-
-import java.util.*;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-/**
- * Collection 工具类
- *
- * hasPermi
- */
-public class CollectionUtils {
-
- public static boolean containsAny(Object source, Object... targets) {
- return Arrays.asList(targets).contains(source);
- }
-
- public static boolean isAnyEmpty(Collection... collections) {
- return Arrays.stream(collections).anyMatch(CollectionUtil::isEmpty);
- }
-
- public static List filterList(Collection from, Predicate predicate) {
- if (CollUtil.isEmpty(from)) {
- return new ArrayList<>();
- }
- return from.stream().filter(predicate).collect(Collectors.toList());
- }
-
- public static List distinct(Collection from, Function keyMapper) {
- if (CollUtil.isEmpty(from)) {
- return new ArrayList<>();
- }
- return distinct(from, keyMapper, (t1, t2) -> t1);
- }
-
- public static List distinct(Collection from, Function keyMapper, BinaryOperator cover) {
- if (CollUtil.isEmpty(from)) {
- return new ArrayList<>();
- }
- return new ArrayList<>(convertMap(from, keyMapper, Function.identity(), cover).values());
- }
-
- public static List convertList(Collection from, Function func) {
- if (CollUtil.isEmpty(from)) {
- return new ArrayList<>();
- }
- return from.stream().map(func).filter(Objects::nonNull).collect(Collectors.toList());
- }
-
- public static List convertList(Collection from, Function func, Predicate filter) {
- if (CollUtil.isEmpty(from)) {
- return new ArrayList<>();
- }
- return from.stream().filter(filter).map(func).filter(Objects::nonNull).collect(Collectors.toList());
- }
-
- public static Set convertSet(Collection from, Function func) {
- if (CollUtil.isEmpty(from)) {
- return new HashSet<>();
- }
- return from.stream().map(func).filter(Objects::nonNull).collect(Collectors.toSet());
- }
-
- public static Set convertSet(Collection from, Function func, Predicate filter) {
- if (CollUtil.isEmpty(from)) {
- return new HashSet<>();
- }
- return from.stream().filter(filter).map(func).filter(Objects::nonNull).collect(Collectors.toSet());
- }
-
- public static Map convertMap(Collection from, Function keyFunc) {
- if (CollUtil.isEmpty(from)) {
- return new HashMap<>();
- }
- return convertMap(from, keyFunc, Function.identity());
- }
-
- public static Map convertMap(Collection from, Function keyFunc, Supplier> supplier) {
- if (CollUtil.isEmpty(from)) {
- return supplier.get();
- }
- return convertMap(from, keyFunc, Function.identity(), supplier);
- }
-
- public static Map convertMap(Collection from, Function keyFunc, Function valueFunc) {
- if (CollUtil.isEmpty(from)) {
- return new HashMap<>();
- }
- return convertMap(from, keyFunc, valueFunc, (v1, v2) -> v1);
- }
-
- public static Map convertMap(Collection from, Function keyFunc, Function valueFunc, BinaryOperator mergeFunction) {
- if (CollUtil.isEmpty(from)) {
- return new HashMap<>();
- }
- return convertMap(from, keyFunc, valueFunc, mergeFunction, HashMap::new);
- }
-
- public static Map convertMap(Collection from, Function keyFunc, Function valueFunc, Supplier> supplier) {
- if (CollUtil.isEmpty(from)) {
- return supplier.get();
- }
- return convertMap(from, keyFunc, valueFunc, (v1, v2) -> v1, supplier);
- }
-
- public static Map convertMap(Collection from, Function keyFunc, Function valueFunc, BinaryOperator mergeFunction, Supplier> supplier) {
- if (CollUtil.isEmpty(from)) {
- return new HashMap<>();
- }
- return from.stream().collect(Collectors.toMap(keyFunc, valueFunc, mergeFunction, supplier));
- }
-
- public static Map> convertMultiMap(Collection from, Function keyFunc) {
- if (CollUtil.isEmpty(from)) {
- return new HashMap<>();
- }
- return from.stream().collect(Collectors.groupingBy(keyFunc, Collectors.mapping(t -> t, Collectors.toList())));
- }
-
- public static Map> convertMultiMap(Collection from, Function keyFunc, Function valueFunc) {
- if (CollUtil.isEmpty(from)) {
- return new HashMap<>();
- }
- return from.stream()
- .collect(Collectors.groupingBy(keyFunc, Collectors.mapping(valueFunc, Collectors.toList())));
- }
-
- // 暂时没想好名字，先以 2 结尾噶
- public static Map> convertMultiMap2(Collection from, Function keyFunc, Function valueFunc) {
- if (CollUtil.isEmpty(from)) {
- return new HashMap<>();
- }
- return from.stream().collect(Collectors.groupingBy(keyFunc, Collectors.mapping(valueFunc, Collectors.toSet())));
- }
-
- public static Map convertImmutableMap(Collection from, Function keyFunc) {
- if (CollUtil.isEmpty(from)) {
- return Collections.emptyMap();
- }
- ImmutableMap.Builder builder = ImmutableMap.builder();
- from.forEach(item -> builder.put(keyFunc.apply(item), item));
- return builder.build();
- }
-
- public static boolean containsAny(Collection source, Collection candidates) {
- return org.springframework.util.CollectionUtils.containsAny(source, candidates);
- }
-
- public static T getFirst(List from) {
- return !CollectionUtil.isEmpty(from) ? from.get(0) : null;
- }
-
- public static T findFirst(List from, Predicate predicate) {
- if (CollUtil.isEmpty(from)) {
- return null;
- }
- return from.stream().filter(predicate).findFirst().orElse(null);
- }
-
- public static > V getMaxValue(List from, Function valueFunc) {
- if (CollUtil.isEmpty(from)) {
- return null;
- }
- assert from.size() > 0; // 断言，避免告警
- T t = from.stream().max(Comparator.comparing(valueFunc)).get();
- return valueFunc.apply(t);
- }
-
- public static void addIfNotNull(Collection coll, T item) {
- if (item == null) {
- return;
- }
- coll.add(item);
- }
-
- public static Collection singleton(T deptId) {
- return deptId == null ? Collections.emptyList() : Collections.singleton(deptId);
- }
-
-}
diff --git a/bs-common/src/main/java/com/bs/common/utils/file/FileTypeUtils.java b/bs-common/src/main/java/com/bs/common/utils/file/FileTypeUtils.java
index 4833abc..fda10c2 100644
--- a/bs-common/src/main/java/com/bs/common/utils/file/FileTypeUtils.java
+++ b/bs-common/src/main/java/com/bs/common/utils/file/FileTypeUtils.java
@@ -1,8 +1,7 @@
package com.bs.common.utils.file;
-import org.apache.commons.lang3.StringUtils;
-
import java.io.File;
+import org.apache.commons.lang3.StringUtils;
/**
* 文件类型工具类
diff --git a/bs-common/src/main/java/com/bs/common/utils/reflect/ReflectUtils.java b/bs-common/src/main/java/com/bs/common/utils/reflect/ReflectUtils.java
index 491d8bf..38c0264 100644
--- a/bs-common/src/main/java/com/bs/common/utils/reflect/ReflectUtils.java
+++ b/bs-common/src/main/java/com/bs/common/utils/reflect/ReflectUtils.java
@@ -1,15 +1,19 @@
package com.bs.common.utils.reflect;
-import com.bs.common.core.text.Convert;
-import com.bs.common.utils.DateUtils;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.poi.ss.usermodel.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.*;
-import java.util.Date;
+import com.bs.common.core.text.Convert;
+import com.bs.common.utils.DateUtils;
/**
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
diff --git a/bs-common/src/main/java/com/bs/common/utils/spring/SpringUtils.java b/bs-common/src/main/java/com/bs/common/utils/spring/SpringUtils.java
index db9dcf3..ad0ff5a 100644
--- a/bs-common/src/main/java/com/bs/common/utils/spring/SpringUtils.java
+++ b/bs-common/src/main/java/com/bs/common/utils/spring/SpringUtils.java
@@ -12,11 +12,11 @@ import com.bs.common.utils.StringUtils;
/**
* spring工具类 方便在非spring管理环境中获取bean
- *
+ *
* @author bs
*/
@Component
-public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware
+public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware
{
/** Spring应用上下文环境 */
private static ConfigurableListableBeanFactory beanFactory;
@@ -24,13 +24,13 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
private static ApplicationContext applicationContext;
@Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
+ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
{
SpringUtils.beanFactory = beanFactory;
}
@Override
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
SpringUtils.applicationContext = applicationContext;
}
@@ -113,7 +113,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
/**
* 获取aop代理对象
- *
+ *
* @param invoker
* @return
*/
diff --git a/bs-common/src/main/java/com/bs/common/utils/sql/SqlUtil.java b/bs-common/src/main/java/com/bs/common/utils/sql/SqlUtil.java
index 3f9a5e8..5b2d9e6 100644
--- a/bs-common/src/main/java/com/bs/common/utils/sql/SqlUtil.java
+++ b/bs-common/src/main/java/com/bs/common/utils/sql/SqlUtil.java
@@ -5,7 +5,7 @@ import com.bs.common.utils.StringUtils;
/**
* sql操作工具类
- *
+ *
* @author bs
*/
public class SqlUtil
diff --git a/bs-framework/pom.xml b/bs-framework/pom.xml
index 9906a04..5e95de3 100644
--- a/bs-framework/pom.xml
+++ b/bs-framework/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- my-base
+ bs-jxc
com.bs
3.8.6
@@ -16,10 +16,7 @@
-
- com.bs
- bs-system
-
+
org.springframework.boot
diff --git a/bs-framework/src/main/java/com/bs/framework/aspectj/DataScopeAspect.java b/bs-framework/src/main/java/com/bs/framework/aspectj/DataScopeAspect.java
index 54bb01c..d73e844 100644
--- a/bs-framework/src/main/java/com/bs/framework/aspectj/DataScopeAspect.java
+++ b/bs-framework/src/main/java/com/bs/framework/aspectj/DataScopeAspect.java
@@ -1,5 +1,11 @@
package com.bs.framework.aspectj;
+import java.util.ArrayList;
+import java.util.List;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
import com.bs.common.annotation.DataScope;
import com.bs.common.core.domain.BaseEntity;
import com.bs.common.core.domain.entity.SysRole;
@@ -9,13 +15,6 @@ import com.bs.common.core.text.Convert;
import com.bs.common.utils.SecurityUtils;
import com.bs.common.utils.StringUtils;
import com.bs.framework.security.context.PermissionContextHolder;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* 数据过滤处理
diff --git a/bs-framework/src/main/java/com/bs/framework/config/CaptchaConfig.java b/bs-framework/src/main/java/com/bs/framework/config/CaptchaConfig.java
index 761f949..9cdcdfc 100644
--- a/bs-framework/src/main/java/com/bs/framework/config/CaptchaConfig.java
+++ b/bs-framework/src/main/java/com/bs/framework/config/CaptchaConfig.java
@@ -21,14 +21,13 @@ public class CaptchaConfig
DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
Properties properties = new Properties();
// 是否有边框 默认为true 我们可以自己设置yes，no
- properties.setProperty(KAPTCHA_BORDER, "no");
+ properties.setProperty(KAPTCHA_BORDER, "yes");
// 验证码文本字符颜色 默认为Color.BLACK
- properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue");
+ properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black");
// 验证码图片宽度 默认为200
properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
// 验证码图片高度 默认为50
properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
- properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "10");
// 验证码文本字符大小 默认为40
properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38");
// KAPTCHA_SESSION_KEY
@@ -38,11 +37,7 @@ public class CaptchaConfig
// 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
// 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
- //properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
- properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise");
- properties.setProperty(KAPTCHA_BACKGROUND_CLR_FROM, "white");
- //
- properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"0123456789");
+ properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
Config config = new Config(properties);
defaultKaptcha.setConfig(config);
return defaultKaptcha;
diff --git a/bs-framework/src/main/java/com/bs/framework/config/MyTenantLineHandlerImpl.java b/bs-framework/src/main/java/com/bs/framework/config/MyTenantLineHandlerImpl.java
deleted file mode 100644
index b7c5813..0000000
--- a/bs-framework/src/main/java/com/bs/framework/config/MyTenantLineHandlerImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.bs.framework.config;
-
-import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
-import com.bs.common.config.TenantConfigProperties;
-import com.bs.common.utils.SecurityUtils;
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.LongValue;
-
-/**
- * @author: gfk
- * @create: 2023/3/3
- * @Description:
- * @FileName: MyTenantLineHandlerImpl
- * @History:
- * @自定义内容：
- */
-
-/**
- * 租户处理器
- *
- * @author luohq
- * @date 2022-08-07 12:31
- */
-@Slf4j
-public class MyTenantLineHandlerImpl implements TenantLineHandler {
- /**
- * 租户ID请求头名称
- */
- public static final String TENANT_ID_HEADER = "X-TENANT-ID";
- /**
- * 默认租户ID
- */
- public static final Long DEFAULT_TENANT_ID = 1L;
-
- private final TenantConfigProperties tenantConfigProperties;
-
- public MyTenantLineHandlerImpl(TenantConfigProperties tenantConfigProperties) {
- this.tenantConfigProperties = tenantConfigProperties;
- }
- @Override
- public Expression getTenantId() {
- Long tenantId = SecurityUtils.getTenantId();
-/* String tenantId = Optional.ofNullable(null)
- .map(String::valueOf)
- //.orElseThrow(() -> new RuntimeException("解析请求头中的X-TENANT-ID失败！"));
- .orElseGet(() -> {
- log.info("解析请求头中的X-TENANT-ID失败 - 使用默认租户ID: {}", DEFAULT_TENANT_ID);
- return "1";
- });*/
- //return new LongValue(tenantId);
- if(tenantId==null){
- return new LongValue(0);
- }
- return new LongValue(tenantId);
-
- }
-
- @Override
- public String getTenantIdColumn() {
- //默认tenant_id
- return "tenant_id";
- }
-
- @Override
- public boolean ignoreTable(String tableName) {
- //是否忽略此table的租户处理逻辑
- if(SecurityUtils.getTenantId()==null){
- return true;
- }
- // 1.是否跳过租户对该表对操作
- if (tenantConfigProperties.getTenantSkip()) {
- return true;
- }
- if(tenantConfigProperties.getOpenTenant()){
- return tenantConfigProperties.getNoIgnoreTables().contains(tableName);
- }
- return true;
-
- }
-}
diff --git a/bs-framework/src/main/java/com/bs/framework/config/MybatisPlusConfig.java b/bs-framework/src/main/java/com/bs/framework/config/MybatisPlusConfig.java
index fb2f075..3821a69 100644
--- a/bs-framework/src/main/java/com/bs/framework/config/MybatisPlusConfig.java
+++ b/bs-framework/src/main/java/com/bs/framework/config/MybatisPlusConfig.java
@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import com.bs.common.config.TenantConfigProperties;
import com.bs.common.mybatis.handler.DefaultDBFieldHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -23,11 +21,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
public class MybatisPlusConfig
{
@Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor(TenantConfigProperties tenantConfigProperties)
+ public MybatisPlusInterceptor mybatisPlusInterceptor()
{
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
//启用多租户插件
- interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new MyTenantLineHandlerImpl(tenantConfigProperties)));
+ //interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new MyTenantLineHandlerImpl()));
// 分页插件
interceptor.addInnerInterceptor(paginationInnerInterceptor());
// 乐观锁插件
diff --git a/bs-framework/src/main/java/com/bs/framework/web/service/SysPermissionService.java b/bs-framework/src/main/java/com/bs/framework/web/service/SysPermissionService.java
index 10bbf55..ba8c57c 100644
--- a/bs-framework/src/main/java/com/bs/framework/web/service/SysPermissionService.java
+++ b/bs-framework/src/main/java/com/bs/framework/web/service/SysPermissionService.java
@@ -1,16 +1,15 @@
package com.bs.framework.web.service;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import com.bs.common.core.domain.entity.SysRole;
import com.bs.common.core.domain.entity.SysUser;
import com.bs.system.service.ISysMenuService;
import com.bs.system.service.ISysRoleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
/**
* 用户权限处理
@@ -18,7 +17,8 @@ import java.util.Set;
* @author bs
*/
@Component
-public class SysPermissionService {
+public class SysPermissionService
+{
@Autowired
private ISysRoleService roleService;
@@ -31,12 +31,16 @@ public class SysPermissionService {
* @param user 用户信息
* @return 角色权限信息
*/
- public Set getRolePermission(SysUser user) {
+ public Set getRolePermission(SysUser user)
+ {
Set roles = new HashSet();
// 管理员拥有所有权限
- if (user.isAdmin()) {
+ if (user.isAdmin())
+ {
roles.add("admin");
- } else {
+ }
+ else
+ {
roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));
}
return roles;
@@ -48,21 +52,29 @@ public class SysPermissionService {
* @param user 用户信息
* @return 菜单权限信息
*/
- public Set getMenuPermission(SysUser user) {
+ public Set getMenuPermission(SysUser user)
+ {
Set perms = new HashSet();
// 管理员拥有所有权限
- if (user.isAdmin()) {
+ if (user.isAdmin())
+ {
perms.add("*:*:*");
- } else {
+ }
+ else
+ {
List roles = user.getRoles();
- if (!CollectionUtils.isEmpty(roles)) {
+ if (!CollectionUtils.isEmpty(roles))
+ {
// 多角色设置permissions属性，以便数据权限匹配权限
- for (SysRole role : roles) {
+ for (SysRole role : roles)
+ {
Set rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
role.setPermissions(rolePerms);
perms.addAll(rolePerms);
}
- } else {
+ }
+ else
+ {
perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
}
}
diff --git a/bs-framework/src/main/java/com/bs/framework/web/service/TokenService.java b/bs-framework/src/main/java/com/bs/framework/web/service/TokenService.java
index 9404668..78194b8 100644
--- a/bs-framework/src/main/java/com/bs/framework/web/service/TokenService.java
+++ b/bs-framework/src/main/java/com/bs/framework/web/service/TokenService.java
@@ -1,5 +1,12 @@
package com.bs.framework.web.service;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
import com.bs.common.constant.CacheConstants;
import com.bs.common.constant.Constants;
import com.bs.common.core.domain.model.LoginUser;
@@ -13,14 +20,6 @@ import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
/**
* token验证处理
diff --git a/bs-generator/pom.xml b/bs-generator/pom.xml
index 0704787..8ce4732 100644
--- a/bs-generator/pom.xml
+++ b/bs-generator/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- my-base
+ bs-jxc
com.bs
3.8.6
@@ -34,11 +34,7 @@
com.bs
bs-common
-
-
- com.baomidou
- mybatis-plus-generator
-
+
diff --git a/bs-generator/src/main/java/com/bs/generator/service/GenTableServiceImpl.java b/bs-generator/src/main/java/com/bs/generator/service/GenTableServiceImpl.java
index a7c7d56..7726dca 100644
--- a/bs-generator/src/main/java/com/bs/generator/service/GenTableServiceImpl.java
+++ b/bs-generator/src/main/java/com/bs/generator/service/GenTableServiceImpl.java
@@ -1,45 +1,41 @@
package com.bs.generator.service;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.generator.config.po.TableField;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import com.bs.common.constant.Constants;
import com.bs.common.constant.GenConstants;
import com.bs.common.core.text.CharsetKit;
import com.bs.common.exception.ServiceException;
import com.bs.common.utils.SecurityUtils;
import com.bs.common.utils.StringUtils;
-import com.bs.common.utils.collection.CollectionUtils;
import com.bs.generator.domain.GenTable;
import com.bs.generator.domain.GenTableColumn;
import com.bs.generator.mapper.GenTableColumnMapper;
import com.bs.generator.mapper.GenTableMapper;
-import com.bs.generator.util.GenTableUtils;
import com.bs.generator.util.GenUtils;
import com.bs.generator.util.VelocityInitializer;
import com.bs.generator.util.VelocityUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
/**
* 业务 服务层实现
@@ -92,23 +88,7 @@ public class GenTableServiceImpl implements IGenTableService
@Override
public List selectDbTableList(GenTable genTable)
{
- List tableList = GenTableUtils.getTableList(genTable.getTableName(), genTable.getTableComment());
- // 移除置顶前缀的表名
- tableList.removeIf(table -> table.getName().toUpperCase().startsWith("QRTZ_"));
- tableList.removeIf(table -> table.getName().toUpperCase().startsWith("ACT_"));
- tableList.removeIf(table -> table.getName().toUpperCase().startsWith("FLW_"));
- // 移除已经生成的表
- // 移除在 Codegen 中，已经存在的
- List genTables = genTableMapper.selectGenTableList(new GenTable());
- Set existsTables = CollectionUtils.convertSet(genTables, GenTable::getTableName);
- tableList.removeIf(table -> existsTables.contains(table.getName()));
- List result = tableList.stream().map(tmp -> {
- GenTable data = new GenTable();
- data.setTableName(tmp.getName());
- data.setTableComment(tmp.getComment());
- return data;
- }).collect(Collectors.toList());
- return result;
+ return genTableMapper.selectDbTableList(genTable);
}
/**
@@ -120,15 +100,7 @@ public class GenTableServiceImpl implements IGenTableService
@Override
public List selectDbTableListByNames(String[] tableNames)
{
- List result = new ArrayList<>(tableNames.length);
- for (String tableName : tableNames) {
- TableInfo table = GenTableUtils.getTable(tableName);
- GenTable data = new GenTable();
- data.setTableName(table.getName());
- data.setTableComment(table.getComment());
- result.add(data);
- }
- return result;
+ return genTableMapper.selectDbTableListByNames(tableNames);
}
/**
@@ -188,35 +160,27 @@ public class GenTableServiceImpl implements IGenTableService
public void importGenTable(List tableList)
{
Long operName = SecurityUtils.getUsername();
- try {
- for (GenTable table : tableList) {
+ try
+ {
+ for (GenTable table : tableList)
+ {
String tableName = table.getTableName();
GenUtils.initTable(table, operName);
int row = genTableMapper.insertGenTable(table);
- if (row > 0) {
+ if (row > 0)
+ {
// 保存列信息
- TableInfo tableInfo = GenTableUtils.getTable(tableName);
- List fields = tableInfo.getFields();
- AtomicInteger index = new AtomicInteger(1);
- List genTableColumns = fields.stream().map(tmp -> {
- GenTableColumn data = new GenTableColumn();
- data.setColumnName(tmp.getColumnName());
- data.setColumnComment(tmp.getComment());
- data.setIsRequired(tmp.getMetaInfo().isNullable() ? "1" : "0");
- data.setIsPk(tmp.isKeyFlag() ? "1" : "0");
- data.setSort(index.getAndIncrement());
- data.setIsIncrement(tmp.isKeyIdentityFlag() ? "1" : "0");
- data.setColumnType(tmp.getType());
- return data;
- }).collect(Collectors.toList());
- //List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
- for (GenTableColumn column : genTableColumns) {
+ List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+ for (GenTableColumn column : genTableColumns)
+ {
GenUtils.initColumnField(column, table);
genTableColumnMapper.insertGenTableColumn(column);
}
}
}
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
throw new ServiceException("导入失败：" + e.getMessage());
}
}
diff --git a/bs-generator/src/main/java/com/bs/generator/util/GenTableUtils.java b/bs-generator/src/main/java/com/bs/generator/util/GenTableUtils.java
deleted file mode 100644
index 3581cb9..0000000
--- a/bs-generator/src/main/java/com/bs/generator/util/GenTableUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.bs.generator.util;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.DateType;
-import com.bs.common.utils.spring.SpringUtils;
-import org.springframework.core.env.Environment;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class GenTableUtils {
-
- private static final String DATASOURCE_DYNAMIC_KEY = "spring.datasource.druid.master";
-
- public static Environment environment = SpringUtils.getBean(Environment.class);
-
- public static List getTableList(String nameLike, String commentLike) {
- List tables = getTableList0(null);
- return tables.stream().filter(tableInfo -> (StrUtil.isEmpty(nameLike) || tableInfo.getName().contains(nameLike))
- && (StrUtil.isEmpty(commentLike) || tableInfo.getComment().contains(commentLike)))
- .collect(Collectors.toList());
- }
-
- public static TableInfo getTable(String name) {
- return CollUtil.getFirst(getTableList0(name));
- }
-
- public static List getTableList0(String name) {
- String url = environment.getProperty(DATASOURCE_DYNAMIC_KEY + ".url");
- String username = environment.getProperty(DATASOURCE_DYNAMIC_KEY + ".username");
- String password = environment.getProperty(DATASOURCE_DYNAMIC_KEY + ".password");
- // 使用 MyBatis Plus Generator 解析表结构
- DataSourceConfig dataSourceConfig = new DataSourceConfig.Builder(url, username,
- password).build();
- StrategyConfig.Builder strategyConfig = new StrategyConfig.Builder();
- if (StrUtil.isNotEmpty(name)) {
- strategyConfig.addInclude(name);
- }
- // 只使用 Date 类型，不使用 LocalDate
- GlobalConfig globalConfig = new GlobalConfig.Builder().dateType(DateType.ONLY_DATE).build();
- ConfigBuilder builder = new ConfigBuilder(null, dataSourceConfig, strategyConfig.build(),
- null, globalConfig, null);
- // 按照名字排序
- List tables = builder.getTableInfoList();
- tables.sort(Comparator.comparing(TableInfo::getName));
- return tables;
- }
-
-}
diff --git a/bs-generator/src/main/java/com/bs/generator/util/GenUtils.java b/bs-generator/src/main/java/com/bs/generator/util/GenUtils.java
index b307735..8163ccd 100644
--- a/bs-generator/src/main/java/com/bs/generator/util/GenUtils.java
+++ b/bs-generator/src/main/java/com/bs/generator/util/GenUtils.java
@@ -1,13 +1,12 @@
package com.bs.generator.util;
+import java.util.Arrays;
+import org.apache.commons.lang3.RegExUtils;
import com.bs.common.constant.GenConstants;
import com.bs.common.utils.StringUtils;
import com.bs.generator.config.GenConfig;
import com.bs.generator.domain.GenTable;
import com.bs.generator.domain.GenTableColumn;
-import org.apache.commons.lang3.RegExUtils;
-
-import java.util.Arrays;
/**
* 代码生成器 工具类
diff --git a/bs-generator/src/main/java/com/bs/generator/util/VelocityUtils.java b/bs-generator/src/main/java/com/bs/generator/util/VelocityUtils.java
index 0939777..9b7d3d3 100644
--- a/bs-generator/src/main/java/com/bs/generator/util/VelocityUtils.java
+++ b/bs-generator/src/main/java/com/bs/generator/util/VelocityUtils.java
@@ -1,5 +1,10 @@
package com.bs.generator.util;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.bs.common.constant.GenConstants;
@@ -7,12 +12,6 @@ import com.bs.common.utils.DateUtils;
import com.bs.common.utils.StringUtils;
import com.bs.generator.domain.GenTable;
import com.bs.generator.domain.GenTableColumn;
-import org.apache.velocity.VelocityContext;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
/**
* 模板处理工具类
diff --git a/bs-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/bs-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 53a7c90..0839c83 100644
--- a/bs-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/bs-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"