Merge branch 'master' into 'develop'

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <groupId>com.mushiny</groupId>
     <artifactId>pubTools</artifactId>
-    <version>1.1.7-RELEASE</version>
+    <version>1.0.0-RELEASE</version>
     <packaging>jar</packaging>
     <properties>
         <java.version>8</java.version>

src/main/java/com/mushiny/pubTools/annotation/RedissonLock.java → src/main/java/com/mushiny/pubtools/annotation/RedissonLock.java

@@ -6,9 +6,9 @@
  * 版权所有，侵权必究！
  */
 
-package com.mushiny.pubTools.annotation;
+package com.mushiny.pubtools.annotation;
 
-import com.mushiny.pubTools.enums.LockType;
+import com.mushiny.pubtools.enums.LockType;
 
 import java.lang.annotation.*;
 import java.util.concurrent.TimeUnit;

src/main/java/com/mushiny/pubTools/aspect/RedissonLockAspect.java → src/main/java/com/mushiny/pubtools/aspect/RedissonLockAspect.java

-package com.mushiny.pubTools.aspect;
+package com.mushiny.pubtools.aspect;
 
-import com.mushiny.pubTools.annotation.RedissonLock;
-import com.mushiny.pubTools.execption.RedissonErrorCode;
-import com.mushiny.pubTools.execption.RedissonException;
+import com.mushiny.pubtools.annotation.RedissonLock;
+import com.mushiny.pubtools.execption.RedissonErrorCode;
+import com.mushiny.pubtools.execption.RedissonException;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -35,7 +35,7 @@ public class RedissonLockAspect {
     RedissonClient redissonClient;
 
 
-    @Pointcut("@annotation(com.mushiny.pubTools.annotation.RedissonLock)")
+    @Pointcut("@annotation(com.mushiny.pubtools.annotation.RedissonLock)")
     public void pointCut() {
 
     }

src/main/java/com/mushiny/pubTools/config/RedissonManager.java → src/main/java/com/mushiny/pubtools/config/RedissonManager.java

-package com.mushiny.pubTools.config;
+package com.mushiny.pubtools.config;
 
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;

src/main/java/com/mushiny/pubTools/enums/LockType.java → src/main/java/com/mushiny/pubtools/enums/LockType.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.mushiny.pubTools.enums;
+package com.mushiny.pubtools.enums;
 
 /**
  * 行政区域  级别枚举

src/main/java/com/mushiny/pubTools/execption/RedissonErrorCode.java → src/main/java/com/mushiny/pubtools/execption/RedissonErrorCode.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.mushiny.pubTools.execption;
+package com.mushiny.pubtools.execption;
 
 /**
  * 错误编码，由5位数字组成，前2位为模块编码，后3位为业务编码

src/main/java/com/mushiny/pubTools/execption/RedissonException.java → src/main/java/com/mushiny/pubtools/execption/RedissonException.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.mushiny.pubTools.execption;
+package com.mushiny.pubtools.execption;
 
 
 /**

src/main/java/com/mushiny/pubTools/utils/RedissonLockUtil.java → src/main/java/com/mushiny/pubtools/utils/RedissonLockUtil.java

-package com.mushiny.pubTools.utils;
+package com.mushiny.pubtools.utils;
 
-import com.mushiny.pubTools.execption.RedissonErrorCode;
-import com.mushiny.pubTools.execption.RedissonException;
+import com.mushiny.pubtools.execption.RedissonErrorCode;
+import com.mushiny.pubtools.execption.RedissonException;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;

src/main/java/com/mushiny/pubTools/utils/SnowFlakeUtil.java → src/main/java/com/mushiny/pubtools/utils/SnowFlakeUtil.java

-package com.mushiny.pubTools.utils;
+package com.mushiny.pubtools.utils;
 
 /**
  * 描述信息

src/test/java/com/mushiny/pubTools/MwmsRedissonApplicationTests.java

-package com.mushiny.pubTools;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class MwmsRedissonApplicationTests {
-
-    @Test
-    void contextLoads() {
-
-    }
-
-}

src/main/java/com/mushiny/pubTools/controller/PingApiForTestContraller.java → src/test/java/com/mushiny/pubtools/MwmsRedissonApplicationTests.java

-package com.mushiny.pubTools.controller;
+package com.mushiny.pubtools;
 
-import com.mushiny.pubTools.enums.LockType;
-import com.mushiny.pubTools.utils.RedissonLockUtil;
-import lombok.extern.slf4j.Slf4j;
+import com.mushiny.pubtools.enums.LockType;
+import com.mushiny.pubtools.utils.RedissonLockUtil;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.boot.test.context.SpringBootTest;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-@RestController
-@Slf4j
-public class PingApiForTestContraller {
+@SpringBootTest
+class MwmsRedissonApplicationTests {
 
     @Autowired
     RedissonLockUtil redissonLockUtil;
 
-    @PostMapping("api/ping")
-    public int pingApi(@RequestParam String storageBinCode, @RequestParam Long workStationId, @RequestParam Long warehouseId) {
+    @Test
+    void contextLoads() {
         String threadId = Thread.currentThread().getName() + Thread.currentThread().getId();
-        redissonLockUtil.getLockByKey(storageBinCode + workStationId + warehouseId, LockType.READ_LOCK.value());
-        Boolean getLock = redissonLockUtil.tryLock(null,  storageBinCode + workStationId + warehouseId, LockType.REENTRANT_LOCK.value());
+        redissonLockUtil.getLockByKey("2652132254444", LockType.READ_LOCK.value());
+        Boolean getLock = redissonLockUtil.tryLock(null,  "2652132254444", LockType.REENTRANT_LOCK.value());
         if (getLock) {
             System.out.println(threadId + "拿锁成功");
             try {
@@ -36,9 +33,7 @@ public class PingApiForTestContraller {
             }
         } else {
             System.out.println("拿锁失败");
-            return  1;
         }
-        return  1;
     }
 
 }