[feat] 新增根据手机号模糊查询用户的接口

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.6.41.0.3</version>
+    <version>3.6.41.0.4</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <ruoyi.version>3.6.41.0.3</ruoyi.version>
+        <ruoyi.version>3.6.41.0.4</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>

ruoyi-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-api</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java

@@ -1,7 +1,9 @@
 package com.ruoyi.system.api.inner;
 
+import com.github.pagehelper.Page;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +29,16 @@ public interface InnerRemoteUserService {
     @GetMapping("/inner/user/info/phoneNumber/{phoneNumber:\\d+}")
     R<LoginUser> getUserInfoByPhoneNumber_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    /**
+     * 通过手机号查询用户信息
+     *
+     * @param phoneNumber 用户名
+     * @param source      请求来源
+     * @return 结果
+     */
+    @GetMapping("/inner/user/list/phoneNumber/{phoneNumber:\\d+}")
+    R<Page<SysUser>> findByPhoneNumberStartingWith_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     @PutMapping("/inner/user")
     R<LoginUser> edit_Inner(@RequestBody LoginUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java

@@ -22,6 +22,11 @@ public class SecurityConstants
      */
     public static final String AUTHORIZATION_HEADER = "Authorization";
 
+    /**
+     * WEBSOCKET头字段
+     */
+    public final static String WEBSOCKET_HEADER = "Sec-WebSocket-Key";
+
     /**
      * 请求来源
      */

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java

@@ -16,7 +16,4 @@ public class TokenConstants
      * 令牌秘钥
      */
     public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
-
-    public final static String WEBSOCKET_HEADER = "Sec-WebSocket-Key";
-
 }

ruoyi-common/ruoyi-common-datascope/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-redis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-seata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-security/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-sensitive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-gateway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java

@@ -1,6 +1,5 @@
 package com.ruoyi.gateway.filter;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.system.api.domain.SysUser;
 
@@ -51,6 +53,14 @@ public interface SysUserMapper
      */
     public SysUser selectUserByPhoneNumber(String phoneNumber);
 
+    /**
+     * 通过手机号查询用户
+     *
+     * @param phoneNumber 手机号
+     * @return 用户对象信息
+     */
+    public Page<SysUser> findByPhoneNumberStartingWith(String phoneNumber);
+
     /**
      * 通过用户ID查询用户
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.github.pagehelper.Page;
 import com.ruoyi.system.api.domain.SysUser;
 
 /**
@@ -58,6 +60,14 @@ public interface ISysUserService
      */
     public SysUser selectUserById(Long userId);
 
+    /**
+     * 通过手机号查询用户
+     *
+     * @param phoneNumber 用户名
+     * @return 用户对象信息
+     */
+    public Page<SysUser> findByPhoneNumberStartingWith(String phoneNumber);
+
     /**
      * 根据用户ID查询用户所属角色组
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.github.pagehelper.Page;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,6 +129,17 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserByPhoneNumber(phoneNumber);
     }
 
+    /**
+     * 通过手机号查询用户
+     *
+     * @param phoneNumber 手机号
+     * @return 用户对象信息
+     */
+    @Override
+    public Page<SysUser> findByPhoneNumberStartingWith(String phoneNumber) {
+        return userMapper.findByPhoneNumberStartingWith(phoneNumber);
+    }
+
     /**
      * 通过用户ID查询用户
      * 

ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt

@@ -1,5 +1,6 @@
 package com.ruoyi.system.controller.inner
 
+import com.github.pagehelper.Page
 import com.ruoyi.common.core.domain.R
 import com.ruoyi.common.core.utils.StringUtils
 import com.ruoyi.common.core.web.controller.BaseController
@@ -56,6 +57,15 @@ open class InnerSysUserController : BaseController() {
         return R.ok(sysUserVo)
     }
 
+    /**
+     * 获取当前用户信息
+     */
+    @InnerAuth
+    @GetMapping("/list/phoneNumber/{phoneNumber:\\d+}")
+    fun findByPhoneNumberStartingWith(@PathVariable("phoneNumber") phoneNumber: String?): R<Page<SysUser>> {
+        return R.ok(userService.findByPhoneNumberStartingWith(phoneNumber))
+    }
+
     /**
      * 根据ID获取用户信息
      */

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -146,6 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where u.phonenumber = #{phoneNumber} and u.del_flag = '0'
 	</select>
+	<select id="findByPhoneNumberStartingWith" parameterType="String" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.phonenumber = CONCAT(#{phoneNumber},"%") and u.del_flag = '0'
+	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(

ruoyi-ui/src/views/index.vue

@@ -914,7 +914,7 @@ export default {
   data() {
     return {
       // 版本号
-      version: "3.6.41.0.3",
+      version: "3.6.41.0.4",
     };
   },
   methods: {

ruoyi-visual/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-visual/ruoyi-monitor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-visual</artifactId>
-        <version>3.6.41.0.3</version>
+        <version>3.6.41.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>