模块改造和知识库模块

java/storlead-api/src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
     max-swallow-size: -1
     basedir: /app/temp
   servlet:
-    context-path: /api
+    context-path: /router/rest
   compression:
     enabled: true
     min-response-size: 1024

java/storlead-api/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ server:
     max-swallow-size: -1
     basedir: /app/sp/sp-tems/temp
   servlet:
-    context-path: /api
+    context-path: /router/rest
   compression:
     enabled: true
     min-response-size: 1024

java/storlead-api/src/main/resources/application-test.yml

@@ -4,7 +4,7 @@ server:
     max-swallow-size: -1
     basedir: /app/sp/smarttrade/temp/${spring.profiles.active}
   servlet:
-    context-path: /api
+    context-path: /router/rest
   compression:
     enabled: true
     min-response-size: 1024

java/storlead-framework/storlead-web/src/main/java/com/storlead/framework/web/assemble/Result.java

@@ -57,15 +57,6 @@ public class Result<T> implements Serializable {
 	  this.timestamp = System.currentTimeMillis();
 	}
 
-	// 修改构造函数，使其可以接受int, java.lang.String, T作为参数
-//	public Result(boolean success,String message, Integer code, T result,long timestamp) {
-//		this.code = code;
-//		this.message = message;
-//		this.result = result;
-//		this.success = success;
-//		this.timestamp = timestamp;
-//	}
-
 	public T getResult(){
 		return result;
 	}
@@ -75,7 +66,7 @@ public class Result<T> implements Serializable {
 	 }
 	 public Result<T> success(String message) {
 		this.message = message;
-		this.code = ResultCode.SC_OK_200.getCode();
+		this.code = ResultCode.SUCCESS.getCode();
 		this.success = true;
 		this.timestamp = System.currentTimeMillis();
 		return this;
@@ -85,7 +76,7 @@ public class Result<T> implements Serializable {
 	public static Result<Object> ok() {
 		Result<Object> r = new Result<Object>();
 		r.setSuccess(true);
-		r.setCode(ResultCode.SC_OK_200.getCode());
+		r.setCode(ResultCode.SUCCESS.getCode());
 		r.setMessage("成功");
 		r.setTimestamp(System.currentTimeMillis());
 		return r;
@@ -94,7 +85,7 @@ public class Result<T> implements Serializable {
 	public static <T> Result<T> ok(String msg) {
 		Result<T> r = new Result<T>();
 		r.setSuccess(true);
-		r.setCode(ResultCode.SC_OK_200.getCode());
+		r.setCode(ResultCode.SUCCESS.getCode());
 		r.setMessage(msg);
 		r.setTimestamp(System.currentTimeMillis());
 		return r;
@@ -103,7 +94,7 @@ public class Result<T> implements Serializable {
 	public static <T> Result<T> ok(T result) {
 		Result<T> r = new Result<T>();
 		r.setSuccess(true);
-		r.setCode(ResultCode.SC_OK_200.getCode());
+		r.setCode(ResultCode.SUCCESS.getCode());
 		r.setResult(result);
 		r.setTimestamp(System.currentTimeMillis());
 		return r;
@@ -112,7 +103,7 @@ public class Result<T> implements Serializable {
 	public static <T> Result<T> result(T result) {
 		Result<T> r = new Result<T>();
 		r.setSuccess(true);
-		r.setCode(ResultCode.SC_OK_200.getCode());
+		r.setCode(ResultCode.SUCCESS.getCode());
 		r.setResult(result);
 		r.setTimestamp(System.currentTimeMillis());
 		return r;

java/storlead-knowledge/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-saas-platform</artifactId>
+        <version>1.0</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storlead-knowledge</artifactId>
+    <packaging>pom</packaging>
+    <name>storlead-knowledge</name>
+    <version>1.0</version>
+    <description>知识库域聚合模块：core（模型）、spi（业务契约）、biz（数据与实现）、api（HTTP）。</description>
+
+    <modules>
+        <module>storlead-knowledge-core</module>
+        <module>storlead-knowledge-spi</module>
+        <module>storlead-knowledge-biz</module>
+        <module>storlead-knowledge-api</module>
+    </modules>
+</project>

java/storlead-knowledge/storlead-knowledge-api/pom.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-knowledge</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storlead-knowledge-api</artifactId>
+    <packaging>jar</packaging>
+    <name>storlead-knowledge-api</name>
+    <description>知识库域 HTTP 接入层：Controller、对外 REST。</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-knowledge-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-knowledge-biz</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-auth</artifactId>
+        </dependency>
+    </dependencies>
+</project>

java/storlead-knowledge/storlead-knowledge-api/src/main/java/com/storlead/knowledge/api/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 知识库域 HTTP 接口：{@code RestController} 等放置于此包。
+ */
+package com.storlead.knowledge.api;

java/storlead-knowledge/storlead-knowledge-biz/pom.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-knowledge</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storlead-knowledge-biz</artifactId>
+    <packaging>jar</packaging>
+    <name>storlead-knowledge-biz</name>
+    <description>知识库域实现：Mapper、Service 实现、工具与自动配置。</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-knowledge-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>storlead-knowledge-biz</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>

java/storlead-knowledge/storlead-knowledge-biz/src/main/java/com/storlead/knowledge/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 知识库域实现：{@code mapper}、{@code service.impl} 等建议放在本模块子包中。
+ */
+package com.storlead.knowledge;

java/storlead-knowledge/storlead-knowledge-core/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-knowledge</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storlead-knowledge-core</artifactId>
+    <packaging>jar</packaging>
+    <name>storlead-knowledge-core</name>
+    <description>知识库域模型：entity、dto、vo、组合 model。</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>

java/storlead-knowledge/storlead-knowledge-core/src/main/java/com/storlead/knowledge/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 知识库域模型与值对象：{@code pojo}、{@code model} 等建议放在本模块子包中。
+ */
+package com.storlead.knowledge;

java/storlead-knowledge/storlead-knowledge-spi/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-knowledge</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storlead-knowledge-spi</artifactId>
+    <packaging>jar</packaging>
+    <name>storlead-knowledge-spi</name>
+    <description>知识库域对外业务契约（SPI）：服务接口，无实现、无 Web。</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-knowledge-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>

java/storlead-knowledge/storlead-knowledge-spi/src/main/java/com/storlead/knowledge/service/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 知识库域对外服务契约：在此包下定义 {@code I*} 接口（无实现）。
+ */
+package com.storlead.knowledge.service;

java/storlead-message/storlead-message-biz/pom.xml

@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-user</artifactId>
+            <artifactId>storlead-user-biz</artifactId>
         </dependency>
     </dependencies>
 

java/storlead-message/storlead-message-core/pom.xml

@@ -21,5 +21,9 @@
             <groupId>com.storlead.boot</groupId>
             <artifactId>storlead-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-user-spi</artifactId>
+        </dependency>
     </dependencies>
 </project>

java/storlead-message/storlead-message-core/src/main/java/com/storlead/message/service/impl/WechatMessageServiceImpl.java

@@ -11,7 +11,6 @@ import com.storlead.message.pojo.entity.MessageTemplateEventDetailEntity;
 import com.storlead.message.service.WechatMessageService;
 import com.storlead.user.pojo.entity.UserEntity;
 import com.storlead.user.service.IUserService;
-import com.storlead.user.service.impl.UserServiceImpl;
 import com.storlead.wx.service.CorpWeChatService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;

java/storlead-user/pom.xml

@@ -2,81 +2,25 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>storlead-saas-platform</artifactId>
         <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-saas-platform</artifactId>
         <version>1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>storlead-user</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
     <name>storlead-user</name>
     <version>1.0</version>
-    <description>common project for Spring Boot</description>
-
-
-    <dependencies>
-        <!--  jwt 需要,移除会报错  -->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>${io.jsonwebtoken.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-mybatis</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-common</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-thirdparty-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>pinyin-sdk-pinyin4j</artifactId>
-            <version>7.2.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>sp-sales-user</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                    <include>**/*.json</include>
-                    <include>**/*.ftl</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
+    <description>用户与组织域聚合模块：core（模型）、spi（业务契约）、api（HTTP/Controller）、biz（Mapper 与实现）。</description>
+
+    <modules>
+        <module>storlead-user-core</module>
+        <module>storlead-user-spi</module>
+        <module>storlead-user-biz</module>
+        <module>storlead-user-api</module>
+    </modules>
 </project>

java/storlead-user/src/main/java/com/storlead/user/constant/JurisdictionConstant.java

@@ -1,37 +0,0 @@
-package com.storlead.user.constant;
-
-/**
- * @program: 权限相关常量
- * @description:
- * @author: chenkq
- * @create: 2022-04-20 17:06
- */
-
-public class JurisdictionConstant {
-
-    /**
-     * 动态权限sql属性标记
-     */
-    public static final String SqlScriptProperty = "jurisdictionSql";
-
-    /**
-     * 权限按钮集合属性标记
-     */
-    public static final String BtnProperty = "jurisdictionBtns";
-
-    /**
-     * 字典缓存reis key
-     */
-    public static final String RedisDictKey = "redis-permission-dict-";
-
-    /**
-     * 缓存需要权限的资源
-     */
-    public static final String RedisApiCodeKey = "redis-permission-api-code-";
-
-    /**
-     *  记录是否需要权限
-     */
-    public static final String PermissionVerificationTrack = "context-permission-verification-track";
-
-}

java/storlead-user/src/main/java/com/storlead/user/util/TestMain.java

@@ -1,21 +0,0 @@
-package com.storlead.user.util;//package com.storlead.user.util;
-//
-//import com.storlead.sales.modules.message.model.WechatToken;
-//import com.storlead.sales.modules.message.model.vo.CorpWeChatDeptVO;
-//import com.storlead.sales.modules.message.model.vo.CorpWeChatUserVO;
-//import com.storlead.sales.modules.message.properties.CorpWeChatConstants;
-//import com.storlead.wx.util.CorpWechatUtil;
-//
-//import java.util.List;
-//
-//public class TestMain {
-//    public static void main(String[] args) {
-//        WechatToken t = CorpWechatUtil.getAccessToken(CorpWeChatConstants.GET_ACCESS_TOKEN_URL, "ww5323bd8ab4394132", "FE-ofiE08oeT8DsccbigqPFWl6Nk8LRKBFffpL76Z-M");
-//        //部门
-//        List<CorpWeChatDeptVO> volist = CorpWechatUtil.getDeptListFormTencent(CorpWeChatConstants.GET_DEPT_LIST_URL,t.getToken(),null);
-//        //用户
-//        List<CorpWeChatUserVO> allVo = CorpWechatUtil.getUserListUnderDeptFormTencent(CorpWeChatConstants.GET_USER_LIST_URL,t.getToken(),Long.valueOf("1"));
-////        System.out.println(allVo);
-//    }
-//
-//}

java/storlead-user/src/main/java/com/storlead/user/util/UserJwtUntil.java

@@ -1,85 +0,0 @@
-package com.storlead.user.util;
-
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.JwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.time.Duration;
-import java.util.Date;
-
-
-/**
- * JWT工具类
- *
- * @author blank
- * @date 2020-12-30 下午 5:26
- */
-@Slf4j
-@Component
-public class UserJwtUntil {
-
-//    @Value("${spring.security.jwt.expiryInHours}")
-    public Integer expiryInHours = 2400;
-
-    /**
-     * 过期时间
-     * dev 100天
-     * test prod 10小时
-     */
-
-//    @Value("${spring.security.jwt.secretKey}")
-    public String secretKey = "VzMzUUNCY0g2cnRVQkR6OU5kTnVUY2tkZWlodFdkc0dpdVRwTmk4dnRWc2lKYmllRnEyekVLV29NWEJIM2IzSm1wRllacWdndFZmZFY0UTk0RmhxQm4zR1R4";
-
-    /**
-     * 生成JWT
-     *
-     * @param username 用户名
-     * @return java.lang.String
-     * @author blank
-     * @date 2020-12-30 下午 5:30
-     */
-    public String generate(String username) {
-
-        return Jwts.builder()
-                //将用户名放进JWT
-                .setSubject(username)
-                //设置JWT签发时间
-                .setIssuedAt(new Date())
-                //设置过期时间
-                .setExpiration(new Date(System.currentTimeMillis() + Duration.ofHours(expiryInHours).toMillis()))
-                //设置加密算法和密钥
-                .signWith(SignatureAlgorithm.HS512, secretKey)
-                .compact();
-    }
-
-    /**
-     * 解析JWT
-     *
-     * @param token JWT字符串
-     * @return io.jsonwebtoken.Claims
-     * @author blank
-     * @date 2020-12-30 下午 5:30
-     */
-    public Claims parse(String token) {
-        // 如果是空字符串直接返回null
-        if (!StringUtils.hasLength(token)) {
-            return null;
-        }
-
-        Claims claims = null;
-        // 解析失败了会抛出异常, 所以我们要捕捉一下. token 过期 非法 都会导致解析失败
-        try {
-            claims = Jwts.parser()
-                    .setSigningKey(secretKey)
-                    .parseClaimsJws(token)
-                    .getBody();
-        } catch (JwtException e) {
-            log.error("token解析失败:{}", e.toString());
-        }
-        return claims;
-    }
-}

java/storlead-user/storlead-user-api/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-user</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storlead-user-api</artifactId>
+    <packaging>jar</packaging>
+    <name>storlead-user-api</name>
+    <description>用户域 HTTP 接入层：Controller、对外 REST 契约（与 spi 业务接口区分）。</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-user-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-user-biz</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-auth</artifactId>
+        </dependency>
+    </dependencies>
+</project>

java/storlead-user/storlead-user-api/src/main/java/com/storlead/user/api/UserApiController.java

@@ -0,0 +1,124 @@
+package com.storlead.user.api;
+
+import com.storlead.framework.auth.vo.LoginUser;
+import com.storlead.framework.util.LoginUserUtil;
+import com.storlead.framework.web.assemble.Result;
+import com.storlead.user.model.UserInfo;
+import com.storlead.user.model.UserQueryModel;
+import com.storlead.user.pojo.entity.UserEntity;
+import com.storlead.user.pojo.vo.WxUserVO;
+import com.storlead.user.service.IUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.net.http.HttpClient;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 用户表 前端控制器
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys/user")
+@Api(tags="System-User ->  公共接口")
+public class UserApiController {
+
+	@Resource
+	private IUserService sysUserService;
+
+	/**
+	 * 查询数据 查出所有部门,并以树结构数据格式响应给前端
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
+	@ApiOperation(value = "公共接口-用户信息-列表", notes = "公共接口-用户信息-列表")
+	@ApiResponses({
+			@ApiResponse(code = 200, message = "", response = UserInfo.class)
+	})
+	public Result<List<UserInfo>> queryTreeList(UserQueryModel userQueryModel) {
+		Result<List<UserInfo>> result = new Result<>();
+		try {
+			List<UserInfo> list = sysUserService.getUserListBySearch(userQueryModel);
+			result.setResult(list);
+			result.setSuccess(true);
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+		}
+		return result;
+	}
+
+	 /***
+	  * @Description: 用户列表，按拼音首字母排序
+	  * @Param:
+	  * @return:
+	  * @Author: YPZ
+	  * @Date: 2023/3/16 11:54
+	  */
+	@RequestMapping(value = "/user-list-pinyin", method = RequestMethod.GET)
+	@ApiOperation(value = "公共接口-用户信息-列表（按拼音首字母排序）", notes = "公共接口-用户信息-列表（按拼音首字母排序）")
+	@ApiResponses({
+			@ApiResponse(code = 200, message = "", response = UserInfo.class)
+	})
+	public Result<List<WxUserVO>> userListPinyin(UserQueryModel userQueryModel) {
+		Result<List<WxUserVO>> result = new Result<>();
+		try {
+			List<WxUserVO> wxUserInfoList =sysUserService.getPingyinUserList(userQueryModel);
+			result.setResult(wxUserInfoList);
+			result.setSuccess(true);
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+		}
+		return result;
+	}
+
+	@RequestMapping(value = "/list-subordinate", method = RequestMethod.GET)
+	@ApiOperation(value = "公共接口-下级用户信息-列表", notes = "公共接口-下级用户信息-列表")
+	@ApiResponses({
+			@ApiResponse(code = 200, message = "", response = UserInfo.class)
+	})
+	public Result<List<UserInfo>> listSubordinate(UserQueryModel userQueryModel) {
+		Result<List<UserInfo>> result = new Result<>();
+		try {
+			LoginUser loginUser = LoginUserUtil.getLoginUser();
+			List<UserInfo> list = sysUserService.getUserListBySearch(userQueryModel);
+			List<Long> allSubordinate = sysUserService.getAllSubordinate(loginUser.getId());
+			Set<Long> allSubordinateSet =new HashSet<>(allSubordinate);
+			list = list.stream().filter((u)->allSubordinateSet.contains(u.getId())).collect(Collectors.toList());
+			result.setResult(list);
+			result.setSuccess(true);
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+		}
+		return result;
+	}
+
+	/**
+	 * 查询数据 查出所有部门,并以树结构数据格式响应给前端
+	 *
+	 * @return
+	 */
+	@GetMapping(value = "/findManager")
+	@ApiOperation(value = "公共接口-用户信息-查看当前用户领导", notes = "公共接口-用户信息-查看当前用户领导")
+	public Result findManager() {
+		LoginUser loginUser = LoginUserUtil.getLoginUser();
+		UserEntity user = sysUserService.getById(loginUser.getManagerId());
+		return Result.ok(user);
+	}
+
+}

java/storlead-user/storlead-user-biz/pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-user</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storlead-user-biz</artifactId>
+    <packaging>jar</packaging>
+    <name>storlead-user-biz</name>
+    <description>用户域实现：Mapper、Service 实现、工具与自动配置。</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-user-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-thirdparty-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>pinyin-sdk-pinyin4j</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>storlead-user-biz</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+</project>

java/storlead-user/src/main/java/com/storlead/user/service/impl/UserServiceImpl.java → java/storlead-user/storlead-user-biz/src/main/java/com/storlead/user/service/impl/UserServiceImpl.java

@@ -20,7 +20,7 @@ import com.storlead.user.pojo.entity.*;
 import com.storlead.user.pojo.vo.UserVo;
 import com.storlead.user.pojo.vo.WxUserVO;
 import com.storlead.user.service.*;
-import com.storlead.user.util.PingyinUtil;
+import com.storlead.user.util.PinyinUtil;
 import com.storlead.thirdparty.api.enums.ThirdPartyChannel;
 import com.storlead.thirdparty.api.dto.ThirdPartyUserSyncDTO;
 import com.storlead.thirdparty.api.service.ThirdPartyUserSyncService;
@@ -548,7 +548,7 @@ public class UserServiceImpl extends MyBaseServiceImpl<UserMapper, UserEntity> i
 	@Override
 	public List<WxUserVO> getPingyinUserList(UserQueryModel userQueryModel) {
 		List<UserInfo> list = getUserListBySearch(userQueryModel);
-		List<WxUserVO> wxUserInfoList = PingyinUtil.wxUserList(list);
+		List<WxUserVO> wxUserInfoList = PinyinUtil.wxUserList(list);
 		return wxUserInfoList;
 	}
 

java/storlead-user/src/main/java/com/storlead/user/util/PingyinUtil.java → java/storlead-user/storlead-user-biz/src/main/java/com/storlead/user/util/PinyinUtil.java

@@ -14,22 +14,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-public class PingyinUtil {
-
-    public static void main(String[] args) {
-//        List<String> list = new ArrayList<>();
-//        list.add("张三");
-//        list.add("李四");
-//        list.add("王五");
-//        list.add("赵六");
-//        list.add("曾七");
-//        Map<String,Object> map = screenManufacturer(list);
-//        for (String key:map.keySet()){
-//            System.out.println("key= "+key+" and value= "+map.get(key));
-//        }
-//        System.out.println(getFullPinyin("曾")+getFullPinyin("张"));
-        System.out.println(getLowFullSpell("目录"));
-    }
+public class PinyinUtil {
 
     // 这里需要用到 pinyin4j-2.5.0.jar 这个汉字转拼音的jar包
 
@@ -96,7 +81,6 @@ public class PingyinUtil {
                 // 循环找出 首字母一样的数据
                 List<String> letter = new ArrayList<>();
                 for (String str : list) {
-//                    String pybf = getFullSpell(str);
                     String pybf = getFullPinyin(str);
                     String zm = pybf.substring(0, 1);
                     if (word.equals(zm)) {
@@ -134,7 +118,6 @@ public class PingyinUtil {
                 // 循环找出 首字母一样的数据
                 List<UserInfo> userInfoList = new ArrayList<>();
                 for (String str : userNameList) {
-//                    String pybf = getFullSpell(str);
                     String pybf = getFullPinyin(str);
                     String zm = pybf.substring(0, 1);
                     if (word.equals(zm)) {
@@ -153,16 +136,8 @@ public class PingyinUtil {
         return null;
     }
 
-
-     /***
-      * @Description: 姓氏多音字解决方案
-      * @Param:
-      * @return:
-      * @Author: YPZ
-      * @Date: 2023/3/23 11:26
-      */
     /**
-     * 多音字拼音
+     * 多音字拼音（姓氏等）
      */
     public static Map<String, String> FIRST_NAME_PINYIN = new HashMap<>();
     static {

java/storlead-user/storlead-user-core/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.storlead.boot</groupId>
+        <artifactId>storlead-user</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storlead-user-core</artifactId>
+    <packaging>jar</packaging>
+    <name>storlead-user-core</name>
+    <description>用户域模型：entity、dto、vo、组合 model。</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>