fix 每日出图上限增加5次验证，单次解除上限50次

midjourney/pom.xml

@@ -133,18 +133,6 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.tencentcloudapi</groupId>
-                    <artifactId>tencentcloud-sdk-java-sms</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.tencentcloudapi</groupId>
-                    <artifactId>tencentcloud-sdk-java-faceid</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.tencentcloudapi</groupId>
-                    <artifactId>tencentcloud-sdk-java</artifactId>
-                </exclusion>
             </exclusions>
             <version>1.0</version>
         </dependency>

midjourney/src/main/java/com/yhlxj/redis/RedisService.java

@@ -788,6 +788,7 @@ public class RedisService {
         MIDJOURNEY_USER_SUBMIT("midjourney:user:submit:", "midjourney user submit", 30L),
         MIDJOURNEY_CAR_TASK("midjourney:car:task","midjourney car 任务数", 48 * 60 * 60L),
         MIDJOURNEY_USER_AGAIN("midjourney:user:again","midjourney用户重试次数", 30L),
+        MIDJOURNEY_RELEASE_LIMIT("midjourney:release:limit:","midjourney解除限制次数", 30L),
         ;
 
         private String name;

midjourney/src/main/java/com/yhlxj/service/midjourney/MidjourneyService.java

@@ -54,4 +54,6 @@ public interface MidjourneyService {
     void saveConversationRecord(String userToken, String json,String carid,String status);
 
     void userSubmitLimit(MidjourneyUser user,String action,Object customId,Boolean again);
+
+    void releaseLimit(String userToken);
 }

midjourney/src/main/java/com/yhlxj/web/GlobalExceptionHandler.java

@@ -61,15 +61,17 @@ public class GlobalExceptionHandler {
                 if (GatewayApiCode.CMS_TOKEN_VALID.getCode().equals(Integer.parseInt(code))) {
                     apiCode = GatewayApiCode.CMS_TOKEN_VALID;
                 }
+                if (apiCode != null) {
+                    return GatewayResponse.FAIL.newBuilder().buildGatewayCode(apiCode).toResult();
+                }else {
+                    return GatewayResponse.FAIL.newBuilder().setCode(Integer.valueOf(ee.getCode())).setMsg(message).toResult(value);
+                }
             }
         }
         if (e instanceof PersistenceException) {
             return GatewayResponse.FAIL.newBuilder().setMsg(GatewayApiCode.SYSTEM_BUSYNESS_ERROR.getMsg()).toResult(value);
         }
         log.error("全局错误处理: \n Cause: {} \n Value: {}", message, value);
-        if (apiCode != null) {
-            return GatewayResponse.FAIL.newBuilder().buildGatewayCode(apiCode).toResult();
-        }
         return GatewayResponse.FAIL.newBuilder().setMsg(message).toResult(value);
     }
 

midjourney/src/main/java/com/yhlxj/web/mirror/MidjourneyController.java

@@ -1,12 +1,16 @@
 package com.yhlxj.web.mirror;
 
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.util.BlackOpsUtil;
 import com.cyksj.common.util.IoKit;
+import com.cyksj.common.util.SmsUtil;
 import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
@@ -34,14 +38,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -611,4 +613,22 @@ public class MidjourneyController {
         return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyService.uploadFile(uploadDTO,getUser()));
     }
 
+
+    /**
+     * 图片验证解除50次数
+     */
+    @GetMapping("/check/code")
+    @NoSubmit
+    public Result<String> getPhoneCode(String ticket,String randStr) throws Exception {
+        if (ObjectUtil.hasEmpty(ticket, randStr)) {
+            throw BusinessRuntimeException.getInstance("请先完成图形认证");
+        } else {
+            //腾讯云图形验证
+            String ip = StringUtil.getInternalAddressByIP(ServletUtil.getClientIP(request));
+            SmsUtil.checkTencentCaptcha(ticket, ip, randStr);
+        }
+        String userToken = request.getHeader("user-token");
+        midjourneyService.releaseLimit(userToken);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
 }

netflix-service/src/main/java/com/cyksj/service/mange/cms/CmsUserManager.java

@@ -12,7 +12,7 @@ import com.cyksj.model.entity.CmsRole;
 import com.cyksj.model.entity.CmsUser;
 import com.cyksj.model.entity.CmsUserRole;
 import com.cyksj.service.mange.business.UserBusinessRateService;
-import com.cyksj.service.mange.cms.manager.service.CacheService;
+import com.cyksj.service.mange.cms.service.CacheService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;