From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播

---
 src/main/java/com/yeshi/buwan/controller/parser/CommentParser.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/parser/CommentParser.java b/src/main/java/com/yeshi/buwan/controller/parser/CommentParser.java
index 1b22a41..d26c700 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/CommentParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/CommentParser.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.GsonBuilder;
 import com.yeshi.buwan.domain.*;
+import com.yeshi.buwan.domain.system.DetailSystem;
 import com.yeshi.buwan.domain.user.LoginUser;
 import com.yeshi.buwan.dto.user.LoginInfoDto;
 import com.yeshi.buwan.dto.user.QQUserInfo;
@@ -109,29 +110,38 @@
         }
 
 
+        LoginUser lu = null;
         try {
-            LoginUser lu = userService.login(loginInfoDto);
-            if (lu != null) {
-                JSONObject object = new JSONObject();
-                object.put("LoginUid", lu.getId());
-                out.print(JsonUtil.loadTrueJson(object.toString()));
-            } else {
+            lu = userService.login(loginInfoDto);
+            if (lu == null) {
                 out.print(JsonUtil.loadFalseJson("鐧诲綍澶辫触"));
+                return;
             }
         } catch (LoginUserException e) {
             //鐢ㄦ埛涓嶅瓨鍦�
-            if (e.getCode() == LoginUserException.CODE_NO_USER && loginTypeInt == LoginUser.LOGIN_TYPE_EMAIL) {
+            if (e.getCode() == LoginUserException.CODE_NO_USER && loginTypeInt != LoginUser.LOGIN_TYPE_EMAIL) {
                 //娉ㄥ唽
                 try {
-                    userService.register(loginInfoDto);
+                    lu = userService.register(loginInfoDto);
                 } catch (RegisterUserException e1) {
                     out.print(JsonUtil.loadFalseJson("鐧诲綍澶辫触"));
+                    return;
                 }
 
             } else {
                 out.print(JsonUtil.loadFalseJson(e.getMessage()));
+                return;
             }
         }
+        if (lu != null) {
+            JSONObject object = new JSONObject();
+            object.put("LoginUid", lu.getId());
+            object.put("Portrait", lu.getPortrait());
+            object.put("NickName", lu.getName());
+            out.print(JsonUtil.loadTrueJson(object.toString()));
+        } else {
+            out.print(JsonUtil.loadFalseJson("鐧诲綍澶辫触"));
+        }
     }
 
 

--
Gitblit v1.8.0