Merge branch 'mj' into pre

netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneyUser.java

@@ -43,12 +43,12 @@ public class MidjourneyUser extends BaseEntity{
     /**
      * mj fast次数
      */
-    private Long mjFastNum;
+    private Integer mjFastNum;
 
     /**
      * mj relax次数
      */
-    private Long mjRelaxNum;
+    private Integer mjRelaxNum;
 
     /**
      * 当前模式 1:fast 2:relax

netflix-service/src/main/java/com/cyksj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -123,7 +123,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
     /**
      * 恢复次数
      */
-    public void recoverUserLimit(Long id,Integer mode,Long num){
+    public void recoverUserLimit(Long id,Integer mode,Integer num){
         if (mode == 1){
             redisService.incr(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + id, 1L);
         }

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MidjourneyController.java

@@ -68,7 +68,7 @@ public class MidjourneyController {
             if (fastNum == null){
                 redisService.set(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + midjourneyUser.getId(), midjourneyUser.getMjFastNum(), RedisService.key.MIDJOURNEY_FAST_LIMIT.getTimeout());
             }else {
-                midjourneyUser.setMjFastNum(Long.parseLong(fastNum.toString()));
+                midjourneyUser.setMjFastNum(Integer.parseInt(fastNum.toString()));
             }
             Object relaxNum = redisService.get(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + midjourneyUser.getId());
             if (relaxNum == null){
@@ -76,7 +76,7 @@ public class MidjourneyController {
                     redisService.set(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + midjourneyUser.getId(), midjourneyUser.getMjRelaxNum(), RedisService.key.MIDJOURNEY_RELAX_LIMIT.getTimeout());
                 }
             }else {
-                midjourneyUser.setMjRelaxNum(Long.parseLong(relaxNum.toString()));
+                midjourneyUser.setMjRelaxNum(Integer.parseInt(relaxNum.toString()));
             }
         }
         return midjourneyUser;