资料系统6

src/main/java/com/caimei/www/controller/authorized/document/DocumentAuthController.java

@@ -1,6 +1,7 @@
 package com.caimei.www.controller.authorized.document;
 
 import com.caimei.www.pojo.JsonModel;
+import com.caimei.www.pojo.document.OssAuthorization;
 import com.caimei.www.service.page.DocumentAuthService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -24,15 +25,6 @@ public class DocumentAuthController {
         this.documentAuthService = documentAuthService;
     }
 
-    /**
-     * 获取cookie数据,判断是否登录
-     */
-    @GetMapping("authorization")
-    public JsonModel getAuthorizationCookie(@CookieValue(value = "authorizationMobile", required = false) String authorizationMobile) {
-        return documentAuthService.getAuthorizationCookie(authorizationMobile);
-
-    }
-
     /**
      * 获取图形验证码
      */
@@ -56,15 +48,19 @@ public class DocumentAuthController {
      * oss手机短信验证码登录
      */
     @PostMapping("/mobileCodeLogin")
-    public ResponseEntity<JsonModel> mobileCodeLogin(String mobile, String code) {
-        return documentAuthService.mobileCodeLogin(mobile, code);
+    public ResponseEntity<JsonModel> mobileCodeLogin(OssAuthorization authorization) {
+        return documentAuthService.mobileCodeLogin(authorization);
     }
 
     /**
      * 资料列表
      */
     @GetMapping("/dataList")
-    public JsonModel dataList(String name, Integer pageNum, Integer pageSize) {
+    public JsonModel dataList(@CookieValue(value = "authorizationMobile", required = false) String mobile, String name, Integer pageNum, Integer pageSize) {
+        Boolean isLogin = documentAuthService.getAuthorizationCookie(mobile);
+        if (!isLogin) {
+            return JsonModel.error(-99, "请登录");
+        }
         return documentAuthService.dataList(name, pageNum, pageSize);
     }
 
@@ -72,7 +68,11 @@ public class DocumentAuthController {
      * 资料详情
      */
     @GetMapping("/dataDetails")
-    public JsonModel dataDetails(Integer pdfId) {
+    public JsonModel dataDetails(@CookieValue(value = "authorizationMobile", required = false) String mobile, Integer pdfId) {
+        Boolean isLogin = documentAuthService.getAuthorizationCookie(mobile);
+        if (!isLogin) {
+            return JsonModel.error(-99, "请登录");
+        }
         if (pdfId == null) {
             return JsonModel.error("参数异常");
         }

src/main/java/com/caimei/www/pojo/document/OssAuthorization.java

@@ -29,4 +29,9 @@ public class OssAuthorization implements Serializable {
      * 授权时间
      */
     private Date addTime;
+
+    /**
+     * 手机验证码
+     */
+    private String code;
 }

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 com.caimei.www.pojo.document.OssAuthorization;
 import org.springframework.http.ResponseEntity;
 
 /**
@@ -17,7 +18,7 @@ public interface DocumentAuthService {
      * @param authorizationMobile cookie中的数据
      * @return
      */
-    JsonModel getAuthorizationCookie(String authorizationMobile);
+    Boolean getAuthorizationCookie(String authorizationMobile);
 
     /**
      * 获取图形验证码
@@ -37,11 +38,10 @@ public interface DocumentAuthService {
     /**
      * oss手机短信验证码登录
      *
-     * @param mobile 手机号
-     * @param code   验证码
+     * @param authorization 用户信息
      * @return
      */
-    ResponseEntity<JsonModel> mobileCodeLogin(String mobile, String code);
+    ResponseEntity<JsonModel> mobileCodeLogin(OssAuthorization authorization);
 
     /**
      * 资料列表

src/main/java/com/caimei/www/service/page/impl/DocumentAuthServiceImpl.java

@@ -49,14 +49,12 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
     private String domain;
 
     @Override
-    public JsonModel getAuthorizationCookie(String authorizationMobile) {
+    public Boolean getAuthorizationCookie(String authorizationMobile) {
         if (!StringUtils.isEmpty(authorizationMobile)) {
             OssAuthorization ossAuthorization = documentAuthDao.findOssAuthorizationByMobile(authorizationMobile);
-            if (ossAuthorization != null) {
-                return JsonModel.success(ossAuthorization);
-            }
+            return ossAuthorization != null;
         }
-        return JsonModel.error();
+        return false;
     }
 
     @Override
@@ -107,17 +105,17 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
     }
 
     @Override
-    public ResponseEntity<JsonModel> mobileCodeLogin(String mobile, String code) {
+    public ResponseEntity<JsonModel> mobileCodeLogin(OssAuthorization authorization) {
         HttpHeaders headers = new HttpHeaders();
-        if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(code)) {
+        if (StringUtils.isEmpty(authorization.getMobile()) || StringUtils.isEmpty(authorization.getCode())) {
             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);
+        String mobileCode = (String) redisService.get(authorization.getMobile() + ":mobileCode");
+        if (!StringUtils.isEmpty(mobileCode) && authorization.getCode().equals(mobileCode)) {
+            OssAuthorization ossAuthorization = documentAuthDao.findOssAuthorizationByMobile(authorization.getMobile());
             if (ossAuthorization != null) {
                 String cookie = new CookieBuilder().setKey("authorizationMobile")
-                        .setValue(mobile)
+                        .setValue(authorization.getMobile())
                         .setMaxAge(60 * 60 * 24 * 30)
                         .setPath("/")
                         .build();