lyhzzz 7 months ago
parent
commit
65cfb96b89

+ 1 - 3
src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -158,8 +158,6 @@ public class TestController extends BaseController {
         return Result.success();
     }
 
-    public static void main(String[] args) {
-        System.out.println(SecurityUtil.MD5(" \u0011\u0007"));
-    }
+
 
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.RuntimeUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
+import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneConstant;
@@ -174,7 +175,7 @@ public class SceneApiController extends BaseController {
 
         }
 
-        if(!SecurityUtil.MD5(password).equals(ssoUser.getPassword())) {
+        if(!MD5.create().digestHex(password).toUpperCase().equals(ssoUser.getPassword())) {
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
         }
         sendResponse(ssoUser,webSite, request,response,sceneNum,lang,vlog, pad);

+ 2 - 3
src/main/java/com/fdkankan/ucenter/service/impl/AppService.java

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.service.impl;
 
+import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.AppConstant;
 import com.fdkankan.common.constant.CameraConstant;
@@ -52,7 +53,7 @@ public class AppService {
         if (StringUtils.isEmpty(param.getPassword()) || StringUtils.isEmpty(param.getPhoneNum())){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-        String passwordCode = SecurityUtil.MD5(param.getPassword());
+        String passwordCode = MD5.create().digestHex(param.getPassword()).toUpperCase();
         User user = userService.getByUserName(param.getPhoneNum());
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
@@ -62,7 +63,6 @@ public class AppService {
         }
         String token = this.redisLogin(user.getUserName(), JSONObject.toJSONString(user),21800L);
         LoginVo loginVo = commonLogin(user, param, token);
-        loginVo.getUser().setPassword(param.getPassword());
         return loginVo;
     }
 
@@ -84,7 +84,6 @@ public class AppService {
         BeanUtils.copyProperties(user,userVo);
         userVo.setCameraCount(count);
         userVo.setSceneCount(sceneProCount + scenePlusCount);
-        userVo.setPassword(SecurityUtil.MD5(user.getPassword()));
         LoginVo vo = new LoginVo();
         vo.setToken(token);
         vo.setUser(userVo);

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

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.service.impl;
 
+import cn.hutool.crypto.digest.MD5;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.SecurityUtil;
@@ -50,7 +51,6 @@ public class AppUserService {
         userVo.setExpansionTotal(expansionCount);
         userVo.setIncrementNum(incrementNum);
         userVo.setIncrementBindNum(incrementBindNum);
-        userVo.setPassword(SecurityUtil.MD5(userVo.getPassword()));
         return userVo;
     }
 

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

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.service.impl;
 
+import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ConstantRegex;
 import com.fdkankan.common.exception.BusinessException;
@@ -88,7 +89,7 @@ public class LoginService {
         }else {
             password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
         }
-        String passwordCode = SecurityUtil.MD5(password);
+        String passwordCode = MD5.create().digestHex(password).toUpperCase();
         User user = userService.getByUserName(param.getPhoneNum());
         if(user == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
@@ -155,9 +156,7 @@ public class LoginService {
         }else {
             password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
         }
-        if(!password.matches(ConstantFilePath.PASSWORD_REGEX)){
-            throw new BusinessException(LoginConstant.FAILURE_CODE_3011, LoginConstant.FAILURE_MSG_3011);
-        }
+
         if (!param.getConfirmPwd().equals(param.getPassword())){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3009, LoginConstant.FAILURE_MSG_3009);
         }
@@ -280,7 +279,8 @@ public class LoginService {
         if(!param.getMsgAuthCode().equals(registerValidCode)){
             checkSms(param.getMsgAuthCode(),param.getPhoneNum(),true);
         }
-        String pwdMd5 = SecurityUtil.MD5(password);
+        String pwdMd5 = MD5.create().digestHex(password).toUpperCase();
+
         userService.updatePassword(param.getPhoneNum(), pwdMd5);
     }
 

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

@@ -99,7 +99,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Override
     public void register(RegisterParam param) {
         User userEntity = new User();
-        userEntity.setPassword(SecurityUtil.MD5(param.getPassword()));
+        userEntity.setPassword(param.getPassword());
         userEntity.setEmail(param.getEmail());
         userEntity.setUserName(param.getPhoneNum());
         userEntity.setNickName(param.getPhoneNum());

+ 0 - 3
src/main/java/com/fdkankan/ucenter/util/DateUserUtil.java

@@ -135,9 +135,6 @@ public class DateUserUtil {
         return endTime;
     }
 
-    public static void main(String[] args) {
-        System.out.println(SecurityUtil.MD5(":\u0011\u001B\u0018\u0015\u0007\u0011\u00064DGFE"));
-    }
 
     public static Date getHoursTime(Date date){
         Calendar calendar = Calendar.getInstance();