Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RedisLockAspect.java

ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoAddBo.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-
+import java.util.Date;
 
 
 /**
@@ -40,4 +40,8 @@ public class TestDemoAddBo {
     @NotBlank(message = "值不能为空")
     private String value;
 
+	/** 创建时间 */
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+
 }

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

@@ -1,8 +1,10 @@
 package com.ruoyi.demo.controller;
 
-import com.ruoyi.common.annotation.RedisLock;
+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.redis.RedisLockManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -10,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.concurrent.TimeUnit;
+import java.time.LocalTime;
 
 
 /**
@@ -24,44 +26,47 @@ import java.util.concurrent.TimeUnit;
 public class RedisLockController {
 
 	@Autowired
-	private RedisLockManager redisLockManager;
+	private LockTemplate lockTemplate;
 
 	/**
-	 * #p0 标识取第一个参数为redis锁的key
+	 * 测试lock4j 注解
 	 */
-	@GetMapping("/testLock1")
-	@RedisLock(expireTime = 10, key = "#p0")
-	public AjaxResult<String> testLock1(String key, String value) {
+	@Lock4j(keys = {"#key"})
+	@GetMapping("/testLock4j")
+	public  AjaxResult<String> testLock4j(String key,String value){
+		System.out.println("start:"+key+",time:"+ LocalTime.now().toString());
 		try {
-			// 同时请求排队
-//			Thread.sleep(5000);
-			// 锁超时测试
-			Thread.sleep(11000);
+			Thread.sleep(10000);
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}
+		System.out.println("end :"+key+",time:"+LocalTime.now().toString());
 		return AjaxResult.success("操作成功",value);
 	}
 
 	/**
-	 * 测试锁工具类
+	 * 测试lock4j 工具
 	 */
-	@GetMapping("/testLock2")
-	public AjaxResult<Void> testLock(String key, Long time) {
-		try {
-			boolean flag = redisLockManager.getLock(key, time, TimeUnit.SECONDS);
-			if (flag) {
-				log.info("获取锁成功: " + key);
-				Thread.sleep(3000);
-				redisLockManager.unLock(key);
-				log.info("释放锁成功: " + key);
-			} else {
-				log.error("获取锁失败: " + key);
-			}
-		} catch (InterruptedException e) {
-			log.error(e.getMessage());
+	@GetMapping("/testLock4jLockTemaplate")
+	public  AjaxResult<String> testLock4jLockTemaplate(String key,String value){
+		final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class);
+		if (null == lockInfo) {
+			throw new RuntimeException("业务处理中,请稍后再试");
 		}
-		return AjaxResult.success();
+		// 获取锁成功，处理业务
+		try {
+			try {
+				Thread.sleep(8000);
+			} catch (InterruptedException e) {
+				//
+			}
+			System.out.println("执行简单方法1 , 当前线程:" + Thread.currentThread().getName());
+		} finally {
+			//释放锁
+			lockTemplate.releaseLock(lockInfo);
+		}
+		//结束
+		return AjaxResult.success("操作成功",value);
 	}
 
 	/**

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java

@@ -0,0 +1,52 @@
+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.demo.domain.TestDemo;
+import com.ruoyi.demo.service.ITestDemoService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 测试批量方法
+ *
+ * @author Lion Li
+ * @date 2021-05-30
+ */
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/demo/batch")
+public class TestBatchController extends BaseController {
+
+    private final ITestDemoService iTestDemoService;
+
+    /**
+     * 新增批量方法
+     */
+    @PostMapping()
+    public AjaxResult<Void> add() {
+		List<TestDemo> list = new ArrayList<>();
+		for (int i = 0; i < 1000; i++) {
+			list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
+		}
+        return toAjax(iTestDemoService.saveAll(list) ? 1 : 0);
+    }
+
+    /**
+     * 修改批量方法
+     */
+    @DeleteMapping()
+    public AjaxResult<Void> edit() {
+        return toAjax(iTestDemoService.remove(new LambdaQueryWrapper<TestDemo>()
+			.eq(TestDemo::getOrderNum, -1L)) ? 1 : 0);
+    }
+
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java

@@ -1,6 +1,8 @@
 package com.ruoyi.demo.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -23,8 +25,11 @@ public class TestDemo implements Serializable {
     private static final long serialVersionUID=1L;
 
 
-    /** 主键 */
+	/**
+	 * 主键
+	 */
     @TableId(value = "id")
+	@JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 部门id */
@@ -64,7 +69,6 @@ public class TestDemo implements Serializable {
     private String updateBy;
 
     /** 删除标志 */
-    @TableLogic
     private Long delFlag;
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java

@@ -1,13 +1,14 @@
 package com.ruoyi.demo.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
-import java.math.BigDecimal;
-import com.ruoyi.common.annotation.Excel;
 
 /**
  * 测试树表对象 test_tree
@@ -26,6 +27,7 @@ public class TestTree implements Serializable {
 
     /** 主键 */
     @TableId(value = "id")
+	@JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 父id */

ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.feign;
 
+import com.ruoyi.demo.feign.constant.FeignTestConstant;
 import com.ruoyi.demo.feign.fallback.FeignTestFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -7,10 +8,15 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * feign测试service
- *
+ * 规范接口 Service 无感调用
+ * 常量管理请求路径 更加规范
+ * 自定义容错处理 安全可靠
  * @author Lion Li
  */
-@FeignClient(name = "baidu",url = "http://www.baidu.com",fallback = FeignTestFallback.class)
+@FeignClient(
+	name = FeignTestConstant.BAIDU_NAME,
+	url = FeignTestConstant.BAIDU_URL,
+	fallback = FeignTestFallback.class)
 public interface FeignTestService {
 
     @GetMapping("/s")

ruoyi-demo/src/main/java/com/ruoyi/demo/feign/constant/FeignTestConstant.java

@@ -0,0 +1,9 @@
+package com.ruoyi.demo.feign.constant;
+
+public class FeignTestConstant {
+
+	public static final String BAIDU_NAME = "baidu";
+
+	public static final String BAIDU_URL = "http://www.baidu.com";
+
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.demo.mapper;
 
-import com.ruoyi.common.core.mybatisplus.MybatisPlusRedisCache;
-import com.ruoyi.common.core.page.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.demo.domain.TestDemo;
 import org.apache.ibatis.annotations.CacheNamespace;
 
@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.CacheNamespace;
  * @author Lion Li
  * @date 2021-05-30
  */
+// 如使需切换数据源 请勿使用缓存 会造成数据不一致现象
 @CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
 public interface TestDemoMapper extends BaseMapperPlus<TestDemo> {
 

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java

@@ -1,9 +1,7 @@
 package com.ruoyi.demo.mapper;
 
-import com.ruoyi.common.core.mybatisplus.MybatisPlusRedisCache;
-import com.ruoyi.common.core.page.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.demo.domain.TestTree;
-import org.apache.ibatis.annotations.CacheNamespace;
 
 /**
  * 测试树表Mapper接口
@@ -11,7 +9,7 @@ import org.apache.ibatis.annotations.CacheNamespace;
  * @author Lion Li
  * @date 2021-05-30
  */
-@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
+//@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
 public interface TestTreeMapper extends BaseMapperPlus<TestTree> {
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java

@@ -5,7 +5,7 @@ import com.ruoyi.demo.vo.TestDemoVo;
 import com.ruoyi.demo.bo.TestDemoQueryBo;
 import com.ruoyi.demo.bo.TestDemoAddBo;
 import com.ruoyi.demo.bo.TestDemoEditBo;
-import com.ruoyi.common.core.page.IServicePlus;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 import java.util.Collection;
@@ -18,6 +18,7 @@ import java.util.List;
  * @date 2021-05-30
  */
 public interface ITestDemoService extends IServicePlus<TestDemo> {
+
 	/**
 	 * 查询单个
 	 * @return

ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.demo.service;
 
-import com.ruoyi.common.core.page.IServicePlus;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.demo.bo.TestTreeAddBo;
 import com.ruoyi.demo.bo.TestTreeEditBo;
 import com.ruoyi.demo.bo.TestTreeQueryBo;

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java

@@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
@@ -29,7 +29,7 @@ import java.util.Map;
  * @date 2021-05-30
  */
 @Service
-public class TestDemoServiceImpl extends ServiceImpl<TestDemoMapper, TestDemo> implements ITestDemoService {
+public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDemo> implements ITestDemoService {
 
 	@Override
 	public TestDemoVo queryById(Long id) {

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java

@@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.demo.bo.TestTreeAddBo;
 import com.ruoyi.demo.bo.TestTreeEditBo;
 import com.ruoyi.demo.bo.TestTreeQueryBo;
@@ -26,13 +26,14 @@ import java.util.Map;
  * @date 2021-05-30
  */
 @Service
-public class TestTreeServiceImpl extends ServiceImpl<TestTreeMapper, TestTree> implements ITestTreeService {
+public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree> implements ITestTreeService {
 
 	@Override
 	public TestTreeVo queryById(Long id) {
 		return getVoById(id, TestTreeVo.class);
 	}
 
+//	@DataSource(DataSourceType.SLAVE) // 切换从库查询
 	@DataScope(isUser = true)
 	@Override
 	public List<TestTreeVo> queryList(TestTreeQueryBo bo) {

ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java

@@ -1,10 +1,12 @@
 package com.ruoyi.demo.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 
@@ -21,8 +23,13 @@ public class TestDemoVo {
 
 	private static final long serialVersionUID = 1L;
 
-	/** 主键 */
+	/**
+	 * 主键
+	 * 如果是自定义id 或者 雪花id
+	 * 需要增加序列化为字符串注解 因为Long到前端会失真
+	 */
 	@ApiModelProperty("主键")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/** 部门id */
@@ -52,7 +59,7 @@ public class TestDemoVo {
 
 	/** 创建时间 */
 	@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty("创建时间")
 	private Date createTime;
 
@@ -63,7 +70,7 @@ public class TestDemoVo {
 
 	/** 更新时间 */
 	@Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty("更新时间")
 	private Date updateTime;
 

ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java

@@ -1,10 +1,13 @@
 package com.ruoyi.demo.vo;
 
-import com.ruoyi.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 
@@ -23,6 +26,7 @@ public class TestTreeVo {
 
 	/** 主键 */
 	@ApiModelProperty("主键")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/** 父id */