From dc01f2c11e1b52e7e3fd874e06553aa9ea80bc5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 15 Jun 2023 13:41:54 +0800
Subject: [PATCH] 'commit'

---
 .../com/dsideal/FengHuang/DingTalk/Full.java  | 19 +++----------
 .../dsideal/FengHuang/DingTalk/Increment.java | 28 +++----------------
 .../DingTalk/Util/DingTalkCommon.java         | 20 +++++++++++++
 3 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/dsideal/FengHuang/DingTalk/Full.java b/src/main/java/com/dsideal/FengHuang/DingTalk/Full.java
index a99c49c..0aad79b 100644
--- a/src/main/java/com/dsideal/FengHuang/DingTalk/Full.java
+++ b/src/main/java/com/dsideal/FengHuang/DingTalk/Full.java
@@ -12,23 +12,12 @@ import com.jfinal.plugin.redis.RedisPlugin;
 public class Full {
 
     public static void main(String[] args_) throws Exception {
-        PropKit.use("dingtalk.properties");
-        final String appKey = PropKit.get("appKey");
-        String appSecret = PropKit.get("appSecret");
-
-        DruidPlugin druid = DingTalkCommon.createDruidPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"), PropKit.get("password").trim(), PropKit.get("driverClassName"));
-        druid.start();
-
-        ActiveRecordPlugin arp = new ActiveRecordPlugin(druid);
-        arp.setDevMode(false);
-        arp.setDialect(new MysqlDialect());
-        arp.start();
-
-        // 用于缓存模块的redis服务
-        RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000);
-        redis.start();
+        //启动数据库链接
+        DingTalkCommon.Start();
 
         //accessToken
+        final String appKey = PropKit.get("appKey");
+        String appSecret = PropKit.get("appSecret");
         String accessToken = DingTalkCommon.getAccessToken(appKey, appSecret);
 
         //同步钉钉与云平台中部门信息
diff --git a/src/main/java/com/dsideal/FengHuang/DingTalk/Increment.java b/src/main/java/com/dsideal/FengHuang/DingTalk/Increment.java
index ad4a2e5..b685fcf 100644
--- a/src/main/java/com/dsideal/FengHuang/DingTalk/Increment.java
+++ b/src/main/java/com/dsideal/FengHuang/DingTalk/Increment.java
@@ -2,40 +2,20 @@ package com.dsideal.FengHuang.DingTalk;
 
 import com.dsideal.FengHuang.DingTalk.Util.DingTalkCommon;
 import com.dsideal.FengHuang.DingTalk.Util.Model;
-import com.dsideal.FengHuang.DingTalk.Util.OrgPerson;
 import com.dsideal.FengHuang.DingTalk.Util.Progress;
 import com.dsideal.FengHuang.Util.CommonUtil;
 import com.jfinal.kit.PropKit;
-import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
-import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
-import com.jfinal.plugin.druid.DruidPlugin;
-import com.jfinal.plugin.redis.RedisPlugin;
-
-import java.util.Date;
-import java.util.List;
 
 public class Increment {
 
     public static void main(String[] args_) throws Exception {
-        PropKit.use("dingtalk.properties");
-        final String appKey = PropKit.get("appKey");
-        String appSecret = PropKit.get("appSecret");
-
-        DruidPlugin druid = DingTalkCommon.createDruidPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"), PropKit.get("password").trim(), PropKit.get("driverClassName"));
-        druid.start();
-
-        ActiveRecordPlugin arp = new ActiveRecordPlugin(druid);
-        arp.setDevMode(false);
-        arp.setDialect(new MysqlDialect());
-        arp.start();
-
-        // 用于缓存模块的redis服务
-        RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000);
-        redis.start();
+        //启动数据库链接
+        DingTalkCommon.Start();
 
         //accessToken
+        final String appKey = PropKit.get("appKey");
+        String appSecret = PropKit.get("appSecret");
         String accessToken = DingTalkCommon.getAccessToken(appKey, appSecret);
 
         //同步钉钉与云平台中部门信息
diff --git a/src/main/java/com/dsideal/FengHuang/DingTalk/Util/DingTalkCommon.java b/src/main/java/com/dsideal/FengHuang/DingTalk/Util/DingTalkCommon.java
index 639313c..36e1e64 100644
--- a/src/main/java/com/dsideal/FengHuang/DingTalk/Util/DingTalkCommon.java
+++ b/src/main/java/com/dsideal/FengHuang/DingTalk/Util/DingTalkCommon.java
@@ -9,11 +9,15 @@ import com.aliyun.dingtalkoauth2_1_0.models.GetSsoAccessTokenRequest;
 import com.aliyun.dingtalkoauth2_1_0.models.GetSsoAccessTokenResponse;
 import com.aliyun.tea.TeaException;
 import com.dsideal.FengHuang.Util.CommonUtil;
+import com.jfinal.kit.PropKit;
 import com.jfinal.kit.StrKit;
+import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.plugin.redis.Redis;
+import com.jfinal.plugin.redis.RedisPlugin;
 
 import java.util.Calendar;
 
@@ -43,6 +47,22 @@ public class DingTalkCommon {
         return druidPlugin;
     }
 
+    public static void Start(){
+        PropKit.use("dingtalk.properties");
+
+        DruidPlugin druid = DingTalkCommon.createDruidPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"), PropKit.get("password").trim(), PropKit.get("driverClassName"));
+        druid.start();
+
+        ActiveRecordPlugin arp = new ActiveRecordPlugin(druid);
+        arp.setDevMode(false);
+        arp.setDialect(new MysqlDialect());
+        arp.start();
+
+        // 用于缓存模块的redis服务
+        RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000);
+        redis.start();
+    }
+
     /**
      * 使用 Token 初始化账号Client
      *