das项目结构修改

das/src/main/java/com/das/modules/auth/entity/SysUser.java

@@ -1,12 +1,11 @@
 package com.das.modules.auth.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.das.common.constant.BaseEntity;
-import lombok.Data;
+import lombok.*;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -18,10 +17,10 @@ import java.util.Date;
  *
  * @author chenhaojie
  */
-@Data
 @TableName("sys_user")
-@ToString(callSuper = true)
+@Data
-@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysUser extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -35,42 +34,50 @@ public class SysUser extends BaseEntity {
     /**
      * 登录账号
      */
+    @TableField("account")
     private String account;
 
     /**
      * 加密后的密码
      */
+    @TableField("password")
     private String password;
 
     /**
      * 职员名称
      */
+    @TableField("user_name")
     private String userName;
 
     /**
      * 职员邮箱
      */
+    @TableField("email")
     private String email;
 
     /**
      * 职员联系电话
      */
+    @TableField("phone")
     private String phone;
 
     /**
      * 所属机构id
      */
+    @TableField("org_id")
     private Long orgId;
 
     /**
      * 最近一次登录时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("last_login")
     private Date lastLogin;
 
     /**
      * 乐观锁
      */
+    @TableField("revision")
     private int revision;
 
 }

das/src/main/java/com/das/modules/auth/service/impl/LoginServiceImpl.java

@@ -49,11 +49,6 @@ public class LoginServiceImpl implements ILoginService {
 
     @Override
     public LoginUserDetails login(LoginRequest loginRequest, HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException {
-//        String iv = request.getHeader("v");
-//        System.out.println("iv:" + iv);
-//        param = aesUtil.decrypt(key, param, iv);
-//        ObjectMapper objectMapper = new ObjectMapper();
-//        LoginRequest loginRequest = objectMapper.readValue(param, LoginRequest.class);
         String name = loginRequest.getUsername();
         String password = loginRequest.getPassword();
         String code = loginRequest.getCode();

das/src/main/resources/mapper/SysUserMapper.xml

@@ -2,30 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.das.modules.auth.mapper.SysUserMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.das.modules.auth.entity.SysUser">
-        <id column="id" property="id"/>
-        <result column="created_time" property="createdTime"/>
-        <result column="created_by" property="createdBy"/>
-        <result column="updated_time" property="updatedTime"/>
-        <result column="updated_by" property="updatedBy"/>
-        <result column="account" property="account"/>
-        <result column="password" property="password"/>
-        <result column="user_name" property="userName"/>
-        <result column="email" property="email"/>
-        <result column="phone" property="phone"/>
-        <result column="org_id" property="orgId"/>
-        <result column="last_login" property="lastLogin"/>
-        <result column="revision" property="revision"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        created_time,
-        created_by,
-        updated_time,
-        updated_by,
-        id, account, user_name, org_id, last_login, email, phone, revision, password
-    </sql>
 
 </mapper>