diff --git a/microservices-modules/microservices-modules-system/pom.xml b/microservices-modules/microservices-modules-system/pom.xml index c50a8ca24..c71f9b422 100644 --- a/microservices-modules/microservices-modules-system/pom.xml +++ b/microservices-modules/microservices-modules-system/pom.xml @@ -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"> - com.ruoyi + com.microservices microservices-modules 3.6.2 @@ -56,25 +56,25 @@ - com.ruoyi + com.microservices microservices-common-datasource - com.ruoyi + com.microservices microservices-common-datascope - com.ruoyi + com.microservices microservices-common-log - com.ruoyi + com.microservices microservices-common-swagger @@ -87,7 +87,7 @@ lombok - com.ruoyi + com.microservices microservices-common-httpClient 3.6.2 compile diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/MicroservicesSystemApplication.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/MicroservicesSystemApplication.java new file mode 100644 index 000000000..8ac60b252 --- /dev/null +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/MicroservicesSystemApplication.java @@ -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"); + } +} diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/CacheController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/CacheController.java similarity index 88% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/CacheController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/CacheController.java index fa75217eb..89644328a 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/CacheController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/CacheController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/ServerController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/ServerController.java similarity index 71% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/ServerController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/ServerController.java index 77fdc01ad..e311981e8 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/ServerController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/ServerController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysConfigController.java similarity index 84% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysConfigController.java index 35571bc73..0445d1c1b 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysConfigController.java @@ -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.*; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDeptController.java similarity index 91% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDeptController.java index 35bc2f479..953ee9acb 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDeptController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDeptRoleController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDeptRoleController.java similarity index 87% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDeptRoleController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDeptRoleController.java index 1626415d9..ca8f07bfe 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDeptRoleController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDeptRoleController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDictDataController.java similarity index 79% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDictDataController.java index 008f4c753..e9911ec67 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDictDataController.java @@ -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.*; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDictTypeController.java similarity index 84% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDictTypeController.java index 1f64f5c62..d60c329e6 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysDictTypeController.java @@ -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.*; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysLogininforController.java similarity index 74% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysLogininforController.java index 6673beefb..9cfea9247 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysLogininforController.java @@ -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.*; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysMenuController.java similarity index 87% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysMenuController.java index 714046046..2f03b6b6b 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysMenuController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysNoticeController.java similarity index 84% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysNoticeController.java index 1a999e646..6958d32d2 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysNoticeController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysOperlogController.java similarity index 73% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysOperlogController.java index fff81bf6b..7a6695f2f 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysOperlogController.java @@ -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.*; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysPostController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysPostController.java similarity index 84% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysPostController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysPostController.java index 5beace490..426c11a5c 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysPostController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysPostController.java @@ -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.*; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysProfileController.java similarity index 84% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysProfileController.java index 650a0890f..5b323fc81 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysProfileController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysRoleController.java similarity index 87% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysRoleController.java index 57bc8fd06..51028afa2 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysRoleController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java index 5f3581c27..b980e82f3 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserDeptRoleController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java similarity index 93% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserDeptRoleController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java index af9f0beb4..ace5024ae 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserDeptRoleController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserDeptRoleController.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserOnlineController.java similarity index 73% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserOnlineController.java index f552dc701..d4ba88d94 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserOnlineController.java @@ -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.*; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/GitLinkUser.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/GitLinkUser.java similarity index 91% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/GitLinkUser.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/GitLinkUser.java index 72802184e..e46991cab 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/GitLinkUser.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/GitLinkUser.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/Server.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/Server.java similarity index 96% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/Server.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/Server.java index e59b5c9fb..5e7531fbe 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/Server.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/Server.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysConfig.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysConfig.java index fb686d1f8..453d0569c 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysConfig.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysDeptRole.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysDeptRole.java similarity index 91% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysDeptRole.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysDeptRole.java index c92404db1..08d31cebf 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysDeptRole.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysDeptRole.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysMenu.java similarity index 95% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysMenu.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysMenu.java index b78183ace..6623281cf 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysMenu.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysPost.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysPost.java index 0052eec0e..ecab3ca97 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysPost.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysRoleDept.java similarity index 95% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysRoleDept.java index 47b21bf79..efda3f79d 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysRoleDept.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysRoleMenu.java similarity index 95% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysRoleMenu.java index de10a7470..09cb43011 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysRoleMenu.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysUserOnline.java similarity index 97% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysUserOnline.java index 69bac9a3a..4d178e9e6 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.microservices.system.domain; /** * 当前在线会话 diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysUserPost.java similarity index 95% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysUserPost.java index 6e8c416f2..cc7ac68f2 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/SysUserPost.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/GitLinkUserDeptRoleByDeptInput.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/GitLinkUserDeptRoleByDeptInput.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/GitLinkUserDeptRoleByDeptInput.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/GitLinkUserDeptRoleByDeptInput.java index a6eef1f3b..38431828a 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/GitLinkUserDeptRoleByDeptInput.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/GitLinkUserDeptRoleByDeptInput.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/SysUserDeptRoleByDeptInput.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/SysUserDeptRoleByDeptInput.java similarity index 87% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/SysUserDeptRoleByDeptInput.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/SysUserDeptRoleByDeptInput.java index b8f215bea..d079b128b 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/SysUserDeptRoleByDeptInput.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/SysUserDeptRoleByDeptInput.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/SysUserDeptRoleByUserInput.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/SysUserDeptRoleByUserInput.java similarity index 87% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/SysUserDeptRoleByUserInput.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/SysUserDeptRoleByUserInput.java index cd657008a..214724b45 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/dto/SysUserDeptRoleByUserInput.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/dto/SysUserDeptRoleByUserInput.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Cpu.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Cpu.java similarity index 93% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Cpu.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Cpu.java index 1977686d4..8dd9af73d 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Cpu.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Cpu.java @@ -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相关信息 diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Jvm.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Jvm.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Jvm.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Jvm.java index 5407ccac5..63bbc8816 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Jvm.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Jvm.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Mem.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Mem.java similarity index 89% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Mem.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Mem.java index 0d04d16a1..2d2ff5ff0 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Mem.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Mem.java @@ -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; /** * 內存相关信息 diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Sys.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Sys.java similarity index 96% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Sys.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Sys.java index b171be9de..ebfbd9629 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/Sys.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/Sys.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.server; +package com.microservices.system.domain.server; /** * 系统相关信息 diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/SysInfo.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/SysInfo.java similarity index 96% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/SysInfo.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/SysInfo.java index 5072b5758..40a878565 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/server/SysInfo.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/server/SysInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.server; +package com.microservices.system.domain.server; /** * 系统文件相关信息 diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/GitLinkUserSearchVo.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/GitLinkUserSearchVo.java similarity index 89% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/GitLinkUserSearchVo.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/GitLinkUserSearchVo.java index da9287c06..5ec56ed9f 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/GitLinkUserSearchVo.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/GitLinkUserSearchVo.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/MetaVo.java similarity index 94% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/MetaVo.java index 53bb9f614..9947d5ceb 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/MetaVo.java @@ -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; /** * 路由显示信息 diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/RouterVo.java similarity index 98% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/RouterVo.java index 1c05d34bd..60994da72 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.microservices.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleInputVo.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/SysRoleInputVo.java similarity index 85% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleInputVo.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/SysRoleInputVo.java index fec7ac573..7c5d871dd 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleInputVo.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/SysRoleInputVo.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleUpdateVo.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/SysRoleUpdateVo.java similarity index 84% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleUpdateVo.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/SysRoleUpdateVo.java index 8405df598..91f03fb84 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleUpdateVo.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/SysRoleUpdateVo.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/TreeSelect.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/TreeSelect.java index dc82901e2..543cb60ff 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/domain/vo/TreeSelect.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/GitLinkUserMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/GitLinkUserMapper.java similarity index 77% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/GitLinkUserMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/GitLinkUserMapper.java index 71d18ea21..0ade79b65 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/GitLinkUserMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/GitLinkUserMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysConfigMapper.java similarity index 94% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysConfigMapper.java index 59523816e..2f085bb3c 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysConfigMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDeptMapper.java similarity index 97% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDeptMapper.java index ce25a3178..3137a5fff 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDeptMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDeptRoleMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDeptRoleMapper.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDeptRoleMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDeptRoleMapper.java index 6a3e4a314..cde03c273 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDeptRoleMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDeptRoleMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDictDataMapper.java similarity index 95% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDictDataMapper.java index d1d5f0afe..0b9203553 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDictDataMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDictTypeMapper.java similarity index 94% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDictTypeMapper.java index 1c09279ce..067eb0c31 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysDictTypeMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysLogininforMapper.java similarity index 89% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysLogininforMapper.java index f295f6217..4b9938a89 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysLogininforMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysMenuMapper.java similarity index 97% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysMenuMapper.java index e899557b4..7e66cf09b 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysMenuMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysNoticeMapper.java similarity index 91% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysNoticeMapper.java index af3e8f316..c0edbfc5c 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysNoticeMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysOperLogMapper.java similarity index 90% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysOperLogMapper.java index 126d6d3a9..3fba599f5 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysOperLogMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysPostMapper.java similarity index 95% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysPostMapper.java index 960691fd1..d14b7b893 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysPostMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysRoleMapper.java similarity index 96% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysRoleMapper.java index ea7a7782e..d34f4b46d 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysRoleMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysRoleMenuMapper.java similarity index 90% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysRoleMenuMapper.java index 92bcec0e0..497f59d68 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysRoleMenuMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserDeptRoleMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java similarity index 97% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserDeptRoleMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java index 9f2841de3..11f326137 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserDeptRoleMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserDeptRoleMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserMapper.java similarity index 97% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserMapper.java index a335c4027..5bf630bfa 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserPostMapper.java similarity index 90% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserPostMapper.java index ad0cc3444..3f86d6e02 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/mapper/SysUserPostMapper.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysConfigService.java similarity index 94% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysConfigService.java index f6cc5f76f..2a8ad32fc 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysConfigService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDeptRoleService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDeptRoleService.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDeptRoleService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDeptRoleService.java index 980778965..8e5702813 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDeptRoleService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDeptRoleService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDeptService.java similarity index 96% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDeptService.java index 1ae25a00f..dbbdbb281 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDeptService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDictDataService.java similarity index 93% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDictDataService.java index 48212729b..ebc3cf283 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDictDataService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDictTypeService.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDictTypeService.java index 54ffe0292..9b9a82763 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysDictTypeService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysLogininforService.java similarity index 88% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysLogininforService.java index 74c79b2f2..8de213e5e 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysLogininforService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysMenuService.java similarity index 94% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysMenuService.java index eb17ebc99..880e38f3a 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysMenuService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysNoticeService.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysNoticeService.java index 70c1a0296..157b3cb3f 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysNoticeService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysOperLogService.java similarity index 90% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysOperLogService.java index 1b5de02f6..748cfddee 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysOperLogService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysPostService.java similarity index 95% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysPostService.java index 135fcc53a..b22826591 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysPostService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysRoleMenuService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysRoleMenuService.java similarity index 85% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysRoleMenuService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysRoleMenuService.java index a70a1e658..a1221b8ab 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysRoleMenuService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysRoleMenuService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysRoleService.java similarity index 96% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysRoleService.java index 993f26c68..975b3052b 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysRoleService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserDeptRoleService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java similarity index 90% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserDeptRoleService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java index 681429d49..365e8a6cb 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserDeptRoleService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserDeptRoleService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserOnlineService.java similarity index 87% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserOnlineService.java index 9ca0ac45b..31ef81720 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserOnlineService.java @@ -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; /** * 在线用户 服务层 diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserService.java similarity index 97% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserService.java index a5251a954..0142450c7 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/ISysUserService.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysConfigServiceImpl.java similarity index 90% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysConfigServiceImpl.java index 6c456fff8..f49480b04 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysConfigServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDeptRoleServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDeptRoleServiceImpl.java similarity index 89% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDeptRoleServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDeptRoleServiceImpl.java index c33995976..9591fc76f 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDeptRoleServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDeptRoleServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDeptServiceImpl.java similarity index 94% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDeptServiceImpl.java index 26a34315f..6240371c9 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDeptServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDictDataServiceImpl.java similarity index 90% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDictDataServiceImpl.java index d30b43355..fbc0372d1 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDictDataServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDictTypeServiceImpl.java similarity index 90% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDictTypeServiceImpl.java index 7c2ce1bb8..5334678ff 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysDictTypeServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysLogininforServiceImpl.java similarity index 85% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysLogininforServiceImpl.java index 6779384c3..b76c1111b 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysLogininforServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysMenuServiceImpl.java similarity index 94% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysMenuServiceImpl.java index 61e91e438..65cf64ad5 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysMenuServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysNoticeServiceImpl.java similarity index 89% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysNoticeServiceImpl.java index 3828ce03e..f2036ef45 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysNoticeServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysOperLogServiceImpl.java similarity index 87% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysOperLogServiceImpl.java index cf1dc6fa2..055ad8624 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysOperLogServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysPostServiceImpl.java similarity index 89% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysPostServiceImpl.java index f64c69145..8705dfaa0 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysPostServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysRoleMenuServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysRoleMenuServiceImpl.java similarity index 81% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysRoleMenuServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysRoleMenuServiceImpl.java index 568104c31..79c9e6622 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysRoleMenuServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysRoleMenuServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysRoleServiceImpl.java similarity index 91% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysRoleServiceImpl.java index 8f983b826..28ba901e4 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysRoleServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptRoleServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java similarity index 93% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptRoleServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java index 37f6697de..76e545c07 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptRoleServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserOnlineServiceImpl.java similarity index 88% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserOnlineServiceImpl.java index 48d486743..f8fe564fb 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserOnlineServiceImpl.java @@ -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; /** diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserServiceImpl.java similarity index 92% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserServiceImpl.java index 064d0f421..e8fdc6fb6 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SystemRequestCustomServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SystemRequestCustomServiceImpl.java similarity index 77% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SystemRequestCustomServiceImpl.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SystemRequestCustomServiceImpl.java index 453e2ffef..c9af3aec1 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/service/impl/SystemRequestCustomServiceImpl.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SystemRequestCustomServiceImpl.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/task/SyncGitLinkUserInfoJob.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/task/SyncGitLinkUserInfoJob.java similarity index 89% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/task/SyncGitLinkUserInfoJob.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/task/SyncGitLinkUserInfoJob.java index ffee76c3c..a79d3b651 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/task/SyncGitLinkUserInfoJob.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/task/SyncGitLinkUserInfoJob.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/task/SystemApplicationRunner.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/task/SystemApplicationRunner.java similarity index 88% rename from microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/task/SystemApplicationRunner.java rename to microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/task/SystemApplicationRunner.java index 72c76b9c1..90d1a1300 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/task/SystemApplicationRunner.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/task/SystemApplicationRunner.java @@ -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; diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java deleted file mode 100644 index 10f58d6a9..000000000 --- a/microservices-modules/microservices-modules-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java +++ /dev/null @@ -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" + - " ''-' `'-' `-..-' "); - } -} diff --git a/microservices-modules/microservices-modules-system/src/main/resources/bootstrap-prod.yml b/microservices-modules/microservices-modules-system/src/main/resources/bootstrap-prod.yml index 1e46ec942..5b4e0bb9d 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/bootstrap-prod.yml +++ b/microservices-modules/microservices-modules-system/src/main/resources/bootstrap-prod.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-system + name: microservices-system config: activate: # 环境配置 diff --git a/microservices-modules/microservices-modules-system/src/main/resources/bootstrap.yml b/microservices-modules/microservices-modules-system/src/main/resources/bootstrap.yml index 941c0597b..f4a9f0437 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/bootstrap.yml +++ b/microservices-modules/microservices-modules-system/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-system + name: microservices-system profiles: # 环境配置 active: dev diff --git a/microservices-modules/microservices-modules-system/src/main/resources/logback.xml b/microservices-modules/microservices-modules-system/src/main/resources/logback.xml index f7d1dc99d..d2de890da 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/logback.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/GitLinkUserMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/GitLinkUserMapper.xml index dc0fd0f5d..e2078ed1e 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/GitLinkUserMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/GitLinkUserMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml index 3cd93f885..d5f900d91 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml index 5c3f2e676..8a797950d 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptRoleMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptRoleMapper.xml index 7c0a0c7dd..cdfd04d5c 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptRoleMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDeptRoleMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -22,7 +22,7 @@ LEFT JOIN sys_role sr ON sr.role_id = sdr.role_id - @@ -63,7 +63,7 @@ and sr.role_name=#{roleName} - + insert into sys_dept_role dept_id, @@ -75,7 +75,7 @@ - + update sys_dept_role role_id = #{roleId}, diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 8da9030bf..4f89d0ab2 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 55b4075f1..d411761fd 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml index b0cec6b88..6c42d32da 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml index 661413356..a35983edf 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml index ad5358571..47129fc76 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 18f7cfeef..167aa3084 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysPostMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysPostMapper.xml index 227c45953..2ebbe8584 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml index cb036406c..54e9e8945 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index cb60a8529..4f0d73278 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml index acaba67ac..0895aa4ad 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserDeptRoleMapper.xml @@ -2,21 +2,21 @@ - + - + - - - - + @@ -29,7 +29,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -84,7 +84,7 @@ - - + insert into sys_user_dept_role dept_id, @@ -228,7 +228,7 @@ - + update sys_user_dept_role role_id = #{roleId}, diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserMapper.xml index 9179b26e3..21555a23a 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_user u - select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.gitlink_user_id from sys_user u where u.del_flag = '0' diff --git a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc40b..8e9c1a07d 100644 --- a/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/microservices-modules/microservices-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - +