修复BUG,稳定版本

src/main/java/com/zy/bms/common/io/pc/UserIO.java

@@ -2,7 +2,6 @@ package com.zy.bms.common.io.pc;
 
 import com.zy.bms.common.io.PageIO;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * 用户查询入参
@@ -11,18 +10,11 @@ import lombok.EqualsAndHashCode;
  * create on 2021/2/18
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 public class UserIO extends PageIO {
-
-    /**
-     * 用户名
-     */
-    private String username;
-
     /**
-     * 昵称
+     * 昵称/用户名
      */
-    private String nickname;
+    private String key;
 
     /**
      * 性别 1:男 2:女

src/main/java/com/zy/bms/config/InterceptorConfig.java

@@ -29,7 +29,8 @@ public class InterceptorConfig implements WebMvcConfigurer {
     private static List<String> whiteList = new ArrayList<>();
 
     static {
-        whiteList.add("/zy4g/api/pc/admin/**");
+        whiteList.add("/bms/api/pc/admin/**");
+        whiteList.add("/common/**");
     }
 
     /**
@@ -37,11 +38,12 @@ public class InterceptorConfig implements WebMvcConfigurer {
      */
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-//        registry.addInterceptor(verifyInterceptor)
-//                .addPathPatterns("/zy4g/api/pc/**");
-//
-//        registry.addInterceptor(authInterceptor)
-//                .addPathPatterns("/zy4g/api/pc/**")
-//                .excludePathPatterns(whiteList);
+        registry.addInterceptor(verifyInterceptor)
+                .addPathPatterns("/bms/api/pc/**")
+                .excludePathPatterns("/common/**");
+
+        registry.addInterceptor(authInterceptor)
+                .addPathPatterns("/bms/api/pc/**")
+                .excludePathPatterns(whiteList);
     }
 }

src/main/java/com/zy/bms/mapper/UserMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zy.bms.common.io.pc.UserIO;
 import com.zy.bms.model.User;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -22,5 +23,5 @@ public interface UserMapper extends BaseMapper<User> {
      * @param page 分页条件
      * @param io   查询条件
      */
-    IPage<User> getListPage(IPage<User> page, UserIO io);
+    IPage<User> getListPage(IPage<User> page, @Param("io") UserIO io);
 }

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: prod

src/main/resources/mapper/UserMapping.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.UserMapper">
 
     <select id="getListPage" resultType="com.zy.bms.model.User">
@@ -19,18 +17,15 @@
             createTime
         FROM user
         <where>
-            <if test="param2.username != null and param2.username != ''">
-                AND username LIKE CONCAT("%",#{param2.username},"%")
+            <if test="io.key != null and io.key != ''">
+                AND (username LIKE CONCAT("%",#{io.key},"%")
+                    OR nickname LIKE CONCAT("%",#{io.key},"%")
+                    OR phone LIKE CONCAT("%",#{io.key},"%"))
             </if>
-            <if test="param2.nickname != null and param2.nickname != ''">
-                AND nickname LIKE CONCAT("%",#{param2.nickname},"%")
-            </if>
-            <if test="param2.gender != null and param2.gender != ''">
-                AND gender = #{param2.gender}
+            <if test="io.gender != null and io.gender != ''">
+                AND gender = #{io.gender}
             </if>
         </where>
-        <if test="param2.orderBy != null and param2.orderBy != ''">
-            ORDER BY ${param2.orderBy} #{param2.order}
-        </if>
+            ORDER BY createTime DESC
     </select>
 </mapper>