回退给亿迅

license/src/main/java/iot/sixiang/license/controller/LoginController.java

@@ -18,14 +18,19 @@ import iot.sixiang.license.model.dto.CheckCodeDto;
 import iot.sixiang.license.model.vo.LoginReqVo;
 import iot.sixiang.license.model.vo.LoginVo;
 import iot.sixiang.license.model.vo.UserResetPwdVo;
-import iot.sixiang.license.service.UserPermissionService;
 import iot.sixiang.license.service.UserService;
 import iot.sixiang.license.util.CommonUtil;
 import iot.sixiang.license.util.EmailUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
@@ -47,8 +52,8 @@ public class LoginController {
     UserMapper userMapper;
     @Resource
     UserService userService;
-    @Resource
-    UserPermissionService userPermissionService;
+    //@Resource
+    //UserPermissionService userPermissionService;
 
     // @Value("${spring.mail.to}")
     // private String account;
@@ -94,9 +99,8 @@ public class LoginController {
             return ResResult.failed().setMsgValue("用户名或密码错误次数达到三次，请三分钟后再重试");
         } else {
             Date curCodeDate = new Date();
-            // 合并到正式代码时要放开注释并把  "if (code.equals("123456")) {" 注释掉
-            // if (code.equals(UserUtils.getEmailCode(userName)) && curCodeDate.before(UserUtils.getEmailCodeExpTime(userName))) {
-            if (code.equals("123456")) {
+            if (code.equals(UserUtils.getEmailCode(userName)) && curCodeDate.before(UserUtils.getEmailCodeExpTime(userName))) {
+                //if (code.equals("123456")) {
                 String token = JwtUtil.createToken(dbUser);
                 LoginVo loginVo = new LoginVo();
                 loginVo.setAuthorization(token);