添加swagger

pom.xml

@@ -67,12 +67,6 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
 
-        <!--mybatis-spring-boot-->
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-
         <!--redis-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -103,6 +97,17 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.41</version>
         </dependency>
+        <!-- mybatisplus与springboot整合 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <!-- springboot整合mybatis（核心就这一个） -->
+        <!-- 注意顺序，这个一定要放在最下面 -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/unissoft/controller/UserController.java

@@ -2,7 +2,7 @@ package com.unissoft.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.unissoft.model.UserModel;
+import com.unissoft.model.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
@@ -86,8 +86,8 @@ public class UserController {
         JSONObject jsonObject = JSON.parseObject(claims);
         Map<String, String> jsonMap = JSONObject.toJavaObject(jsonObject, Map.class);
         JSONObject user = JSON.parseObject(jsonMap.get("user_name"));
-        UserModel userModel = JSONObject.toJavaObject(user, UserModel.class);
-        System.out.println(userModel);
+        SysUser SysUser = JSONObject.toJavaObject(user, SysUser.class);
+        System.out.println(SysUser);
         return ResultView.success(decode);
     }
 }

src/main/java/com/unissoft/mapper/PublicMapper.java

@@ -1,8 +1,8 @@
 package com.unissoft.mapper;
 
-import com.unissoft.model.OauthClientDetailsModel;
-import com.unissoft.model.UserModel;
 import com.unissoft.dto.BaseDto;
+import com.unissoft.model.OauthClientDetailsModel;
+import com.unissoft.model.SysUser;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import java.util.List;
  */
 public interface PublicMapper {
 
-    UserModel getUserByName(String name);
+    SysUser getUserByName(String name);
 
-    List<BaseDto> getRoleByUserId(Long userId);
+    List<BaseDto> getRoleByUserId(int userId);
 
     OauthClientDetailsModel getOauthClientDetailsByClientId(String clientId);
 

src/main/java/com/unissoft/model/SysUser.java

@@ -0,0 +1,282 @@
+package com.unissoft.model;
+
+
+
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户表
+ * </p>
+ *
+ * @author wsm
+ * @since 2020-11-25
+ */
+@TableName("sys_user")
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "u_id", type = IdType.AUTO)
+    private Integer uId;
+    /**
+     * 用户名
+     */
+    @TableField("u_name")
+    private String uName;
+    /**
+     * 昵称
+     */
+    @TableField("u_nickname")
+    private String uNickname;
+    /**
+     * 密码
+     */
+    @TableField("u_password")
+    private String uPassword;
+    /**
+     * 头像
+     */
+    @TableField("u_photo")
+    private String uPhoto;
+    /**
+     * 性别(0女,1男)
+     */
+    @TableField("u_sex")
+    private Integer uSex;
+    /**
+     * 生日
+     */
+    @TableField("u_birthday")
+    private Date uBirthday;
+    /**
+     * 手机号
+     */
+    @TableField("u_phone")
+    private String uPhone;
+    /**
+     * 邮箱
+     */
+    @TableField("u_mail")
+    private String uMail;
+    /**
+     * 地址
+     */
+    @TableField("u_address")
+    private String uAddress;
+    /**
+     * 个人说明
+     */
+    @TableField("u_explain")
+    private String uExplain;
+    /**
+     * 用户来源
+     */
+    @TableField("u_user_source")
+    private Integer uUserSource;
+    /**
+     * 用户状态（1：正常，2：异常，3：禁用）
+     */
+    @TableField("u_status")
+    private Integer uStatus;
+    /**
+     * 创建人
+     */
+    @TableField("u_create_by")
+    private String uCreateBy;
+    /**
+     * 创建时间
+     */
+    @TableField("u_create_time")
+    private Date uCreateTime;
+    /**
+     * 更新人
+     */
+    @TableField("u_update_by")
+    private String uUpdateBy;
+    /**
+     * 更新时间
+     */
+    @TableField("u_update_time")
+    private Date uUpdateTime;
+    /**
+     * 备注
+     */
+    @TableField("u_remark")
+    private String uRemark;
+
+
+    public Integer getuId() {
+        return uId;
+    }
+
+    public void setuId(Integer uId) {
+        this.uId = uId;
+    }
+
+    public String getuName() {
+        return uName;
+    }
+
+    public void setuName(String uName) {
+        this.uName = uName;
+    }
+
+    public String getuNickname() {
+        return uNickname;
+    }
+
+    public void setuNickname(String uNickname) {
+        this.uNickname = uNickname;
+    }
+
+    public String getuPassword() {
+        return uPassword;
+    }
+
+    public void setuPassword(String uPassword) {
+        this.uPassword = uPassword;
+    }
+
+    public String getuPhoto() {
+        return uPhoto;
+    }
+
+    public void setuPhoto(String uPhoto) {
+        this.uPhoto = uPhoto;
+    }
+
+    public Integer getuSex() {
+        return uSex;
+    }
+
+    public void setuSex(Integer uSex) {
+        this.uSex = uSex;
+    }
+
+    public Date getuBirthday() {
+        return uBirthday;
+    }
+
+    public void setuBirthday(Date uBirthday) {
+        this.uBirthday = uBirthday;
+    }
+
+    public String getuPhone() {
+        return uPhone;
+    }
+
+    public void setuPhone(String uPhone) {
+        this.uPhone = uPhone;
+    }
+
+    public String getuMail() {
+        return uMail;
+    }
+
+    public void setuMail(String uMail) {
+        this.uMail = uMail;
+    }
+
+    public String getuAddress() {
+        return uAddress;
+    }
+
+    public void setuAddress(String uAddress) {
+        this.uAddress = uAddress;
+    }
+
+    public String getuExplain() {
+        return uExplain;
+    }
+
+    public void setuExplain(String uExplain) {
+        this.uExplain = uExplain;
+    }
+
+    public Integer getuUserSource() {
+        return uUserSource;
+    }
+
+    public void setuUserSource(Integer uUserSource) {
+        this.uUserSource = uUserSource;
+    }
+
+    public Integer getuStatus() {
+        return uStatus;
+    }
+
+    public void setuStatus(Integer uStatus) {
+        this.uStatus = uStatus;
+    }
+
+    public String getuCreateBy() {
+        return uCreateBy;
+    }
+
+    public void setuCreateBy(String uCreateBy) {
+        this.uCreateBy = uCreateBy;
+    }
+
+    public Date getuCreateTime() {
+        return uCreateTime;
+    }
+
+    public void setuCreateTime(Date uCreateTime) {
+        this.uCreateTime = uCreateTime;
+    }
+
+    public String getuUpdateBy() {
+        return uUpdateBy;
+    }
+
+    public void setuUpdateBy(String uUpdateBy) {
+        this.uUpdateBy = uUpdateBy;
+    }
+
+    public Date getuUpdateTime() {
+        return uUpdateTime;
+    }
+
+    public void setuUpdateTime(Date uUpdateTime) {
+        this.uUpdateTime = uUpdateTime;
+    }
+
+    public String getuRemark() {
+        return uRemark;
+    }
+
+    public void setuRemark(String uRemark) {
+        this.uRemark = uRemark;
+    }
+
+    @Override
+    public String toString() {
+        return "SysUser{" +
+        ", uId=" + uId +
+        ", uName=" + uName +
+        ", uNickname=" + uNickname +
+        ", uPassword=" + uPassword +
+        ", uPhoto=" + uPhoto +
+        ", uSex=" + uSex +
+        ", uBirthday=" + uBirthday +
+        ", uPhone=" + uPhone +
+        ", uMail=" + uMail +
+        ", uAddress=" + uAddress +
+        ", uExplain=" + uExplain +
+        ", uUserSource=" + uUserSource +
+        ", uStatus=" + uStatus +
+        ", uCreateBy=" + uCreateBy +
+        ", uCreateTime=" + uCreateTime +
+        ", uUpdateBy=" + uUpdateBy +
+        ", uUpdateTime=" + uUpdateTime +
+        ", uRemark=" + uRemark +
+        "}";
+    }
+}

src/main/java/com/unissoft/model/UserModel.java

@@ -1,255 +0,0 @@
-package com.unissoft.model;
-
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 文件描述:用户表
- *
- * @author tongxi.xia
- * @date 2020年11月17日 15:16
- */
-public class UserModel implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-    /**
-     * 用户名
-     */
-    private String name;
-    /**
-     * 昵称
-     */
-    private String nickname;
-    /**
-     * 密码
-     */
-    private String password;
-    /**
-     * 头像
-     */
-    private String photo;
-    /**
-     * 性别(0女,1男)
-     */
-    private Integer sex;
-    /**
-     * 生日
-     */
-    private Date birthday;
-    /**
-     * 手机号
-     */
-    private String phone;
-    /**
-     * 邮箱
-     */
-    private String mail;
-    /**
-     * 地址
-     */
-    private String address;
-    /**
-     * 个人说明
-     */
-    private String explain;
-    /**
-     * 用户来源
-     */
-    private Integer userSource;
-    /**
-     * 用户状态（1：正常，2：异常，3：禁用）
-     */
-    private Integer status;
-    /**
-     * 创建人
-     */
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getPhoto() {
-        return photo;
-    }
-
-    public void setPhoto(String photo) {
-        this.photo = photo;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public Date getBirthday() {
-        return birthday;
-    }
-
-    public void setBirthday(Date birthday) {
-        this.birthday = birthday;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getMail() {
-        return mail;
-    }
-
-    public void setMail(String mail) {
-        this.mail = mail;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getExplain() {
-        return explain;
-    }
-
-    public void setExplain(String explain) {
-        this.explain = explain;
-    }
-
-    public Integer getUserSource() {
-        return userSource;
-    }
-
-    public void setUserSource(Integer userSource) {
-        this.userSource = userSource;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "UserModel{" +
-                ", id=" + id +
-                ", name=" + name +
-                ", nickname=" + nickname +
-                ", password=" + password +
-                ", photo=" + photo +
-                ", sex=" + sex +
-                ", birthday=" + birthday +
-                ", phone=" + phone +
-                ", mail=" + mail +
-                ", address=" + address +
-                ", explain=" + explain +
-                ", userSource=" + userSource +
-                ", status=" + status +
-                ", createBy=" + createBy +
-                ", createTime=" + createTime +
-                ", updateBy=" + updateBy +
-                ", updateTime=" + updateTime +
-                ", remark=" + remark +
-                "}";
-    }
-}

src/main/java/com/unissoft/service/MyUserDetailService.java

@@ -1,8 +1,12 @@
 package com.unissoft.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.unissoft.dto.BaseDto;
+import com.unissoft.exception.MyRuntimeException;
 import com.unissoft.mapper.PublicMapper;
-import com.unissoft.model.UserModel;
+import com.unissoft.model.SysUser;
+import com.unissoft.result.ResultEnum;
+import com.unissoft.result.ResultView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
@@ -11,10 +15,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
-import com.unissoft.dto.BaseDto;
-import com.unissoft.exception.MyRuntimeException;
-import com.unissoft.result.ResultEnum;
-import com.unissoft.result.ResultView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,14 +37,14 @@ public class MyUserDetailService implements UserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String name) throws UsernameNotFoundException {
         //查用户
-        UserModel userModel = publicMapper.getUserByName(name);
-        if (userModel == null) {
+        SysUser SysUser = publicMapper.getUserByName(name);
+        if (SysUser == null) {
             throw new MyRuntimeException(ResultView.error(ResultEnum.CODE_5));
         }
         System.err.println("当前登录的用户是：" + name);
 
         //查该用户拥有的角色
-        List<BaseDto> roleDtos = publicMapper.getRoleByUserId(userModel.getId());
+        List<BaseDto> roleDtos = publicMapper.getRoleByUserId(SysUser.getuId());
         List<SimpleGrantedAuthority> authorities = new ArrayList<>();
         if (roleDtos.size() == 0) {
             authorities.add(new SimpleGrantedAuthority("ROLE_NoRole"));
@@ -55,9 +55,9 @@ public class MyUserDetailService implements UserDetailsService {
             }
         }
 
-//        String password = {noop} + userModel.getPassword();
-        String jsonString = JSONObject.toJSONString(userModel);
-        String password = new BCryptPasswordEncoder().encode(userModel.getPassword());
+//        String password = {noop} + SysUser.getPassword();
+        String jsonString = JSONObject.toJSONString(SysUser);
+        String password = new BCryptPasswordEncoder().encode(SysUser.getuPassword());
         User user = new User(jsonString, password, authorities);
 //        User user = new User(name, password, authorities);
         return user;

src/main/resources/mapper/PublicMapper.xml

@@ -3,26 +3,25 @@
 <mapper namespace="com.unissoft.mapper.PublicMapper">
 
     <!-- 通用查询映射结果 -->
-
-    <resultMap id="UserMap" type="com.unissoft.model.UserModel">
-        <id column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="nickname" property="nickname"/>
-        <result column="password" property="password"/>
-        <result column="photo" property="photo"/>
-        <result column="sex" property="sex"/>
-        <result column="birthday" property="birthday"/>
-        <result column="phone" property="phone"/>
-        <result column="mail" property="mail"/>
-        <result column="address" property="address"/>
-        <result column="explain" property="explain"/>
-        <result column="user_source" property="userSource"/>
-        <result column="status" property="status"/>
-        <result column="create_by" property="createBy"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="remark" property="remark"/>
+    <resultMap id="UserMap" type="com.unissoft.model.SysUser">
+        <id column="u_id" property="uId" />
+        <result column="u_name" property="uName" />
+        <result column="u_nickname" property="uNickname" />
+        <result column="u_password" property="uPassword" />
+        <result column="u_photo" property="uPhoto" />
+        <result column="u_sex" property="uSex" />
+        <result column="u_birthday" property="uBirthday" />
+        <result column="u_phone" property="uPhone" />
+        <result column="u_mail" property="uMail" />
+        <result column="u_address" property="uAddress" />
+        <result column="u_explain" property="uExplain" />
+        <result column="u_user_source" property="uUserSource" />
+        <result column="u_status" property="uStatus" />
+        <result column="u_create_by" property="uCreateBy" />
+        <result column="u_create_time" property="uCreateTime" />
+        <result column="u_update_by" property="uUpdateBy" />
+        <result column="u_update_time" property="uUpdateTime" />
+        <result column="u_remark" property="uRemark" />
     </resultMap>
 
     <resultMap id="OauthClientDetailsMap" type="com.unissoft.model.OauthClientDetailsModel">
@@ -45,13 +44,13 @@
     </resultMap>
 
     <select id="getUserByName" resultMap="UserMap">
-        SELECT id,`name`,password FROM `user` WHERE `name` = #{name}
+        SELECT u_id,u_name,u_password FROM sys_user WHERE u_name = #{name}
     </select>
 
     <select id="getRoleByUserId" resultMap="BaseDtoMap">
-        SELECT t3.id,t3.name FROM `user` t1,user_role t2,role t3
-        WHERE  t1.`id` = t2.`user_id`
-        AND t2.`role_id` = t3.`id` AND t1.`id` = #{userId};
+       SELECT t3.r_id id,t3.r_name name FROM sys_user t1,sys_user_role t2,sys_role t3
+        WHERE  t1.u_id = t2.`user_id`
+        AND t2.`role_id` = t3.`r_id` AND t1.`u_id` = #{userId}
     </select>
 
     <select id="getOauthClientDetailsByClientId" resultMap="OauthClientDetailsMap">