Merge pull request #60 from zhangbin1010/dev

Dev

Author: zhangbinhub

cloud/acp-admin-cloud-dependencies/src/main/kotlin/pers/acp/admin/common/serialnumber/GenerateSerialNumber.kt

@@ -14,22 +14,22 @@ class GenerateSerialNumber(private val redisTemplate: RedisTemplate<Any, Any>) {
     /**
      * 生成序列号
      * @param keyString 序列号键名称
-     * @param expirationTime 过期时间（重新计数超时时间）
+     * @param expirationTime 过期时间（重新计数超时时间），单位毫秒，默认24小时
      */
     @JvmOverloads
-    fun getSerialNumber(keyString: String = CommonTools.getNowString(), expirationTime: Long = 86400000): Long {
-        val result = redisTemplate.execute { connection ->
-            connection.execute("incr", keyString.toByteArray())
-        } as Long
-        if (result == 1L) {
-            GlobalScope.launch {
-                redisTemplate.execute { connection ->
-                    connection.execute("pexpire",
-                            keyString.toByteArray(),
-                            expirationTime.toString().toByteArray())
+    fun getSerialNumber(keyString: String = CommonTools.getNowString(), expirationTime: Long = 86400000): Long =
+            (redisTemplate.execute { connection ->
+                connection.execute("incr", keyString.toByteArray())
+            } as Long).also {
+                if (it == 1L) {
+                    GlobalScope.launch {
+                        redisTemplate.execute { connection ->
+                            connection.execute("pexpire",
+                                    keyString.toByteArray(),
+                                    expirationTime.toString().toByteArray())
+                        }
+                    }
                 }
             }
-        }
-        return result
-    }
+
 }

cloud/oauth-server/src/test/java/pers/acp/admin/oauth/test/TestSerialNumber.java

@@ -17,7 +17,7 @@ class TestSerialNumber extends BaseTest {
 
     @Test
     void testGenerateSerialNumber() throws InterruptedException {
-        String key = "321";
+        String key = "serial_number";
         long number = generateSerialNumber.getSerialNumber(key, 10000);
         System.out.println(CommonTools.getNowTimeString() + " 第一次获取序列号（超时时间10秒）：" + number);
         new Thread(() -> {