Merge branch 'test'

cif-service/src/main/java/com/txz/cif/service/impl/UserServiceImpl.java

@@ -116,9 +116,9 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
     @Override
     public Boolean checkCode(String phoneNo, String code) {
         // fixme 上线修改短验
-        if (StrUtil.equals("888888", code)) {
-            return true;
-        }
+        // if (StrUtil.equals("888888", code)) {
+        //     return true;
+        // }
         // log.error("checkCode  phoneNo:" + phoneNo);
         // log.error("checkCode  code:" + code);
         String key = this.getSmsKey(phoneNo);
@@ -243,16 +243,16 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
             return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
         }
         // fixme 上线修改短验
-        if (!verifyCode.equals("888888")) {
-            String key = getSmsKey(user.getAreaCode() + user.getPhoneNo());
-            Object o = redisClient.get(key);
-            if (ObjectUtil.isNull(o)) {
-                return Result.fail();
-            }
-            if (!StrUtil.equals(o.toString(), verifyCode)) {
-                return ResultGenerator.genFailResult(ResultCode.CODE_CHECK_FAIL);
-            }
+        // if (!verifyCode.equals("888888")) {
+        String key = getSmsKey(user.getAreaCode() + user.getPhoneNo());
+        Object o = redisClient.get(key);
+        if (ObjectUtil.isNull(o)) {
+            return Result.fail();
+        }
+        if (!StrUtil.equals(o.toString(), verifyCode)) {
+            return ResultGenerator.genFailResult(ResultCode.CODE_CHECK_FAIL);
         }
+        // }
         update(User.builder().id(user.getId()).pwd(SecureUtil.md5(newPwd + user.getSalt())).build());
         // redisClient.del(key);
         return Result.success();