分布式锁的实现方式改为Redisson，并优化抽象接口

Author: zlt2000

zlt-business/user-center/src/main/java/com/central/user/controller/SysRoleController.java

@@ -61,7 +61,7 @@ public Result<List<SysRole>> findAll() {
      * @return
      */
     @PostMapping("/roles/saveOrUpdate")
-    public Result saveOrUpdate(@RequestBody SysRole sysRole) {
+    public Result saveOrUpdate(@RequestBody SysRole sysRole) throws Exception {
         return sysRoleService.saveOrUpdateRole(sysRole);
     }
 

zlt-business/user-center/src/main/java/com/central/user/controller/SysUserController.java

@@ -19,6 +19,8 @@
 import com.central.search.model.SearchDto;
 import com.central.user.model.SysUserExcel;
 import org.apache.commons.collections4.MapUtils;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
@@ -57,6 +59,9 @@ public class SysUserController {
     @Autowired
     private IQueryService queryService;
 
+    @Autowired
+    private RedissonClient redisson;
+
     /**
      * 当前登录用户 LoginAppUser
      *
@@ -65,6 +70,9 @@ public class SysUserController {
     @ApiOperation(value = "根据access_token当前登录用户")
     @GetMapping("/users/current")
     public Result<LoginAppUser> getLoginAppUser(@LoginUser(isFull = true) SysUser user) {
+        RLock lock = redisson.getLock("test");
+        lock.lock();
+
         return Result.succeed(appUserService.getLoginAppUser(user));
     }
 
@@ -236,7 +244,7 @@ public Result delete(@PathVariable Long id) {
     @CacheEvict(value = "user", key = "#sysUser.username")
     @PostMapping("/users/saveOrUpdate")
     @AuditLog(operation = "'新增或更新用户:' + #sysUser.username")
-    public Result saveOrUpdate(@RequestBody SysUser sysUser) {
+    public Result saveOrUpdate(@RequestBody SysUser sysUser) throws Exception {
         return appUserService.saveOrUpdateUser(sysUser);
     }
 

zlt-business/user-center/src/main/java/com/central/user/service/ISysRoleService.java

@@ -9,10 +9,13 @@
 import com.central.common.service.ISuperService;
 
 /**
-* @author zlt
+ * @author zlt
+ * <p>
+ * Blog: https://zlt2000.gitee.io
+ * Github: https://github.com/zlt2000
  */
 public interface ISysRoleService extends ISuperService<SysRole> {
-	void saveRole(SysRole sysRole);
+	void saveRole(SysRole sysRole) throws Exception;
 
 	void deleteRole(Long id);
 
@@ -28,7 +31,7 @@ public interface ISysRoleService extends ISuperService<SysRole> {
 	 * @param sysRole
 	 * @return Result
 	 */
-	Result saveOrUpdateRole(SysRole sysRole);
+	Result saveOrUpdateRole(SysRole sysRole) throws Exception;
 
 	/**
 	 * 查询所有角色

zlt-business/user-center/src/main/java/com/central/user/service/ISysUserService.java

@@ -13,7 +13,10 @@
 import com.central.common.model.SysUser;
 
 /**
-* @author zlt
+ * @author zlt
+ * <p>
+ * Blog: https://zlt2000.gitee.io
+ * Github: https://github.com/zlt2000
  */
 public interface ISysUserService extends ISuperService<SysUser> {
 	/**
@@ -98,7 +101,7 @@ public interface ISysUserService extends ISuperService<SysUser> {
 	 */
 	List<SysUserExcel> findAllUsers(Map<String, Object> params);
 
-	Result saveOrUpdateUser(SysUser sysUser);
+	Result saveOrUpdateUser(SysUser sysUser) throws Exception;
 
 	/**
 	 * 删除用户

zlt-business/user-center/src/main/java/com/central/user/service/impl/SysRoleServiceImpl.java

@@ -29,7 +29,7 @@
 @Slf4j
 @Service
 public class SysRoleServiceImpl extends SuperServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
-    private final static String LOCK_KEY_ROLECODE = CommonConstant.LOCK_KEY_PREFIX+"rolecode:";
+    private final static String LOCK_KEY_ROLECODE = "rolecode:";
 
     @Resource
     private SysUserRoleMapper userRoleMapper;
@@ -42,7 +42,7 @@ public class SysRoleServiceImpl extends SuperServiceImpl<SysRoleMapper, SysRole>
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void saveRole(SysRole sysRole) {
+    public void saveRole(SysRole sysRole) throws Exception {
         String roleCode = sysRole.getCode();
         super.saveIdempotency(sysRole, lock
                 , LOCK_KEY_ROLECODE+roleCode, new QueryWrapper<SysRole>().eq("code", roleCode), "角色code已存在");
@@ -67,7 +67,7 @@ public PageResult<SysRole> findRoles(Map<String, Object> params) {
 
     @Override
     @Transactional
-    public Result saveOrUpdateRole(SysRole sysRole) {
+    public Result saveOrUpdateRole(SysRole sysRole) throws Exception {
         if (sysRole.getId() == null) {
             this.saveRole(sysRole);
         } else {

zlt-business/user-center/src/main/java/com/central/user/service/impl/SysUserServiceImpl.java

@@ -37,7 +37,7 @@
 @Slf4j
 @Service
 public class SysUserServiceImpl extends SuperServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-    private final static String LOCK_KEY_USERNAME = CommonConstant.LOCK_KEY_PREFIX+"username:";
+    private final static String LOCK_KEY_USERNAME = "username:";
 
     @Autowired
     private PasswordEncoder passwordEncoder;
@@ -219,7 +219,7 @@ public Result updateEnabled(Map<String, Object> params) {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Result saveOrUpdateUser(SysUser sysUser) {
+    public Result saveOrUpdateUser(SysUser sysUser) throws Exception {
         if (sysUser.getId() == null) {
             if (StringUtils.isBlank(sysUser.getType())) {
                 sysUser.setType(UserType.BACKEND.name());

zlt-business/user-center/src/test/java/com/central/user/service/SysUserServiceTest.java

@@ -1,18 +1,21 @@
 package com.central.user.service;
 
+import com.central.common.lock.DistributedLock;
 import com.central.common.model.LoginAppUser;
 import static org.assertj.core.api.Assertions.*;
 
 import com.central.common.model.PageResult;
 import com.central.common.model.SysUser;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.redisson.api.RLock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * SysUserServiceTest单元测试用例
@@ -25,6 +28,20 @@ public class SysUserServiceTest {
 	@Autowired
 	private ISysUserService sysUserService;
 
+	@Autowired
+	private DistributedLock locker;
+
+	@Test
+	public void testLock() throws Exception {
+		Object lock = null;
+		try {
+			lock = locker.tryLock("test", 1000, TimeUnit.MILLISECONDS, true);
+			Thread.sleep(5000);
+		} finally {
+			locker.unlock(lock);
+		}
+	}
+
 	@Test
 	public void testFindByUsername() {
 		LoginAppUser loginAppUser = sysUserService.findByUsername("admin");

zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/AbstractDistributedLock.java

@@ -1,93 +1,48 @@
 package com.central.common.lock;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * 分布式锁顶级接口
- * 例如：
- * RETRY_TIMES=100，SLEEP_MILLIS=100
- * RETRY_TIMES * SLEEP_MILLIS = 10000 意味着如果一直获取不了锁，最长会等待10秒后抛超时异常
  *
  * @author zlt
  * @date 2018/5/29 14:12
+ * <p>
+ * Blog: https://zlt2000.gitee.io
+ * Github: https://github.com/zlt2000
  */
 public interface DistributedLock {
-
-    /**
-     * 默认超时时间
-     */
-    long TIMEOUT_MILLIS = 5000;
-
-    /**
-     * 重试次数
-     */
-    int RETRY_TIMES = 100;
-
-    /**
-     * 每次重试后等待的时间
-     */
-    long SLEEP_MILLIS = 100;
-
-    /**
-     * 获取锁
-     *
-     * @param key key
-     * @return 成功/失败
-     */
-    boolean lock(String key);
-
-    /**
-     * 获取锁
-     *
-     * @param key        key
-     * @param retryTimes 重试次数
-     * @return 成功/失败
-     */
-    boolean lock(String key, int retryTimes);
-
-    /**
-     * 获取锁
-     *
-     * @param key         key
-     * @param retryTimes  重试次数
-     * @param sleepMillis 获取锁失败的重试间隔
-     * @return 成功/失败
-     */
-    boolean lock(String key, int retryTimes, long sleepMillis);
-
-    /**
-     * 获取锁
-     *
-     * @param key    key
-     * @param expire 获取锁超时时间
-     * @return 成功/失败
-     */
-    boolean lock(String key, long expire);
-
     /**
-     * 获取锁
-     *
-     * @param key        key
-     * @param expire     获取锁超时时间
-     * @param retryTimes 重试次数
-     * @return 成功/失败
+     * 获取锁，如果获取不成功则一直等待直到lock被获取
+     * @param key 锁的key
+     * @param leaseTime 加锁的时间，超过这个时间后锁便自动解锁；
+     *                  如果leaseTime为-1，则保持锁定直到显式解锁
+     * @param unit {@code leaseTime} 参数的时间单位
+     * @param isFair 是否公平锁
+     * @return 锁对象
      */
-    boolean lock(String key, long expire, int retryTimes);
+    Object lock(String key, long leaseTime, TimeUnit unit, boolean isFair) throws Exception;
+    Object lock(String key, long leaseTime, TimeUnit unit) throws Exception;
+    Object lock(String key, boolean isFair) throws Exception;
+    Object lock(String key) throws Exception;
 
     /**
-     * 获取锁
-     *
-     * @param key         key
-     * @param expire      获取锁超时时间
-     * @param retryTimes  重试次数
-     * @param sleepMillis 获取锁失败的重试间隔
-     * @return 成功/失败
+     * 尝试获取锁，如果锁不可用则等待最多waitTime时间后放弃
+     * @param key 锁的key
+     * @param waitTime 获取锁的最大尝试时间(单位毫秒)
+     * @param leaseTime 加锁的时间，超过这个时间后锁便自动解锁；
+     *                  如果leaseTime为-1，则保持锁定直到显式解锁
+     * @param unit {@code waitTime} 和 {@code leaseTime} 参数的时间单位
+     * @return 锁对象，如果获取锁失败则为null
      */
-    boolean lock(String key, long expire, int retryTimes, long sleepMillis);
+    Object tryLock(String key, long waitTime, long leaseTime, TimeUnit unit, boolean isFair) throws Exception;
+    Object tryLock(String key, long waitTime, long leaseTime, TimeUnit unit) throws Exception;
+    Object tryLock(String key, long waitTime, TimeUnit unit, boolean isFair) throws Exception;
+    Object tryLock(String key, long waitTime, TimeUnit unit) throws Exception;
 
     /**
      * 释放锁
-     *
-     * @param key key值
-     * @return 释放结果
+     * @param lock 锁对象
      */
-    boolean releaseLock(String key);
+    void unlock(Object lock) throws Exception;
 }