发布 2.3.1

ruoyi/src/main/java/com/ruoyi/common/annotation/RedisLock.java

@@ -0,0 +1,27 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 分布式锁（注解模式，不推荐使用，最好用锁的工具类）
+ *
+ * @author shenxinquan
+ */
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RedisLock {
+
+	/**
+	 * 锁过期时间 默认30秒
+	 */
+	int expireTime() default 30;
+
+	/**
+	 * 锁key值
+	 */
+	String key() default "redisLockKey";
+}

ruoyi/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -13,7 +13,7 @@ import java.util.Date;
 
 /**
  * web层通用数据处理
- * 
+ *
  * @author ruoyi
  */
 public class BaseController
@@ -39,7 +39,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */

ruoyi/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -96,8 +96,12 @@ public class RedisCache {
 	 * @param collection 多个对象
 	 * @return
 	 */
-	public long deleteObject(final Collection collection) {
-		return redissonClient.getKeys().delete(Arrays.toString(collection.toArray()));
+	public void deleteObject(final Collection collection) {
+		RBatch batch = redissonClient.createBatch();
+		collection.forEach(t->{
+			batch.getBucket(t.toString()).deleteAsync();
+		});
+		batch.execute();
 	}
 
 	/**

ruoyi/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -43,9 +43,9 @@ public class PageUtils {
     public static final int DEFAULT_PAGE_NUM = 1;
 
     /**
-     * 每页显示记录数 默认值
+     * 每页显示记录数 默认值 默认查全部
      */
-    public static final int DEFAULT_PAGE_SIZE = 10;
+    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
 
     /**
      * 构建 plus 分页对象

ruoyi/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java

@@ -95,6 +95,7 @@ public class ImageUtils
         }
         finally
         {
+            IOUtils.closeQuietly(in);
             IOUtils.closeQuietly(baos);
         }
     }

ruoyi/src/main/java/com/ruoyi/demo/controller/RedisLockController.java

@@ -0,0 +1,35 @@
+package com.ruoyi.demo.controller;
+
+import com.ruoyi.common.annotation.RedisLock;
+import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 测试分布式锁的样例
+ *
+ * @author shenxinquan
+ */
+@RestController
+@RequestMapping("/demo/redisLock")
+public class RedisLockController {
+
+	/**
+	 * #p0 标识取第一个参数为redis锁的key
+	 */
+	@GetMapping("/getLock")
+	@RedisLock(expireTime = 10, key = "#p0")
+	public AjaxResult<String> getLock(String key, String value) {
+		try {
+			// 同时请求排队
+//			Thread.sleep(5000);
+			// 锁超时测试
+			Thread.sleep(11000);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		return AjaxResult.success("操作成功",value);
+	}
+}

ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import org.aspectj.lang.JoinPoint;
@@ -166,13 +167,8 @@ public class DataScopeAspect {
 				BaseEntity baseEntity = (BaseEntity) params;
 				baseEntity.getParams().put(DATA_SCOPE, sql);
 			} else {
-				try {
-					Method getParams = params.getClass().getDeclaredMethod("getParams", null);
-					Map<String, Object> invoke = (Map<String, Object>) getParams.invoke(params, null);
-					invoke.put(DATA_SCOPE, sql);
-				} catch (Exception e) {
-					// 方法未找到 不处理
-				}
+				Map<String, Object> invoke = ReflectUtils.invokeGetter(params, "params");
+				invoke.put(DATA_SCOPE, sql);
 			}
 		}
 	}

ruoyi/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java

@@ -0,0 +1,167 @@
+package com.ruoyi.framework.aspectj;
+
+
+import com.ruoyi.common.annotation.RedisLock;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 分布式锁（注解实现版本）
+ *
+ * @author shenxinquan
+ */
+
+@Slf4j
+@Aspect
+@Order(9)
+@Component
+public class RedisLockAspect {
+
+	@Autowired
+	private RedissonClient redissonClient;
+
+	private static final String LOCK_TITLE = "RedisLock_";
+
+	@Pointcut("@annotation(com.ruoyi.common.annotation.RedisLock)")
+	public void annotationPointcut() {
+	}
+
+	@Around("annotationPointcut()")
+	public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
+		// 获得当前访问的class
+		Class<?> className = joinPoint.getTarget().getClass();
+		// 获得访问的方法名
+		String methodName = joinPoint.getSignature().getName();
+		// 得到方法的参数的类型
+		Class<?>[] argClass = ((MethodSignature) joinPoint.getSignature()).getParameterTypes();
+		Object[] args = joinPoint.getArgs();
+		String key = "";
+		// 默认30秒过期时间
+		int expireTime = 30;
+
+		try {
+			// 得到访问的方法对象
+			Method method = className.getMethod(methodName, argClass);
+			method.setAccessible(true);
+			// 判断是否存在@RedisLock注解
+			if (method.isAnnotationPresent(RedisLock.class)) {
+				RedisLock annotation = method.getAnnotation(RedisLock.class);
+				key = getRedisKey(args, annotation.key());
+				expireTime = getExpireTime(annotation);
+			}
+		} catch (Exception e) {
+			throw new RuntimeException("redis分布式锁注解参数异常", e);
+		}
+
+		Object res;
+		try {
+			if (acquire(key, expireTime, TimeUnit.SECONDS)) {
+				try {
+					res = joinPoint.proceed();
+					return res;
+				} catch (Exception e) {
+					throw new RuntimeException(e);
+				} finally {
+					release(key);
+				}
+			} else {
+				throw new RuntimeException("redis分布式锁注解参数异常");
+			}
+		} catch (IllegalMonitorStateException e) {
+			log.error("lock timeout => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
+			throw new RuntimeException("lock timeout => key : " + key);
+		} catch (Exception e) {
+			throw new Exception("redis分布式未知异常", e);
+		}
+	}
+
+	private int getExpireTime(RedisLock annotation) {
+		return annotation.expireTime();
+	}
+
+	private String getRedisKey(Object[] args, String primalKey) {
+		if (args.length == 0) {
+			return primalKey;
+		}
+		// 获取#p0...集合
+		List<String> keyList = getKeyParsList(primalKey);
+		for (String keyName : keyList) {
+			int keyIndex = Integer.parseInt(keyName.toLowerCase().replace("#p", ""));
+			Object parValue = args[keyIndex];
+			primalKey = primalKey.replace(keyName, String.valueOf(parValue));
+		}
+		return primalKey.replace("+", "").replace("'", "");
+	}
+
+	/**
+	 * 获取key中#p0中的参数名称
+	 */
+	private static List<String> getKeyParsList(String key) {
+		List<String> listPar = new ArrayList<>();
+		if (key.contains("#")) {
+			int plusIndex = key.substring(key.indexOf("#")).indexOf("+");
+			int indexNext = 0;
+			String parName;
+			int indexPre = key.indexOf("#");
+			if (plusIndex > 0) {
+				indexNext = key.indexOf("#") + plusIndex;
+				parName = key.substring(indexPre, indexNext);
+			} else {
+				parName = key.substring(indexPre);
+			}
+			listPar.add(parName.trim());
+			key = key.substring(indexNext + 1);
+			if (key.contains("#")) {
+				listPar.addAll(getKeyParsList(key));
+			}
+		}
+		return listPar;
+	}
+
+	/**
+	 * 加锁（RLock）带超时时间的
+	 */
+	private boolean acquire(String key, long expire, TimeUnit expireUnit) {
+		//声明key对象
+		key = LOCK_TITLE + key;
+		try {
+			//获取锁对象
+			RLock mylock = redissonClient.getLock(key);
+			//加锁，并且设置锁过期时间，防止死锁的产生
+			mylock.tryLock(expire, expire, expireUnit);
+		} catch (InterruptedException e) {
+			return false;
+		}
+		log.info("lock => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
+		//加锁成功
+		return true;
+	}
+
+	/**
+	 * 锁的释放
+	 */
+	private void release(String lockName) {
+		//必须是和加锁时的同一个key
+		String key = LOCK_TITLE + lockName;
+		//获取所对象
+		RLock mylock = redissonClient.getLock(key);
+		//释放锁（解锁）
+		mylock.unlock();
+		log.info("unlock => key : " + key + " , ThreadName : " + Thread.currentThread().getName());
+	}
+
+}

ruoyi/src/main/java/com/ruoyi/framework/config/RedisConfig.java

@@ -1,5 +1,6 @@
 package com.ruoyi.framework.config;
 
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.framework.config.properties.RedissonProperties;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
@@ -52,7 +53,7 @@ public class RedisConfig extends CachingConfigurerSupport {
 			.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
 			.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
 			.setDatabase(redisProperties.getDatabase())
-			.setPassword(redisProperties.getPassword())
+			.setPassword(StrUtil.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
 			.setTimeout(singleServerConfig.getTimeout())
 			.setRetryAttempts(singleServerConfig.getRetryAttempts())
 			.setRetryInterval(singleServerConfig.getRetryInterval())

ruoyi/src/main/resources/application-dev.yml

@@ -81,7 +81,7 @@ redisson:
   # 单节点配置
   singleServerConfig:
     # 客户端名称
-    clientName: ${ruoyi-vue-plus.name}
+    clientName: ${ruoyi.name}
     # 最小空闲连接数
     connectionMinimumIdleSize: 32
     # 连接池大小

ruoyi/src/main/resources/application-prod.yml

@@ -81,7 +81,7 @@ redisson:
   # 单节点配置
   singleServerConfig:
     # 客户端名称
-    clientName: ${ruoyi-vue-plus.name}
+    clientName: ${ruoyi.name}
     # 最小空闲连接数
     connectionMinimumIdleSize: 32
     # 连接池大小

ruoyi/src/main/resources/application.yml

@@ -8,8 +8,8 @@ ruoyi:
   copyrightYear: 2021
   # 实例演示开关
   demoEnabled: true
-  # 文件路径,使用jvm系统变量,兼容windows和linux;
-  profile: ${user.dir}/ruoyi/uploadPath
+  # 文件路径
+  profile: ./ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
 

ruoyi/src/main/resources/vm/java/vo.java.vm

@@ -29,7 +29,7 @@ public class ${ClassName}Vo {
 	private ${pkColumn.javaType} ${pkColumn.javaField};
 
 #foreach ($column in $columns)
-#if($column.isList)
+#if($column.isList && $column.isPk!=1)
 	/** $column.columnComment */
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)

ruoyi/src/main/resources/vm/vue/index-tree.vue.vm

@@ -247,7 +247,7 @@
 #end
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -302,6 +302,8 @@ export default {
   },
   data() {
     return {
+	  //按钮loading
+	  buttonLoading: false,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -480,12 +482,14 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+	  this.loading = true;
       this.reset();
       this.getTreeselect();
       if (row != null) {
         this.form.${treeParentCode} = row.${treeCode};
       }
       get${BusinessName}(row.${pkColumn.javaField}).then(response => {
+	    this.loading = false;
         this.form = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
@@ -500,6 +504,7 @@ export default {
     submitForm() {
       this.#[[$]]#refs["form"].validate(valid => {
         if (valid) {
+		  this.buttonLoading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
@@ -507,12 +512,14 @@ export default {
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
+			  this.buttonLoading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             add${BusinessName}(this.form).then(response => {
+			  this.buttonLoading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -527,9 +534,11 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }).then(() => {
+		  this.loading = true;
           return del${BusinessName}(row.${pkColumn.javaField});
         }).then(() => {
+		  this.loading = false;
           this.getList();
           this.msgSuccess("删除成功");
         })

ruoyi/src/main/resources/vm/vue/index.vue.vm

@@ -301,7 +301,7 @@
 #end
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -353,6 +353,8 @@ export default {
   },
   data() {
     return {
+	  //按钮loading
+	  buttonLoading: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -534,9 +536,11 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.loading = true;
       this.reset();
       const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
       get${BusinessName}(${pkColumn.javaField}).then(response => {
+        this.loading = false;
         this.form = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
@@ -554,6 +558,7 @@ export default {
     submitForm() {
       this.#[[$]]#refs["form"].validate(valid => {
         if (valid) {
+          this.buttonLoading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
           this.form.$column.javaField = this.form.${column.javaField}.join(",");
@@ -564,12 +569,14 @@ export default {
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
+              this.buttonLoading = false;
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             add${BusinessName}(this.form).then(response => {
+              this.buttonLoading = false;
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -585,9 +592,11 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.loading = true;
           return del${BusinessName}(${pkColumn.javaField}s);
         }).then(() => {
+          this.loading = false;
           this.getList();
           this.msgSuccess("删除成功");
         })