修改文件夹名称

pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <modules>
-        <module>redisson-lock</module>
+<!--        <module>redisson-lock</module>-->
     </modules>
     <groupId>com.mushiny</groupId>
     <artifactId>pubTools</artifactId>

redisson-lock/pom.xml

@@ -3,14 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>pubTools</artifactId>
-        <groupId>com.mushiny</groupId>
-        <version>1.0.0-RELEASE</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.7.8</version>
+        <relativePath></relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>redisson-lock</artifactId>
-
+    <packaging>jar</packaging>
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
@@ -52,6 +53,23 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>4.5.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.26</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

redisson-lock/src/main/java/com/mushiny/pubtools/annotation/RedissonLock.java → redisson-lock/src/main/java/com/mushiny/redisson/annotation/RedissonLock.java

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

redisson-lock/src/main/java/com/mushiny/pubtools/aspect/RedissonLockAspect.java → redisson-lock/src/main/java/com/mushiny/redisson/aspect/RedissonLockAspect.java

-package com.mushiny.pubtools.aspect;
+package com.mushiny.redisson.aspect;
 
-import com.mushiny.pubtools.annotation.RedissonLock;
-import com.mushiny.pubtools.execption.RedissonErrorCode;
-import com.mushiny.pubtools.execption.RedissonException;
+import com.mushiny.redisson.annotation.RedissonLock;
+import com.mushiny.redisson.execption.RedissonErrorCode;
+import com.mushiny.redisson.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.redisson.annotation.RedissonLock)")
     public void pointCut() {
 
     }

redisson-lock/src/main/java/com/mushiny/pubtools/config/RedissonManager.java → redisson-lock/src/main/java/com/mushiny/redisson/config/RedissonManager.java

-package com.mushiny.pubtools.config;
+package com.mushiny.redisson.config;
 
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
@@ -16,13 +16,13 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class RedissonManager {
 
-    @Value("${spring.redis.host}")
+    @Value("${spring.redis.host:192.168.3.104}")
     private String addresses;
 
-    @Value("${spring.redis.password}")
+    @Value("${spring.redis.password:q1w2e3r4}")
     private String password;
 
-    @Value("${spring.redis.port}")
+    @Value("${spring.redis.port:6379}")
     private String port;
 
     @Bean(destroyMethod = "shutdown")

redisson-lock/src/main/java/com/mushiny/redisson/controller/TestController.java

+package com.mushiny.redisson.controller;
+
+import com.mushiny.redisson.enums.LockType;
+import com.mushiny.redisson.utils.RedissonLockUtil;
+import com.mushiny.redisson.utils.ResultForLock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 描述信息
+ *
+ * @auther lxy
+ * @since 2023/8/10 13:03
+ */
+@RestController
+public class TestController {
+    @Autowired
+    RedissonLockUtil redissonLockUtil;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    public int count = 0;
+
+    @PostMapping ("api/ping")
+    public ResultForLock<String> contextLoads() {
+        String threadId = Thread.currentThread().getName() + Thread.currentThread().getId();
+        redissonLockUtil.getLockByKey("265213225444411", LockType.REENTRANT_LOCK.value());
+        Boolean getLock = redissonLockUtil.tryLock(50000L, "265213225444411", LockType.REENTRANT_LOCK.value());
+        if (getLock) {
+            System.out.println(threadId + "拿锁成功");
+            try {
+                count++;
+                jdbcTemplate.execute("UPDATE descrease a SET a.number =  a.number-1");
+//                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd  HH:mm:ss");
+//                Date startDate = new Date();
+//                System.out.println(threadId + "执行调度ping" + dateFormat.format(startDate));
+                Thread.sleep(2000);
+//                System.out.println("结束时间为" + dateFormat.format(new Date()));
+                System.out.println("执行数量为"+count);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return  new ResultForLock().error();
+            }finally {
+                redissonLockUtil.releaseLock("265213225444411", LockType.REENTRANT_LOCK.value());
+            }
+        } else {
+            System.out.println("拿锁失败");
+        }
+        return  new ResultForLock().ok(threadId);
+    }
+}

redisson-lock/src/main/java/com/mushiny/pubtools/enums/LockType.java → redisson-lock/src/main/java/com/mushiny/redisson/enums/LockType.java

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

redisson-lock/src/main/java/com/mushiny/pubtools/execption/RedissonErrorCode.java → redisson-lock/src/main/java/com/mushiny/redisson/execption/RedissonErrorCode.java

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

redisson-lock/src/main/java/com/mushiny/pubtools/execption/RedissonException.java → redisson-lock/src/main/java/com/mushiny/redisson/execption/RedissonException.java

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

redisson-lock/src/main/java/com/mushiny/pubtools/utils/RedissonLockUtil.java → redisson-lock/src/main/java/com/mushiny/redisson/utils/RedissonLockUtil.java

-package com.mushiny.pubtools.utils;
+package com.mushiny.redisson.utils;
 
-import com.mushiny.pubtools.execption.RedissonErrorCode;
-import com.mushiny.pubtools.execption.RedissonException;
+import com.mushiny.redisson.execption.RedissonErrorCode;
+import com.mushiny.redisson.execption.RedissonException;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -73,7 +73,7 @@ public class RedissonLockUtil {
             lock = rLock.tryLock(waitTime, TimeUnit.MILLISECONDS);
             if (!lock) {
                 log.error("分布式锁加锁:{}失败，请重新尝试");
-                throw new RedissonException(RedissonErrorCode.METHOD_IN_EXECUTION);
+//                throw new RedissonException(RedissonErrorCode.METHOD_IN_EXECUTION);
             }
         } catch (Exception e) {
             e.printStackTrace();

redisson-lock/src/main/java/com/mushiny/redisson/utils/ResultForLock.java

+/*
+ * Copyright (c) 2020 牧星仓库管理系统 All rights reserved.
+ *
+ * http://www.mushiny.com
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.mushiny.redisson.utils;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 响应数据
+ *
+ * @author Elen elen.shen@mushiny.comn
+ * @since 2.1.0
+ */
+@Data
+public class ResultForLock<T> implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 编码：0表示成功，其他值表示失败
+	 */
+	private int code = 0;
+
+	/**
+	 * 消息内容
+	 */
+	private String msg = "success";
+
+	/**
+	 * 响应数据
+	 */
+	private T data;
+
+	public ResultForLock<T> ok(T data) {
+		this.setData(data);
+		return this;
+	}
+
+	public boolean success() {
+		return code == 0;
+	}
+
+	public ResultForLock<T> error() {
+		this.code = 500;
+		this.msg = "error";
+		return this;
+	}
+
+	public ResultForLock<T> error(int code) {
+		this.code = 500;
+		this.msg = "error";
+		return this;
+	}
+
+	public ResultForLock<T> error(int code, String msg) {
+		this.code = code;
+		this.msg = msg;
+		return this;
+	}
+
+	public ResultForLock<T> error(String msg) {
+		this.code = 500;
+		this.msg = "error";
+		return this;
+	}
+
+}

redisson-lock/src/main/java/com/mushiny/pubtools/utils/SnowFlakeUtil.java → redisson-lock/src/main/java/com/mushiny/redisson/utils/SnowFlakeUtil.java

-package com.mushiny.pubtools.utils;
+package com.mushiny.redisson.utils;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
+
+import java.util.UUID;
 
 /**
  * 描述信息
@@ -8,14 +13,14 @@ package com.mushiny.pubtools.utils;
  */
 public class SnowFlakeUtil {
     /**
-     * 起始时间戳，从2021-12-01开始生成
+     * 起始时间戳，从2023-08-01开始生成
      */
-    private final static long START_STAMP = 1638288000000L;
+    private final static long START_STAMP = 1690819200000L;
 
     /**
      * 序列号占用的位数 12
      */
-    private final static long SEQUENCE_BIT = 12;
+    private final static long SEQUENCE_BIT = 22;
 
     /**
      * 机器标识占用的位数
@@ -91,6 +96,32 @@ public class SnowFlakeUtil {
                 | sequence;                             // 序列号部分
     }
 
+
+    /**
+     * 产生下一个String类型的ID
+     */
+    public synchronized String nextStrId() {
+        String prefix = RandomUtil.randomString(10);
+        long currStamp = getNewStamp();
+        if (currStamp < lastStamp) {
+            throw new RuntimeException("时钟后移，拒绝生成ID！");
+        }
+        if (currStamp == lastStamp) {
+            // 相同毫秒内，序列号自增
+            sequence = (sequence + 1) & MAX_SEQUENCE;
+            // 同一毫秒的序列数已经达到最大
+            if (sequence == 0L) {
+                currStamp = getNextMill();
+            }
+        } else {
+            // 不同毫秒内，序列号置为0
+            sequence = 0L;
+        }
+        lastStamp = currStamp;
+        Long outStamp = (currStamp - START_STAMP) << 8;
+        return prefix + outStamp;
+    }
+
     private long getNextMill() {
         long mill = getNewStamp();
         while (mill <= lastStamp) {
@@ -103,11 +134,5 @@ public class SnowFlakeUtil {
         return System.currentTimeMillis();
     }
 
-    public static void main(String[] args) {
-        // 192.168.3.104    192.168.3.221测试生成12位id
-        SnowFlakeUtil snowFlake1 = new SnowFlakeUtil(104);
-        System.out.println(snowFlake1.nextId());
-        SnowFlakeUtil snowFlake2 = new SnowFlakeUtil(221);
-        System.out.println(snowFlake2.nextId());
-    }
+
 }

redisson-lock/src/main/resources/application.yml_bak

+#server:
+#  port: 10101
+#  servlet:
+#    context-path: /
+#  shutdown: graceful #开启优雅停机，默认IMMEDIATE是立即关机
+#  tomcat:
+#    maxThreads: 1000
+#    connection-timeout: 15000ms
+#    keepAliveTimeout: 15000
+#    maxKeepAliveRequests: 200
+#
+#spring:
+#  datasource:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://localhost:3306/test?serverTimezone=GMT%2b8
+#    username: root
+#    password: 123456
+#
+#
+#
+#

redisson-lock/src/test/java/pubtools/MwmsRedissonApplicationTests.java

 package pubtools;
 
-import com.mushiny.pubtools.enums.LockType;
-import com.mushiny.pubtools.utils.RedissonLockUtil;
+import com.mushiny.redisson.enums.LockType;
+import com.mushiny.redisson.utils.RedissonLockUtil;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;