plf 4 éve
szülő
commit
e2d44d9db9

+ 2 - 5
src/main/java/com/caimei/www/controller/authorized/document/DocumentAuthController.java

@@ -3,6 +3,7 @@ package com.caimei.www.controller.authorized.document;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.service.page.DocumentAuthService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -55,10 +56,7 @@ public class DocumentAuthController {
      * oss手机短信验证码登录
      */
     @PostMapping("/mobileCodeLogin")
-    public JsonModel mobileCodeLogin(String mobile, String code) {
-        if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(code)) {
-            return JsonModel.error("参数异常");
-        }
+    public ResponseEntity<JsonModel> mobileCodeLogin(String mobile, String code) {
         return documentAuthService.mobileCodeLogin(mobile, code);
     }
 
@@ -80,5 +78,4 @@ public class DocumentAuthController {
         }
         return documentAuthService.dataDetails(pdfId);
     }
-
 }

+ 2 - 1
src/main/java/com/caimei/www/service/page/DocumentAuthService.java

@@ -1,6 +1,7 @@
 package com.caimei.www.service.page;
 
 import com.caimei.www.pojo.JsonModel;
+import org.springframework.http.ResponseEntity;
 
 /**
  * Description
@@ -40,7 +41,7 @@ public interface DocumentAuthService {
      * @param code   验证码
      * @return
      */
-    JsonModel mobileCodeLogin(String mobile, String code);
+    ResponseEntity<JsonModel> mobileCodeLogin(String mobile, String code);
 
     /**
      * 资料列表

+ 10 - 5
src/main/java/com/caimei/www/service/page/impl/DocumentAuthServiceImpl.java

@@ -19,6 +19,8 @@ import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -105,24 +107,27 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
     }
 
     @Override
-    public JsonModel mobileCodeLogin(String mobile, String code) {
+    public ResponseEntity<JsonModel> mobileCodeLogin(String mobile, String code) {
+        HttpHeaders headers = new HttpHeaders();
+        if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(code)) {
+            return new ResponseEntity<>(JsonModel.error("参数异常"), headers, HttpStatus.OK);
+        }
         String mobileCode = (String) redisService.get(mobile + ":mobileCode");
         if (!StringUtils.isEmpty(mobileCode) && code.equals(mobileCode)) {
             OssAuthorization ossAuthorization = documentAuthDao.findOssAuthorizationByMobile(mobile);
             if (ossAuthorization != null) {
-                HttpHeaders headers = new HttpHeaders();
                 String cookie = new CookieBuilder().setKey("authorizationMobile")
                         .setValue(mobile)
                         .setMaxAge(60 * 60 * 24 * 30)
                         .setPath("/")
                         .build();
                 headers.add("Set-Cookie", cookie);
-                return JsonModel.success();
+                return new ResponseEntity<>(JsonModel.success(), headers, HttpStatus.OK);
             } else {
-                return JsonModel.error(-2, "登录失败");
+                return new ResponseEntity<>(JsonModel.error(-2, "登录失败"), headers, HttpStatus.OK);
             }
         } else {
-            return JsonModel.error("短信验证码不正确");
+            return new ResponseEntity<>(JsonModel.error("短信验证码不正确"), headers, HttpStatus.OK);
         }
     }