整理依赖包

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java

@@ -42,11 +42,17 @@ public class UserLoginController {
     @PostMapping(value = "/login")
     @ApiOperation(value = "用户登录")
     public ResponseResult login(
-            @RequestBody LoginRequest loginRequest
+            //@RequestBody LoginRequest loginRequest
-            /*@RequestParam("password") String password, @RequestParam("phone") String phone*/){
+            @RequestParam("password") String password, @RequestParam("phone") String phone,
-        /*LoginRequest loginRequest = new LoginRequest();
+            @RequestParam("type")int type, @RequestParam("wechatId") String wechatId,
+            @RequestParam("tenDayEffective") int tenDayEffective
+            ){
+        LoginRequest loginRequest = new LoginRequest();
+        loginRequest.setTenDayEffective(tenDayEffective);
+        loginRequest.setType(type);
+        loginRequest.setWechatId(wechatId);
         loginRequest.setPassword(password);
-        loginRequest.setPhone(phone);*/
+        loginRequest.setPhone(phone);
         return userLoginService.login(loginRequest);
     }
 }

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java

@@ -90,7 +90,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
                 return ResponseResult.FAIL(CommonCode.USER_IS_NOT_EXIST.code(), CommonCode.USER_IS_NOT_EXIST.message());
             }
             String newPassword = Md5Util.md5(loginRequest.getPassword()+userEntity.getId());
-            if(!newPassword.equals(loginRequest.getPassword())){
+            if(!newPassword.equals(userEntity.getPassword())){
                 return ResponseResult.FAIL(CommonCode.PASSWORD_IS_ERROR.code(), CommonCode.PASSWORD_IS_ERROR.message());
             }
 

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/JwtUtil.java

@@ -1,11 +1,8 @@
 package com.daqing.financial.hrauth.util;
 
 
-import com.auth0.jwt.JWT;
+import com.daqing.framework.util.Md5Util;
-import com.auth0.jwt.algorithms.Algorithm;
-import com.daqing.financial.hrauth.SpringContextHolder;
 
-import java.util.Date;
 import java.util.Set;
 
 /**
@@ -16,7 +13,7 @@ import java.util.Set;
  */
 public class JwtUtil {
 
-    private final static Algorithm algorithm = SpringContextHolder.getBean("algorithm", Algorithm.class);
+    //private final static Algorithm algorithm = SpringContextHolder.getBean("algorithm", Algorithm.class);
 
     //private final static OdcProperties properties = SpringContextHolder.getBean("odcProperties", OdcProperties.class);
 
@@ -27,16 +24,19 @@ public class JwtUtil {
      * @param timeout; 单位是秒
      */
     public static String createJwtToken(Long userId, long timeout) {
-        return JWT.create()
+        String token = Md5Util.md5(userId+timeout+"dq");
+        RedisUtil.setEx("dq:token:"+userId, token, timeout);
+        return token;
+        /*return JWT.create()
             .withClaim("member", userId)
             .withExpiresAt(new Date(System.currentTimeMillis() + timeout * 1000))
-            .sign(algorithm);
+            .sign(algorithm);*/
     }
 
     /**
      * token正确且有效，则返回userId
      */
-    public static Long verifyToken(String token) {
+/*    public static Long verifyToken(String token) {
         try {
             String noBearerToken = token.replaceFirst("Bearer ", "");
             Long userId = JWT.require(algorithm)
@@ -52,7 +52,7 @@ public class JwtUtil {
             return null;
         }
         return null;
-    }
+    }*/
 
     public static String getRedisKey(Long userId, String token) {
         return String.format("dq:token:%d:%s", userId, token);

dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/UserLoginMapper.xml

@@ -16,11 +16,11 @@
     <select id="login" parameterType="com.daqing.framework.domain.hrms.request.LoginRequest" resultType="com.daqing.framework.domain.hrms.UserEntity">
         select id,account,phone_account,password,login_num from hrms_user
         where del_or_not = 0 and status = 0
-        <if test="loginRequest.phone != null or loginRequest.phone != '' ">
+        <if test="phone != null and phone != '' ">
-            and phone_account = #{loginRequest.phone}
+            and phone_account = #{phone}
         </if>
-        <if test="loginRequest.wechat_id != null or loginRequest.wechat_id != '' ">
+        <if test="wechatId != null and wechatId != '' ">
-            and wechat_id = #{loginRequest.wechat_id}
+            and wechat_id = #{wechatId}
         </if>
 
     </select>

dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java

@@ -17,4 +17,8 @@ public class Md5Util {
         }
         return DigestUtils.md5DigestAsHex(str.getBytes());
     }
+
+    public static void main(String[] args) {
+        System.out.printf(md5("1234561"));
+    }
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/LoginRequest.java

@@ -6,6 +6,8 @@ import lombok.Data;
 @Data
 public class LoginRequest {
 
+    private int id;
+
     @ApiModelProperty(value = "手机号码")
     private String phone;