commit：1.5多应用版本

orange-demo-multi-service/application/upms/pom.xml

@@ -12,7 +12,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>upms-interface</module>
+        <module>upms-api</module>
         <module>upms-service</module>
     </modules>
 </project>

orange-demo-multi-service/application/upms/upms-api/pom.xml

@@ -8,9 +8,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>upms-interface</artifactId>
+    <artifactId>upms-api</artifactId>
     <version>1.0.0</version>
-    <name>upms-interface</name>
+    <name>upms-api</name>
     <packaging>jar</packaging>
 
     <dependencies>

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/client/SysUserClient.java

@@ -1,11 +1,11 @@
-package com.orange.demo.upmsinterface.client;
+package com.orange.demo.upmsapi.client;
 
 import com.orange.demo.common.core.base.client.BaseFallbackFactory;
 import com.orange.demo.common.core.config.FeignConfig;
 import com.orange.demo.common.core.base.client.BaseClient;
 import com.orange.demo.common.core.object.*;
-import com.orange.demo.upmsinterface.dto.SysUserDto;
-import com.orange.demo.upmsinterface.vo.SysUserVo;
+import com.orange.demo.upmsapi.dto.SysUserDto;
+import com.orange.demo.upmsapi.vo.SysUserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -78,8 +78,8 @@ public interface SysUserClient extends BaseClient<SysUserDto, SysUserVo, Long> {
      * @return 应答结果对象。
      */
     @Override
-    @PostMapping("/sysUser/delete")
-    ResponseResult<Void> delete(@RequestParam("userId") Long userId);
+    @PostMapping("/sysUser/deleteById")
+    ResponseResult<Integer> deleteById(@RequestParam("userId") Long userId);
 
     /**
      * 删除符合过滤条件的数据。

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysMenuType.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysPermCodeType.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysPermModuleType.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysUserStatus.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/constant/SysUserType.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.constant;
+package com.orange.demo.upmsapi.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysMenuDto.java

@@ -1,8 +1,8 @@
-package com.orange.demo.upmsinterface.dto;
+package com.orange.demo.upmsapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.validator.ConstDictRef;
-import com.orange.demo.upmsinterface.constant.SysMenuType;
+import com.orange.demo.upmsapi.constant.SysMenuType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysPermCodeDto.java

@@ -1,8 +1,8 @@
-package com.orange.demo.upmsinterface.dto;
+package com.orange.demo.upmsapi.dto;
 
 import com.orange.demo.common.core.validator.ConstDictRef;
 import com.orange.demo.common.core.validator.UpdateGroup;
-import com.orange.demo.upmsinterface.constant.SysPermCodeType;
+import com.orange.demo.upmsapi.constant.SysPermCodeType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysPermDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.dto;
+package com.orange.demo.upmsapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import io.swagger.annotations.ApiModel;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysPermModuleDto.java

@@ -1,8 +1,8 @@
-package com.orange.demo.upmsinterface.dto;
+package com.orange.demo.upmsapi.dto;
 
 import com.orange.demo.common.core.validator.ConstDictRef;
 import com.orange.demo.common.core.validator.UpdateGroup;
-import com.orange.demo.upmsinterface.constant.SysPermModuleType;
+import com.orange.demo.upmsapi.constant.SysPermModuleType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysRoleDto.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.dto;
+package com.orange.demo.upmsapi.dto;
 
 import com.orange.demo.common.core.validator.UpdateGroup;
 import io.swagger.annotations.ApiModel;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysUserDto.java

@@ -1,10 +1,10 @@
-package com.orange.demo.upmsinterface.dto;
+package com.orange.demo.upmsapi.dto;
 
 import com.orange.demo.common.core.validator.AddGroup;
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.common.core.validator.ConstDictRef;
-import com.orange.demo.upmsinterface.constant.SysUserType;
-import com.orange.demo.upmsinterface.constant.SysUserStatus;
+import com.orange.demo.upmsapi.constant.SysUserType;
+import com.orange.demo.upmsapi.constant.SysUserStatus;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysMenuVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.vo;
+package com.orange.demo.upmsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysPermCodeVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.vo;
+package com.orange.demo.upmsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysPermModuleVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.vo;
+package com.orange.demo.upmsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysPermVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.vo;
+package com.orange.demo.upmsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysRoleVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.vo;
+package com.orange.demo.upmsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysUserVo.java

@@ -1,4 +1,4 @@
-package com.orange.demo.upmsinterface.vo;
+package com.orange.demo.upmsapi.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

orange-demo-multi-service/application/upms/upms-service/pom.xml

@@ -17,7 +17,12 @@
         <!-- 业务组件依赖 -->
         <dependency>
             <groupId>com.orange.demo</groupId>
-            <artifactId>upms-interface</artifactId>
+            <artifactId>upms-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.orange.demo</groupId>
+            <artifactId>common-core</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/UpmsApplication.java

@@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 
 /**
- * upms服务启动类。
+ * Upms服务启动类。
  *
  * @author Jerry
  * @date 2020-08-08

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java

@@ -18,7 +18,7 @@ import javax.sql.DataSource;
  */
 @Configuration
 @EnableTransactionManagement
-@MapperScan(value = {"com.orange.demo.*.dao"})
+@MapperScan(value = {"com.orange.demo.*.dao", "com.orange.demo.common.*.dao"})
 public class DataSourceConfig {
 
     @Bean(initMethod = "init", destroyMethod = "close")

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java

@@ -11,11 +11,10 @@ import com.orange.demo.common.core.constant.ErrorCodeEnum;
 import com.orange.demo.common.core.constant.ApplicationConstant;
 import com.orange.demo.common.core.object.ResponseResult;
 import com.orange.demo.common.core.object.TokenData;
-import com.orange.demo.common.core.util.MyCommonUtil;
-import com.orange.demo.common.core.util.RsaUtil;
+import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.redis.cache.SessionCacheHelper;
-import com.orange.demo.upmsinterface.constant.SysUserStatus;
-import com.orange.demo.upmsinterface.constant.SysUserType;
+import com.orange.demo.upmsapi.constant.SysUserStatus;
+import com.orange.demo.upmsapi.constant.SysUserType;
 import com.orange.demo.upmsservice.model.SysMenu;
 import com.orange.demo.upmsservice.model.SysUser;
 import com.orange.demo.upmsservice.service.*;
@@ -173,6 +172,8 @@ public class LoginController {
         tokenData.setIsAdmin(isAdmin);
         tokenData.setShowName(user.getShowName());
         tokenData.setSessionId(sessionId);
+        // 这里手动将TokenData存入request，便于OperationLogAspect统一处理操作日志。
+        TokenData.addToRequest(tokenData);
         JSONObject jsonData = new JSONObject();
         jsonData.put(TokenData.REQUEST_ATTRIBUTE_NAME, tokenData);
         jsonData.put("showName", user.getShowName());

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysMenuController.java

@@ -9,8 +9,8 @@ import com.orange.demo.common.core.util.MyModelUtil;
 import com.orange.demo.common.core.util.MyCommonUtil;
 import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.validator.UpdateGroup;
-import com.orange.demo.upmsinterface.dto.SysMenuDto;
-import com.orange.demo.upmsinterface.vo.SysMenuVo;
+import com.orange.demo.upmsapi.dto.SysMenuDto;
+import com.orange.demo.upmsapi.vo.SysMenuVo;
 import com.orange.demo.upmsservice.model.SysMenu;
 import com.orange.demo.upmsservice.service.SysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermCodeController.java

@@ -9,8 +9,8 @@ import com.orange.demo.common.core.util.MyModelUtil;
 import com.orange.demo.common.core.util.MyCommonUtil;
 import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.validator.UpdateGroup;
-import com.orange.demo.upmsinterface.dto.SysPermCodeDto;
-import com.orange.demo.upmsinterface.vo.SysPermCodeVo;
+import com.orange.demo.upmsapi.dto.SysPermCodeDto;
+import com.orange.demo.upmsapi.vo.SysPermCodeVo;
 import com.orange.demo.upmsservice.model.SysPermCode;
 import com.orange.demo.upmsservice.service.SysPermCodeService;
 import org.springframework.beans.factory.annotation.Autowired;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermController.java

@@ -12,8 +12,8 @@ import com.orange.demo.common.core.util.MyCommonUtil;
 import com.orange.demo.common.core.util.MyPageUtil;
 import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.validator.UpdateGroup;
-import com.orange.demo.upmsinterface.dto.SysPermDto;
-import com.orange.demo.upmsinterface.vo.SysPermVo;
+import com.orange.demo.upmsapi.dto.SysPermDto;
+import com.orange.demo.upmsapi.vo.SysPermVo;
 import com.orange.demo.upmsservice.model.SysPerm;
 import com.orange.demo.upmsservice.service.SysPermService;
 import org.springframework.beans.factory.annotation.Autowired;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermModuleController.java

@@ -9,8 +9,8 @@ import com.orange.demo.common.core.util.MyModelUtil;
 import com.orange.demo.common.core.util.MyCommonUtil;
 import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.validator.UpdateGroup;
-import com.orange.demo.upmsinterface.dto.SysPermModuleDto;
-import com.orange.demo.upmsinterface.vo.SysPermModuleVo;
+import com.orange.demo.upmsapi.dto.SysPermModuleDto;
+import com.orange.demo.upmsapi.vo.SysPermModuleVo;
 import com.orange.demo.upmsservice.model.SysPerm;
 import com.orange.demo.upmsservice.model.SysPermModule;
 import com.orange.demo.upmsservice.service.SysPermModuleService;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysRoleController.java

@@ -12,10 +12,10 @@ import com.orange.demo.common.core.util.MyCommonUtil;
 import com.orange.demo.common.core.util.MyModelUtil;
 import com.orange.demo.common.core.util.MyPageUtil;
 import com.orange.demo.common.core.annotation.MyRequestBody;
-import com.orange.demo.upmsinterface.dto.SysRoleDto;
-import com.orange.demo.upmsinterface.dto.SysUserDto;
-import com.orange.demo.upmsinterface.vo.SysRoleVo;
-import com.orange.demo.upmsinterface.vo.SysUserVo;
+import com.orange.demo.upmsapi.dto.SysRoleDto;
+import com.orange.demo.upmsapi.dto.SysUserDto;
+import com.orange.demo.upmsapi.vo.SysRoleVo;
+import com.orange.demo.upmsapi.vo.SysUserVo;
 import com.orange.demo.upmsservice.model.SysRole;
 import com.orange.demo.upmsservice.model.SysUser;
 import com.orange.demo.upmsservice.model.SysUserRole;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java

@@ -3,8 +3,8 @@ package com.orange.demo.upmsservice.controller;
 import com.github.pagehelper.page.PageMethod;
 import com.orange.demo.upmsservice.model.*;
 import com.orange.demo.upmsservice.service.*;
-import com.orange.demo.upmsinterface.dto.*;
-import com.orange.demo.upmsinterface.vo.*;
+import com.orange.demo.upmsapi.dto.*;
+import com.orange.demo.upmsapi.vo.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
@@ -292,6 +292,20 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
         return super.baseExistId(userId);
     }
 
+    /**
+     * 根据主键Id删除数据。
+     *
+     * @param userId 主键Id。
+     * @return 删除数量。
+     */
+    @ApiOperation(hidden = true, value = "deleteById")
+    @PostMapping("/deleteById")
+    public ResponseResult<Integer> deleteById(@RequestParam Long userId) throws Exception {
+        SysUser filter = new SysUser();
+        filter.setUserId(userId);
+        return super.baseDeleteBy(filter);
+    }
+
     /**
      * 删除符合过滤条件的数据。
      *

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysMenuMapper.xml

@@ -27,7 +27,7 @@
             AND ur.user_id = #{userId}
             AND ur.role_id = rm.role_id
             AND rm.menu_id = m.menu_id
-            AND m.menu_type <= ${@com.orange.demo.upmsinterface.constant.SysMenuType@TYPE_MENU}
+            AND m.menu_type <= ${@com.orange.demo.upmsapi.constant.SysMenuType@TYPE_MENU}
         </where>
         ORDER BY m.show_order
     </select>

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml

@@ -15,12 +15,14 @@
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
+
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
         <include refid="com.orange.demo.upmsservice.dao.SysUserMapper.inputFilterRef"/>
         AND zz_sys_user.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
+
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
     <sql id="inputFilterRef">
         <if test="sysUserFilter != null">

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java

@@ -4,7 +4,7 @@ import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
-import com.orange.demo.upmsinterface.vo.SysMenuVo;
+import com.orange.demo.upmsapi.vo.SysMenuVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.mapstruct.Mapper;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java

@@ -4,7 +4,7 @@ import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
-import com.orange.demo.upmsinterface.vo.SysPermCodeVo;
+import com.orange.demo.upmsapi.vo.SysPermCodeVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.mapstruct.Mapper;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java

@@ -4,7 +4,7 @@ import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
-import com.orange.demo.upmsinterface.vo.SysRoleVo;
+import com.orange.demo.upmsapi.vo.SysRoleVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.mapstruct.Mapper;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java

@@ -1,13 +1,13 @@
 package com.orange.demo.upmsservice.model;
 
-import com.orange.demo.upmsinterface.constant.SysUserType;
-import com.orange.demo.upmsinterface.constant.SysUserStatus;
+import com.orange.demo.upmsapi.vo.SysUserVo;
+import com.orange.demo.upmsapi.constant.SysUserType;
+import com.orange.demo.upmsapi.constant.SysUserStatus;
 import com.orange.demo.common.core.annotation.RelationConstDict;
 import com.orange.demo.common.core.annotation.RelationManyToMany;
 import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.common.core.annotation.DeletedFlagColumn;
-import com.orange.demo.upmsinterface.vo.SysUserVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.mapstruct.*;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysMenuServiceImpl.java

@@ -7,7 +7,7 @@ import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.constant.GlobalDeletedFlag;
 import com.orange.demo.common.core.util.MyModelUtil;
 import com.orange.demo.common.core.object.CallResult;
-import com.orange.demo.upmsinterface.constant.SysMenuType;
+import com.orange.demo.upmsapi.constant.SysMenuType;
 import com.orange.demo.upmsservice.service.SysMenuService;
 import com.orange.demo.upmsservice.service.SysPermCodeService;
 import com.orange.demo.upmsservice.dao.SysMenuPermCodeMapper;

orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java

@@ -10,9 +10,10 @@ import com.orange.demo.common.core.constant.GlobalDeletedFlag;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
-import com.orange.demo.upmsinterface.constant.SysUserStatus;
+import com.orange.demo.upmsapi.constant.SysUserStatus;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -210,7 +211,8 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
     @Override
     public List<SysUser> getSysUserListWithRelation(SysUser filter, String orderBy) {
         List<SysUser> resultList = sysUserMapper.getSysUserList(null, null, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 
@@ -230,7 +232,8 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
             String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy) {
         List<SysUser> resultList =
                 sysUserMapper.getSysUserList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
     }
 

orange-demo-multi-service/application/upms/upms-service/src/main/resources/log4j2.xml

@@ -22,8 +22,8 @@
             [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] [%t] ==> %msg%n
         </property>
         <property name="LOG_PATTERN_EX">
-                        <!-- 下面注释中 %X{PtxId}, SpanId: %X{PspanId} 为PinPoint 中的traceid -->
-            [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] 请求Id[%X{traceId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
+            <!-- 下面注释中 %X{PtxId}, SpanId: %X{PspanId} 为PinPoint 中的traceid -->
+            [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] T:[%X{traceId}] S:[%X{sessionId}] U:[%X{userId}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
         </property>
         <!-- 日志保留天数 -->
         <property name="EVERY_FILE_COUNT">31</property>

orange-demo-multi-service/application/upms/upms-service/upms-service.iml

@@ -20,7 +20,25 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="upms-interface" />
+    <orderEntry type="module" module-name="upms-api" />
+    <orderEntry type="module" module-name="application-common" />
+    <orderEntry type="module" module-name="common-swagger" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
     <orderEntry type="module" module-name="common-core" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.5.RELEASE" level="project" />
@@ -36,6 +54,7 @@
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
@@ -52,12 +71,14 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.5" level="project" />
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
     <orderEntry type="library" name="Maven: com.github.ben-manes.caffeine:caffeine:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: cn.jimmyshi:bean-query:1.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
@@ -68,6 +89,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
@@ -88,24 +110,6 @@
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
-    <orderEntry type="module" module-name="application-common" />
-    <orderEntry type="module" module-name="common-swagger" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
     <orderEntry type="module" module-name="common-redis" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.7.0" level="project" />
@@ -126,7 +130,6 @@
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
@@ -150,7 +153,6 @@
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
@@ -186,13 +188,11 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />