yystopf
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(微服务平台重命名): 调整系统微服务 

1、GroupId调整为com.microservices
2、启动类命名开头调整为Microservices*Application
3、日志输出目录调整为logs/microservices-*
4、应用名称调整为microservices-*
This commit is contained in:
OTTO 2024-05-27 15:03:28 +08:00
parent aab3cccf98
commit 332cc32fd6
112 changed files with 623 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
microservices-modules/microservices-modules-system/pom.xml
View File

@ -3,7 +3,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.ruoyi</groupId>
<groupId>com.microservices</groupId>
<artifactId>microservices-modules</artifactId>
<version>3.6.2</version>
</parent>
@ -56,25 +56,25 @@
<!-- RuoYi Common DataSource -->
<dependency>
<groupId>com.ruoyi</groupId>
<groupId>com.microservices</groupId>
<artifactId>microservices-common-datasource</artifactId>
</dependency>
<!-- RuoYi Common DataScope -->
<dependency>
<groupId>com.ruoyi</groupId>
<groupId>com.microservices</groupId>
<artifactId>microservices-common-datascope</artifactId>
</dependency>
<!-- RuoYi Common Log -->
<dependency>
<groupId>com.ruoyi</groupId>
<groupId>com.microservices</groupId>
<artifactId>microservices-common-log</artifactId>
</dependency>
<!-- RuoYi Common Swagger -->
<dependency>
<groupId>com.ruoyi</groupId>
<groupId>com.microservices</groupId>
<artifactId>microservices-common-swagger</artifactId>
</dependency>
<dependency>
@ -87,7 +87,7 @@
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<groupId>com.microservices</groupId>
<artifactId>microservices-common-httpClient</artifactId>
<version>3.6.2</version>
<scope>compile</scope>

25
microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/MicroservicesSystemApplication.java Normal file
View File

@ -0,0 +1,25 @@
package com.microservices.system;
import com.microservices.common.security.annotation.EnableCustomConfig;
import com.microservices.common.security.annotation.EnableRyFeignClients;
import com.microservices.common.swagger.annotation.EnableCustomSwagger2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
* 系统模块
*
* @author ruoyi
*/
@EnableCustomConfig
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling
public class MicroservicesSystemApplication {
public static void main(String[] args) {
SpringApplication.run(MicroservicesSystemApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n");
}
}

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/CacheController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/CacheController.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.security.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/ServerController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/ServerController.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.system.domain.Server;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.system.domain.Server;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

22
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysConfigController.java
View File

@ -1,15 +1,15 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.microservices.common.core.utils.poi.ExcelUtil;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.domain.SysConfig;
import com.microservices.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

26
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDeptController.java
View File

@ -1,17 +1,17 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.service.ISysDeptService;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.domain.R;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.InnerAuth;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.service.ISysDeptService;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;

32
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDeptRoleController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDeptRoleController.java
View File

@ -1,20 +1,20 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.vo.SysRoleInputVo;
import com.ruoyi.system.domain.vo.SysRoleUpdateVo;
import com.ruoyi.system.service.ISysDeptRoleService;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.Logical;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.domain.SysMenu;
import com.microservices.system.domain.vo.SysRoleInputVo;
import com.microservices.system.domain.vo.SysRoleUpdateVo;
import com.microservices.system.service.ISysDeptRoleService;
import com.microservices.system.service.ISysMenuService;
import com.microservices.system.service.ISysRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

26
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDictDataController.java
View File

@ -1,17 +1,17 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDictData;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.utils.poi.ExcelUtil;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysDictData;
import com.microservices.system.service.ISysDictDataService;
import com.microservices.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

22
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDictTypeController.java
View File

@ -1,15 +1,15 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDictType;
import com.ruoyi.system.service.ISysDictTypeService;
import com.microservices.common.core.utils.poi.ExcelUtil;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysDictType;
import com.microservices.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

26
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysLogininforController.java
View File

@ -1,17 +1,17 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.system.api.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.core.utils.poi.ExcelUtil;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.redis.service.RedisService;
import com.microservices.common.security.annotation.InnerAuth;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.system.api.domain.SysLogininfor;
import com.microservices.system.service.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

26
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysMenuController.java
View File

@ -1,17 +1,17 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.service.ISysMenuService;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.domain.R;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.InnerAuth;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.domain.SysMenu;
import com.microservices.system.service.ISysMenuService;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

24
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysNoticeController.java
View File

@ -1,16 +1,16 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;
import com.microservices.common.core.domain.R;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.InnerAuth;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysNotice;
import com.microservices.system.service.ISysNoticeService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

22
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysOperlogController.java
View File

@ -1,15 +1,15 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.system.api.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
import com.microservices.common.core.utils.poi.ExcelUtil;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.InnerAuth;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.system.api.domain.SysOperLog;
import com.microservices.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

22
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysPostController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysPostController.java
View File

@ -1,15 +1,15 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
import com.microservices.common.core.utils.poi.ExcelUtil;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.domain.SysPost;
import com.microservices.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

32
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysProfileController.java
View File

@ -1,20 +1,20 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.file.FileTypeUtils;
import com.ruoyi.common.core.utils.file.MimeTypeUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteFileService;
import com.ruoyi.system.api.domain.SysFile;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.service.ISysUserService;
import com.microservices.common.core.domain.R;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.utils.file.FileTypeUtils;
import com.microservices.common.core.utils.file.MimeTypeUtils;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.service.TokenService;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.RemoteFileService;
import com.microservices.system.api.domain.SysFile;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.api.model.LoginUser;
import com.microservices.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

34
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysRoleController.java
View File

@ -1,21 +1,21 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.microservices.common.core.domain.R;
import com.microservices.common.core.utils.poi.ExcelUtil;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.InnerAuth;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.service.ISysDeptService;
import com.microservices.system.service.ISysRoleService;
import com.microservices.system.service.ISysUserService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

40
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java
View File

@ -1,24 +1,24 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.service.*;
import com.ruoyi.system.task.SyncGitLinkUserInfoJob;
import com.microservices.common.core.domain.R;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.utils.poi.ExcelUtil;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.InnerAuth;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.common.security.service.TokenService;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.api.domain.SysUserDeptRole;
import com.microservices.system.api.model.LoginUser;
import com.microservices.system.service.*;
import com.microservices.system.task.SyncGitLinkUserInfoJob;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;

34
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserDeptRoleController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java
View File

@ -1,22 +1,22 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.GenericsTableDataInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.ruoyi.system.domain.dto.GitLinkUserDeptRoleByDeptInput;
import com.ruoyi.system.domain.dto.SysUserDeptRoleByDeptInput;
import com.ruoyi.system.domain.dto.SysUserDeptRoleByUserInput;
import com.ruoyi.system.domain.vo.GitLinkUserSearchVo;
import com.ruoyi.system.service.ISysUserDeptRoleService;
import com.microservices.common.core.domain.R;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.GenericsTableDataInfo;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.InnerAuth;
import com.microservices.common.security.annotation.Logical;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.system.api.domain.SysUserDeptRole;
import com.microservices.system.domain.dto.GitLinkUserDeptRoleByDeptInput;
import com.microservices.system.domain.dto.SysUserDeptRoleByDeptInput;
import com.microservices.system.domain.dto.SysUserDeptRoleByUserInput;
import com.microservices.system.domain.vo.GitLinkUserSearchVo;
import com.microservices.system.service.ISysUserDeptRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

26
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserOnlineController.java
View File

@ -1,17 +1,17 @@
package com.ruoyi.system.controller;
package com.microservices.system.controller;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.web.controller.BaseController;
import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.TableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.redis.service.RedisService;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.system.api.model.LoginUser;
import com.microservices.system.domain.SysUserOnline;
import com.microservices.system.service.ISysUserOnlineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

10
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/GitLinkUser.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/GitLinkUser.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysUser;
import com.microservices.common.core.annotation.Excel;
import com.microservices.common.core.web.domain.BaseEntity;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysUser;
import lombok.Data;
import java.util.Calendar;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/Server.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/Server.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import com.ruoyi.common.core.utils.Arith;
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.system.domain.server.*;
import com.microservices.common.core.utils.Arith;
import com.microservices.common.core.utils.ip.IpUtils;
import com.microservices.system.domain.server.*;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
import oshi.hardware.CentralProcessor.TickType;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysConfig.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysConfig.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
import com.microservices.common.core.annotation.Excel;
import com.microservices.common.core.annotation.Excel.ColumnType;
import com.microservices.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysDeptRole.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysDeptRole.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import com.ruoyi.common.core.web.domain.BaseEntity;
import com.microservices.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysMenu.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysMenu.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import com.ruoyi.common.core.web.domain.BaseEntity;
import com.microservices.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysPost.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysPost.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
import com.microservices.common.core.annotation.Excel;
import com.microservices.common.core.annotation.Excel.ColumnType;
import com.microservices.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

2
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysRoleDept.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

2
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysRoleMenu.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

2
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysUserOnline.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
/**
* 当前在线会话

2
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysUserPost.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.microservices.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

2
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/GitLinkUserDeptRoleByDeptInput.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/GitLinkUserDeptRoleByDeptInput.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.domain.dto;
package com.microservices.system.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/SysUserDeptRoleByDeptInput.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/SysUserDeptRoleByDeptInput.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.domain.dto;
package com.microservices.system.domain.dto;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.microservices.system.api.domain.SysUserDeptRole;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/SysUserDeptRoleByUserInput.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/SysUserDeptRoleByUserInput.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.domain.dto;
package com.microservices.system.domain.dto;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.microservices.system.api.domain.SysUserDeptRole;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Cpu.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Cpu.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.domain.server;
package com.microservices.system.domain.server;
import com.ruoyi.common.core.utils.Arith;
import com.microservices.common.core.utils.Arith;
/**
* CPU相关信息

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Jvm.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Jvm.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.domain.server;
package com.microservices.system.domain.server;
import com.ruoyi.common.core.utils.Arith;
import com.ruoyi.common.core.utils.DateUtils;
import com.microservices.common.core.utils.Arith;
import com.microservices.common.core.utils.DateUtils;
import java.lang.management.ManagementFactory;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Mem.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Mem.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.domain.server;
package com.microservices.system.domain.server;
import com.ruoyi.common.core.utils.Arith;
import com.microservices.common.core.utils.Arith;
/**
* 內存相关信息

2
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Sys.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Sys.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.domain.server;
package com.microservices.system.domain.server;
/**
* 系统相关信息

2
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/SysInfo.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/SysInfo.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.domain.server;
package com.microservices.system.domain.server;
/**
* 系统文件相关信息

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/GitLinkUserSearchVo.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/GitLinkUserSearchVo.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.domain.vo;
package com.microservices.system.domain.vo;
import com.ruoyi.common.core.utils.StringUtils;
import com.microservices.common.core.utils.StringUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/MetaVo.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.domain.vo;
package com.microservices.system.domain.vo;
import com.ruoyi.common.core.utils.StringUtils;
import com.microservices.common.core.utils.StringUtils;
/**
* 路由显示信息

2
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/RouterVo.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.domain.vo;
package com.microservices.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleInputVo.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/SysRoleInputVo.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.domain.vo;
package com.microservices.system.domain.vo;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.microservices.common.core.utils.bean.BeanUtils;
import com.microservices.system.api.domain.SysRole;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleUpdateVo.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/SysRoleUpdateVo.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.domain.vo;
package com.microservices.system.domain.vo;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.microservices.common.core.utils.bean.BeanUtils;
import com.microservices.system.api.domain.SysRole;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/TreeSelect.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.domain.vo;
package com.microservices.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.domain.SysMenu;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.domain.SysMenu;
import java.io.Serializable;
import java.util.List;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/GitLinkUserMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/GitLinkUserMapper.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.common.datasource.annotation.Slave;
import com.ruoyi.system.domain.GitLinkUser;
import com.microservices.common.datasource.annotation.Slave;
import com.microservices.system.domain.GitLinkUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysConfigMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.domain.SysConfig;
import com.microservices.system.domain.SysConfig;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDeptMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysDept;
import com.microservices.system.api.domain.SysDept;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDeptRoleMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDeptRoleMapper.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.domain.SysDeptRole;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.domain.SysDeptRole;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDictDataMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysDictData;
import com.microservices.system.api.domain.SysDictData;
import org.apache.ibatis.annotations.Param;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDictTypeMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysDictType;
import com.microservices.system.api.domain.SysDictType;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysLogininforMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysLogininfor;
import com.microservices.system.api.domain.SysLogininfor;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysMenuMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.domain.SysMenu;
import com.microservices.system.domain.SysMenu;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysNoticeMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysNotice;
import com.microservices.system.api.domain.SysNotice;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysOperLogMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysOperLog;
import com.microservices.system.api.domain.SysOperLog;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysPostMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.domain.SysPost;
import com.microservices.system.domain.SysPost;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysRoleMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysRole;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysRoleMenuMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.domain.SysRoleMenu;
import com.microservices.system.domain.SysRoleMenu;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserDeptRoleMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.microservices.system.api.domain.SysUserDeptRole;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.api.domain.SysUser;
import com.microservices.system.api.domain.SysUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserPostMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
package com.microservices.system.mapper;
import com.ruoyi.system.domain.SysUserPost;
import com.microservices.system.domain.SysUserPost;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysConfigService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.domain.SysConfig;
import com.microservices.system.domain.SysConfig;
import java.util.List;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDeptRoleService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDeptRoleService.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.domain.vo.SysRoleInputVo;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.domain.vo.SysRoleInputVo;
import java.util.List;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDeptService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.domain.vo.TreeSelect;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.domain.vo.TreeSelect;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDictDataService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysDictData;
import com.microservices.system.api.domain.SysDictData;
import java.util.List;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDictTypeService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysDictData;
import com.ruoyi.system.api.domain.SysDictType;
import com.microservices.system.api.domain.SysDictData;
import com.microservices.system.api.domain.SysDictType;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysLogininforService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysLogininfor;
import com.microservices.system.api.domain.SysLogininfor;
import java.util.List;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysMenuService.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.domain.vo.TreeSelect;
import com.microservices.system.domain.SysMenu;
import com.microservices.system.domain.vo.RouterVo;
import com.microservices.system.domain.vo.TreeSelect;
import java.util.List;
import java.util.Set;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysNoticeService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysNotice;
import com.microservices.system.api.domain.SysNotice;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysOperLogService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysOperLog;
import com.microservices.system.api.domain.SysOperLog;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysPostService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysPostService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.domain.SysPost;
import com.microservices.system.domain.SysPost;
import java.util.List;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysRoleMenuService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysRoleMenuService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.domain.SysRoleMenu;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.domain.SysRoleMenu;
import java.util.List;

4
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysRoleService.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysRole;
import java.util.List;
import java.util.Set;

14
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserDeptRoleService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.web.page.GenericsTableDataInfo;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.ruoyi.system.domain.dto.GitLinkUserDeptRoleByDeptInput;
import com.ruoyi.system.domain.dto.SysUserDeptRoleByDeptInput;
import com.ruoyi.system.domain.dto.SysUserDeptRoleByUserInput;
import com.ruoyi.system.domain.vo.GitLinkUserSearchVo;
import com.microservices.common.core.web.page.GenericsTableDataInfo;
import com.microservices.system.api.domain.SysUserDeptRole;
import com.microservices.system.domain.dto.GitLinkUserDeptRoleByDeptInput;
import com.microservices.system.domain.dto.SysUserDeptRoleByDeptInput;
import com.microservices.system.domain.dto.SysUserDeptRoleByUserInput;
import com.microservices.system.domain.vo.GitLinkUserSearchVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserOnlineService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.SysUserOnline;
import com.microservices.system.api.model.LoginUser;
import com.microservices.system.domain.SysUserOnline;
/**
* 在线用户 服务层

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserService.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
package com.microservices.system.service;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.GitLinkUser;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.domain.GitLinkUser;
import java.util.List;

20
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysConfigServiceImpl.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.text.Convert;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.redis.service.RedisService;
import com.microservices.system.domain.SysConfig;
import com.microservices.system.mapper.SysConfigMapper;
import com.microservices.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

38
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDeptRoleServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDeptRoleServiceImpl.java
View File

@ -1,23 +1,23 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.enums.SystemRole;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.ruoyi.system.domain.SysDeptRole;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.vo.SysRoleInputVo;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysDeptRoleMapper;
import com.ruoyi.system.mapper.SysUserDeptRoleMapper;
import com.ruoyi.system.service.ISysDeptRoleService;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.enums.SystemRole;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.utils.uuid.IdUtils;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysUserDeptRole;
import com.microservices.system.domain.SysDeptRole;
import com.microservices.system.domain.SysMenu;
import com.microservices.system.domain.vo.SysRoleInputVo;
import com.microservices.system.mapper.SysDeptMapper;
import com.microservices.system.mapper.SysDeptRoleMapper;
import com.microservices.system.mapper.SysUserDeptRoleMapper;
import com.microservices.system.service.ISysDeptRoleService;
import com.microservices.system.service.ISysMenuService;
import com.microservices.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

48
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDeptServiceImpl.java
View File

@ -1,28 +1,28 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.enums.SystemRole;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.common.security.utils.DictUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteZoneService;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysDictData;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.utils.FeignUtils;
import com.ruoyi.system.domain.vo.TreeSelect;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysDeptRoleService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserDeptRoleService;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.core.constant.SecurityConstants;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.enums.SystemRole;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.text.Convert;
import com.microservices.common.core.utils.DateUtils;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.datascope.annotation.DataScope;
import com.microservices.common.security.utils.DictUtils;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.RemoteZoneService;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.api.domain.SysDictData;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.api.utils.FeignUtils;
import com.microservices.system.domain.vo.TreeSelect;
import com.microservices.system.mapper.SysDeptMapper;
import com.microservices.system.mapper.SysRoleMapper;
import com.microservices.system.service.ISysDeptRoleService;
import com.microservices.system.service.ISysDeptService;
import com.microservices.system.service.ISysUserDeptRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

10
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDictDataServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.security.utils.DictUtils;
import com.ruoyi.system.api.domain.SysDictData;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService;
import com.microservices.common.security.utils.DictUtils;
import com.microservices.system.api.domain.SysDictData;
import com.microservices.system.mapper.SysDictDataMapper;
import com.microservices.system.service.ISysDictDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

20
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.utils.DictUtils;
import com.ruoyi.system.api.domain.SysDictData;
import com.ruoyi.system.api.domain.SysDictType;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.system.service.ISysDictTypeService;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.security.utils.DictUtils;
import com.microservices.system.api.domain.SysDictData;
import com.microservices.system.api.domain.SysDictType;
import com.microservices.system.mapper.SysDictDataMapper;
import com.microservices.system.mapper.SysDictTypeMapper;
import com.microservices.system.service.ISysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysLogininforServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.system.api.domain.SysLogininfor;
import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.system.service.ISysLogininforService;
import com.microservices.system.api.domain.SysLogininfor;
import com.microservices.system.mapper.SysLogininforMapper;
import com.microservices.system.service.ISysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

32
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysMenuServiceImpl.java
View File

@ -1,20 +1,20 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.domain.vo.TreeSelect;
import com.ruoyi.system.mapper.SysMenuMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleMenuService;
import com.microservices.common.core.constant.Constants;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.api.domain.SysUserDeptRole;
import com.microservices.system.domain.SysMenu;
import com.microservices.system.domain.vo.MetaVo;
import com.microservices.system.domain.vo.RouterVo;
import com.microservices.system.domain.vo.TreeSelect;
import com.microservices.system.mapper.SysMenuMapper;
import com.microservices.system.mapper.SysRoleMapper;
import com.microservices.system.service.ISysMenuService;
import com.microservices.system.service.ISysRoleMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysNoticeServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.system.api.domain.SysNotice;
import com.ruoyi.system.mapper.SysNoticeMapper;
import com.ruoyi.system.service.ISysNoticeService;
import com.microservices.system.api.domain.SysNotice;
import com.microservices.system.mapper.SysNoticeMapper;
import com.microservices.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysOperLogServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.system.api.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
import com.microservices.system.api.domain.SysOperLog;
import com.microservices.system.mapper.SysOperLogMapper;
import com.microservices.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

16
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysPostServiceImpl.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.service.ISysPostService;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.system.domain.SysPost;
import com.microservices.system.mapper.SysPostMapper;
import com.microservices.system.mapper.SysUserPostMapper;
import com.microservices.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

16
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysRoleMenuServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysRoleMenuServiceImpl.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
import com.ruoyi.system.service.ISysRoleMenuService;
import com.ruoyi.system.service.ISysRoleService;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.redis.service.RedisService;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.domain.SysRoleMenu;
import com.microservices.system.mapper.SysRoleMenuMapper;
import com.microservices.system.service.ISysRoleMenuService;
import com.microservices.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

32
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysRoleServiceImpl.java
View File

@ -1,20 +1,20 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.enums.SystemRole;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.mapper.SysDeptRoleMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysRoleMenuService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserDeptRoleService;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.enums.SystemRole;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.utils.SpringUtils;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.api.domain.SysUserDeptRole;
import com.microservices.system.domain.SysRoleMenu;
import com.microservices.system.mapper.SysDeptRoleMapper;
import com.microservices.system.mapper.SysRoleMapper;
import com.microservices.system.service.ISysRoleMenuService;
import com.microservices.system.service.ISysRoleService;
import com.microservices.system.service.ISysUserDeptRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

66
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptRoleServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java
View File

@ -1,39 +1,39 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.enums.SystemRole;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.PageUtils;
import com.ruoyi.common.core.utils.html.EscapeUtil;
import com.ruoyi.common.core.web.page.GenericsTableDataInfo;
import com.ruoyi.common.httpClient.domain.GitLinkRequestUrl;
import com.ruoyi.common.httpClient.util.GitLinkRequestHelper;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.DictUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteCmsService;
import com.ruoyi.system.api.RemotePmsService;
import com.ruoyi.system.api.RemoteZoneService;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.ruoyi.system.api.utils.FeignUtils;
import com.ruoyi.system.domain.dto.GitLinkUserDeptRoleByDeptInput;
import com.ruoyi.system.domain.dto.SysUserDeptRoleByDeptInput;
import com.ruoyi.system.domain.dto.SysUserDeptRoleByUserInput;
import com.ruoyi.system.domain.vo.GitLinkUserSearchVo;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysUserDeptRoleMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysDeptRoleService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserDeptRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.core.constant.SecurityConstants;
import com.microservices.common.core.enums.SystemRole;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.utils.PageUtils;
import com.microservices.common.core.utils.html.EscapeUtil;
import com.microservices.common.core.web.page.GenericsTableDataInfo;
import com.microservices.common.httpClient.domain.GitLinkRequestUrl;
import com.microservices.common.httpClient.util.GitLinkRequestHelper;
import com.microservices.common.redis.service.RedisService;
import com.microservices.common.security.service.TokenService;
import com.microservices.common.security.utils.DictUtils;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.RemoteCmsService;
import com.microservices.system.api.RemotePmsService;
import com.microservices.system.api.RemoteZoneService;
import com.microservices.system.api.domain.SysDept;
import com.microservices.system.api.domain.SysRole;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.api.domain.SysUserDeptRole;
import com.microservices.system.api.utils.FeignUtils;
import com.microservices.system.domain.dto.GitLinkUserDeptRoleByDeptInput;
import com.microservices.system.domain.dto.SysUserDeptRoleByDeptInput;
import com.microservices.system.domain.dto.SysUserDeptRoleByUserInput;
import com.microservices.system.domain.vo.GitLinkUserSearchVo;
import com.microservices.system.mapper.SysDeptMapper;
import com.microservices.system.mapper.SysUserDeptRoleMapper;
import com.microservices.system.mapper.SysUserMapper;
import com.microservices.system.service.ISysDeptRoleService;
import com.microservices.system.service.ISysRoleService;
import com.microservices.system.service.ISysUserDeptRoleService;
import com.microservices.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

10
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserOnlineServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.system.api.model.LoginUser;
import com.microservices.system.domain.SysUserOnline;
import com.microservices.system.service.ISysUserOnlineService;
import org.springframework.stereotype.Service;
/**

58
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserServiceImpl.java
View File

@ -1,34 +1,34 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.enums.SystemRole;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.PageUtils;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanValidators;
import com.ruoyi.common.core.utils.html.EscapeUtil;
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.common.httpClient.domain.GitLinkRequestUrl;
import com.ruoyi.common.httpClient.util.GitLinkRequestHelper;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.SysUserDeptRole;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.GitLinkUser;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.core.constant.SecurityConstants;
import com.microservices.common.core.constant.UserConstants;
import com.microservices.common.core.enums.SystemRole;
import com.microservices.common.core.exception.ServiceException;
import com.microservices.common.core.utils.JwtUtils;
import com.microservices.common.core.utils.PageUtils;
import com.microservices.common.core.utils.SpringUtils;
import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.core.utils.bean.BeanValidators;
import com.microservices.common.core.utils.html.EscapeUtil;
import com.microservices.common.core.utils.ip.IpUtils;
import com.microservices.common.httpClient.domain.GitLinkRequestUrl;
import com.microservices.common.httpClient.util.GitLinkRequestHelper;
import com.microservices.common.redis.service.RedisService;
import com.microservices.common.security.auth.AuthUtil;
import com.microservices.common.security.service.TokenService;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.api.domain.SysUserDeptRole;
import com.microservices.system.api.model.LoginUser;
import com.microservices.system.domain.GitLinkUser;
import com.microservices.system.domain.SysPost;
import com.microservices.system.domain.SysUserPost;
import com.microservices.system.mapper.*;
import com.microservices.system.service.ISysConfigService;
import com.microservices.system.service.ISysRoleService;
import com.microservices.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

8
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SystemRequestCustomServiceImpl.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SystemRequestCustomServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.system.service.impl;
package com.microservices.system.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.security.service.IRequestCustomService;
import com.microservices.common.core.constant.SecurityConstants;
import com.microservices.common.core.utils.ServletUtils;
import com.microservices.common.security.service.IRequestCustomService;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.HandlerMapping;

14
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/task/SyncGitLinkUserInfoJob.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/task/SyncGitLinkUserInfoJob.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.system.task;
package com.microservices.system.task;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.GitLinkUser;
import com.ruoyi.system.mapper.GitLinkUserMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import com.microservices.common.core.utils.DateUtils;
import com.microservices.system.api.domain.SysUser;
import com.microservices.system.domain.GitLinkUser;
import com.microservices.system.mapper.GitLinkUserMapper;
import com.microservices.system.mapper.SysUserMapper;
import com.microservices.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

6
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/task/SystemApplicationRunner.java → microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/task/SystemApplicationRunner.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.task;
package com.microservices.system.task;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.redis.service.RedisService;
import com.microservices.common.core.constant.CacheConstants;
import com.microservices.common.redis.service.RedisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;

36
microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
View File

@ -1,36 +0,0 @@
package com.ruoyi.system;
import com.ruoyi.common.security.annotation.EnableCustomConfig;
import com.ruoyi.common.security.annotation.EnableRyFeignClients;
import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
* 系统模块
*
* @author ruoyi
*/
@EnableCustomConfig
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling
public class RuoYiSystemApplication
{
public static void main(String[] args)
{
SpringApplication.run(RuoYiSystemApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +
" |(_ o _) / _( )_ .' \n" +
" | (_,_).' __ ___(_ o _)' \n" +
" | |\\ \\ | || |(_,_)' \n" +
" | | \\ `' /| `-' / \n" +
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
}
}

2
microservices-modules/microservices-modules-system/src/main/resources/bootstrap-prod.yml
View File

@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
name: ruoyi-system
name: microservices-system
config:
activate:
# 环境配置

2
microservices-modules/microservices-modules-system/src/main/resources/bootstrap.yml
View File

@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
name: ruoyi-system
name: microservices-system
profiles:
# 环境配置
active: dev

4
microservices-modules/microservices-modules-system/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/ruoyi-system" />
<property name="log.path" value="logs/microservices-system"/>
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@ -58,7 +58,7 @@
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info"/>
<logger name="com.microservices" level="info"/>
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn"/>
<!-- add converter for %tid -->

4
microservices-modules/microservices-modules-system/src/main/resources/mapper/system/GitLinkUserMapper.xml
View File

@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.GitLinkUserMapper">
<resultMap type="com.ruoyi.system.domain.GitLinkUser" id="GitLinkUserResult">
<mapper namespace="com.microservices.system.mapper.GitLinkUserMapper">
<resultMap type="com.microservices.system.domain.GitLinkUser" id="GitLinkUserResult">
<result property="id" column="id"/>
<result property="login" column="login"/>
<result property="hashedPassword" column="hashed_password"/>

2
microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
<mapper namespace="com.microservices.system.mapper.SysConfigMapper">
<resultMap type="SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" />

2
microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
<mapper namespace="com.microservices.system.mapper.SysDeptMapper">
<resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />

10
microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptRoleMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptRoleMapper">
<mapper namespace="com.microservices.system.mapper.SysDeptRoleMapper">
<resultMap type="com.ruoyi.system.domain.SysDeptRole" id="SysDeptRoleResult">
<resultMap type="com.microservices.system.domain.SysDeptRole" id="SysDeptRoleResult">
<result property="deptId" column="dept_id"/>
<result property="roleId" column="role_id"/>
</resultMap>
@ -22,7 +22,7 @@
LEFT JOIN sys_role sr ON sr.role_id = sdr.role_id
</sql>
<select id="selectSysDeptRoleList" parameterType="com.ruoyi.system.domain.SysDeptRole"
<select id="selectSysDeptRoleList" parameterType="com.microservices.system.domain.SysDeptRole"
resultMap="SysDeptRoleResult">
<include refid="selectSysDeptRoleVo"/>
</select>
@ -63,7 +63,7 @@
and sr.role_name=#{roleName}
</select>
<insert id="insertSysDeptRole" parameterType="com.ruoyi.system.domain.SysDeptRole">
<insert id="insertSysDeptRole" parameterType="com.microservices.system.domain.SysDeptRole">
insert into sys_dept_role
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="deptId != null">dept_id,</if>
@ -75,7 +75,7 @@
</trim>
</insert>
<update id="updateSysDeptRole" parameterType="com.ruoyi.system.domain.SysDeptRole">
<update id="updateSysDeptRole" parameterType="com.microservices.system.domain.SysDeptRole">
update sys_dept_role
<trim prefix="SET" suffixOverrides=",">
<if test="roleId != null">role_id = #{roleId},</if>

Some files were not shown because too many files have changed in this diff Show More