src/main/java/com/yutou/qqbot/QQBotApplication.java

@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class QQBotApplication {
-    public static final String version="QQBot v.1.3.2";
+    public static final String version="QQBot v.1.3.1";
     public static void main(String[] args) {
         System.out.println("version = " + version);
         SpringApplication.run(QQBotApplication.class, args);

src/main/java/com/yutou/qqbot/utlis/RedisTools.java

@@ -14,7 +14,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
@@ -25,7 +24,7 @@ public class RedisTools {
     private static String host;
     private static int port;
     public static int TOKEN_TIMEOUT_DEFAULT = 360;
-    public final static int DATABASES_ALI_OSS = 4;
+    public final static int DATABASES_ALI_OSS=4;
 
     private RedisTools() {
 
@@ -58,13 +57,13 @@ public class RedisTools {
         return true;
     }
 
-    public static boolean set(String key, String value, long timeout, int db) {
+    public static boolean set (String key,String value, long timeout,int db){
         try {
             if (isNotInstallRedis) {
                 return false;
             }
             Jedis jedis = getRedis();
-            if (db > -1) {
+            if(db>-1){
                 jedis.select(db);
             }
             if (timeout == -1) {
@@ -82,11 +81,11 @@ public class RedisTools {
     }
 
     public static boolean set(Object key, String value) {
-        return set(QQBOT_USER, key + "", value);
+        return set(QQBOT_USER, key+"", value);
     }
 
     public static boolean set(String key, String value, long timeout) {
-        return set(key, value, timeout, QQBOT_USER);
+        return set(key, value, timeout,QQBOT_USER);
     }
 
     public static String get(String key, int dbIndex) {
@@ -106,19 +105,19 @@ public class RedisTools {
     }
 
     public static String get(Object key) {
-        return get(key + "", QQBOT_USER);
+        return get(key+"", QQBOT_USER);
     }
 
-    public static String get(Object key, String defValue) {
+    public static String get(Object key,String defValue){
-        String ret = get(key);
+        String ret=get(key);
-        if (StringUtils.isEmpty(ret)) {
+        if(StringUtils.isEmpty(ret)){
-            return defValue;
+            return  defValue;
         }
         return ret;
     }
 
     public static boolean remove(String key) {
-        return remove(key, QQBOT_USER);
+       return remove(key,QQBOT_USER);
     }
 
     public static void removeLoginState(String uid) {
@@ -138,22 +137,20 @@ public class RedisTools {
         jedis.close();
         return tmp;
     }
-
+    public static boolean exists(Object key,String value){
-    public static boolean exists(Object key, String value) {
+        return exists(QQBOT_USER,key,value);
-        return exists(QQBOT_USER, key, value);
     }
-
+    public static boolean exists(int db,Object key, String value) {
-    public static boolean exists(int db, Object key, String value) {
         if (isNotInstallRedis) {
             return false;
         }
         Jedis jedis = getRedis();
         jedis.select(db);
-        boolean flag = false;
+        boolean flag=false;
-        if (value == null) {
+        if(value==null){
-            flag = jedis.exists(key + "");
+            flag= jedis.exists(key+"");
-        } else {
+        }else {
-            flag = value.equals(jedis.get(key + ""));
+            flag = value.equals(jedis.get(key+""));
         }
         jedis.close();
         return flag;
@@ -188,45 +185,13 @@ public class RedisTools {
 
     public static boolean list_isExist(String listName, String value) {
         Jedis jedis = getRedis();
+        jedis.select(QQBOT_USER);
         boolean flag = jedis.sismember(listName, value);
         jedis.close();
         return flag;
     }
-
-    public static String getHashMap(String hashKey, String key) {
-        Jedis jedis = getRedis();
-        return jedis.hget(hashKey, key);
-    }
-
-    public static Map<String, String> getHashMap(String hashKey) {
-        return getRedis().hgetAll(hashKey);
-    }
-
-    public static boolean setHashMap(String hashKey, String key, String value) {
-        Jedis jedis = getRedis();
-        long l = jedis.hsetnx(hashKey, key, value);
-        jedis.close();
-        return l > 0;
-    }
-
-    public static boolean removeHashMap(String hashKey, String key) {
-        Jedis jedis = getRedis();
-        long l = jedis.hdel(hashKey, key);
-        jedis.close();
-        return l > 0;
-    }
-
-    public static boolean removeHashMap(String hashKey) {
-        Jedis jedis = getRedis();
-        long del = jedis.del(hashKey);
-        return del > 0;
-
-    }
-
     public static Jedis getRedis() {
-        Jedis jedis = new Jedis(host, port);
+        return new Jedis(host, port);
-        jedis.select(QQBOT_USER);
-        return jedis;
     }
 
     public static boolean remove(String key, int index) {
@@ -235,9 +200,13 @@ public class RedisTools {
         }
         Jedis jedis = getRedis();
         jedis.select(index);
-        long i = jedis.del(key);
+        Long i = jedis.del(key);
         jedis.close();
-        return i > 0;
+        if (i > 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     private static class PropertyUtil {
@@ -318,7 +287,7 @@ public class RedisTools {
                     system("cmd", message);
                     break;
                 case "msg":
-                    AppTools.sendServer("来自服务姬的通知~", message);
+                    AppTools.sendServer("来自服务姬的通知~",message);
                     break;
             }
         }
@@ -355,6 +324,7 @@ public class RedisTools {
         }
 
 
+
         public static void bot(String value) {
             switch (value) {
                 case "getip":
@@ -365,12 +335,10 @@ public class RedisTools {
             }
         }
     }
-
     public static void processOut(InputStream inputStream) {
-        processOut(inputStream, null, true);
+        processOut(inputStream,null,true);
     }
-
+    public static void processOut(InputStream inputStream, ObjectInterface objectInterface, boolean isOutQQBot){
-    public static void processOut(InputStream inputStream, ObjectInterface objectInterface, boolean isOutQQBot) {
         String tmp;
         StringBuilder str = new StringBuilder();
         try {
@@ -383,15 +351,14 @@ public class RedisTools {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (objectInterface != null) {
+        if(objectInterface!=null){
             objectInterface.out(str.toString());
         }
-        //  Log.i("cmd > " + str);
+      //  Log.i("cmd > " + str);
-        if (isOutQQBot) {
+        if(isOutQQBot) {
             QQBotManager.getInstance().sendMessage(str.toString());
         }
     }
-
     public static void main(String[] args) {
         RedisTools.pullMsg("msg", "abc");
     }