feat:配置修改

xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XMenuDO.java

@@ -1,9 +1,11 @@
 package com.xiang.xservice.auth.service.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
 
 import java.time.LocalDateTime;
 
@@ -20,6 +22,7 @@ public class XMenuDO {
     private static final long serialVersionUID = 1L;
 
     /** 菜单ID */
+    @TableId
     private Long menuId;
 
     /** 菜单名称 */

xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java

@@ -21,13 +21,6 @@ public interface XUserMapper extends BaseMapper<XUser> {
      */
     XUser selectByUsername(String username);
 
-    /**
-     * 批量插入
-     * @param list
-     * @return
-     */
-    int insertBatch(List<XUser> list);
-
     /**
      * 查询用户列表
      * @param user
@@ -42,12 +35,6 @@ public interface XUserMapper extends BaseMapper<XUser> {
      */
     XUser getUserById(Long id);
 
-    /**
-     * 编辑用户
-     * @param user
-     * @return
-     */
-    int update(XUser user);
 
     /**
      * 批量删除

xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java

@@ -165,7 +165,7 @@ public class XUserServiceImpl implements XUserService {
         // 4. db 存储token
         user.setToken(token);
         user.setRefreshToken(refreshToken);
-        userMapper.update(user);
+        userMapper.updateById(user);
         return loginResp;
     }
 
@@ -257,7 +257,7 @@ public class XUserServiceImpl implements XUserService {
         user.setCreateTime(request.getDateTime());
         user.setUpdateBy(request.getOperator());
         user.setUpdateTime(request.getDateTime());
-        return userMapper.update(user) > 0;
+        return userMapper.updateById(user) > 0;
     }
 
     @Override
@@ -343,7 +343,7 @@ public class XUserServiceImpl implements XUserService {
         // 更新 Redis 和 DB
         redisService.set(RedisConstant.LOGIN_TOKEN + request.getUsername(), newToken, 3, TimeUnit.HOURS);
         user.setToken(newToken);
-        userMapper.update(user);
+        userMapper.updateById(user);
         LoginResp loginResp = new LoginResp();
         loginResp.setToken(newToken);
         loginResp.setUsername(request.getUsername());
@@ -358,7 +358,7 @@ public class XUserServiceImpl implements XUserService {
             throw new BusinessException(Code01UserErrorCode.USER_NOT_EXISTS);
         }
         user.setStatus(status);
-        return userMapper.update(user) > 0;
+        return userMapper.updateById(user) > 0;
     }
 
     @Override
@@ -391,6 +391,6 @@ public class XUserServiceImpl implements XUserService {
         }
         String encodePwd = passwordEncoder.encode(password);
         user.setPassword(encodePwd);
-        return userMapper.update(user) > 0;
+        return userMapper.updateById(user) > 0;
     }
 }

xs-service/src/main/resources/mapper/user/XUserMapper.xml

@@ -44,40 +44,11 @@
         token,
         refresh_token
     </sql>
-    <insert id="insertBatch">
-        insert into x_user(name, username, password, email, phone, status, tenant_id) VALUES
-        <foreach collection="list" item="item" separator=",">
-            (#{item.name}, #{item.username}, #{item.password}, #{item.email}, #{item.phone}, #{item.status}, #{item.tenantId})
-        </foreach>
-    </insert>
 
-    <update id="delete" >
+    <update id="del" >
         update x_user set del_flag = 1 where id = #{id}
     </update>
 
-    <update id="update" parameterType="com.xiang.xservice.auth.service.entity.XUser">
-        UPDATE x_user
-        <set>
-            <if test="null != name and '' != name">name = #{name},</if>
-            <if test="null != username and '' != username">username = #{username},</if>
-            <if test="null != password and '' != password">password = #{password},</if>
-            <if test="null != email and '' != email">email = #{email},</if>
-            <if test="null != phone and '' != phone">phone = #{phone},</if>
-            <if test="null != avatar and '' != avatar">avatar = #{avatar},</if>
-            <if test="null != loginIp and '' != loginIp">login_ip = #{loginIp},</if>
-            <if test="null != loginDate ">login_date = #{loginDate},</if>
-            <if test="null != delFlag ">del_flag = #{delFlag},</if>
-            <if test="null != createBy and '' != createBy">create_by = #{createBy},</if>
-            <if test="null != createTime ">create_time = #{createTime},</if>
-            <if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
-            <if test="null != updateTime ">update_time = #{updateTime},</if>
-            <if test="null != tenantId ">tenant_id = #{tenantId},</if>
-            <if test="null != token and '' != token ">token = #{token},</if>
-            <if test="null != refreshToken and '' != refreshToken ">refresh_token = #{refreshToken},</if>
-            <if test="status != null">status = #{status}</if>
-        </set>
-        WHERE id = #{id}
-    </update>
     <update id="deleteBatch">
         update x_user set del_flag = 1, update_time = #{time}, update_by = #{operator} where id in
         <foreach collection="ids" item="id" open="(" close=")" separator=",">