From a572c68b53dde3273229b26cee062e3dea91906a Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Wed, 10 May 2023 01:20:59 +0800
Subject: [PATCH] Update dingtalk dependencies

---
 .../java/com/schbrain/common/util/IdWorker.java    | 10 ++++++++--
 pom.xml                                            | 14 ++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/IdWorker.java b/commons/common-util/src/main/java/com/schbrain/common/util/IdWorker.java
index c8e4eb2..174e974 100644
--- a/commons/common-util/src/main/java/com/schbrain/common/util/IdWorker.java
+++ b/commons/common-util/src/main/java/com/schbrain/common/util/IdWorker.java
@@ -84,10 +84,16 @@ public class IdWorker {
         }
     }
 
+    /**
+     * generate a new id
+     */
     public static long getId() {
         return INSTANCE.nextId();
     }
 
+    /**
+     * generate a new id String
+     */
     public static String getIdStr() {
         return String.valueOf(INSTANCE.nextId());
     }
@@ -98,8 +104,8 @@ public class IdWorker {
      * @param id the nextId
      * @return the timestamp of id
      */
-    public long getIdTimestamp(long id) {
-        return idEpoch + (id >> timestampLeftShift);
+    public static long getIdTimestamp(long id) {
+        return INSTANCE.idEpoch + (id >> timestampLeftShift);
     }
 
     private synchronized long nextId() {
diff --git a/pom.xml b/pom.xml
index 9880bae..243652a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,8 +108,9 @@
         <alibabacloud-dysmsapi20170525.version>2.0.23</alibabacloud-dysmsapi20170525.version>
 
         <!-- dingtalk -->
-        <aliyun-dingtalk-sdk.version>2.0.11</aliyun-dingtalk-sdk.version>
-        <alibaba-dingtalk-sdk.version>2.0.0</alibaba-dingtalk-sdk.version>
+        <alibaba-dingtalk-service-sdk.version>2.0.0</alibaba-dingtalk-service-sdk.version>
+        <cube-sdk-java.version>1.0.2-RELEASE</cube-sdk-java.version>
+        <dingtalk.version>2.0.11</dingtalk.version>
 
         <!-- maven plugins -->
         <flatten-maven-plugin.version>1.4.1</flatten-maven-plugin.version>
@@ -531,12 +532,17 @@
             <dependency>
                 <groupId>com.aliyun</groupId>
                 <artifactId>alibaba-dingtalk-service-sdk</artifactId>
-                <version>${alibaba-dingtalk-sdk.version}</version>
+                <version>${alibaba-dingtalk-service-sdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.schbrain.cube</groupId>
+                <artifactId>cube-sdk-java</artifactId>
+                <version>${cube-sdk-java.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.aliyun</groupId>
                 <artifactId>dingtalk</artifactId>
-                <version>${aliyun-dingtalk-sdk.version}</version>
+                <version>${dingtalk.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-- 
GitLab