wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-18 19:16:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：1.5多应用版本

Browse Source
This commit is contained in:
Jerry
2021-03-31 09:43:36 +08:00
parent 060cb450be
commit 71d07cefb3
1343 changed files with 11695 additions and 71470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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")

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

@@ -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());

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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);
}
/**
* 删除符合过滤条件的数据。
*

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

@@ -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 &lt;= ${@com.orange.demo.upmsinterface.constant.SysMenuType@TYPE_MENU}
AND m.menu_type &lt;= ${@com.orange.demo.upmsapi.constant.SysMenuType@TYPE_MENU}
</where>
ORDER BY m.show_order
</select>

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

@@ -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">

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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.*;

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

@@ -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;

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

@@ -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;
}

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

@@ -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>