lyhzzz преди 3 години
родител
ревизия
999755f411

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/app/AppController.java

@@ -53,7 +53,6 @@ public class AppController {
 
     /**
      * 验证码登陆
-     * @param user
      * @return
      */
     @PostMapping("/quickLogin")
@@ -105,6 +104,7 @@ public class AppController {
     @PostMapping("/resetPassword")
     public Result resetPassword(@RequestBody RegisterParam param){
         param.setConfirmPwd(param.getPassword());
+        param.setClear("YES");
         loginService.changePassword(param);
         return Result.success();
     }

+ 6 - 1
src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -237,7 +237,12 @@ public class LoginService {
             throw new BusinessException(LoginConstant.FAILURE_CODE_3009, LoginConstant.FAILURE_MSG_3009);
         }
         //对前端传的密码解密
-        String password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
+        String password;
+        if(StringUtils.isNotBlank(param.getClear()) && param.getClear().equals("YES")){
+            password = param.getPassword();
+        }else {
+            password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
+        }
         //正则判断密码是否符合规则(8位以上并且数字英文组合)
         if(!password.matches(ConstantRegex.PASSWORD_REGEX)){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3011, LoginConstant.FAILURE_MSG_3011);

+ 7 - 10
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -10,6 +10,7 @@ import com.fdkankan.common.constant.SceneKind;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
+import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.JwtUtil;
@@ -98,7 +99,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Autowired
     private RedisUtil redisUtil;
 
-    @Autowired
+    @Resource
     private ISceneUpgradeMapper sceneUpgradeMapper;
 
     @Autowired
@@ -717,9 +718,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public void updateViewCount(String num) {
-        String redisKey = RedisKeyUtil.SCENE_VIEW_COUNT + num;
-        if(!redisUtil.hasKey(redisKey)){
-            Integer count = null;
+        String redisKey = RedisKey.SCENE_VISIT_CNT;
+        if(!redisUtil.hHasKey(redisKey,num)){
+            Integer count = 0;
             ScenePro pro = this.getByNum(num);
             if(pro !=null){
                 count = pro.getViewCount();
@@ -730,13 +731,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     count = scenePlusExt.getViewCount();
                 }
             }
-            if(count !=null){
-                redisUtil.set(redisKey,String.valueOf(count));
-            }
-        }
-        if(redisUtil.hasKey(redisKey)){
-            redisUtil.incr(redisKey,1);
+            redisUtil.hset(redisKey,num,String.valueOf(count));
         }
+        redisUtil.hincr(redisKey,num,1);
     }
 
     @Override

+ 3 - 0
src/main/java/com/fdkankan/ucenter/vo/request/RegisterParam.java

@@ -10,4 +10,7 @@ public class RegisterParam {
     private String country;
     private String confirmPwd;
     private String email;
+
+    private String clear;
+
 }