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

commit：集成knife4j

Browse Source
This commit is contained in:
Jerry
2020-10-29 18:51:32 +08:00
parent c87e94d2e8
commit 6e57f10dfc
648 changed files with 6447 additions and 708 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

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan;
* upms服务启动类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@SpringCloudApplication
@EnableFeignClients(basePackages = "com.orange.demo")

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

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
* NOTE: 和multiDataSource相关的配置没有包含进来，因为涉及到条件属性，所以由其相关的配置对象自己处理。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@RefreshScope

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

@@ -14,7 +14,7 @@ import javax.sql.DataSource;
* 数据源配置Bean对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Configuration
@EnableTransactionManagement

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

@@ -1,8 +1,11 @@
package com.orange.demo.upmsservice.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.constant.ApplicationConstant;
import com.orange.demo.common.core.object.ResponseResult;
@@ -29,8 +32,10 @@ import java.util.*;
* 登录接口控制器类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@ApiSupport(order = 1)
@Api(tags = "登录接口")
@Slf4j
@RestController
@RequestMapping("/login")
@@ -58,6 +63,12 @@ public class LoginController {
* @param password 密码。
* @return 应答结果对象，其中包括JWT的Token数据，以及菜单列表。
*/
@ApiImplicitParams({
// 这里包含密码密文，仅用于方便开发期间的接口测试，集成测试和发布阶段，需要将当前注解去掉。
// 如果您重新生成了公钥和私钥，请替换password的缺省值。
@ApiImplicitParam(name = "loginName", defaultValue = "admin"),
@ApiImplicitParam(name = "password", defaultValue = "IP3ccke3GhH45iGHB5qP9p7iZw6xUyj28Ju10rnBiPKOI35sc%2BjI7%2FdsjOkHWMfUwGYGfz8ik31HC2Ruk%2Fhkd9f6RPULTHj7VpFdNdde2P9M4mQQnFBAiPM7VT9iW3RyCtPlJexQ3nAiA09OqG%2F0sIf1kcyveSrulxembARDbDo%3D")
})
@GetMapping("/doLogin")
public ResponseResult<JSONObject> doLogin(
@RequestParam String loginName, @RequestParam String password) throws Exception {
@@ -101,7 +112,7 @@ public class LoginController {
*/
@PostMapping("/changePassword")
public ResponseResult<Void> changePassword(
@MyRequestBody String oldPass, @MyRequestBody String newPass) throws Exception {
@RequestParam String oldPass, @RequestParam String newPass) throws Exception {
if (MyCommonUtil.existBlankArgument(oldPass, oldPass)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}

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

@@ -1,11 +1,10 @@
package com.orange.demo.upmsservice.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.annotation.MyRequestBody;
@@ -24,8 +23,9 @@ import java.util.*;
* 菜单管理接口控制器类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Api(tags = "菜单管理接口")
@Slf4j
@RestController
@RequestMapping("/sysMenu")
@@ -44,8 +44,9 @@ public class SysMenuController {
* @return 应答结果对象，包含新增菜单的主键Id。
*/
@SuppressWarnings("unchecked")
@ApiOperationSupport(ignoreParameters = {"sysMenu.menuId"})
@PostMapping("/add")
public ResponseResult<JSONObject> add(
public ResponseResult<Long> add(
@MyRequestBody("sysMenu") SysMenuDto sysMenuDto, @MyRequestBody String permCodeIdListString) {
String errorMessage = MyCommonUtil.getModelValidationError(sysMenuDto);
if (errorMessage != null) {
@@ -61,9 +62,7 @@ public class SysMenuController {
permCodeIdSet = (Set<Long>) result.getData().get("permCodeIdSet");
}
sysMenuService.saveNew(sysMenu, permCodeIdSet);
JSONObject responseData = new JSONObject();
responseData.put("sysMenuId", sysMenu.getMenuId());
return ResponseResult.success(responseData);
return ResponseResult.success(sysMenu.getMenuId());
}
/**

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

@@ -1,13 +1,11 @@
package com.orange.demo.upmsservice.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.page.PageMethod;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.MyPageParam;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.util.MyPageUtil;
@@ -27,8 +25,9 @@ import java.util.*;
* 权限字管理接口控制器类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Api(tags = "权限字管理接口")
@Slf4j
@RestController
@RequestMapping("/sysPermCode")
@@ -45,8 +44,9 @@ public class SysPermCodeController {
* @return 应答结果对象，包含新增权限字的主键Id。
*/
@SuppressWarnings("unchecked")
@ApiOperationSupport(ignoreParameters = {"sysPermCode.permCodeId"})
@PostMapping("/add")
public ResponseResult<JSONObject> add(
public ResponseResult<Long> add(
@MyRequestBody("sysPermCode") SysPermCodeDto sysPermCodeDto, @MyRequestBody String permIdListString) {
String errorMessage = MyCommonUtil.getModelValidationError(sysPermCodeDto);
if (errorMessage != null) {
@@ -62,9 +62,7 @@ public class SysPermCodeController {
permIdSet = (Set<Long>) result.getData().get("permIdSet");
}
sysPermCode = sysPermCodeService.saveNew(sysPermCode, permIdSet);
JSONObject responseData = new JSONObject();
responseData.put("sysPermCodeId", sysPermCode.getPermCodeId());
return ResponseResult.success(responseData);
return ResponseResult.success(sysPermCode.getPermCodeId());
}
/**
@@ -172,7 +170,7 @@ public class SysPermCodeController {
* @return 应答结果对象，包含该用户的全部权限资源列表。
*/
@PostMapping("/listAllPermCodesByUserFilter")
public ResponseResult<JSONObject> listAllPermCodesByUserFilter(
public ResponseResult<MyPageData<SysPermCodeDto>> listAllPermCodesByUserFilter(
@MyRequestBody String loginName,
@MyRequestBody String permCode,
@MyRequestBody MyPageParam pageParam) {
@@ -184,8 +182,8 @@ public class SysPermCodeController {
}
List<SysPermCode> permCodeList =
sysPermCodeService.getUserPermCodeListByFilter(loginName, permCode);
JSONObject responseData = MyPageUtil.makeResponseData(
MyPageData<SysPermCodeDto> pageData = MyPageUtil.makeResponseData(
MyModelUtil.copyCollectionTo(permCodeList, SysPermCodeDto.class));
return ResponseResult.success(responseData);
return ResponseResult.success(pageData);
}
}

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

@@ -1,13 +1,13 @@
package com.orange.demo.upmsservice.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.common.core.object.CallResult;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.MyPageParam;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.util.MyPageUtil;
@@ -28,8 +28,9 @@ import java.util.Map;
* 权限资源管理接口控制器类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Api(tags = "权限资源管理接口")
@Slf4j
@RestController
@RequestMapping("/sysPerm")
@@ -44,8 +45,9 @@ public class SysPermController {
* @param sysPermDto 新增权限资源对象。
* @return 应答结果对象，包含新增权限资源的主键Id。
*/
@ApiOperationSupport(ignoreParameters = {"sysPerm.permId"})
@PostMapping("/add")
public ResponseResult<JSONObject> add(@MyRequestBody("sysPerm") SysPermDto sysPermDto) {
public ResponseResult<Long> add(@MyRequestBody("sysPerm") SysPermDto sysPermDto) {
String errorMessage = MyCommonUtil.getModelValidationError(sysPermDto);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
@@ -56,9 +58,7 @@ public class SysPermController {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, result.getErrorMessage());
}
sysPerm = sysPermService.saveNew(sysPerm);
JSONObject responseData = new JSONObject();
responseData.put("permId", sysPerm.getPermId());
return ResponseResult.success(responseData);
return ResponseResult.success(sysPerm.getPermId());
}
/**
@@ -136,7 +136,7 @@ public class SysPermController {
* @return 应答结果对象，包含权限资源列表。
*/
@PostMapping("/list")
public ResponseResult<JSONObject> list(
public ResponseResult<MyPageData<SysPermDto>> list(
@MyRequestBody("sysPermFilter") SysPermDto sysPermDtoFiltter, @MyRequestBody MyPageParam pageParam) {
if (pageParam != null) {
PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
@@ -161,7 +161,7 @@ public class SysPermController {
* @return 应答结果对象，包含该用户的全部权限资源列表。
*/
@PostMapping("/listAllPermsByUserFilter")
public ResponseResult<JSONObject> listAllPermsByUserFilter(
public ResponseResult<MyPageData<Map<String, Object>>> listAllPermsByUserFilter(
@MyRequestBody String loginName,
@MyRequestBody Long moduleId,
@MyRequestBody String url,
@@ -174,8 +174,7 @@ public class SysPermController {
}
List<Map<String, Object>> userPermMapList =
sysPermService.getUserPermListByFilter(loginName, moduleId, url);
JSONObject responseData = MyPageUtil.makeResponseData(userPermMapList);
return ResponseResult.success(responseData);
return ResponseResult.success(MyPageUtil.makeResponseData(userPermMapList));
}
/**

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

@@ -1,9 +1,10 @@
package com.orange.demo.upmsservice.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.annotation.MyRequestBody;
@@ -26,8 +27,9 @@ import java.util.Map;
* 权限资源模块管理接口控制器类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Api(tags = "权限资源模块管理接口")
@Slf4j
@RestController
@RequestMapping("/sysPermModule")
@@ -42,8 +44,9 @@ public class SysPermModuleController {
* @param sysPermModuleDto 新增权限资源模块对象。
* @return 应答结果对象，包含新增权限资源模块的主键Id。
*/
@ApiOperationSupport(ignoreParameters = {"sysPermModule.moduleId"})
@PostMapping("/add")
public ResponseResult<JSONObject> add(@MyRequestBody("sysPermModule") SysPermModuleDto sysPermModuleDto) {
public ResponseResult<Long> add(@MyRequestBody("sysPermModule") SysPermModuleDto sysPermModuleDto) {
String errorMessage = MyCommonUtil.getModelValidationError(sysPermModuleDto);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
@@ -55,9 +58,7 @@ public class SysPermModuleController {
return ResponseResult.error(ErrorCodeEnum.DATA_PARENT_ID_NOT_EXIST, errorMessage);
}
sysPermModule = sysPermModuleService.saveNew(sysPermModule);
JSONObject responseData = new JSONObject();
responseData.put("permModuleId", sysPermModule.getModuleId());
return ResponseResult.success(responseData);
return ResponseResult.success(sysPermModule.getModuleId());
}
/**

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

@@ -1,16 +1,14 @@
package com.orange.demo.upmsservice.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.common.core.object.CallResult;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.common.core.object.CallResult;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.MyOrderParam;
import com.orange.demo.common.core.object.MyPageParam;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.util.MyPageUtil;
@@ -33,8 +31,9 @@ import java.util.stream.Collectors;
* 角色管理接口控制器类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Api(tags = "角色管理接口")
@Slf4j
@RestController
@RequestMapping("/sysRole")
@@ -53,8 +52,9 @@ public class SysRoleController {
* @return 应答结果对象，包含新增角色的主键Id。
*/
@SuppressWarnings("unchecked")
@ApiOperationSupport(ignoreParameters = {"sysRole.roleId", "sysRole.createTimeStart", "sysRole.createTimeEnd"})
@PostMapping("/add")
public ResponseResult<JSONObject> add(
public ResponseResult<Long> add(
@MyRequestBody("sysRole") SysRoleDto sysRoleDto, @MyRequestBody String menuIdListString) {
String errorMessage = MyCommonUtil.getModelValidationError(sysRoleDto);
if (errorMessage != null) {
@@ -70,9 +70,7 @@ public class SysRoleController {
menuIdSet = (Set<Long>) result.getData().get("menuIdSet");
}
sysRoleService.saveNew(sysRole, menuIdSet);
JSONObject responseData = new JSONObject();
responseData.put("roleId", sysRole.getRoleId());
return ResponseResult.success(responseData);
return ResponseResult.success(sysRole.getRoleId());
}
/**
@@ -83,6 +81,7 @@ public class SysRoleController {
* @return 应答结果对象。
*/
@SuppressWarnings("unchecked")
@ApiOperationSupport(ignoreParameters = {"sysRole.createTimeStart", "sysRole.createTimeEnd"})
@PostMapping("/update")
public ResponseResult<Void> update(
@MyRequestBody("sysRole") SysRoleDto sysRoleDto, @MyRequestBody String menuIdListString) {
@@ -138,7 +137,7 @@ public class SysRoleController {
* @return 应答结果对象，包含角色列表。
*/
@PostMapping("/list")
public ResponseResult<JSONObject> list(
public ResponseResult<MyPageData<SysRoleDto>> list(
@MyRequestBody("sysRoleFilter") SysRoleDto sysRoleDtoFilter,
@MyRequestBody MyOrderParam orderParam,
@MyRequestBody MyPageParam pageParam) {
@@ -186,7 +185,7 @@ public class SysRoleController {
* @return 应答结果对象，包含用户列表数据。
*/
@PostMapping("/listNotInUserRole")
public ResponseResult<JSONObject> listNotInUserRole(
public ResponseResult<MyPageData<SysUserDto>> listNotInUserRole(
@MyRequestBody Long roleId,
@MyRequestBody("sysUserFilter") SysUserDto sysUserDtoFilter,
@MyRequestBody MyOrderParam orderParam,
@@ -200,10 +199,9 @@ public class SysRoleController {
}
SysUser filter = MyModelUtil.copyTo(sysUserDtoFilter, SysUser.class);
String orderBy = MyOrderParam.buildOrderBy(orderParam, SysUser.class);
List<SysUser> userList =
sysUserService.getNotInSysUserListByRoleId(roleId, filter, orderBy);
JSONObject responseData = MyPageUtil.makeResponseData(userList);
return ResponseResult.success(responseData);
List<SysUser> userList = sysUserService.getNotInSysUserListByRoleId(roleId, filter, orderBy);
List<SysUserDto> userDtoList = MyModelUtil.copyCollectionTo(userList, SysUserDto.class);
return ResponseResult.success(MyPageUtil.makeResponseData(userDtoList));
}
/**
@@ -216,7 +214,7 @@ public class SysRoleController {
* @return 应答结果对象，包含用户列表数据。
*/
@PostMapping("/listUserRole")
public ResponseResult<JSONObject> listUserRole(
public ResponseResult<MyPageData<SysUserDto>> listUserRole(
@MyRequestBody Long roleId,
@MyRequestBody("sysUserFilter") SysUserDto sysUserDtoFilter,
@MyRequestBody MyOrderParam orderParam,
@@ -231,8 +229,8 @@ public class SysRoleController {
SysUser filter = MyModelUtil.copyTo(sysUserDtoFilter, SysUser.class);
String orderBy = MyOrderParam.buildOrderBy(orderParam, SysUser.class);
List<SysUser> userList = sysUserService.getSysUserListByRoleId(roleId, filter, orderBy);
JSONObject responseData = MyPageUtil.makeResponseData(userList);
return ResponseResult.success(responseData);
List<SysUserDto> userDtoList = MyModelUtil.copyCollectionTo(userList, SysUserDto.class);
return ResponseResult.success(MyPageUtil.makeResponseData(userDtoList));
}
private ResponseResult<Void> doRoleUserVerify(Long roleId) {
@@ -303,7 +301,7 @@ public class SysRoleController {
* @return 符合条件的角色列表。
*/
@PostMapping("/listAllRolesByPermCode")
public ResponseResult<JSONObject> listAllRolesByPermCode(
public ResponseResult<MyPageData<SysRoleDto>> listAllRolesByPermCode(
@MyRequestBody Long permCodeId, @MyRequestBody MyPageParam pageParam) {
if (MyCommonUtil.existBlankArgument(permCodeId)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -317,8 +315,7 @@ public class SysRoleController {
if (roleList instanceof Page) {
totalCount = ((Page<SysRole>) roleList).getTotal();
}
JSONObject responseData = MyPageUtil.makeResponseData(roleDtoList, totalCount);
return ResponseResult.success(responseData);
return ResponseResult.success(MyPageUtil.makeResponseData(roleDtoList, totalCount));
}
/**
@@ -330,7 +327,7 @@ public class SysRoleController {
* @return 符合条件的角色列表。
*/
@PostMapping("/listAllRolesByPerm")
public ResponseResult<JSONObject> listAllRolesByPerm(
public ResponseResult<MyPageData<SysRoleDto>> listAllRolesByPerm(
@MyRequestBody String url, @MyRequestBody MyPageParam pageParam) {
if (MyCommonUtil.existBlankArgument(url)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -344,7 +341,6 @@ public class SysRoleController {
if (roleList instanceof Page) {
totalCount = ((Page<SysRole>) roleList).getTotal();
}
JSONObject responseData = MyPageUtil.makeResponseData(roleDtoList, totalCount);
return ResponseResult.success(responseData);
return ResponseResult.success(MyPageUtil.makeResponseData(roleDtoList, totalCount));
}
}

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

@@ -1,6 +1,5 @@
package com.orange.demo.upmsservice.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.upmsservice.model.*;
@@ -15,6 +14,9 @@ import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.AddGroup;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.upmsservice.config.ApplicationConfig;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,8 +28,9 @@ import java.util.*;
* 用户管理操作控制器类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Api(tags = "用户管理管理接口")
@Slf4j
@RestController
@RequestMapping("/sysUser")
@@ -51,8 +54,12 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @return 应答结果对象，包含新增用户的主键Id。
*/
@SuppressWarnings("unchecked")
@ApiOperationSupport(ignoreParameters = {
"sysUser.userId",
"sysUser.createTimeStart",
"sysUser.createTimeEnd"})
@PostMapping("/add")
public ResponseResult<JSONObject> add(
public ResponseResult<Long> add(
@MyRequestBody("sysUser") SysUserDto sysUserDto, @MyRequestBody String roleIdListString) {
String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto, Default.class, AddGroup.class);
if (errorMessage != null) {
@@ -65,9 +72,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
}
Set<Long> roleIdSet = (Set<Long>) result.getData().get("roleIdSet");
sysUserService.saveNew(sysUser, roleIdSet);
JSONObject responseData = new JSONObject();
responseData.put("userId", sysUser.getUserId());
return ResponseResult.success(responseData);
return ResponseResult.success(sysUser.getUserId());
}
/**
@@ -78,6 +83,9 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @return 应答结果对象。
*/
@SuppressWarnings("unchecked")
@ApiOperationSupport(ignoreParameters = {
"sysUser.createTimeStart",
"sysUser.createTimeEnd"})
@PostMapping("/update")
public ResponseResult<Void> update(
@MyRequestBody("sysUser") SysUserDto sysUserDto, @MyRequestBody String roleIdListString) {
@@ -153,7 +161,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @return 应答结果对象，包含查询结果集。
*/
@PostMapping("/list")
public ResponseResult<JSONObject> list(
public ResponseResult<MyPageData<SysUserDto>> list(
@MyRequestBody("sysUserFilter") SysUserDto sysUserDtoFilter,
@MyRequestBody MyOrderParam orderParam,
@MyRequestBody MyPageParam pageParam) {
@@ -202,6 +210,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象集合。
*/
@ApiOperation(hidden = true, value = "listByIds")
@PostMapping("/listByIds")
public ResponseResult<List<SysUserDto>> listByIds(
@RequestParam Set<Long> userIds, @RequestParam Boolean withDict) {
@@ -215,6 +224,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象数据。
*/
@ApiOperation(hidden = true, value = "getById")
@PostMapping("/getById")
public ResponseResult<SysUserDto> getById(
@RequestParam Long userId, @RequestParam Boolean withDict) {
@@ -227,6 +237,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param userIds 主键Id集合。
* @return 应答结果对象，包含true全部存在，否则false。
*/
@ApiOperation(hidden = true, value = "existIds")
@PostMapping("/existIds")
public ResponseResult<Boolean> existIds(@RequestParam Set<Long> userIds) {
return super.baseExistIds(userIds);
@@ -238,6 +249,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param userId 主键Id。
* @return 应答结果对象，包含true表示存在，否则false。
*/
@ApiOperation(hidden = true, value = "existId")
@PostMapping("/existId")
public ResponseResult<Boolean> existId(@RequestParam Long userId) {
return super.baseExistId(userId);
@@ -249,6 +261,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
@ApiOperation(hidden = true, value = "listBy")
@PostMapping("/listBy")
public ResponseResult<List<SysUserDto>> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, SysUser.INSTANCE);
@@ -260,6 +273,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
@ApiOperation(hidden = true, value = "listMapBy")
@PostMapping("/listMapBy")
public ResponseResult<List<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam) {
return super.baseListMapBy(queryParam, SysUser.INSTANCE);
@@ -271,6 +285,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
@ApiOperation(hidden = true, value = "getBy")
@PostMapping("/getBy")
public ResponseResult<SysUserDto> getBy(@RequestBody MyQueryParam queryParam) {
return super.baseGetBy(queryParam, SysUser.INSTANCE);
@@ -282,6 +297,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param queryParam 查询参数。
* @return 应答结果对象，包含结果数量。
*/
@ApiOperation(hidden = true, value = "countBy")
@PostMapping("/countBy")
public ResponseResult<Integer> countBy(@RequestBody MyQueryParam queryParam) {
return super.baseCountBy(queryParam);
@@ -293,6 +309,7 @@ public class SysUserController extends BaseController<SysUser, SysUserDto, Long>
* @param aggregationParam 聚合参数。
* @return 应该结果对象，包含聚合计算后的分组Map列表。
*/
@ApiOperation(hidden = true, value = "aggregateBy")
@PostMapping("/aggregateBy")
public ResponseResult<List<Map<String, Object>>> aggregateBy(@RequestBody MyAggregationParam aggregationParam) {
return super.baseAggregateBy(aggregationParam);

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

@@ -9,7 +9,7 @@ import java.util.List;
* 菜单数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysMenuMapper extends BaseDaoMapper<SysMenu> {

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

@@ -7,7 +7,7 @@ import com.orange.demo.upmsservice.model.SysMenuPermCode;
* 菜单与权限字关系数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysMenuPermCodeMapper extends BaseDaoMapper<SysMenuPermCode> {
}

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

@@ -11,7 +11,7 @@ import java.util.Map;
* 权限字数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysPermCodeMapper extends BaseDaoMapper<SysPermCode> {

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

@@ -7,7 +7,7 @@ import com.orange.demo.upmsservice.model.SysPermCodePerm;
* 权限字与权限资源关系数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysPermCodePermMapper extends BaseDaoMapper<SysPermCodePerm> {
}

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

@@ -11,7 +11,7 @@ import java.util.Map;
* 权限资源数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysPermMapper extends BaseDaoMapper<SysPerm> {

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

@@ -9,7 +9,7 @@ import java.util.List;
* 权限资源模块数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysPermModuleMapper extends BaseDaoMapper<SysPermModule> {

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

@@ -7,7 +7,7 @@ import com.orange.demo.upmsservice.model.SysPermWhitelist;
* 权限资源白名单数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysPermWhitelistMapper extends BaseDaoMapper<SysPermWhitelist> {
}

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

@@ -10,7 +10,7 @@ import java.util.List;
* 角色数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysRoleMapper extends BaseDaoMapper<SysRole> {

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

@@ -7,7 +7,7 @@ import com.orange.demo.upmsservice.model.SysRoleMenu;
* 角色与菜单操作关联关系数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysRoleMenuMapper extends BaseDaoMapper<SysRoleMenu> {
}

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

@@ -10,7 +10,7 @@ import java.util.*;
* 用户管理数据操作访问接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysUserMapper extends BaseDaoMapper<SysUser> {

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

@@ -9,7 +9,7 @@ import java.util.List;
* 用户与角色关联关系数据访问操作接口。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
public interface SysUserRoleMapper extends BaseDaoMapper<SysUserRole> {

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

@@ -82,7 +82,7 @@
AND pcp.perm_id = p.perm_id
AND p.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
</where>
<if test="orderBy != null">
<if test="orderBy != null and orderBy != ''">
ORDER BY ${orderBy}
</if>
</select>

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

@@ -22,7 +22,7 @@
</if>
AND deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
</where>
<if test="orderBy != null">
<if test="orderBy != null and orderBy != ''">
ORDER BY ${orderBy}
</if>
</select>

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

@@ -50,7 +50,7 @@
</if>
<include refid="filterRef"/>
</where>
<if test="orderBy != null">
<if test="orderBy != null and orderBy != ''">
ORDER BY ${orderBy}
</if>
</select>
@@ -79,7 +79,7 @@
AND zz_sys_user_role.user_id = zz_sys_user.user_id
<include refid="filterRef"/>
</where>
<if test="orderBy != null">
<if test="orderBy != null and orderBy != ''">
ORDER BY ${orderBy}
</if>
</select>
@@ -91,7 +91,7 @@
WHERE zz_sys_user_role.role_id = #{roleId} AND zz_sys_user_role.user_id = zz_sys_user.user_id)
<include refid="filterRef"/>
</where>
<if test="orderBy != null">
<if test="orderBy != null and orderBy != ''">
ORDER BY ${orderBy}
</if>
</select>

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

@@ -21,7 +21,7 @@ import java.util.List;
* 菜单实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_menu")

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

@@ -8,7 +8,7 @@ import javax.persistence.*;
* 菜单与权限字关联实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_menu_perm_code")

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

@@ -14,7 +14,7 @@ import java.util.Map;
* 权限资源实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_perm")

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

@@ -21,7 +21,7 @@ import java.util.List;
* 权限字实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_perm_code")

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

@@ -8,7 +8,7 @@ import javax.persistence.*;
* 权限字与权限资源关联实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_perm_code_perm")

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

@@ -15,7 +15,7 @@ import java.util.List;
* 权限模块实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_perm_module")

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

@@ -8,7 +8,7 @@ import javax.persistence.*;
* 白名单实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_perm_whitelist")

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

@@ -19,7 +19,7 @@ import java.util.List;
* 角色实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_role")

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

@@ -8,7 +8,7 @@ import javax.persistence.*;
* 角色菜单实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_role_menu")

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

@@ -23,7 +23,7 @@ import java.util.List;
* SysUser实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_user")

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

@@ -8,7 +8,7 @@ import javax.persistence.*;
* 用户角色实体对象。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Data
@Table(name = "zz_sys_user_role")

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

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
* 菜单数据服务类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Service
public class SysMenuService extends BaseService<SysMenu, SysMenuDto, Long> {

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

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
* 权限字数据服务类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Service
public class SysPermCodeService extends BaseService<SysPermCode, SysPermCodeDto, Long> {

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

@@ -19,7 +19,7 @@ import java.util.List;
* 权限资源模块数据服务类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Service
public class SysPermModuleService extends BaseService<SysPermModule, SysPermModuleDto, Long> {

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

@@ -27,7 +27,7 @@ import java.util.Map;
* 权限资源数据服务类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Service
public class SysPermService extends BaseService<SysPerm, SysPermDto, Long> {

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
* 白名单数据服务类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Service
public class SysPermWhitelistService extends BaseService<SysPermWhitelist, SysPermWhitelist, String> {

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

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
* 角色数据服务类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Service
public class SysRoleService extends BaseService<SysRole, SysRoleDto, Long> {

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

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
* 用户管理数据操作服务类。
*
* @author Jerry
* @date 2020-10-19
* @date 2020-08-08
*/
@Service
public class SysUserService extends BaseService<SysUser, SysUserDto, Long> {
@@ -171,7 +171,6 @@ public class SysUserService extends BaseService<SysUser, SysUserDto, Long> {
if (sysUserMapper.updateByExampleSelective(deletedObject, sysUserExample) == 0) {
return false;
}
// 这里可继续删除关联数据。
SysUserRole userRole = new SysUserRole();
userRole.setUserId(userId);
sysUserRoleMapper.delete(userRole);

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

@@ -59,6 +59,9 @@
<Root level="${OUTPUT_LOG_LEVEL}">
<AppenderRef ref="console"/>
</Root>
<Logger name="springfox.documentation" additivity="false" level="error">
<AppenderRef ref="console"/>
</Logger>
<!-- AsyncLogger 是基于Disruptor的全量异步队列，性能极高，队列默认大小4096。-->
<!-- 队列默认值可通过JVM参数设置，参考博客：https://www.jianshu.com/p/82469047acbf -->
<AsyncLogger name="com.orange.demo" additivity="false" level="info">

21
orange-demo-multi-service/application/upms/upms-service/upms-service.iml
View File

@@ -50,9 +50,9 @@
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.1.5" 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.alibaba:fastjson:1.2.70" 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" />
@@ -89,6 +89,23 @@
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.11" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" 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" />