修改返回参数

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

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Mono;
 
 /**
  * Description
@@ -29,7 +30,7 @@ public class DocumentAuthController {
      * 获取图形验证码
      */
     @GetMapping("/getImgVerifyCode")
-    public JsonModel getImgVerifyCode() {
+    public Mono<JsonModel> getImgVerifyCode() {
         return documentAuthService.getImgVerifyCode();
     }
 
@@ -37,9 +38,9 @@ public class DocumentAuthController {
      * oss短信登录,发送短信验证
      */
     @GetMapping("/note")
-    public JsonModel ossNote(String mobile, String imgCode, String token) {
+    public Mono<JsonModel> ossNote(String mobile, String imgCode, String token) {
         if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(imgCode) || StringUtils.isEmpty(token)) {
-            return JsonModel.error("参数异常");
+            return Mono.just(JsonModel.error("参数异常"));
         }
         return documentAuthService.ossNote(mobile, imgCode, token);
     }
@@ -56,10 +57,10 @@ public class DocumentAuthController {
      * 资料列表
      */
     @GetMapping("/dataList")
-    public JsonModel dataList(@CookieValue(value = "authorizationMobile", required = false) String mobile, String name, Integer pageNum, Integer pageSize) {
+    public Mono<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 Mono.just(JsonModel.error(-99, "请登录"));
         }
         return documentAuthService.dataList(name, pageNum, pageSize);
     }
@@ -68,13 +69,13 @@ public class DocumentAuthController {
      * 资料详情
      */
     @GetMapping("/dataDetails")
-    public JsonModel dataDetails(@CookieValue(value = "authorizationMobile", required = false) String mobile, Integer pdfId) {
+    public Mono<JsonModel> dataDetails(@CookieValue(value = "authorizationMobile", required = false) String mobile, Integer pdfId) {
         Boolean isLogin = documentAuthService.getAuthorizationCookie(mobile);
         if (!isLogin) {
-            return JsonModel.error(-99, "请登录");
+            return Mono.just(JsonModel.error(-99, "请登录"));
         }
         if (pdfId == null) {
-            return JsonModel.error("参数异常");
+            return Mono.just(JsonModel.error("参数异常"));
         }
         return documentAuthService.dataDetails(pdfId);
     }

src/main/java/com/caimei/www/service/page/DocumentAuthService.java

@@ -3,6 +3,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;
+import reactor.core.publisher.Mono;
 
 /**
  * Description
@@ -23,7 +24,7 @@ public interface DocumentAuthService {
     /**
      * 获取图形验证码
      */
-    JsonModel getImgVerifyCode();
+    Mono<JsonModel> getImgVerifyCode();
 
     /**
      * oss短信登录,发送短信验证
@@ -33,7 +34,7 @@ public interface DocumentAuthService {
      * @param token   图形token
      * @return
      */
-    JsonModel ossNote(String mobile, String imgCode, String token);
+    Mono<JsonModel> ossNote(String mobile, String imgCode, String token);
 
     /**
      * oss手机短信验证码登录
@@ -51,7 +52,7 @@ public interface DocumentAuthService {
      * @param pageSize 分页参数
      * @return
      */
-    JsonModel dataList(String name, Integer pageNum, Integer pageSize);
+    Mono<JsonModel> dataList(String name, Integer pageNum, Integer pageSize);
 
     /**
      * 资料详情
@@ -59,5 +60,5 @@ public interface DocumentAuthService {
      * @param pdfId 文件id
      * @return
      */
-    JsonModel dataDetails(Integer pdfId);
+    Mono<JsonModel> dataDetails(Integer pdfId);
 }

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

@@ -23,6 +23,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+import reactor.core.publisher.Mono;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -58,7 +59,7 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
     }
 
     @Override
-    public JsonModel getImgVerifyCode() {
+    public Mono<JsonModel> getImgVerifyCode() {
         Map<String, Object> jsonResult = new HashMap<>(2);
         try {
             VerifyCodeUtils.VerifyCode verifyCode = null;
@@ -76,14 +77,14 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
             }
             jsonResult.put("baseImage", verifyCode.getBase64Image());
             jsonResult.put("token", verifyCode.getMd5Code());
-            return JsonModel.success(jsonResult);
+            return Mono.just(JsonModel.success(jsonResult));
         } catch (Exception e) {
-            return JsonModel.error("验证码获取失败");
+            return Mono.just(JsonModel.error("验证码获取失败"));
         }
     }
 
     @Override
-    public JsonModel ossNote(String mobile, String imgCode, String token) {
+    public Mono<JsonModel> ossNote(String mobile, String imgCode, String token) {
         String code = (String) redisService.get("www:oss:" + token);
         String mobileCode = RandomCodeGenerator.generateCodeInt(6);
         //手机验证码,30分钟有效
@@ -93,7 +94,7 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
         if (!StringUtils.isEmpty(code) && code.equals(imgCode)) {
             boolean sms = SMSUtils.sendSms(mobile, content);
             if (sms) {
-                return JsonModel.success();
+                return Mono.just(JsonModel.success());
             }
         } else {
             boolean exists = redisService.exists(mobile + ":mobileCode");
@@ -101,7 +102,7 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
                 redisService.remove(mobile + ":mobileCode");
             }
         }
-        return JsonModel.error("验证码不正确");
+        return Mono.just(JsonModel.error("验证码不正确"));
     }
 
     @Override
@@ -130,7 +131,7 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
     }
 
     @Override
-    public JsonModel dataList(String name, Integer pageNum, Integer pageSize) {
+    public Mono<JsonModel> dataList(String name, Integer pageNum, Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 20 : pageSize;
         PageHelper.startPage(pageNum, pageSize);
@@ -146,11 +147,11 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
             }
             pageInfo = new PageInfo<>(ossArchiveList);
         }
-        return JsonModel.success(pageInfo);
+        return Mono.just(JsonModel.success(pageInfo));
     }
 
     @Override
-    public JsonModel dataDetails(Integer pdfId) {
+    public Mono<JsonModel> dataDetails(Integer pdfId) {
         String endpoint = "https://oss-cn-shenzhen.aliyuncs.com";
         String accessKeyId = "LTAI4GBL3o4YkWnbKYgf2Xia";
         String accessKeySecret = "dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK";
@@ -166,6 +167,6 @@ public class DocumentAuthServiceImpl implements DocumentAuthService {
         map.put("ossArchivePdf", ossArchivePdf);
         map.put("ossArchive", ossArchive);
         ossClient.shutdown();
-        return JsonModel.success(map);
+        return Mono.just(JsonModel.success(map));
     }
 }