1

src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.aspectj.apache.bcel.generic.RET;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -104,7 +105,7 @@ public class SceneApiController extends BaseController {
     //app 使用跳转到编辑页面
     @RequestMapping("/goEditScenePage")
     @VerifySign
-    public void goEditScenePage(HttpServletRequest request, HttpServletResponse response) throws Exception{
+    public Result goEditScenePage(HttpServletRequest request, HttpServletResponse response) throws Exception{
         String phoneNum = request.getParameter("phoneNum");
         String password = request.getParameter("password");
         String sceneNum = request.getParameter("sceneNum");
@@ -144,7 +145,7 @@ public class SceneApiController extends BaseController {
                     BeanUtils.copyProperties(dbUser,user);
                 }
 
-                sendResponse(user,webSite, request,response,sceneNum,lang,vlog, pad);
+                return sendResponse(user,webSite, request,response,sceneNum,lang,vlog, pad);
             }
         }
 
@@ -184,11 +185,11 @@ public class SceneApiController extends BaseController {
         if(!SecurityUtil.MD5(passwordCode).equals(ssoUser.getPassword())) {
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
         }
-        sendResponse(ssoUser,webSite, request,response,sceneNum,lang,vlog, pad);
+        return sendResponse(ssoUser,webSite, request,response,sceneNum,lang,vlog, pad);
 
     }
 
-    private void sendResponse(UserVo user, String webSite, HttpServletRequest request,
+    private Result sendResponse(UserVo user, String webSite, HttpServletRequest request,
                               HttpServletResponse response, String sceneNum, String lang, String vlog, String pad) {
         String token = loginService.redisLogin(user.getUserName(),JSONObject.toJSONString(user),"user");
         //登录成功
@@ -218,17 +219,17 @@ public class SceneApiController extends BaseController {
 
             }
             log.info("goEditScenePage---response--website:{},redirect:{}", webSite,redirect);
-            response.sendRedirect(redirect);
+            return Result.success(redirect);
         }catch (Exception e){
             e.printStackTrace();
         }
-
+        return Result.failure("获取跳转链接失败");
     }
 
     //app调用 跳转到官网消费页面
     @RequestMapping("/goConsumptionPage")
     @VerifySign
-    public void goConsumptionPage(HttpServletRequest request, HttpServletResponse response) throws Exception{
+    public Result goConsumptionPage(HttpServletRequest request, HttpServletResponse response) throws Exception{
         String phoneNum = request.getParameter("phoneNum");
         String password = request.getParameter("password");
         String lang = request.getParameter("lang");
@@ -247,7 +248,7 @@ public class SceneApiController extends BaseController {
         if(StringUtils.isBlank(mainUrl)){
             mainUrl = "http://"+request.getRemoteHost() +"/";
         }
-        response.sendRedirect(mainUrl+ "mobile.html?token="+ loginVo.getToken() + "&app" + (lang == null ? "" : "&lang=" + lang)+"#/consumption/0" );
+        return Result.success(mainUrl+ "mobile.html?token="+ loginVo.getToken() + "&app" + (lang == null ? "" : "&lang=" + lang)+"#/consumption/0" );
     }
 
     /**