implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java
deleted file mode 100644
index e637f4731..000000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ruoyi.common.core.service;
-
-import com.ruoyi.common.core.domain.entity.SysUser;
-
-/**
- * 通用 用户业务
- *
- * @author Lion Li
- */
-public interface UserService {
-
- /**
- * 通过用户名查询用户
- *
- * @param userName 用户名
- * @return 用户对象信息
- */
- SysUser selectUserByUserName(String userName);
-
- /**
- * 通过用户ID查询用户
- *
- * @param userId 用户ID
- * @return 用户对象信息
- */
- SysUser selectUserById(Long userId);
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java
new file mode 100644
index 000000000..5d0f05ad7
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java
@@ -0,0 +1,49 @@
+package com.ruoyi.common.enums;
+
+import com.ruoyi.common.utils.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 数据库类型
+ *
+ * @author Lion Li
+ */
+@Getter
+@AllArgsConstructor
+public enum DataBaseType {
+
+ /**
+ * MySQL
+ */
+ MY_SQL("MySQL"),
+
+ /**
+ * Oracle
+ */
+ ORACLE("Oracle"),
+
+ /**
+ * PostgreSQL
+ */
+ POSTGRE_SQL("PostgreSQL"),
+
+ /**
+ * SQL Server
+ */
+ SQL_SERVER("Microsoft SQL Server");
+
+ private final String type;
+
+ public static DataBaseType find(String databaseProductName) {
+ if (StringUtils.isBlank(databaseProductName)) {
+ return null;
+ }
+ for (DataBaseType type : values()) {
+ if (type.getType().equals(databaseProductName)) {
+ return type;
+ }
+ }
+ return null;
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
index 58bc76140..64324652b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
@@ -9,7 +9,7 @@ import lombok.Getter;
*
* 语法支持 spel 模板表达式
*
- * 内置数据 user 当前用户 内容参考 SysUser
+ * 内置数据 user 当前用户 内容参考 LoginUser
* 如需扩展数据 可使用 {@link com.ruoyi.common.helper.DataPermissionHelper} 操作
* 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService
* 如需扩展更多自定义服务 可以参考 sdss 自行编写
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
new file mode 100644
index 000000000..196035629
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
@@ -0,0 +1,72 @@
+package com.ruoyi.common.helper;
+
+import cn.hutool.core.convert.Convert;
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.ruoyi.common.enums.DataBaseType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+/**
+ * 数据库助手
+ *
+ * @author Lion Li
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class DataBaseHelper {
+
+ private static final DynamicRoutingDataSource DS = SpringUtils.getBean(DynamicRoutingDataSource.class);
+
+ /**
+ * 获取当前数据库类型
+ */
+ public static DataBaseType getDataBaseType() {
+ DataSource dataSource = DS.determineDataSource();
+ try (Connection conn = dataSource.getConnection()) {
+ DatabaseMetaData metaData = conn.getMetaData();
+ String databaseProductName = metaData.getDatabaseProductName();
+ return DataBaseType.find(databaseProductName);
+ } catch (SQLException e) {
+ throw new ServiceException(e.getMessage());
+ }
+ }
+
+ public static boolean isMySql() {
+ return DataBaseType.MY_SQL == getDataBaseType();
+ }
+
+ public static boolean isOracle() {
+ return DataBaseType.ORACLE == getDataBaseType();
+ }
+
+ public static boolean isPostgerSql() {
+ return DataBaseType.POSTGRE_SQL == getDataBaseType();
+ }
+
+ public static boolean isSqlServer() {
+ return DataBaseType.SQL_SERVER == getDataBaseType();
+ }
+
+ public static String findInSet(Object var1, String var2) {
+ DataBaseType dataBasyType = getDataBaseType();
+ String var = Convert.toStr(var1);
+ if (dataBasyType == DataBaseType.SQL_SERVER) {
+ // charindex(',100,' , ',0,100,101,') <> 0
+ return "charindex('," + var + ",' , ','+" + var2 + "+',') <> 0";
+ } else if (dataBasyType == DataBaseType.POSTGRE_SQL) {
+ // (select position(',100,' in ',0,100,101,')) <> 0
+ return "(select position('," + var + ",' in ','||" + var2 + "||',')) <> 0";
+ } else if (dataBasyType == DataBaseType.ORACLE) {
+ // instr(',0,100,101,' , ',100,') <> 0
+ return "instr(','||" + var2 + "||',' , '," + var + ",') <> 0";
+ }
+ // find_in_set(100 , '0,100,101')
+ return "find_in_set(" + var + " , " + var2 + ") <> 0";
+ }
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
index 66b5854af..7875c5630 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
@@ -2,6 +2,7 @@ package com.ruoyi.common.helper;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserType;
@@ -12,7 +13,13 @@ import lombok.NoArgsConstructor;
/**
* 登录鉴权助手
- * 为适配多端登录而封装
+ *
+ * user_type 为 用户类型 同一个用户表 可以有多种用户类型 例如 pc,app
+ * deivce 为 设备类型 同一个用户类型 可以有 多种设备类型 例如 web,ios
+ * 可以组成 用户类型与设备类型多对多的 权限灵活控制
+ *
+ * 多用户体系 针对 多种用户类型 但权限控制不一致
+ * 可以组成 多用户类型表与多设备类型 分别控制权限
*
* @author Lion Li
*/
@@ -26,22 +33,23 @@ public class LoginHelper {
/**
* 登录系统
- * 针对两套用户体系
*
* @param loginUser 登录用户信息
*/
public static void login(LoginUser loginUser) {
+ LOGIN_CACHE.set(loginUser);
StpUtil.login(loginUser.getLoginId());
setLoginUser(loginUser);
}
/**
* 登录系统 基于 设备类型
- * 针对一套用户体系
+ * 针对相同用户体系不同设备
*
* @param loginUser 登录用户信息
*/
public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
+ LOGIN_CACHE.set(loginUser);
StpUtil.login(loginUser.getLoginId(), deviceType.getDevice());
setLoginUser(loginUser);
}
@@ -51,7 +59,6 @@ public class LoginHelper {
*/
public static void setLoginUser(LoginUser loginUser) {
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
- LOGIN_CACHE.set(loginUser);
}
/**
@@ -117,4 +124,18 @@ public class LoginHelper {
return UserType.getUserType(loginId);
}
+ /**
+ * 是否为管理员
+ *
+ * @param userId 用户ID
+ * @return 结果
+ */
+ public static boolean isAdmin(Long userId) {
+ return UserConstants.ADMIN_ID.equals(userId);
+ }
+
+ public static boolean isAdmin() {
+ return isAdmin(getUserId());
+ }
+
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
index 0bd4a55b9..23ace00f9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -13,6 +13,10 @@ import java.util.Map;
/**
* bean深拷贝工具(基于 cglib 性能优异)
+ *
+ * 重点 cglib 不支持 拷贝到链式对象
+ * 例如: 源对象 拷贝到 目标(链式对象)
+ * 请区分好`浅拷贝`和`深拷贝`再做使用
*
* @author Lion Li
*/
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 9d1a14cd1..e3cb9c56a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -7,6 +7,11 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import java.lang.management.ManagementFactory;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
import java.util.Date;
/**
@@ -116,6 +121,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return new Date(time);
}
+ /**
+ * 计算相差天数
+ */
+ public static int differentDaysByMillisecond(Date date1, Date date2)
+ {
+ return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+ }
+
/**
* 计算两个时间差
*/
@@ -136,4 +149,21 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
// long sec = diff % nd % nh % nm / ns;
return day + "天" + hour + "小时" + min + "分钟";
}
+
+ /**
+ * 增加 LocalDateTime ==> Date
+ */
+ public static Date toDate(LocalDateTime temporalAccessor) {
+ ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
+ return Date.from(zdt.toInstant());
+ }
+
+ /**
+ * 增加 LocalDate ==> Date
+ */
+ public static Date toDate(LocalDate temporalAccessor) {
+ LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
+ ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
+ return Date.from(zdt.toInstant());
+ }
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
index 11004be86..446bf1b00 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.utils;
+import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -12,7 +13,6 @@ import lombok.NoArgsConstructor;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* JSON 工具类
@@ -72,13 +72,23 @@ public class JsonUtils {
}
}
- public static Map parseMap(String text) {
+ public static Dict parseMap(String text) {
if (StringUtils.isBlank(text)) {
return null;
}
try {
- return OBJECT_MAPPER.readValue(text, new TypeReference>() {
- });
+ return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructType(Dict.class));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static List parseArrayMap(String text) {
+ if (StringUtils.isBlank(text)) {
+ return null;
+ }
+ try {
+ return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, Dict.class));
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
deleted file mode 100644
index 72c9453c0..000000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ruoyi.common.utils;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
-/**
- * 安全服务工具类
- *
- * @author Long Li
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class SecurityUtils {
-
- /**
- * 生成BCryptPasswordEncoder密码
- *
- * @param password 密码
- * @return 加密字符串
- */
- public static String encryptPassword(String password) {
- BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- return passwordEncoder.encode(password);
- }
-
- /**
- * 判断密码是否相同
- *
- * @param rawPassword 真实密码
- * @param encodedPassword 加密后字符
- * @return 结果
- */
- public static boolean matchesPassword(String rawPassword, String encodedPassword) {
- BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- return passwordEncoder.matches(rawPassword, encodedPassword);
- }
-
- /**
- * 是否为管理员
- *
- * @param userId 用户ID
- * @return 结果
- */
- public static boolean isAdmin(Long userId) {
- return userId != null && 1L == userId;
- }
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index 5babaeb30..6408c8944 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -97,9 +97,8 @@ public class ServletUtils extends ServletUtil {
*
* @param response 渲染对象
* @param string 待渲染的字符串
- * @return null
*/
- public static String renderString(HttpServletResponse response, String string) {
+ public static void renderString(HttpServletResponse response, String string) {
try {
response.setStatus(HttpStatus.HTTP_OK);
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
@@ -108,7 +107,6 @@ public class ServletUtils extends ServletUtil {
} catch (IOException e) {
e.printStackTrace();
}
- return null;
}
/**
@@ -119,12 +117,12 @@ public class ServletUtils extends ServletUtil {
public static boolean isAjaxRequest(HttpServletRequest request) {
String accept = request.getHeader("accept");
- if (accept != null && accept.indexOf("application/json") != -1) {
+ if (accept != null && accept.contains("application/json")) {
return true;
}
String xRequestedWith = request.getHeader("X-Requested-With");
- if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
+ if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
return true;
}
@@ -134,10 +132,7 @@ public class ServletUtils extends ServletUtil {
}
String ajax = request.getParameter("__ajax");
- if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) {
- return true;
- }
- return false;
+ return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
}
public static String getClientIP() {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
index 77a484ec8..16f8861c1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -86,7 +86,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
* 例：
* 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
- * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is {} for a
* 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
*
* @param template 文本模板，被替换的部分用 {} 表示
@@ -231,4 +231,43 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
return matcher.match(pattern, url);
}
+ /**
+ * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。
+ *
+ * @param num 数字对象
+ * @param size 字符串指定长度
+ * @return 返回数字的字符串格式，该字符串为指定长度。
+ */
+ public static final String padl(final Number num, final int size) {
+ return padl(num.toString(), size, '0');
+ }
+
+ /**
+ * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。
+ *
+ * @param s 原始字符串
+ * @param size 字符串指定长度
+ * @param c 用于补齐的字符
+ * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。
+ */
+ public static final String padl(final String s, final int size, final char c) {
+ final StringBuilder sb = new StringBuilder(size);
+ if (s != null) {
+ final int len = s.length();
+ if (s.length() <= size) {
+ for (int i = size - len; i > 0; i--) {
+ sb.append(c);
+ }
+ sb.append(s);
+ } else {
+ return s.substring(len - size, len);
+ }
+ } else {
+ for (int i = size; i > 0; i--) {
+ sb.append(c);
+ }
+ }
+ return sb.toString();
+ }
+
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java
index 76bf864f4..f9f8fa140 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java
@@ -1,9 +1,11 @@
package com.ruoyi.common.utils;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.lang.tree.parser.NodeParser;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -22,8 +24,12 @@ public class TreeBuildUtils extends TreeUtil {
*/
public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label");
- public static List> build(List list, Long parentId, NodeParser nodeParser) {
- return TreeUtil.build(list, parentId, DEFAULT_CONFIG, nodeParser);
+ public static List> build(List list, NodeParser nodeParser) {
+ if (CollUtil.isEmpty(list)) {
+ return null;
+ }
+ K k = ReflectUtils.invokeGetter(list.get(0), "parentId");
+ return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser);
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
index 61f26005b..1ef222907 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
@@ -22,7 +22,6 @@ public class FileUtils extends FileUtil {
*
* @param response 响应对象
* @param realFileName 真实文件名
- * @return
*/
public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException {
String percentEncodedFileName = percentEncode(realFileName);
@@ -35,7 +34,6 @@ public class FileUtils extends FileUtil {
.append("utf-8''")
.append(percentEncodedFileName);
- response.addHeader("Access-Control-Allow-Origin", "*");
response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename");
response.setHeader("Content-disposition", contentDispositionValue.toString());
response.setHeader("download-filename", percentEncodedFileName);
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
index 1d6123055..8d3515e7f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.utils.ip;
+import cn.hutool.core.lang.Dict;
import cn.hutool.core.net.NetUtil;
import cn.hutool.http.HtmlUtil;
import cn.hutool.http.HttpUtil;
@@ -11,8 +12,6 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import java.util.Map;
-
/**
* 获取地址类
*
@@ -48,14 +47,14 @@ public class AddressUtils {
log.error("获取地理位置异常 {}", ip);
return UNKNOWN;
}
- Map obj = JsonUtils.parseMap(rspStr);
- String region = obj.get("pro");
- String city = obj.get("city");
+ Dict obj = JsonUtils.parseMap(rspStr);
+ String region = obj.getStr("pro");
+ String city = obj.getStr("city");
return String.format("%s %s", region, city);
} catch (Exception e) {
log.error("获取地理位置异常 {}", ip);
}
}
- return address;
+ return UNKNOWN;
}
}
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 6b0ea78ea..329b4e7ee 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 3.5.0
+ 4.0.1
4.0.0
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java
index 28e380b85..98cca18c0 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java
@@ -1,6 +1,6 @@
package com.ruoyi.demo.controller;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.RedisUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -44,8 +44,8 @@ public class RedisCacheController {
@ApiOperation("测试 @Cacheable")
@Cacheable(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test1")
- public AjaxResult test1(String key, String value) {
- return AjaxResult.success("操作成功", value);
+ public R test1(String key, String value) {
+ return R.ok("操作成功", value);
}
/**
@@ -59,8 +59,8 @@ public class RedisCacheController {
@ApiOperation("测试 @CachePut")
@CachePut(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test2")
- public AjaxResult test2(String key, String value) {
- return AjaxResult.success("操作成功", value);
+ public R test2(String key, String value) {
+ return R.ok("操作成功", value);
}
/**
@@ -74,8 +74,8 @@ public class RedisCacheController {
@ApiOperation("测试 @CacheEvict")
@CacheEvict(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test3")
- public AjaxResult test3(String key, String value) {
- return AjaxResult.success("操作成功", value);
+ public R test3(String key, String value) {
+ return R.ok("操作成功", value);
}
/**
@@ -85,7 +85,7 @@ public class RedisCacheController {
*/
@ApiOperation("测试设置过期时间")
@GetMapping("/test6")
- public AjaxResult test6(String key, String value) {
+ public R test6(String key, String value) {
RedisUtils.setCacheObject(key, value);
boolean flag = RedisUtils.expire(key, 10, TimeUnit.SECONDS);
System.out.println("***********" + flag);
@@ -95,7 +95,7 @@ public class RedisCacheController {
e.printStackTrace();
}
Object obj = RedisUtils.getCacheObject(key);
- return AjaxResult.success("操作成功", value.equals(obj));
+ return R.ok(value.equals(obj));
}
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
index 7d30a1871..c31925a57 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
@@ -4,7 +4,7 @@ import com.baomidou.lock.LockInfo;
import com.baomidou.lock.LockTemplate;
import com.baomidou.lock.annotation.Lock4j;
import com.baomidou.lock.executor.RedissonLockExecutor;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -36,7 +36,7 @@ public class RedisLockController {
@ApiOperation("测试lock4j 注解")
@Lock4j(keys = {"#key"})
@GetMapping("/testLock4j")
- public AjaxResult testLock4j(String key, String value) {
+ public R testLock4j(String key, String value) {
System.out.println("start:" + key + ",time:" + LocalTime.now().toString());
try {
Thread.sleep(10000);
@@ -44,7 +44,7 @@ public class RedisLockController {
e.printStackTrace();
}
System.out.println("end :" + key + ",time:" + LocalTime.now().toString());
- return AjaxResult.success("操作成功", value);
+ return R.ok("操作成功", value);
}
/**
@@ -52,7 +52,7 @@ public class RedisLockController {
*/
@ApiOperation("测试lock4j 工具")
@GetMapping("/testLock4jLockTemplate")
- public AjaxResult testLock4jLockTemplate(String key, String value) {
+ public R testLock4jLockTemplate(String key, String value) {
final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class);
if (null == lockInfo) {
throw new RuntimeException("业务处理中,请稍后再试");
@@ -70,7 +70,7 @@ public class RedisLockController {
lockTemplate.releaseLock(lockInfo);
}
//结束
- return AjaxResult.success("操作成功", value);
+ return R.ok("操作成功", value);
}
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java
index d8b6e0c22..99c3131b4 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java
@@ -1,6 +1,6 @@
package com.ruoyi.demo.controller;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.RedisUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,20 +23,20 @@ public class RedisPubSubController {
@ApiOperation("发布消息")
@GetMapping("/pub")
- public AjaxResult pub(@ApiParam("通道Key") String key, @ApiParam("发送内容") String value) {
+ public R pub(@ApiParam("通道Key") String key, @ApiParam("发送内容") String value) {
RedisUtils.publish(key, value, consumer -> {
System.out.println("发布通道 => " + key + ", 发送值 => " + value);
});
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
@ApiOperation("订阅消息")
@GetMapping("/sub")
- public AjaxResult sub(@ApiParam("通道Key") String key) {
+ public R sub(@ApiParam("通道Key") String key) {
RedisUtils.subscribe(key, String.class, msg -> {
System.out.println("订阅通道 => " + key + ", 接收值 => " + msg);
});
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
index 1eeab6114..c7f48e519 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
@@ -1,7 +1,7 @@
package com.ruoyi.demo.controller;
import com.ruoyi.common.annotation.RateLimiter;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.LimitType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,8 +29,8 @@ public class RedisRateLimiterController {
@ApiOperation("测试全局限流")
@RateLimiter(count = 2, time = 10)
@GetMapping("/test")
- public AjaxResult test(String value) {
- return AjaxResult.success("操作成功", value);
+ public R test(String value) {
+ return R.ok("操作成功", value);
}
/**
@@ -40,8 +40,8 @@ public class RedisRateLimiterController {
@ApiOperation("测试请求IP限流")
@RateLimiter(count = 2, time = 10, limitType = LimitType.IP)
@GetMapping("/testip")
- public AjaxResult testip(String value) {
- return AjaxResult.success("操作成功", value);
+ public R testip(String value) {
+ return R.ok("操作成功", value);
}
/**
@@ -51,8 +51,8 @@ public class RedisRateLimiterController {
@ApiOperation("测试集群实例限流")
@RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER)
@GetMapping("/testcluster")
- public AjaxResult testcluster(String value) {
- return AjaxResult.success("操作成功", value);
+ public R testcluster(String value) {
+ return R.ok("操作成功", value);
}
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java
index 6b73d64a8..e50ce03a5 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java
@@ -1,6 +1,6 @@
package com.ruoyi.demo.controller;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+
/**
* swagger3 用法示例
*
@@ -24,15 +26,14 @@ public class Swagger3DemoController {
/**
* 上传请求
* 必须使用 @RequestPart 注解标注为文件
- * dataType 必须为 "java.io.File"
*/
@ApiOperation(value = "通用上传请求")
@ApiImplicitParams({
- @ApiImplicitParam(name = "file", value = "文件", dataType = "java.io.File", required = true),
+ @ApiImplicitParam(name = "file", value = "文件", paramType = "query", dataTypeClass = File.class, required = true)
})
@PostMapping(value = "/upload")
- public AjaxResult upload(@RequestPart("file") MultipartFile file) {
- return AjaxResult.success("操作成功", file.getOriginalFilename());
+ public R upload(@RequestPart("file") MultipartFile file) {
+ return R.ok("操作成功", file.getOriginalFilename());
}
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
index 39cf3ebf7..aa1f064a0 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
@@ -2,7 +2,7 @@ package com.ruoyi.demo.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.demo.domain.TestDemo;
import com.ruoyi.demo.mapper.TestDemoMapper;
import io.swagger.annotations.Api;
@@ -41,10 +41,14 @@ public class TestBatchController extends BaseController {
@ApiOperation(value = "新增批量方法")
@PostMapping("/add")
// @DS("slave")
- public AjaxResult add() {
+ public R add() {
List list = new ArrayList<>();
for (int i = 0; i < 1000; i++) {
- list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
+ TestDemo testDemo = new TestDemo();
+ testDemo.setOrderNum(-1);
+ testDemo.setTestKey("批量新增");
+ testDemo.setValue("测试新增");
+ list.add(testDemo);
}
return toAjax(testDemoMapper.insertBatch(list) ? 1 : 0);
}
@@ -57,15 +61,19 @@ public class TestBatchController extends BaseController {
@ApiOperation(value = "新增或更新批量方法")
@PostMapping("/addOrUpdate")
// @DS("slave")
- public AjaxResult addOrUpdate() {
+ public R addOrUpdate() {
List list = new ArrayList<>();
for (int i = 0; i < 1000; i++) {
- list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
- }
+ TestDemo testDemo = new TestDemo();
+ testDemo.setOrderNum(-1);
+ testDemo.setTestKey("批量新增");
+ testDemo.setValue("测试新增");
+ list.add(testDemo); }
testDemoMapper.insertBatch(list);
for (int i = 0; i < list.size(); i++) {
TestDemo testDemo = list.get(i);
- testDemo.setTestKey("批量新增或修改").setValue("批量新增或修改");
+ testDemo.setTestKey("批量新增或修改");
+ testDemo.setValue("批量新增或修改");
if (i % 2 == 0) {
testDemo.setId(null);
}
@@ -79,7 +87,7 @@ public class TestBatchController extends BaseController {
@ApiOperation(value = "删除批量方法")
@DeleteMapping()
// @DS("slave")
- public AjaxResult remove() {
+ public R remove() {
return toAjax(testDemoMapper.delete(new LambdaQueryWrapper()
.eq(TestDemo::getOrderNum, -1L)));
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
index 39817174c..d1f994e5d 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
@@ -5,7 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
@@ -75,12 +75,12 @@ public class TestDemoController extends BaseController {
@Log(title = "测试单表", businessType = BusinessType.IMPORT)
@SaCheckPermission("demo:demo:import")
@PostMapping("/importData")
- public AjaxResult importData(@RequestPart("file") MultipartFile file) throws Exception {
+ public R importData(@RequestPart("file") MultipartFile file) throws Exception {
ExcelResult excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true);
List volist = excelResult.getList();
List list = BeanUtil.copyToList(volist, TestDemo.class);
iTestDemoService.saveBatch(list);
- return AjaxResult.success(excelResult.getAnalysis());
+ return R.ok(excelResult.getAnalysis());
}
/**
@@ -105,10 +105,10 @@ public class TestDemoController extends BaseController {
@ApiOperation("获取测试单表详细信息")
@SaCheckPermission("demo:demo:query")
@GetMapping("/{id}")
- public AjaxResult getInfo(@ApiParam("测试ID")
+ public R getInfo(@ApiParam("测试ID")
@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
- return AjaxResult.success(iTestDemoService.queryById(id));
+ return R.ok(iTestDemoService.queryById(id));
}
/**
@@ -117,9 +117,9 @@ public class TestDemoController extends BaseController {
@ApiOperation("新增测试单表")
@SaCheckPermission("demo:demo:add")
@Log(title = "测试单表", businessType = BusinessType.INSERT)
- @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "不允许重复提交")
+ @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "{repeat.submit.message}")
@PostMapping()
- public AjaxResult add(@RequestBody TestDemoBo bo) {
+ public R add(@RequestBody TestDemoBo bo) {
// 使用校验工具对标 @Validated(AddGroup.class) 注解
// 用于在非 Controller 的地方校验对象
ValidatorUtils.validate(bo, AddGroup.class);
@@ -134,7 +134,7 @@ public class TestDemoController extends BaseController {
@Log(title = "测试单表", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
- public AjaxResult edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
+ public R edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0);
}
@@ -145,7 +145,7 @@ public class TestDemoController extends BaseController {
@SaCheckPermission("demo:demo:remove")
@Log(title = "测试单表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@ApiParam("测试ID串")
+ public R remove(@ApiParam("测试ID串")
@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
index f56888219..9b3bffc09 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
@@ -1,6 +1,6 @@
package com.ruoyi.demo.controller;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.MessageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,8 +35,8 @@ public class TestI18nController {
*/
@ApiOperation("通过code获取国际化内容")
@GetMapping()
- public AjaxResult get(@ApiParam("国际化code") String code) {
- return AjaxResult.success(MessageUtils.message(code));
+ public R get(@ApiParam("国际化code") String code) {
+ return R.ok(MessageUtils.message(code));
}
/**
@@ -47,8 +47,8 @@ public class TestI18nController {
*/
@ApiOperation("Validator 校验国际化")
@GetMapping("/test1")
- public AjaxResult test1(@NotBlank(message = "{not.null}") String str) {
- return AjaxResult.success(str);
+ public R test1(@NotBlank(message = "{not.null}") String str) {
+ return R.ok(str);
}
/**
@@ -59,8 +59,8 @@ public class TestI18nController {
*/
@ApiOperation("Bean 校验国际化")
@GetMapping("/test2")
- public AjaxResult test2(@Validated TestI18nBo bo) {
- return AjaxResult.success(bo);
+ public R test2(@Validated TestI18nBo bo) {
+ return R.ok(bo);
}
@Data
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
index 72b16e6ab..1f34f9cf4 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
@@ -2,12 +2,11 @@ package com.ruoyi.demo.controller;
import com.ruoyi.common.annotation.Sensitive;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.SensitiveStrategy;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
-import lombok.experimental.Accessors;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -32,18 +31,17 @@ public class TestSensitiveController extends BaseController {
*/
@ApiOperation("查询测试单表列表")
@GetMapping("/test")
- public AjaxResult test() {
- TestSensitive testSensitive = new TestSensitive()
- .setIdCard("210397198608215431")
- .setPhone("17640125371")
- .setAddress("北京市朝阳区某某四合院1203室")
- .setEmail("17640125371@163.com")
- .setBankCard("6226456952351452853");
- return AjaxResult.success(testSensitive);
+ public R test() {
+ TestSensitive testSensitive = new TestSensitive();
+ testSensitive.setIdCard("210397198608215431");
+ testSensitive.setPhone("17640125371");
+ testSensitive.setAddress("北京市朝阳区某某四合院1203室");
+ testSensitive.setEmail("17640125371@163.com");
+ testSensitive.setBankCard("6226456952351452853");
+ return R.ok(testSensitive);
}
@Data
- @Accessors(chain = true)
static class TestSensitive {
/**
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
index 9b0d537bb..64f36c941 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
@@ -47,9 +47,9 @@ public class TestTreeController extends BaseController {
@ApiOperation("查询测试树表列表")
@SaCheckPermission("demo:tree:list")
@GetMapping("/list")
- public AjaxResult> list(@Validated(QueryGroup.class) TestTreeBo bo) {
+ public R> list(@Validated(QueryGroup.class) TestTreeBo bo) {
List list = iTestTreeService.queryList(bo);
- return AjaxResult.success(list);
+ return R.ok(list);
}
/**
@@ -70,10 +70,10 @@ public class TestTreeController extends BaseController {
@ApiOperation("获取测试树表详细信息")
@SaCheckPermission("demo:tree:query")
@GetMapping("/{id}")
- public AjaxResult getInfo(@ApiParam("测试树ID")
+ public R getInfo(@ApiParam("测试树ID")
@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
- return AjaxResult.success(iTestTreeService.queryById(id));
+ return R.ok(iTestTreeService.queryById(id));
}
/**
@@ -84,7 +84,7 @@ public class TestTreeController extends BaseController {
@Log(title = "测试树表", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
- public AjaxResult add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
+ public R add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0);
}
@@ -96,7 +96,7 @@ public class TestTreeController extends BaseController {
@Log(title = "测试树表", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
- public AjaxResult edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
+ public R edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0);
}
@@ -107,7 +107,7 @@ public class TestTreeController extends BaseController {
@SaCheckPermission("demo:tree:remove")
@Log(title = "测试树表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@ApiParam("测试树ID串")
+ public R remove(@ApiParam("测试树ID串")
@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
index f698a140a..532c499e1 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
@@ -1,6 +1,6 @@
package com.ruoyi.demo.controller.queue;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,7 +32,7 @@ public class BoundedQueueController {
@ApiOperation("添加队列数据")
@GetMapping("/add")
- public AjaxResult add(@ApiParam("队列名") String queueName,
+ public R add(@ApiParam("队列名") String queueName,
@ApiParam("容量") int capacity) {
// 用完了一定要销毁 否则会一直存在
boolean b = QueueUtils.destroyBoundedQueueObject(queueName);
@@ -42,7 +42,7 @@ public class BoundedQueueController {
log.info("通道: {} , 设置容量: {}", queueName, capacity);
} else {
log.info("通道: {} , 设置容量失败", queueName);
- return AjaxResult.error("操作失败");
+ return R.fail("操作失败");
}
for (int i = 0; i < 11; i++) {
String data = "data-" + i;
@@ -53,30 +53,30 @@ public class BoundedQueueController {
log.info("通道: {} , 发送数据: {}", queueName, data);
}
}
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
@ApiOperation("删除队列数据")
@GetMapping("/remove")
- public AjaxResult remove(@ApiParam("队列名") String queueName) {
+ public R remove(@ApiParam("队列名") String queueName) {
String data = "data-" + 5;
if (QueueUtils.removeBoundedQueueObject(queueName, data)) {
log.info("通道: {} , 删除数据: {}", queueName, data);
} else {
- return AjaxResult.error("操作失败");
+ return R.fail("操作失败");
}
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
@ApiOperation("获取队列数据")
@GetMapping("/get")
- public AjaxResult get(@ApiParam("队列名") String queueName) {
+ public R get(@ApiParam("队列名") String queueName) {
String data;
do {
data = QueueUtils.getBoundedQueueObject(queueName);
log.info("通道: {} , 获取数据: {}", queueName, data);
} while (data != null);
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
index 77ee26812..f8777533c 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
@@ -1,6 +1,6 @@
package com.ruoyi.demo.controller.queue;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,45 +34,45 @@ public class DelayedQueueController {
@ApiOperation("订阅队列")
@GetMapping("/subscribe")
- public AjaxResult subscribe(@ApiParam("队列名") String queueName) {
+ public R subscribe(@ApiParam("队列名") String queueName) {
log.info("通道: {} 监听中......", queueName);
// 项目初始化设置一次即可
QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
// 观察接收时间
log.info("通道: {}, 收到数据: {}", queueName, orderNum);
});
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
@ApiOperation("添加队列数据")
@GetMapping("/add")
- public AjaxResult add(@ApiParam("队列名") String queueName,
+ public R add(@ApiParam("队列名") String queueName,
@ApiParam("订单号") String orderNum,
@ApiParam("延迟时间(秒)") Long time) {
QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS);
// 观察发送时间
log.info("通道: {} , 发送数据: {}", queueName, orderNum);
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
@ApiOperation("删除队列数据")
@GetMapping("/remove")
- public AjaxResult remove(@ApiParam("队列名") String queueName,
+ public R remove(@ApiParam("队列名") String queueName,
@ApiParam("订单号") String orderNum) {
if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) {
log.info("通道: {} , 删除数据: {}", queueName, orderNum);
} else {
- return AjaxResult.error("操作失败");
+ return R.fail("操作失败");
}
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
@ApiOperation("销毁队列")
@GetMapping("/destroy")
- public AjaxResult destroy(@ApiParam("队列名") String queueName) {
+ public R destroy(@ApiParam("队列名") String queueName) {
// 用完了一定要销毁 否则会一直存在
QueueUtils.destroyDelayedQueue(queueName);
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
index 08576904f..80f1b1155 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java
@@ -2,7 +2,6 @@ package com.ruoyi.demo.controller.queue;
import lombok.Data;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
/**
* 实体类 注意不允许使用内部类 否则会找不到类
@@ -11,7 +10,6 @@ import lombok.experimental.Accessors;
* @version 3.6.0
*/
@Data
-@Accessors(chain = true)
@NoArgsConstructor
public class PriorityDemo {
private String name;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
index 832cbcf33..baec18440 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
@@ -1,7 +1,7 @@
package com.ruoyi.demo.controller.queue;
import cn.hutool.core.util.RandomUtil;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,7 +32,7 @@ public class PriorityQueueController {
@ApiOperation("添加队列数据")
@GetMapping("/add")
- public AjaxResult add(@ApiParam("队列名") String queueName) {
+ public R add(@ApiParam("队列名") String queueName) {
// 用完了一定要销毁 否则会一直存在
boolean b = QueueUtils.destroyPriorityQueueObject(queueName);
log.info("通道: {} , 删除: {}", queueName, b);
@@ -42,43 +42,47 @@ public class PriorityQueueController {
log.info("通道: {} , 设置比较器成功", queueName);
} else {
log.info("通道: {} , 设置比较器失败", queueName);
- return AjaxResult.error("操作失败");
+ return R.fail("操作失败");
}
for (int i = 0; i < 10; i++) {
int randomNum = RandomUtil.randomInt(10);
- PriorityDemo data = new PriorityDemo().setName("data-" + i).setOrderNum(randomNum);
+ PriorityDemo data = new PriorityDemo();
+ data.setName("data-" + i);
+ data.setOrderNum(randomNum);
if (QueueUtils.addPriorityQueueObject(queueName, data)) {
log.info("通道: {} , 发送数据: {}", queueName, data);
} else {
log.info("通道: {} , 发送数据: {}, 发送失败", queueName, data);
}
}
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
@ApiOperation("删除队列数据")
@GetMapping("/remove")
- public AjaxResult remove(@ApiParam("队列名") String queueName,
+ public R remove(@ApiParam("队列名") String queueName,
@ApiParam("对象名") String name,
@ApiParam("排序号") Integer orderNum) {
- PriorityDemo data = new PriorityDemo().setName(name).setOrderNum(orderNum);
+ PriorityDemo data = new PriorityDemo();
+ data.setName(name);
+ data.setOrderNum(orderNum);
if (QueueUtils.removePriorityQueueObject(queueName, data)) {
log.info("通道: {} , 删除数据: {}", queueName, data);
} else {
- return AjaxResult.error("操作失败");
+ return R.fail("操作失败");
}
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
@ApiOperation("获取队列数据")
@GetMapping("/get")
- public AjaxResult get(@ApiParam("队列名") String queueName) {
+ public R get(@ApiParam("队列名") String queueName) {
PriorityDemo data;
do {
data = QueueUtils.getPriorityQueueObject(queueName);
log.info("通道: {} , 获取数据: {}", queueName, data);
} while (data != null);
- return AjaxResult.success("操作成功");
+ return R.ok("操作成功");
}
}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
index f36ae2b3f..dc19ce2c7 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
/**
* 测试单表对象 test_demo
@@ -14,7 +13,6 @@ import lombok.experimental.Accessors;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("test_demo")
public class TestDemo extends BaseEntity {
@@ -41,7 +39,7 @@ public class TestDemo extends BaseEntity {
* 排序号
*/
@OrderBy(asc = false, sort = 1)
- private Long orderNum;
+ private Integer orderNum;
/**
* key键
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
index 7459362f5..b480aa0c1 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.Version;
import com.ruoyi.common.core.domain.TreeEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
/**
* 测试树表对象 test_tree
@@ -17,9 +16,8 @@ import lombok.experimental.Accessors;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("test_tree")
-public class TestTree extends TreeEntity {
+public class TestTree extends TreeEntity {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
index 29f4ac973..211a79f14 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
@@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("测试树表业务对象")
-public class TestTreeBo extends TreeEntity {
+public class TestTreeBo extends TreeEntity {
/**
* 主键
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index f0ae61d49..3b80b15ca 100644
--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 3.5.0
+ 4.0.1
4.0.0
ruoyi-extend
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index e21cc6da8..e811fd3be 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -5,7 +5,7 @@
ruoyi-extend
com.ruoyi
- 3.5.0
+ 4.0.1
4.0.0
jar
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
index 829314b41..0b10bbd76 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
@@ -9,6 +9,6 @@ spring:
# 设置 Spring Boot Admin Server 地址
url: http://localhost:9090/admin
instance:
- prefer-ip: true # 注册实例时，优先使用 IP
+ service-host-type: IP
username: ruoyi
password: 123456
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
index e8cac1369..2e020390d 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
@@ -9,6 +9,6 @@ spring:
# 设置 Spring Boot Admin Server 地址
url: http://172.30.0.90:9090/admin
instance:
- prefer-ip: true # 注册实例时，优先使用 IP
+ service-host-type: IP
username: ruoyi
password: 123456
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index a2e640581..f59b63df4 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -4,14 +4,12 @@
ruoyi-extend
com.ruoyi
- 3.5.0
+ 4.0.1
ruoyi-xxl-job-admin
jar
- 2.1.4
- 8.0.23
@@ -62,13 +60,12 @@
org.mybatis.spring.boot
mybatis-spring-boot-starter
- ${mybatis-spring-boot-starter.version}
+ ${spring-boot.mybatis}
mysql
mysql-connector-java
- ${mysql-connector-java.version}
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
index 540a3237a..09ed519fa 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
@@ -9,7 +9,7 @@ spring:
# 设置 Spring Boot Admin Server 地址
url: http://localhost:9090/admin
instance:
- prefer-ip: true # 注册实例时，优先使用 IP
+ service-host-type: IP
username: ruoyi
password: 123456
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
index bcec9d82e..401f60af9 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
@@ -9,7 +9,7 @@ spring:
# 设置 Spring Boot Admin Server 地址
url: http://172.30.0.90:9090/admin
instance:
- prefer-ip: true # 注册实例时，优先使用 IP
+ service-host-type: IP
username: ruoyi
password: 123456
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index fe60db377..9f28913f9 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 3.5.0
+ 4.0.1
4.0.0
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
index 298eb43bf..542b16bfd 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
@@ -3,6 +3,7 @@ package com.ruoyi.framework.aspectj;
import com.ruoyi.common.annotation.RateLimiter;
import com.ruoyi.common.enums.LimitType;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import lombok.extern.slf4j.Slf4j;
@@ -37,7 +38,7 @@ public class RateLimiterAspect {
}
long number = RedisUtils.rateLimiter(combineKey, rateType, count, time);
if (number == -1) {
- throw new ServiceException("访问过于频繁，请稍候再试");
+ throw new ServiceException(MessageUtils.message("rate.limiter.message"));
}
log.info("限制令牌 => {}, 剩余令牌 => {}, 缓存key => '{}'", count, number, combineKey);
} catch (ServiceException e) {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
index e7bbbdd6b..d0422e9d7 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
@@ -5,8 +5,10 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.SecureUtil;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
@@ -14,6 +16,8 @@ import com.ruoyi.framework.config.properties.RepeatSubmitProperties;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component;
@@ -27,7 +31,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
- * 防止重复提交
+ * 防止重复提交(参考美团GTIS防重系统)
*
* @author Lion Li
*/
@@ -37,6 +41,8 @@ import java.util.concurrent.TimeUnit;
@Component
public class RepeatSubmitAspect {
+ private static final ThreadLocal KEY_CACHE = new ThreadLocal<>();
+
private final RepeatSubmitProperties repeatSubmitProperties;
@Before("@annotation(repeatSubmit)")
@@ -64,11 +70,45 @@ public class RepeatSubmitAspect {
String key = RedisUtils.getCacheObject(cacheRepeatKey);
if (key == null) {
RedisUtils.setCacheObject(cacheRepeatKey, "", interval, TimeUnit.MILLISECONDS);
+ KEY_CACHE.set(cacheRepeatKey);
} else {
- throw new ServiceException(repeatSubmit.message());
+ String message = repeatSubmit.message();
+ if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) {
+ message = MessageUtils.message(StringUtils.substring(message, 1, message.length() - 1));
+ }
+ throw new ServiceException(message);
}
}
+ /**
+ * 处理完请求后执行
+ *
+ * @param joinPoint 切点
+ */
+ @AfterReturning(pointcut = "@annotation(repeatSubmit)", returning = "jsonResult")
+ public void doAfterReturning(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Object jsonResult) {
+ if (jsonResult instanceof R) {
+ R r = (R) jsonResult;
+ if (r.getCode() == R.SUCCESS) {
+ return;
+ }
+ RedisUtils.deleteObject(KEY_CACHE.get());
+ KEY_CACHE.remove();
+ }
+ }
+
+ /**
+ * 拦截异常操作
+ *
+ * @param joinPoint 切点
+ * @param e 异常
+ */
+ @AfterThrowing(value = "@annotation(repeatSubmit)", throwing = "e")
+ public void doAfterThrowing(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Exception e) {
+ RedisUtils.deleteObject(KEY_CACHE.get());
+ KEY_CACHE.remove();
+ }
+
/**
* 参数拼装
*/
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
new file mode 100644
index 000000000..47898e3fa
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
@@ -0,0 +1,54 @@
+package com.ruoyi.framework.config;
+
+import cn.hutool.core.util.ArrayUtil;
+import com.ruoyi.common.exception.ServiceException;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+import java.util.Arrays;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * 异步配置
+ *
+ * @author Lion Li
+ */
+@EnableAsync
+@Configuration
+public class AsyncConfig extends AsyncConfigurerSupport {
+
+ @Autowired
+ @Qualifier("scheduledExecutorService")
+ private ScheduledExecutorService scheduledExecutorService;
+
+ /**
+ * 自定义 @Async 注解使用系统线程池
+ */
+ @Override
+ public Executor getAsyncExecutor() {
+ return scheduledExecutorService;
+ }
+
+ /**
+ * 异步执行异常处理
+ */
+ @Override
+ public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+ return (throwable, method, objects) -> {
+ throwable.printStackTrace();
+ StringBuilder sb = new StringBuilder();
+ sb.append("Exception message - ").append(throwable.getMessage())
+ .append(", Method name - ").append(method.getName());
+ if (ArrayUtil.isNotEmpty(objects)) {
+ sb.append(", Parameter value - ").append(Arrays.toString(objects));
+ }
+ throw new ServiceException(sb.toString());
+ };
+ }
+
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
index 6fa54e2a3..a8bec417a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
@@ -11,15 +11,14 @@ import org.redisson.config.Config;
import org.redisson.spring.cache.CacheConfig;
import org.redisson.spring.cache.RedissonSpringCacheManager;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
-import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,9 +43,9 @@ public class RedisConfig extends CachingConfigurerSupport {
@Autowired
private RedissonProperties redissonProperties;
+ @Primary
@Bean(destroyMethod = "shutdown")
- @ConditionalOnMissingBean(RedissonClient.class)
- public RedissonClient redisson() throws IOException {
+ public RedissonClient redisson() {
String prefix = REDIS_PROTOCOL_PREFIX;
if (redisProperties.isSsl()) {
prefix = REDISS_PROTOCOL_PREFIX;
@@ -68,14 +67,11 @@ public class RedisConfig extends CachingConfigurerSupport {
.setTimeout(singleServerConfig.getTimeout())
.setRetryAttempts(singleServerConfig.getRetryAttempts())
.setRetryInterval(singleServerConfig.getRetryInterval())
- .setSubscriptionsPerConnection(singleServerConfig.getSubscriptionsPerConnection())
.setClientName(singleServerConfig.getClientName())
.setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
- .setSubscriptionConnectionMinimumIdleSize(singleServerConfig.getSubscriptionConnectionMinimumIdleSize())
.setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
.setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize())
- .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize())
- .setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval());
+ .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize());
}
// 集群配置方式 参考下方注释
RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
@@ -93,19 +89,14 @@ public class RedisConfig extends CachingConfigurerSupport {
.setTimeout(clusterServersConfig.getTimeout())
.setRetryAttempts(clusterServersConfig.getRetryAttempts())
.setRetryInterval(clusterServersConfig.getRetryInterval())
- .setSubscriptionsPerConnection(clusterServersConfig.getSubscriptionsPerConnection())
.setClientName(clusterServersConfig.getClientName())
.setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
.setPingConnectionInterval(clusterServersConfig.getPingConnectionInterval())
- .setSubscriptionConnectionMinimumIdleSize(clusterServersConfig.getSubscriptionConnectionMinimumIdleSize())
.setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize())
.setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize())
.setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize())
.setSlaveConnectionMinimumIdleSize(clusterServersConfig.getSlaveConnectionMinimumIdleSize())
.setSlaveConnectionPoolSize(clusterServersConfig.getSlaveConnectionPoolSize())
- .setDnsMonitoringInterval(clusterServersConfig.getDnsMonitoringInterval())
- .setFailedSlaveReconnectionInterval(clusterServersConfig.getFailedSlaveReconnectionInterval())
- .setScanInterval(clusterServersConfig.getScanInterval())
.setReadMode(clusterServersConfig.getReadMode())
.setSubscriptionMode(clusterServersConfig.getSubscriptionMode())
.setNodeAddresses(nodes);
@@ -177,18 +168,8 @@ public class RedisConfig extends CachingConfigurerSupport {
* retryAttempts: 3
* # 命令重试发送时间间隔，单位：毫秒
* retryInterval: 1500
- * # 从可用服务器的内部列表中排除 Redis Slave 重新连接尝试的间隔。
- * failedSlaveReconnectionInterval: 3000
- * # 发布和订阅连接池最小空闲连接数
- * subscriptionConnectionMinimumIdleSize: 1
* # 发布和订阅连接池大小
* subscriptionConnectionPoolSize: 50
- * # 单个连接最大订阅数量
- * subscriptionsPerConnection: 5
- * # 扫描间隔
- * scanInterval: 1000
- * # DNS监测时间间隔，单位：毫秒
- * dnsMonitoringInterval: 5000
* # 读取模式
* readMode: "SLAVE"
* # 订阅模式
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
index 0b9024d21..eae9e3fc8 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
@@ -89,26 +89,11 @@ public class RedissonProperties {
*/
private int retryInterval;
- /**
- * 发布和订阅连接的最小空闲连接数
- */
- private int subscriptionConnectionMinimumIdleSize;
-
/**
* 发布和订阅连接池大小
*/
private int subscriptionConnectionPoolSize;
- /**
- * 单个连接最大订阅数量
- */
- private int subscriptionsPerConnection;
-
- /**
- * DNS监测时间间隔，单位：毫秒
- */
- private int dnsMonitoringInterval;
-
}
@Data
@@ -165,36 +150,11 @@ public class RedissonProperties {
*/
private int retryInterval;
- /**
- * 错误重试次数
- */
- private int failedSlaveReconnectionInterval;
-
- /**
- * 发布和订阅连接池最小空闲连接数
- */
- private int subscriptionConnectionMinimumIdleSize;
-
/**
* 发布和订阅连接池大小
*/
private int subscriptionConnectionPoolSize;
- /**
- * 单个连接最大订阅数量
- */
- private int subscriptionsPerConnection;
-
- /**
- * 扫描间隔
- */
- private int scanInterval;
-
- /**
- * DNS监测时间间隔，单位：毫秒
- */
- private int dnsMonitoringInterval;
-
/**
* 读取模式
*/
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java
index c2b3f97b6..7293e1e90 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java
@@ -18,23 +18,27 @@ import java.util.List;
public class SwaggerProperties {
/**
- * 验证码类型
+ * 文档开关
*/
private Boolean enabled;
+
/**
* 设置请求的统一前缀
*/
private String pathMapping;
+
/**
- * 验证码类别
+ * 标头
*/
private String title;
+
/**
- * 数字验证码位数
+ * 描述
*/
private String description;
+
/**
- * 字符验证码长度
+ * 项目版本
*/
private String version;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
index 81051866c..6d7c977de 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
@@ -27,26 +27,16 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
try {
if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
- Date current = new Date();
- // 创建时间为空 则填充
- if (ObjectUtil.isNull(baseEntity.getCreateTime())) {
- baseEntity.setCreateTime(current);
- }
- // 更新时间为空 则填充
- if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
- baseEntity.setUpdateTime(current);
- }
- String username = getLoginUsername();
+ Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime())
+ ? baseEntity.getCreateTime() : new Date();
+ baseEntity.setCreateTime(current);
+ baseEntity.setUpdateTime(current);
+ String username = StringUtils.isNotBlank(baseEntity.getCreateBy())
+ ? baseEntity.getCreateBy() : getLoginUsername();
// 当前已登录 且 创建人为空 则填充
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getCreateBy())) {
- baseEntity.setCreateBy(username);
- }
+ baseEntity.setCreateBy(username);
// 当前已登录 且 更新人为空 则填充
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getUpdateBy())) {
- baseEntity.setUpdateBy(username);
- }
+ baseEntity.setUpdateBy(username);
}
} catch (Exception e) {
throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
index 5098917d6..7ecc12a3f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
@@ -7,9 +7,8 @@ import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.service.UserService;
+import com.ruoyi.common.core.domain.dto.RoleDTO;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DataScopeType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.DataPermissionHelper;
@@ -74,13 +73,13 @@ public class PlusDataPermissionHandler {
inavlidCacheSet.add(mappedStatementId);
return where;
}
- SysUser currentUser = DataPermissionHelper.getVariable("user");
+ LoginUser currentUser = DataPermissionHelper.getVariable("user");
if (ObjectUtil.isNull(currentUser)) {
- currentUser = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId());
+ currentUser = LoginHelper.getLoginUser();
DataPermissionHelper.setVariable("user", currentUser);
}
// 如果是超级管理员，则不过滤数据
- if (ObjectUtil.isNull(currentUser) || currentUser.isAdmin()) {
+ if (LoginHelper.isAdmin()) {
return where;
}
String dataFilterSql = buildDataFilter(dataColumns, isSelect);
@@ -108,11 +107,11 @@ public class PlusDataPermissionHandler {
StringBuilder sqlString = new StringBuilder();
// 更新或删除需满足所有条件
String joinStr = isSelect ? " OR " : " AND ";
- SysUser user = DataPermissionHelper.getVariable("user");
+ LoginUser user = DataPermissionHelper.getVariable("user");
StandardEvaluationContext context = new StandardEvaluationContext();
context.setBeanResolver(beanResolver);
DataPermissionHelper.getContext().forEach(context::setVariable);
- for (SysRole role : user.getRoles()) {
+ for (RoleDTO role : user.getRoles()) {
user.setRoleId(role.getRoleId());
// 获取角色权限泛型
DataScopeType type = DataScopeType.findCode(role.getDataScope());
@@ -160,13 +159,13 @@ public class PlusDataPermissionHandler {
DataPermission dataPermission;
// 获取方法注解
for (Method method : methods) {
- dataPermission = dataPermissionCacheMap.get(method.getName());
+ dataPermission = dataPermissionCacheMap.get(mappedStatementId);
if (ObjectUtil.isNotNull(dataPermission)) {
return dataPermission.value();
}
if (AnnotationUtil.hasAnnotation(method, DataPermission.class)) {
dataPermission = AnnotationUtil.getAnnotation(method, DataPermission.class);
- dataPermissionCacheMap.put(method.getName(), dataPermission);
+ dataPermissionCacheMap.put(mappedStatementId, dataPermission);
return dataPermission.value();
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
index 6995fb69e..c4252b448 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
@@ -4,19 +4,16 @@ import cn.dev33.satoken.config.SaTokenConfig;
import cn.dev33.satoken.listener.SaTokenListener;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.service.UserService;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -44,20 +41,18 @@ public class UserActionListener implements SaTokenListener {
if (userType == UserType.SYS_USER) {
UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
String ip = ServletUtils.getClientIP();
- SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId());
- String tokenValue = StpUtil.getTokenValue();
- UserOnlineDTO userOnlineDTO = new UserOnlineDTO()
- .setIpaddr(ip)
- .setLoginLocation(AddressUtils.getRealAddressByIP(ip))
- .setBrowser(userAgent.getBrowser().getName())
- .setOs(userAgent.getOs().getName())
- .setLoginTime(System.currentTimeMillis())
- .setTokenId(tokenValue)
- .setUserName(user.getUserName());
- if (ObjectUtil.isNotNull(user.getDept())) {
- userOnlineDTO.setDeptName(user.getDept().getDeptName());
- }
- RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, userOnlineDTO, tokenConfig.getTimeout(), TimeUnit.SECONDS);
+ LoginUser user = LoginHelper.getLoginUser();
+ String tokenValue = StpUtil.getTokenValueByLoginId(loginId);
+ UserOnlineDTO dto = new UserOnlineDTO();
+ dto.setIpaddr(ip);
+ dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+ dto.setBrowser(userAgent.getBrowser().getName());
+ dto.setOs(userAgent.getOs().getName());
+ dto.setLoginTime(System.currentTimeMillis());
+ dto.setTokenId(tokenValue);
+ dto.setUserName(user.getUsername());
+ dto.setDeptName(user.getDeptName());
+ RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, dto, tokenConfig.getTimeout(), TimeUnit.SECONDS);
log.info("user doLogin, useId:{}, token:{}", loginId, tokenValue);
} else if (userType == UserType.APP_USER) {
// app端 自行根据业务编写
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
index bc58049db..90b265e27 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
@@ -5,10 +5,9 @@ import cn.dev33.satoken.exception.NotPermissionException;
import cn.dev33.satoken.exception.NotRoleException;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.DemoModeException;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.support.DefaultMessageSourceResolvable;
import org.springframework.validation.BindException;
@@ -32,115 +31,115 @@ import java.util.stream.Collectors;
public class GlobalExceptionHandler {
/**
- * 权限校验异常
+ * 权限码异常
*/
@ExceptionHandler(NotPermissionException.class)
- public AjaxResult handleAccessDeniedException(NotPermissionException e, HttpServletRequest request) {
+ public R handleNotPermissionException(NotPermissionException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
- log.error("请求地址'{}',权限校验失败'{}'", requestURI, e.getMessage());
- return AjaxResult.error(HttpStatus.HTTP_FORBIDDEN, "没有权限，请联系管理员授权");
+ log.error("请求地址'{}',权限码校验失败'{}'", requestURI, e.getMessage());
+ return R.fail(HttpStatus.HTTP_FORBIDDEN, "没有访问权限，请联系管理员授权");
}
/**
- * 角色校验异常
+ * 角色权限异常
*/
@ExceptionHandler(NotRoleException.class)
- public AjaxResult handleAccessDeniedException(NotRoleException e, HttpServletRequest request) {
+ public R handleNotRoleException(NotRoleException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
- log.error("请求地址'{}',角色校验失败'{}'", requestURI, e.getMessage());
- return AjaxResult.error(HttpStatus.HTTP_FORBIDDEN, "没有角色，请联系管理员授权");
+ log.error("请求地址'{}',角色权限校验失败'{}'", requestURI, e.getMessage());
+ return R.fail(HttpStatus.HTTP_FORBIDDEN, "没有访问权限，请联系管理员授权");
}
/**
* 认证失败
*/
@ExceptionHandler(NotLoginException.class)
- public AjaxResult handleAccessDeniedException(NotLoginException e, HttpServletRequest request) {
+ public R handleNotLoginException(NotLoginException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI, e.getMessage());
- return AjaxResult.error(HttpStatus.HTTP_UNAUTHORIZED, StringUtils.format("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI));
+ return R.fail(HttpStatus.HTTP_UNAUTHORIZED, "认证失败，无法访问系统资源");
}
/**
* 请求方式不支持
*/
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
- public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
+ public R handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod());
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
/**
* 业务异常
*/
@ExceptionHandler(ServiceException.class)
- public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) {
+ public R handleServiceException(ServiceException e, HttpServletRequest request) {
log.error(e.getMessage(), e);
Integer code = e.getCode();
- return ObjectUtil.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
+ return ObjectUtil.isNotNull(code) ? R.fail(code.intValue(), e.getMessage()) : R.fail(e.getMessage());
}
/**
* 拦截未知的运行时异常
*/
@ExceptionHandler(RuntimeException.class)
- public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) {
+ public R handleRuntimeException(RuntimeException e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("请求地址'{}',发生未知异常.", requestURI, e);
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
/**
* 系统异常
*/
@ExceptionHandler(Exception.class)
- public AjaxResult handleException(Exception e, HttpServletRequest request) {
+ public R handleException(Exception e, HttpServletRequest request) {
String requestURI = request.getRequestURI();
log.error("请求地址'{}',发生系统异常.", requestURI, e);
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
/**
* 自定义验证异常
*/
@ExceptionHandler(BindException.class)
- public AjaxResult handleBindException(BindException e) {
+ public R handleBindException(BindException e) {
log.error(e.getMessage(), e);
String message = e.getAllErrors().stream()
.map(DefaultMessageSourceResolvable::getDefaultMessage)
.collect(Collectors.joining(", "));
- return AjaxResult.error(message);
+ return R.fail(message);
}
/**
* 自定义验证异常
*/
@ExceptionHandler(ConstraintViolationException.class)
- public AjaxResult constraintViolationException(ConstraintViolationException e) {
+ public R constraintViolationException(ConstraintViolationException e) {
log.error(e.getMessage(), e);
String message = e.getConstraintViolations().stream()
.map(ConstraintViolation::getMessage)
.collect(Collectors.joining(", "));
- return AjaxResult.error(message);
+ return R.fail(message);
}
/**
* 自定义验证异常
*/
@ExceptionHandler(MethodArgumentNotValidException.class)
- public AjaxResult handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+ public R handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
log.error(e.getMessage(), e);
String message = e.getBindingResult().getFieldError().getDefaultMessage();
- return AjaxResult.error(message);
+ return R.fail(message);
}
/**
* 演示模式异常
*/
@ExceptionHandler(DemoModeException.class)
- public AjaxResult handleDemoModeException(DemoModeException e) {
- return AjaxResult.error("演示模式，不允许操作");
+ public R handleDemoModeException(DemoModeException e) {
+ return R.fail("演示模式，不允许操作");
}
}
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 0fb2be48e..f44a9e5f1 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 3.5.0
+ 4.0.1
4.0.0
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index c0cce7241..e9e61e72b 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -5,13 +5,12 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
-import com.ruoyi.generator.service.IGenTableColumnService;
import com.ruoyi.generator.service.IGenTableService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -38,7 +37,6 @@ import java.util.Map;
public class GenController extends BaseController {
private final IGenTableService genTableService;
- private final IGenTableColumnService genTableColumnService;
/**
* 查询代码生成列表
@@ -55,16 +53,16 @@ public class GenController extends BaseController {
*/
@ApiOperation("修改代码生成业务")
@SaCheckPermission("tool:gen:query")
- @GetMapping(value = "/{talbleId}")
- public AjaxResult> getInfo(@PathVariable Long talbleId) {
- GenTable table = genTableService.selectGenTableById(talbleId);
+ @GetMapping(value = "/{tableId}")
+ public R> getInfo(@PathVariable Long tableId) {
+ GenTable table = genTableService.selectGenTableById(tableId);
List tables = genTableService.selectGenTableAll();
- List list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
+ List list = genTableService.selectGenTableColumnListByTableId(tableId);
Map map = new HashMap();
map.put("info", table);
map.put("rows", list);
map.put("tables", tables);
- return AjaxResult.success(map);
+ return R.ok(map);
}
/**
@@ -82,10 +80,10 @@ public class GenController extends BaseController {
*/
@ApiOperation("查询数据表字段列表")
@SaCheckPermission("tool:gen:list")
- @GetMapping(value = "/column/{talbleId}")
+ @GetMapping(value = "/column/{tableId}")
public TableDataInfo columnList(Long tableId) {
TableDataInfo dataInfo = new TableDataInfo<>();
- List list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+ List list = genTableService.selectGenTableColumnListByTableId(tableId);
dataInfo.setRows(list);
dataInfo.setTotal(list.size());
return dataInfo;
@@ -98,12 +96,12 @@ public class GenController extends BaseController {
@SaCheckPermission("tool:gen:import")
@Log(title = "代码生成", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
- public AjaxResult importTableSave(String tables) {
+ public R importTableSave(String tables) {
String[] tableNames = Convert.toStrArray(tables);
// 查询表信息
List tableList = genTableService.selectDbTableListByNames(tableNames);
genTableService.importGenTable(tableList);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -113,10 +111,10 @@ public class GenController extends BaseController {
@SaCheckPermission("tool:gen:edit")
@Log(title = "代码生成", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult editSave(@Validated @RequestBody GenTable genTable) {
+ public R editSave(@Validated @RequestBody GenTable genTable) {
genTableService.validateEdit(genTable);
genTableService.updateGenTable(genTable);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -126,9 +124,9 @@ public class GenController extends BaseController {
@SaCheckPermission("tool:gen:remove")
@Log(title = "代码生成", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")
- public AjaxResult remove(@PathVariable Long[] tableIds) {
+ public R remove(@PathVariable Long[] tableIds) {
genTableService.deleteGenTableByIds(tableIds);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -137,9 +135,9 @@ public class GenController extends BaseController {
@ApiOperation("预览代码")
@SaCheckPermission("tool:gen:preview")
@GetMapping("/preview/{tableId}")
- public AjaxResult> preview(@PathVariable("tableId") Long tableId) throws IOException {
+ public R> preview(@PathVariable("tableId") Long tableId) throws IOException {
Map dataMap = genTableService.previewCode(tableId);
- return AjaxResult.success(dataMap);
+ return R.ok(dataMap);
}
/**
@@ -161,9 +159,9 @@ public class GenController extends BaseController {
@SaCheckPermission("tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
- public AjaxResult genCode(@PathVariable("tableName") String tableName) {
+ public R genCode(@PathVariable("tableName") String tableName) {
genTableService.generatorCode(tableName);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -173,9 +171,9 @@ public class GenController extends BaseController {
@SaCheckPermission("tool:gen:edit")
@Log(title = "代码生成", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}")
- public AjaxResult synchDb(@PathVariable("tableName") String tableName) {
+ public R synchDb(@PathVariable("tableName") String tableName) {
genTableService.synchDb(tableName);
- return AjaxResult.success();
+ return R.ok();
}
/**
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 915cf7dc5..45e9168e5 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -1,14 +1,11 @@
package com.ruoyi.generator.domain;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import org.apache.commons.lang3.ArrayUtils;
import javax.validation.Valid;
@@ -23,7 +20,6 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("gen_table")
public class GenTable extends BaseEntity {
@@ -104,6 +100,7 @@ public class GenTable extends BaseEntity {
/**
* 生成路径（不填默认项目路径）
*/
+ @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
private String genPath;
/**
@@ -153,6 +150,12 @@ public class GenTable extends BaseEntity {
@TableField(exist = false)
private String treeName;
+ /*
+ * 菜单id列表
+ */
+ @TableField(exist = false)
+ private List menuIds;
+
/**
* 上级菜单ID字段
*/
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index 1a978d4f1..1ea991796 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
import javax.validation.constraints.NotBlank;
@@ -20,7 +20,6 @@ import javax.validation.constraints.NotBlank;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("gen_table_column")
public class GenTableColumn extends BaseEntity {
@@ -43,7 +42,7 @@ public class GenTableColumn extends BaseEntity {
/**
* 列描述
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String columnComment;
/**
@@ -65,43 +64,43 @@ public class GenTableColumn extends BaseEntity {
/**
* 是否主键（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isPk;
/**
* 是否自增（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isIncrement;
/**
* 是否必填（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isRequired;
/**
* 是否为插入字段（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isInsert;
/**
* 是否编辑字段（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isEdit;
/**
* 是否列表字段（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isList;
/**
* 是否查询字段（1是）
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isQuery;
/**
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
index cbb92fdc4..29bfe0de8 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
@@ -16,23 +16,12 @@ import java.util.List;
@InterceptorIgnore(dataPermission = "true")
public interface GenTableMapper extends BaseMapperPlus {
-
- Page selectPageGenTableList(@Param("page") Page page, @Param("genTable") GenTable genTable);
-
Page selectPageDbTableList(@Param("page") Page page, @Param("genTable") GenTable genTable);
- /**
- * 查询业务列表
- *
- * @param genTable 业务信息
- * @return 业务集合
- */
- List selectGenTableList(GenTable genTable);
-
/**
* 查询据库列表
*
- * @param genTable 业务信息
+ * @param genTable 查询条件
* @return 数据库表集合
*/
List selectDbTableList(GenTable genTable);
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java
deleted file mode 100644
index 78260aa78..000000000
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.ruoyi.generator.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.generator.domain.GenTableColumn;
-import com.ruoyi.generator.mapper.GenTableColumnMapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 业务字段 服务层实现
- *
- * @author Lion Li
- */
-@RequiredArgsConstructor
-@Service
-public class GenTableColumnServiceImpl implements IGenTableColumnService {
-
- private final GenTableColumnMapper baseMapper;
-
- /**
- * 查询业务字段列表
- *
- * @param tableId 业务字段编号
- * @return 业务字段集合
- */
- @Override
- public List selectGenTableColumnListByTableId(Long tableId) {
- return baseMapper.selectList(new LambdaQueryWrapper()
- .eq(GenTableColumn::getTableId, tableId)
- .orderByAsc(GenTableColumn::getSort));
- }
-
- /**
- * 新增业务字段
- *
- * @param genTableColumn 业务字段信息
- * @return 结果
- */
- @Override
- public int insertGenTableColumn(GenTableColumn genTableColumn) {
- return baseMapper.insert(genTableColumn);
- }
-
- /**
- * 修改业务字段
- *
- * @param genTableColumn 业务字段信息
- * @return 结果
- */
- @Override
- public int updateGenTableColumn(GenTableColumn genTableColumn) {
- return baseMapper.updateById(genTableColumn);
- }
-
- /**
- * 删除业务字段对象
- *
- * @param ids 需要删除的数据ID
- * @return 结果
- */
- @Override
- public int deleteGenTableColumnByIds(String ids) {
- return baseMapper.deleteBatchIds(Arrays.asList(ids.split(",")));
- }
-}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 8f6a40fee..e988894b4 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -1,10 +1,15 @@
package com.ruoyi.generator.service;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants;
@@ -28,7 +33,6 @@ import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -46,6 +50,7 @@ import java.util.zip.ZipOutputStream;
*
* @author Lion Li
*/
+@DS("#header.datasource")
@Slf4j
@RequiredArgsConstructor
@Service
@@ -54,6 +59,19 @@ public class GenTableServiceImpl implements IGenTableService {
private final GenTableMapper baseMapper;
private final GenTableColumnMapper genTableColumnMapper;
+ /**
+ * 查询业务字段列表
+ *
+ * @param tableId 业务字段编号
+ * @return 业务字段集合
+ */
+ @Override
+ public List selectGenTableColumnListByTableId(Long tableId) {
+ return genTableColumnMapper.selectList(new LambdaQueryWrapper()
+ .eq(GenTableColumn::getTableId, tableId)
+ .orderByAsc(GenTableColumn::getSort));
+ }
+
/**
* 查询业务信息
*
@@ -69,13 +87,7 @@ public class GenTableServiceImpl implements IGenTableService {
@Override
public TableDataInfo selectPageGenTableList(GenTable genTable, PageQuery pageQuery) {
- Page page = baseMapper.selectPageGenTableList(pageQuery.build(), genTable);
- return TableDataInfo.build(page);
- }
-
- @Override
- public TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
- Page page = baseMapper.selectPageDbTableList(pageQuery.build(), genTable);
+ Page page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable));
return TableDataInfo.build(page);
}
@@ -87,7 +99,24 @@ public class GenTableServiceImpl implements IGenTableService {
*/
@Override
public List selectGenTableList(GenTable genTable) {
- return baseMapper.selectGenTableList(genTable);
+ return baseMapper.selectList(this.buildGenTableQueryWrapper(genTable));
+ }
+
+ private QueryWrapper buildGenTableQueryWrapper(GenTable genTable) {
+ Map params = genTable.getParams();
+ QueryWrapper wrapper = Wrappers.query();
+ wrapper.like(StringUtils.isNotBlank(genTable.getTableName()), "lower(table_name)", StringUtils.lowerCase(genTable.getTableName()))
+ .like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment()))
+ .between(params.get("beginTime") != null && params.get("endTime") != null,
+ "create_time", params.get("beginTime"), params.get("endTime"));
+ return wrapper;
+ }
+
+
+ @Override
+ public TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
+ Page page = baseMapper.selectPageDbTableList(pageQuery.build(), genTable);
+ return TableDataInfo.build(page);
}
/**
@@ -129,7 +158,6 @@ public class GenTableServiceImpl implements IGenTableService {
* @return 结果
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void updateGenTable(GenTable genTable) {
String options = JsonUtils.toJsonString(genTable.getParams());
genTable.setOptions(options);
@@ -148,7 +176,6 @@ public class GenTableServiceImpl implements IGenTableService {
* @return 结果
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void deleteGenTableByIds(Long[] tableIds) {
List ids = Arrays.asList(tableIds);
baseMapper.deleteBatchIds(ids);
@@ -161,7 +188,6 @@ public class GenTableServiceImpl implements IGenTableService {
* @param tableList 导入表列表
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void importGenTable(List tableList) {
String operName = LoginHelper.getUsername();
try {
@@ -198,6 +224,12 @@ public class GenTableServiceImpl implements IGenTableService {
Map dataMap = new LinkedHashMap<>();
// 查询表信息
GenTable table = baseMapper.selectGenTableById(tableId);
+ Snowflake snowflake = IdUtil.getSnowflake();
+ List menuIds = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
+ menuIds.add(snowflake.nextId());
+ }
+ table.setMenuIds(menuIds);
// 设置主子表信息
setSubTable(table);
// 设置主键列信息
@@ -275,7 +307,6 @@ public class GenTableServiceImpl implements IGenTableService {
* @param tableName 表名称
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public void synchDb(String tableName) {
GenTable table = baseMapper.selectGenTableByName(tableName);
List tableColumns = table.getColumns();
@@ -294,8 +325,16 @@ public class GenTableServiceImpl implements IGenTableService {
GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
column.setColumnId(prevColumn.getColumnId());
if (column.isList()) {
- // 如果是列表，继续保留字典类型
+ // 如果是列表，继续保留查询方式/字典类型选项
column.setDictType(prevColumn.getDictType());
+ column.setQueryType(prevColumn.getQueryType());
+ }
+ if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
+ && (column.isInsert() || column.isEdit())
+ && ((column.isUsableColumn()) || (!column.isSuperColumn()))) {
+ // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项
+ column.setIsRequired(prevColumn.getIsRequired());
+ column.setHtmlType(prevColumn.getHtmlType());
}
genTableColumnMapper.updateById(column);
} else {
@@ -336,6 +375,12 @@ public class GenTableServiceImpl implements IGenTableService {
private void generatorCode(String tableName, ZipOutputStream zip) {
// 查询表信息
GenTable table = baseMapper.selectGenTableByName(tableName);
+ Snowflake snowflake = IdUtil.getSnowflake();
+ List menuIds = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
+ menuIds.add(snowflake.nextId());
+ }
+ table.setMenuIds(menuIds);
// 设置主子表信息
setSubTable(table);
// 设置主键列信息
@@ -373,12 +418,13 @@ public class GenTableServiceImpl implements IGenTableService {
@Override
public void validateEdit(GenTable genTable) {
if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
- Map paramsObj = genTable.getParams();
- if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_CODE))) {
+ String options = JsonUtils.toJsonString(genTable.getParams());
+ Dict paramsObj = JsonUtils.parseMap(options);
+ if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_CODE))) {
throw new ServiceException("树编码字段不能为空");
- } else if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_PARENT_CODE))) {
+ } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_PARENT_CODE))) {
throw new ServiceException("树父编码字段不能为空");
- } else if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_NAME))) {
+ } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) {
throw new ServiceException("树名称字段不能为空");
} else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
if (StringUtils.isEmpty(genTable.getSubTableName())) {
@@ -436,13 +482,13 @@ public class GenTableServiceImpl implements IGenTableService {
* @param genTable 设置后的生成对象
*/
public void setTableFromOptions(GenTable genTable) {
- Map paramsObj = JsonUtils.parseMap(genTable.getOptions());
+ Dict paramsObj = JsonUtils.parseMap(genTable.getOptions());
if (ObjectUtil.isNotNull(paramsObj)) {
- String treeCode = Convert.toStr(paramsObj.get(GenConstants.TREE_CODE));
- String treeParentCode = Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE));
- String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
- String parentMenuId = Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
- String parentMenuName = Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_NAME));
+ String treeCode = paramsObj.getStr(GenConstants.TREE_CODE);
+ String treeParentCode = paramsObj.getStr(GenConstants.TREE_PARENT_CODE);
+ String treeName = paramsObj.getStr(GenConstants.TREE_NAME);
+ String parentMenuId = paramsObj.getStr(GenConstants.PARENT_MENU_ID);
+ String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME);
genTable.setTreeCode(treeCode);
genTable.setTreeParentCode(treeParentCode);
@@ -467,3 +513,4 @@ public class GenTableServiceImpl implements IGenTableService {
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
}
+
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
deleted file mode 100644
index f14f36a53..000000000
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ruoyi.generator.service;
-
-import com.ruoyi.generator.domain.GenTableColumn;
-
-import java.util.List;
-
-/**
- * 业务字段 服务层
- *
- * @author Lion Li
- */
-public interface IGenTableColumnService {
- /**
- * 查询业务字段列表
- *
- * @param tableId 业务字段编号
- * @return 业务字段集合
- */
- List selectGenTableColumnListByTableId(Long tableId);
-
- /**
- * 新增业务字段
- *
- * @param genTableColumn 业务字段信息
- * @return 结果
- */
- int insertGenTableColumn(GenTableColumn genTableColumn);
-
- /**
- * 修改业务字段
- *
- * @param genTableColumn 业务字段信息
- * @return 结果
- */
- int updateGenTableColumn(GenTableColumn genTableColumn);
-
- /**
- * 删除业务字段信息
- *
- * @param ids 需要删除的数据ID
- * @return 结果
- */
- int deleteGenTableColumnByIds(String ids);
-}
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
index 27fac79e3..092020a5f 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
@@ -3,6 +3,7 @@ package com.ruoyi.generator.service;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
import java.util.List;
import java.util.Map;
@@ -14,6 +15,14 @@ import java.util.Map;
*/
public interface IGenTableService {
+ /**
+ * 查询业务字段列表
+ *
+ * @param tableId 业务字段编号
+ * @return 业务字段集合
+ */
+ List selectGenTableColumnListByTableId(Long tableId);
+
TableDataInfo selectPageGenTableList(GenTable genTable, PageQuery pageQuery);
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index cb977d944..1a1d04ac3 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -41,6 +41,7 @@ public class GenUtils {
column.setJavaField(StringUtils.toCamelCase(columnName));
// 设置默认类型
column.setJavaType(GenConstants.TYPE_STRING);
+ column.setQueryType(GenConstants.QUERY_EQ);
if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
// 字符串长度超过500设置为文本域
@@ -136,8 +137,7 @@ public class GenUtils {
public static String getModuleName(String packageName) {
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
- return moduleName;
+ return StringUtils.substring(packageName, lastIndex + 1, nameLength);
}
/**
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 67296b70e..746497041 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -2,8 +2,10 @@ package com.ruoyi.generator.util;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.helper.DataBaseHelper;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -78,14 +80,14 @@ public class VelocityUtils {
public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
String options = genTable.getOptions();
- Map paramsObj = JsonUtils.parseMap(options);
+ Dict paramsObj = JsonUtils.parseMap(options);
String parentMenuId = getParentMenuId(paramsObj);
context.put("parentMenuId", parentMenuId);
}
public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
String options = genTable.getOptions();
- Map paramsObj = JsonUtils.parseMap(options);
+ Dict paramsObj = JsonUtils.parseMap(options);
String treeCode = getTreecode(paramsObj);
String treeParentCode = getTreeParentCode(paramsObj);
String treeName = getTreeName(paramsObj);
@@ -134,7 +136,15 @@ public class VelocityUtils {
templates.add("vm/java/serviceImpl.java.vm");
templates.add("vm/java/controller.java.vm");
templates.add("vm/xml/mapper.xml.vm");
- templates.add("vm/sql/sql.vm");
+ if (DataBaseHelper.isOracle()) {
+ templates.add("vm/sql/oracle/sql.vm");
+ } else if (DataBaseHelper.isPostgerSql()) {
+ templates.add("vm/sql/postgres/sql.vm");
+ } else if (DataBaseHelper.isSqlServer()) {
+ templates.add("vm/sql/sqlserver/sql.vm");
+ } else {
+ templates.add("vm/sql/sql.vm");
+ }
templates.add("vm/js/api.js.vm");
if (GenConstants.TPL_CRUD.equals(tplCategory)) {
templates.add("vm/vue/index.vue.vm");
@@ -207,8 +217,7 @@ public class VelocityUtils {
*/
public static String getPackagePrefix(String packageName) {
int lastIndex = packageName.lastIndexOf(".");
- String basePackage = StringUtils.substring(packageName, 0, lastIndex);
- return basePackage;
+ return StringUtils.substring(packageName, 0, lastIndex);
}
/**
@@ -244,14 +253,28 @@ public class VelocityUtils {
public static String getDicts(GenTable genTable) {
List columns = genTable.getColumns();
Set dicts = new HashSet();
+ addDicts(dicts, columns);
+ if (ObjectUtil.isNotNull(genTable.getSubTable())) {
+ List subColumns = genTable.getSubTable().getColumns();
+ addDicts(dicts, subColumns);
+ }
+ return StringUtils.join(dicts, ", ");
+ }
+
+ /**
+ * 添加字典列表
+ *
+ * @param dicts 字典列表
+ * @param columns 列集合
+ */
+ public static void addDicts(Set dicts, List columns) {
for (GenTableColumn column : columns) {
if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
column.getHtmlType(),
- new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) {
+ new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) {
dicts.add("'" + column.getDictType() + "'");
}
}
- return StringUtils.join(dicts, ", ");
}
/**
@@ -271,10 +294,10 @@ public class VelocityUtils {
* @param paramsObj 生成其他选项
* @return 上级菜单ID字段
*/
- public static String getParentMenuId(Map paramsObj) {
+ public static String getParentMenuId(Dict paramsObj) {
if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
- && StringUtils.isNotEmpty(Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)))) {
- return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
+ && StringUtils.isNotEmpty(paramsObj.getStr(GenConstants.PARENT_MENU_ID))) {
+ return paramsObj.getStr(GenConstants.PARENT_MENU_ID);
}
return DEFAULT_PARENT_MENU_ID;
}
@@ -298,9 +321,9 @@ public class VelocityUtils {
* @param paramsObj 生成其他选项
* @return 树父编码
*/
- public static String getTreeParentCode(Map paramsObj) {
+ public static String getTreeParentCode(Dict paramsObj) {
if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
- return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE)));
+ return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_PARENT_CODE));
}
return StringUtils.EMPTY;
}
@@ -311,9 +334,9 @@ public class VelocityUtils {
* @param paramsObj 生成其他选项
* @return 树名称
*/
- public static String getTreeName(Map paramsObj) {
+ public static String getTreeName(Dict paramsObj) {
if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) {
- return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)));
+ return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_NAME));
}
return StringUtils.EMPTY;
}
@@ -326,8 +349,8 @@ public class VelocityUtils {
*/
public static int getExpandColumn(GenTable genTable) {
String options = genTable.getOptions();
- Map paramsObj = JsonUtils.parseMap(options);
- String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
+ Dict paramsObj = JsonUtils.parseMap(options);
+ String treeName = paramsObj.getStr(GenConstants.TREE_NAME);
int num = 0;
for (GenTableColumn column : genTable.getColumns()) {
if (column.isList()) {
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index 7ef974458..7b1e9c5fa 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -30,9 +30,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 8f0c2690e..b66b25d80 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -53,100 +53,204 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
- select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
-
-
-
+
## 业务功能
diff --git a/pom.xml b/pom.xml
index 2062f0a09..b999e6e13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,30 +6,32 @@