Merge branch 'pre' into dev

service/src/main/java/com/hfkj/channel/saas/utils/SaasCommon.java

@@ -42,7 +42,7 @@ public class SaasCommon {
      * @return
      */
     public Object getToken() {
-        /*try {
+        try {
             Object saasToken = redisUtil.get("SAAS_TOKEN");
             if (saasToken != null) {
                 return saasToken.toString();
@@ -72,8 +72,8 @@ public class SaasCommon {
             return null;
         } finally {
             log.info("==============end 获取token end ==============");
-        }*/
+        }
-        return "b72a5b10-3440-460d-b3e0-f9deaa76a326";
+        return null;
     }
 
     public Object getUpdateToken() {