'commit'

src/main/java/com/dsideal/QingLong/LoginPerson/Controller/LoginPersonController.java

@@ -498,7 +498,7 @@ public class LoginPersonController extends Controller {
         map.put("ticket", ticket);
         JSONObject jo = SyncUtil.getJson(url, map, "GET");
         Kv kv = Kv.create();
-        if (StrKit.isBlank(jo.getJSONObject("result").getString("user_id"))) {
+        if (StrKit.isBlank(jo.getJSONObject("result").toString()) || StrKit.isBlank(jo.getJSONObject("result").getString("user_id"))) {
             kv.set("success", false);
             kv.set("message", "验证票据失败！");
             renderJson(kv);
@@ -506,7 +506,9 @@ public class LoginPersonController extends Controller {
         }
         kv.set("success", true);
         kv.set("message", "验证票据成功！");
-        kv.set("user_id", jo.getJSONObject("result").getString("user_id"));
+        //天喻的GUID号是去掉了-线的，我需要把它补全
+        String user_id = CommonUtil.getBigUuid(jo.getJSONObject("result").getString("user_id"));
+        kv.set("user_id", user_id);
         kv.set("user_name", jo.getJSONObject("result").getString("name"));
         renderJson(kv);
     }

src/main/java/com/dsideal/QingLong/Util/CommonUtil.java

@@ -634,4 +634,30 @@ public class CommonUtil {
         output = output.replaceAll("\\（.*?\\）", "");
         return output;
     }
+
+    /**
+     * 功能：获取小写的uuid,去掉-线的
+     *
+     * @param bigUuid
+     * @return
+     */
+    public static String getSmallUuid(String bigUuid) {
+        return bigUuid.replace("-", "").toLowerCase();
+    }
+
+    /**
+     * 功能：获取大写的uuid
+     *
+     * @param smallUuid
+     * @return
+     */
+    public static String getBigUuid(String smallUuid) {
+        //天喻的GUID号是去掉了-线的，我需要把它补全
+        StringBuilder sb = new StringBuilder(smallUuid);
+        sb.insert(8, "-");
+        sb.insert(13, "-");
+        sb.insert(18, "-");
+        sb.insert(23, "-");
+        return sb.toString().toUpperCase();
+    }
 }