diff --git a/bmw-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/bmw-admin/src/main/java/com/bmw/RuoYiApplication.java similarity index 96% rename from bmw-admin/src/main/java/com/ruoyi/RuoYiApplication.java rename to bmw-admin/src/main/java/com/bmw/RuoYiApplication.java index 21eb95ee0..839ea5731 100644 --- a/bmw-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/bmw-admin/src/main/java/com/bmw/RuoYiApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.bmw; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/bmw-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/bmw-admin/src/main/java/com/bmw/RuoYiServletInitializer.java similarity index 96% rename from bmw-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to bmw-admin/src/main/java/com/bmw/RuoYiServletInitializer.java index 6de67dc76..45ef8f678 100644 --- a/bmw-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/bmw-admin/src/main/java/com/bmw/RuoYiServletInitializer.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.bmw; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/bmw-admin/src/main/java/com/bmw/web/controller/common/CommonController.java similarity index 89% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/common/CommonController.java index 7a049e1ee..7e6544f9c 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/common/CommonController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.bmw.web.controller.common; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.Global; -import com.ruoyi.common.config.ServerConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; +import com.bmw.common.config.Global; +import com.bmw.common.config.ServerConfig; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.file.FileUploadUtils; +import com.bmw.common.utils.file.FileUtils; /** * 通用请求处理 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoDialogController.java similarity index 96% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoDialogController.java index cf52245f0..63b77ef15 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoDialogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.demo.controller; +package com.bmw.web.controller.demo.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoFormController.java similarity index 98% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoFormController.java index 65f732b46..3d6cc69bb 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoFormController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.demo.controller; +package com.bmw.web.controller.demo.controller; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.core.domain.AjaxResult; +import com.bmw.common.core.domain.AjaxResult; /** * 表单相关 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoIconController.java similarity index 92% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoIconController.java index b6884cc1e..6605957a9 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoIconController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.demo.controller; +package com.bmw.web.controller.demo.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoOperateController.java similarity index 95% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoOperateController.java index 703d860df..da03fff00 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoOperateController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.demo.controller; +package com.bmw.web.controller.demo.controller; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.BusinessException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.web.controller.demo.domain.UserOperateModel; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.PageDomain; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.core.page.TableSupport; +import com.bmw.common.core.text.Convert; +import com.bmw.common.exception.BusinessException; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.web.controller.demo.domain.UserOperateModel; /** * 操作控制 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoReportController.java similarity index 94% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoReportController.java index 610100874..d43d1f079 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoReportController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.demo.controller; +package com.bmw.web.controller.demo.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoTableController.java similarity index 96% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoTableController.java index ebb7b3975..d93bb9f01 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoTableController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.demo.controller; +package com.bmw.web.controller.demo.controller; import java.util.ArrayList; import java.util.Arrays; @@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.page.PageDomain; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.core.page.TableSupport; +import com.bmw.common.utils.DateUtils; +import com.bmw.common.utils.StringUtils; /** * 表格相关 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java b/bmw-admin/src/main/java/com/bmw/web/controller/demo/domain/UserOperateModel.java similarity index 92% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java rename to bmw-admin/src/main/java/com/bmw/web/controller/demo/domain/UserOperateModel.java index e7ec0564a..d2df953a1 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/demo/domain/UserOperateModel.java @@ -1,10 +1,10 @@ -package com.ruoyi.web.controller.demo.domain; +package com.bmw.web.controller.demo.domain; import java.util.Date; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.DateUtils; +import com.bmw.common.annotation.Excel; +import com.bmw.common.annotation.Excel.Type; +import com.bmw.common.core.domain.BaseEntity; +import com.bmw.common.utils.DateUtils; public class UserOperateModel extends BaseEntity { diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/DruidController.java similarity index 85% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/monitor/DruidController.java index 336bf8f10..6f997f0b1 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/DruidController.java @@ -1,10 +1,10 @@ -package com.ruoyi.web.controller.monitor; +package com.bmw.web.controller.monitor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; +import com.bmw.common.core.controller.BaseController; /** * druid 监控 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/ServerController.java similarity index 83% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/monitor/ServerController.java index 386b5c7da..05a877e83 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/ServerController.java @@ -1,12 +1,12 @@ -package com.ruoyi.web.controller.monitor; +package com.bmw.web.controller.monitor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.framework.web.domain.Server; +import com.bmw.common.core.controller.BaseController; +import com.bmw.framework.web.domain.Server; /** * 服务器监控 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysLogininforController.java similarity index 84% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysLogininforController.java index 37dd717e7..dbb22ed1a 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bmw.web.controller.monitor; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.bmw.common.annotation.Log; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.system.domain.SysLogininfor; +import com.bmw.system.service.ISysLogininforService; /** * 系统访问记录 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysOperlogController.java similarity index 85% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysOperlogController.java index bde7c26a4..d0311bc7f 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bmw.web.controller.monitor; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -10,14 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.bmw.common.annotation.Log; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.system.domain.SysOperLog; +import com.bmw.system.service.ISysOperLogService; /** * 操作日志记录 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysUserOnlineController.java similarity index 85% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysUserOnlineController.java index a77f64f22..b21b69d99 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.bmw.web.controller.monitor; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -9,17 +9,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OnlineStatus; -import com.ruoyi.framework.shiro.session.OnlineSession; -import com.ruoyi.framework.shiro.session.OnlineSessionDAO; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.bmw.common.annotation.Log; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.enums.OnlineStatus; +import com.bmw.framework.shiro.session.OnlineSession; +import com.bmw.framework.shiro.session.OnlineSessionDAO; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysUserOnline; +import com.bmw.system.service.ISysUserOnlineService; /** * 在线用户监控 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysCaptchaController.java similarity index 96% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysCaptchaController.java index 739c46934..8a0165eda 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysCaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.awt.image.BufferedImage; import java.io.IOException; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; -import com.ruoyi.common.core.controller.BaseController; +import com.bmw.common.core.controller.BaseController; /** * 图片验证码(支持算术形式) diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysConfigController.java similarity index 88% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysConfigController.java index 0ea117f9f..97296a24e 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.bmw.common.annotation.Log; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysConfig; +import com.bmw.system.service.ISysConfigService; /** * 参数配置 信息操作处理 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysDeptController.java similarity index 90% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysDeptController.java index 5f7227be1..8f2517439 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.Ztree; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysDept; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.service.ISysDeptService; +import com.bmw.common.annotation.Log; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.domain.Ztree; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.StringUtils; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysDept; +import com.bmw.system.domain.SysRole; +import com.bmw.system.service.ISysDeptService; /** * 部门信息 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictDataController.java similarity index 87% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictDataController.java index ae7aa9278..7acdfd044 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysDictData; -import com.ruoyi.system.service.ISysDictDataService; +import com.bmw.common.annotation.Log; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysDictData; +import com.bmw.system.service.ISysDictDataService; /** * 数据字典信息 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictTypeController.java similarity index 89% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictTypeController.java index 6bd7e710c..2cf90e470 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysDictType; -import com.ruoyi.system.service.ISysDictTypeService; +import com.bmw.common.annotation.Log; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysDictType; +import com.bmw.system.service.ISysDictTypeService; /** * 数据字典信息 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysIndexController.java similarity index 77% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysIndexController.java index f9c0c9fdf..45b3f0238 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysIndexController.java @@ -1,16 +1,16 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; -import com.ruoyi.common.config.Global; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.service.ISysMenuService; +import com.bmw.common.config.Global; +import com.bmw.common.core.controller.BaseController; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysMenu; +import com.bmw.system.domain.SysUser; +import com.bmw.system.service.ISysMenuService; /** * 首页 业务处理 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysLoginController.java similarity index 88% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysLoginController.java index 1652f74ef..32fc547e9 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -10,10 +10,10 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.utils.ServletUtils; +import com.bmw.common.utils.StringUtils; /** * 登录验证 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysMenuController.java similarity index 91% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysMenuController.java index d1a4e5336..d5fd6fb02 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.Ztree; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.service.ISysMenuService; +import com.bmw.common.annotation.Log; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.domain.Ztree; +import com.bmw.common.enums.BusinessType; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysMenu; +import com.bmw.system.domain.SysRole; +import com.bmw.system.service.ISysMenuService; /** * 菜单信息 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysNoticeController.java similarity index 86% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysNoticeController.java index c7f654e50..5ebca7deb 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -10,14 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.bmw.common.annotation.Log; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysNotice; +import com.bmw.system.service.ISysNoticeService; /** * 公告 信息操作处理 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysPostController.java similarity index 89% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysPostController.java index 7091f5d77..0072fc8ca 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.bmw.common.annotation.Log; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysPost; +import com.bmw.system.service.ISysPostService; /** * 岗位信息操作处理 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysProfileController.java similarity index 89% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysProfileController.java index 59127b0c5..6ba722ea6 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.Global; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.framework.shiro.service.SysPasswordService; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.service.ISysUserService; +import com.bmw.common.annotation.Log; +import com.bmw.common.config.Global; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.file.FileUploadUtils; +import com.bmw.framework.shiro.service.SysPasswordService; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysUser; +import com.bmw.system.service.ISysUserService; /** * 个人信息 业务处理 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysRoleController.java similarity index 92% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysRoleController.java index 8aaeecd37..3003e4e11 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -11,19 +11,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.bmw.common.annotation.Log; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysRole; +import com.bmw.system.domain.SysUser; +import com.bmw.system.domain.SysUserRole; +import com.bmw.system.service.ISysRoleService; +import com.bmw.system.service.ISysUserService; /** * 角色信息 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysUserController.java similarity index 91% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/system/SysUserController.java index 490c4fe17..d887753f5 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/system/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.bmw.web.controller.system; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -12,20 +12,20 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.shiro.service.SysPasswordService; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.bmw.common.annotation.Log; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.framework.shiro.service.SysPasswordService; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysUser; +import com.bmw.system.service.ISysPostService; +import com.bmw.system.service.ISysRoleService; +import com.bmw.system.service.ISysUserService; /** * 用户信息 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java b/bmw-admin/src/main/java/com/bmw/web/controller/tool/BuildController.java similarity index 85% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/tool/BuildController.java index 4d3c1287a..ca5fdb68c 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/tool/BuildController.java @@ -1,10 +1,10 @@ -package com.ruoyi.web.controller.tool; +package com.bmw.web.controller.tool; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; +import com.bmw.common.core.controller.BaseController; /** * build 表单构建 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/bmw-admin/src/main/java/com/bmw/web/controller/tool/SwaggerController.java similarity index 84% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/tool/SwaggerController.java index 7a3bf225e..f4b6748ca 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/tool/SwaggerController.java @@ -1,10 +1,10 @@ -package com.ruoyi.web.controller.tool; +package com.bmw.web.controller.tool; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; +import com.bmw.common.core.controller.BaseController; /** * swagger 接口 diff --git a/bmw-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/bmw-admin/src/main/java/com/bmw/web/controller/tool/TestController.java similarity index 96% rename from bmw-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java rename to bmw-admin/src/main/java/com/bmw/web/controller/tool/TestController.java index 4b1c3dea1..c47296aa8 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/bmw-admin/src/main/java/com/bmw/web/controller/tool/TestController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.tool; +package com.bmw.web.controller.tool; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiModel; diff --git a/bmw-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/bmw-admin/src/main/java/com/bmw/web/core/config/SwaggerConfig.java similarity index 92% rename from bmw-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java rename to bmw-admin/src/main/java/com/bmw/web/core/config/SwaggerConfig.java index c08f21a0b..8cd6b3247 100644 --- a/bmw-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/bmw-admin/src/main/java/com/bmw/web/core/config/SwaggerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.web.core.config; +package com.bmw.web.core.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.Global; +import com.bmw.common.config.Global; import io.swagger.annotations.ApiOperation; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; @@ -36,7 +36,7 @@ public class SwaggerConfig // 扫描所有有注解的api,用这种方式更灵活 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 扫描指定包中的swagger注解 - //.apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) + //.apis(RequestHandlerSelectors.basePackage("com.bmw.project.tool.swagger")) // 扫描所有 .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build(); @@ -50,7 +50,7 @@ public class SwaggerConfig // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题:若依管理系统_接口文档") + .title("标题:系统_接口文档") // 描述 .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 diff --git a/bmw-admin/src/main/resources/application.yml b/bmw-admin/src/main/resources/application.yml index 5decc25f4..133f9ad42 100644 --- a/bmw-admin/src/main/resources/application.yml +++ b/bmw-admin/src/main/resources/application.yml @@ -31,7 +31,7 @@ server: # 日志配置 logging: level: - com.ruoyi: debug + com.bmw: debug org.springframework: warn # 用户配置 @@ -73,7 +73,7 @@ spring: # MyBatis mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi + typeAliasesPackage: com.bmw # 配置mapper的扫描,找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 diff --git a/bmw-admin/src/main/resources/ehcache/ehcache-shiro.xml b/bmw-admin/src/main/resources/ehcache/ehcache-shiro.xml index d40baf240..16ab9b249 100644 --- a/bmw-admin/src/main/resources/ehcache/ehcache-shiro.xml +++ b/bmw-admin/src/main/resources/ehcache/ehcache-shiro.xml @@ -1,5 +1,5 @@ - + diff --git a/bmw-admin/src/main/resources/logback.xml b/bmw-admin/src/main/resources/logback.xml index a360583fa..8c88df896 100644 --- a/bmw-admin/src/main/resources/logback.xml +++ b/bmw-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/bmw-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/bmw-common/src/main/java/com/bmw/common/annotation/DataScope.java similarity index 93% rename from bmw-common/src/main/java/com/ruoyi/common/annotation/DataScope.java rename to bmw-common/src/main/java/com/bmw/common/annotation/DataScope.java index 176878e9d..d10115790 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/bmw-common/src/main/java/com/bmw/common/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bmw.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/bmw-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/bmw-common/src/main/java/com/bmw/common/annotation/DataSource.java similarity index 84% rename from bmw-common/src/main/java/com/ruoyi/common/annotation/DataSource.java rename to bmw-common/src/main/java/com/bmw/common/annotation/DataSource.java index 7a36288ec..84cfe3ed6 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/annotation/DataSource.java +++ b/bmw-common/src/main/java/com/bmw/common/annotation/DataSource.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.annotation; +package com.bmw.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.DataSourceType; +import com.bmw.common.enums.DataSourceType; /** * 自定义多数据源切换注解 diff --git a/bmw-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/bmw-common/src/main/java/com/bmw/common/annotation/Excel.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/annotation/Excel.java rename to bmw-common/src/main/java/com/bmw/common/annotation/Excel.java index 1590a4c9b..f5c22c2b7 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/bmw-common/src/main/java/com/bmw/common/annotation/Excel.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bmw.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bmw-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/bmw-common/src/main/java/com/bmw/common/annotation/Excels.java similarity index 89% rename from bmw-common/src/main/java/com/ruoyi/common/annotation/Excels.java rename to bmw-common/src/main/java/com/bmw/common/annotation/Excels.java index 8c6870c20..a8fabf5e9 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/annotation/Excels.java +++ b/bmw-common/src/main/java/com/bmw/common/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.bmw.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/bmw-common/src/main/java/com/ruoyi/common/annotation/Log.java b/bmw-common/src/main/java/com/bmw/common/annotation/Log.java similarity index 86% rename from bmw-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to bmw-common/src/main/java/com/bmw/common/annotation/Log.java index 157ecff6b..fc21ca204 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/bmw-common/src/main/java/com/bmw/common/annotation/Log.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.annotation; +package com.bmw.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.enums.OperatorType; /** * 自定义操作日志记录注解 diff --git a/bmw-common/src/main/java/com/ruoyi/common/config/Global.java b/bmw-common/src/main/java/com/bmw/common/config/Global.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/config/Global.java rename to bmw-common/src/main/java/com/bmw/common/config/Global.java index c03908cda..650ebdd1f 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/config/Global.java +++ b/bmw-common/src/main/java/com/bmw/common/config/Global.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.config; +package com.bmw.common.config; import java.io.FileNotFoundException; import java.util.HashMap; import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.YamlUtil; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.YamlUtil; /** * 全局配置类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/config/ServerConfig.java b/bmw-common/src/main/java/com/bmw/common/config/ServerConfig.java similarity index 91% rename from bmw-common/src/main/java/com/ruoyi/common/config/ServerConfig.java rename to bmw-common/src/main/java/com/bmw/common/config/ServerConfig.java index b6b35e481..1f1fbb2c6 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/config/ServerConfig.java +++ b/bmw-common/src/main/java/com/bmw/common/config/ServerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.config; +package com.bmw.common.config; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.ServletUtils; +import com.bmw.common.utils.ServletUtils; /** * 服务相关配置 diff --git a/bmw-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java b/bmw-common/src/main/java/com/bmw/common/config/datasource/DynamicDataSourceContextHolder.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java rename to bmw-common/src/main/java/com/bmw/common/config/datasource/DynamicDataSourceContextHolder.java index 6937dca75..3212a5da7 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java +++ b/bmw-common/src/main/java/com/bmw/common/config/datasource/DynamicDataSourceContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config.datasource; +package com.bmw.common.config.datasource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bmw-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java b/bmw-common/src/main/java/com/bmw/common/config/thread/ThreadPoolConfig.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java rename to bmw-common/src/main/java/com/bmw/common/config/thread/ThreadPoolConfig.java index 4c63c9f45..bd95a9b95 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java +++ b/bmw-common/src/main/java/com/bmw/common/config/thread/ThreadPoolConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config.thread; +package com.bmw.common.config.thread; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import com.ruoyi.common.utils.Threads; +import com.bmw.common.utils.Threads; /** * 线程池配置 diff --git a/bmw-common/src/main/java/com/ruoyi/common/constant/Constants.java b/bmw-common/src/main/java/com/bmw/common/constant/Constants.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to bmw-common/src/main/java/com/bmw/common/constant/Constants.java index 99ecc5e61..91b6fdf79 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/bmw-common/src/main/java/com/bmw/common/constant/Constants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.bmw.common.constant; /** * 通用常量信息 diff --git a/bmw-common/src/main/java/com/ruoyi/common/constant/PermissionConstants.java b/bmw-common/src/main/java/com/bmw/common/constant/PermissionConstants.java similarity index 94% rename from bmw-common/src/main/java/com/ruoyi/common/constant/PermissionConstants.java rename to bmw-common/src/main/java/com/bmw/common/constant/PermissionConstants.java index 896721454..473a1644d 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/constant/PermissionConstants.java +++ b/bmw-common/src/main/java/com/bmw/common/constant/PermissionConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.bmw.common.constant; /** * 权限通用常量 diff --git a/bmw-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/bmw-common/src/main/java/com/bmw/common/constant/ScheduleConstants.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to bmw-common/src/main/java/com/bmw/common/constant/ScheduleConstants.java index 005e17623..026964cc8 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/bmw-common/src/main/java/com/bmw/common/constant/ScheduleConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.bmw.common.constant; /** * 任务调度通用常量 diff --git a/bmw-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java b/bmw-common/src/main/java/com/bmw/common/constant/ShiroConstants.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java rename to bmw-common/src/main/java/com/bmw/common/constant/ShiroConstants.java index 6a026e6b8..978f6c21b 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java +++ b/bmw-common/src/main/java/com/bmw/common/constant/ShiroConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.bmw.common.constant; /** * Shiro通用常量 diff --git a/bmw-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/bmw-common/src/main/java/com/bmw/common/constant/UserConstants.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to bmw-common/src/main/java/com/bmw/common/constant/UserConstants.java index 85164caf0..70df0cad1 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/bmw-common/src/main/java/com/bmw/common/constant/UserConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.bmw.common.constant; /** * 用户常量信息 diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/bmw-common/src/main/java/com/bmw/common/core/controller/BaseController.java similarity index 88% rename from bmw-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to bmw-common/src/main/java/com/bmw/common/core/controller/BaseController.java index fbf480e63..853e01639 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/bmw-common/src/main/java/com/bmw/common/core/controller/BaseController.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.controller; +package com.bmw.common.core.controller; import java.beans.PropertyEditorSupport; import java.util.Date; @@ -12,15 +12,15 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.AjaxResult.Type; -import com.ruoyi.common.core.page.PageDomain; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.page.TableSupport; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.domain.AjaxResult.Type; +import com.bmw.common.core.page.PageDomain; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.core.page.TableSupport; +import com.bmw.common.utils.DateUtils; +import com.bmw.common.utils.ServletUtils; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.sql.SqlUtil; /** * web层通用数据处理 diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/bmw-common/src/main/java/com/bmw/common/core/domain/AjaxResult.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java rename to bmw-common/src/main/java/com/bmw/common/core/domain/AjaxResult.java index 4b6c4d276..f1f607542 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java +++ b/bmw-common/src/main/java/com/bmw/common/core/domain/AjaxResult.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain; +package com.bmw.common.core.domain; import java.util.HashMap; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * 操作消息提醒 diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/bmw-common/src/main/java/com/bmw/common/core/domain/BaseEntity.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to bmw-common/src/main/java/com/bmw/common/core/domain/BaseEntity.java index f7d5bf46d..c4be96b1a 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/bmw-common/src/main/java/com/bmw/common/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.bmw.common.core.domain; import java.io.Serializable; import java.util.Date; diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/domain/Ztree.java b/bmw-common/src/main/java/com/bmw/common/core/domain/Ztree.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/core/domain/Ztree.java rename to bmw-common/src/main/java/com/bmw/common/core/domain/Ztree.java index 5567a4dde..7ce3ef71e 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/domain/Ztree.java +++ b/bmw-common/src/main/java/com/bmw/common/core/domain/Ztree.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.bmw.common.core.domain; import java.io.Serializable; diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/bmw-common/src/main/java/com/bmw/common/core/page/PageDomain.java similarity index 93% rename from bmw-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java rename to bmw-common/src/main/java/com/bmw/common/core/page/PageDomain.java index 4355c3eb0..35bd3c974 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/bmw-common/src/main/java/com/bmw/common/core/page/PageDomain.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.page; +package com.bmw.common.core.page; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * 分页数据 diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/bmw-common/src/main/java/com/bmw/common/core/page/TableDataInfo.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to bmw-common/src/main/java/com/bmw/common/core/page/TableDataInfo.java index 2fadf70ea..05cba2452 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/bmw-common/src/main/java/com/bmw/common/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.page; +package com.bmw.common.core.page; import java.io.Serializable; import java.util.List; diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/bmw-common/src/main/java/com/bmw/common/core/page/TableSupport.java similarity index 84% rename from bmw-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java rename to bmw-common/src/main/java/com/bmw/common/core/page/TableSupport.java index 8eab41342..1ddf28955 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java +++ b/bmw-common/src/main/java/com/bmw/common/core/page/TableSupport.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.core.page; +package com.bmw.common.core.page; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.ServletUtils; +import com.bmw.common.constant.Constants; +import com.bmw.common.utils.ServletUtils; /** * 表格数据处理 diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/bmw-common/src/main/java/com/bmw/common/core/text/CharsetKit.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to bmw-common/src/main/java/com/bmw/common/core/text/CharsetKit.java index 77b1a79dd..bb80a4d24 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/bmw-common/src/main/java/com/bmw/common/core/text/CharsetKit.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.text; +package com.bmw.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * 字符集工具类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/bmw-common/src/main/java/com/bmw/common/core/text/Convert.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/core/text/Convert.java rename to bmw-common/src/main/java/com/bmw/common/core/text/Convert.java index b17dfdda6..842e001bd 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/bmw-common/src/main/java/com/bmw/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.bmw.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * 类型转换器 diff --git a/bmw-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/bmw-common/src/main/java/com/bmw/common/core/text/StrFormatter.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to bmw-common/src/main/java/com/bmw/common/core/text/StrFormatter.java index c78ac776d..c02da1ad8 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/bmw-common/src/main/java/com/bmw/common/core/text/StrFormatter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.text; +package com.bmw.common.core.text; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * 字符串格式化 diff --git a/bmw-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/bmw-common/src/main/java/com/bmw/common/enums/BusinessStatus.java similarity index 83% rename from bmw-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to bmw-common/src/main/java/com/bmw/common/enums/BusinessStatus.java index c6640bbc5..b09905a90 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/bmw-common/src/main/java/com/bmw/common/enums/BusinessStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.bmw.common.enums; /** * 操作状态 diff --git a/bmw-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/bmw-common/src/main/java/com/bmw/common/enums/BusinessType.java similarity index 94% rename from bmw-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to bmw-common/src/main/java/com/bmw/common/enums/BusinessType.java index 24d076a44..43d719506 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/bmw-common/src/main/java/com/bmw/common/enums/BusinessType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.bmw.common.enums; /** * 业务操作类型 diff --git a/bmw-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/bmw-common/src/main/java/com/bmw/common/enums/DataSourceType.java similarity index 83% rename from bmw-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java rename to bmw-common/src/main/java/com/bmw/common/enums/DataSourceType.java index 0d945be54..ec8a4f046 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java +++ b/bmw-common/src/main/java/com/bmw/common/enums/DataSourceType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.bmw.common.enums; /** * 数据源 diff --git a/bmw-common/src/main/java/com/ruoyi/common/enums/OnlineStatus.java b/bmw-common/src/main/java/com/bmw/common/enums/OnlineStatus.java similarity index 90% rename from bmw-common/src/main/java/com/ruoyi/common/enums/OnlineStatus.java rename to bmw-common/src/main/java/com/bmw/common/enums/OnlineStatus.java index a05d5ffb8..d49ad8ca8 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/enums/OnlineStatus.java +++ b/bmw-common/src/main/java/com/bmw/common/enums/OnlineStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.bmw.common.enums; /** * 用户会话 diff --git a/bmw-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/bmw-common/src/main/java/com/bmw/common/enums/OperatorType.java similarity index 87% rename from bmw-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to bmw-common/src/main/java/com/bmw/common/enums/OperatorType.java index bdd143c1c..dcbc90d35 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/bmw-common/src/main/java/com/bmw/common/enums/OperatorType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.bmw.common.enums; /** * 操作人类别 diff --git a/bmw-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/bmw-common/src/main/java/com/bmw/common/enums/UserStatus.java similarity index 93% rename from bmw-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to bmw-common/src/main/java/com/bmw/common/enums/UserStatus.java index d7ff44a98..5ecdb218c 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/bmw-common/src/main/java/com/bmw/common/enums/UserStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.bmw.common.enums; /** * 用户状态 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/BusinessException.java b/bmw-common/src/main/java/com/bmw/common/exception/BusinessException.java similarity index 93% rename from bmw-common/src/main/java/com/ruoyi/common/exception/BusinessException.java rename to bmw-common/src/main/java/com/bmw/common/exception/BusinessException.java index d490675e7..3c5522217 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/BusinessException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/BusinessException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.bmw.common.exception; /** * 业务异常 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/bmw-common/src/main/java/com/bmw/common/exception/DemoModeException.java similarity index 85% rename from bmw-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to bmw-common/src/main/java/com/bmw/common/exception/DemoModeException.java index f6ad2ab49..09b871a1b 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/DemoModeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.bmw.common.exception; /** * 演示模式异常 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/bmw-common/src/main/java/com/bmw/common/exception/base/BaseException.java similarity index 93% rename from bmw-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to bmw-common/src/main/java/com/bmw/common/exception/base/BaseException.java index b55d72e18..b4701adee 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/base/BaseException.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.exception.base; +package com.bmw.common.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.MessageUtils; +import com.bmw.common.utils.StringUtils; /** * 基础异常 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/bmw-common/src/main/java/com/bmw/common/exception/file/FileException.java similarity index 73% rename from bmw-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to bmw-common/src/main/java/com/bmw/common/exception/file/FileException.java index 871f09b52..1853afb50 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/file/FileException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.file; +package com.bmw.common.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.bmw.common.exception.base.BaseException; /** * 文件信息异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/bmw-common/src/main/java/com/bmw/common/exception/file/FileNameLengthLimitExceededException.java similarity index 90% rename from bmw-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to bmw-common/src/main/java/com/bmw/common/exception/file/FileNameLengthLimitExceededException.java index 70e0ec9b1..5efc3150a 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.bmw.common.exception.file; /** * 文件名称超长限制异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/bmw-common/src/main/java/com/bmw/common/exception/file/FileSizeLimitExceededException.java similarity index 89% rename from bmw-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to bmw-common/src/main/java/com/bmw/common/exception/file/FileSizeLimitExceededException.java index ec6ab054d..b5f1bb770 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.bmw.common.exception.file; /** * 文件名大小限制异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/bmw-common/src/main/java/com/bmw/common/exception/file/InvalidExtensionException.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to bmw-common/src/main/java/com/bmw/common/exception/file/InvalidExtensionException.java index 8f63a799c..3bf6b0227 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/file/InvalidExtensionException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.bmw.common.exception.file; import java.util.Arrays; import org.apache.commons.fileupload.FileUploadException; diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/bmw-common/src/main/java/com/bmw/common/exception/job/TaskException.java similarity index 93% rename from bmw-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to bmw-common/src/main/java/com/bmw/common/exception/job/TaskException.java index a567b408b..9610ab2ed 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/job/TaskException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.job; +package com.bmw.common.exception.job; /** * 计划策略异常 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/CaptchaException.java similarity index 86% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/CaptchaException.java index 389dbc753..fb29659e6 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/CaptchaException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; /** * 验证码错误异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/RoleBlockedException.java similarity index 86% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/RoleBlockedException.java index 1c4fd4a18..f664f4209 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/RoleBlockedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; /** * 角色锁定异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/UserBlockedException.java similarity index 86% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/UserBlockedException.java index 5150f52f8..2b669492f 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserBlockedException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/UserBlockedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; /** * 用户锁定异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserDeleteException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/UserDeleteException.java similarity index 86% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/UserDeleteException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/UserDeleteException.java index 352003080..b15dd8785 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserDeleteException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/UserDeleteException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; /** * 用户账号已被删除 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/UserException.java similarity index 73% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/UserException.java index c292d70ed..4b8cbaa84 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/UserException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; -import com.ruoyi.common.exception.base.BaseException; +import com.bmw.common.exception.base.BaseException; /** * 用户信息异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/UserNotExistsException.java similarity index 86% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/UserNotExistsException.java index eff818121..1d3d6b2d0 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/UserNotExistsException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; /** * 用户不存在异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordNotMatchException.java similarity index 88% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordNotMatchException.java index a7f3e5ffe..22875e8ce 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordNotMatchException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; /** * 用户密码不正确或不符合规范异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordRetryLimitCountException.java similarity index 89% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordRetryLimitCountException.java index 7ead89b6d..ffddc51cb 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitCountException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordRetryLimitCountException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; /** * 用户错误记数异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordRetryLimitExceedException.java similarity index 89% rename from bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java rename to bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordRetryLimitExceedException.java index b5ccfb97e..485dddc2a 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/bmw-common/src/main/java/com/bmw/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.bmw.common.exception.user; /** * 用户错误最大次数异常类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/json/JSON.java b/bmw-common/src/main/java/com/bmw/common/json/JSON.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/json/JSON.java rename to bmw-common/src/main/java/com/bmw/common/json/JSON.java index 1e5b928b0..f90f2b712 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/json/JSON.java +++ b/bmw-common/src/main/java/com/bmw/common/json/JSON.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.json; +package com.bmw.common.json; import java.io.File; import java.io.IOException; diff --git a/bmw-common/src/main/java/com/ruoyi/common/json/JSONObject.java b/bmw-common/src/main/java/com/bmw/common/json/JSONObject.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/json/JSONObject.java rename to bmw-common/src/main/java/com/bmw/common/json/JSONObject.java index 2f4afe710..3824a6a18 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/json/JSONObject.java +++ b/bmw-common/src/main/java/com/bmw/common/json/JSONObject.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.json; +package com.bmw.common.json; import java.util.ArrayList; import java.util.Collection; @@ -9,7 +9,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * 通用消息对象,基于Map实现的可嵌套数据结构。 支持JSON数据结构。 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/AddressUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/AddressUtils.java similarity index 87% rename from bmw-common/src/main/java/com/ruoyi/common/utils/AddressUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/AddressUtils.java index 6caeade4b..451aafc7c 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/AddressUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/AddressUtils.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.config.Global; -import com.ruoyi.common.json.JSON; -import com.ruoyi.common.json.JSONObject; -import com.ruoyi.common.utils.http.HttpUtils; +import com.bmw.common.config.Global; +import com.bmw.common.json.JSON; +import com.bmw.common.json.JSONObject; +import com.bmw.common.utils.http.HttpUtils; /** * 获取地址类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/Arith.java b/bmw-common/src/main/java/com/bmw/common/utils/Arith.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/utils/Arith.java rename to bmw-common/src/main/java/com/bmw/common/utils/Arith.java index 48a650e89..7906d5d3b 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/Arith.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/Arith.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/DateUtils.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/DateUtils.java index 536cb3cf0..fee796c2d 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/bmw-common/src/main/java/com/bmw/common/utils/ExceptionUtil.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to bmw-common/src/main/java/com/bmw/common/utils/ExceptionUtil.java index ad57439b7..a32b64469 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/IpUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/IpUtils.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/utils/IpUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/IpUtils.java index 6ef0c43f9..92c06d555 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/IpUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/IpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/MapDataUtil.java b/bmw-common/src/main/java/com/bmw/common/utils/MapDataUtil.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/utils/MapDataUtil.java rename to bmw-common/src/main/java/com/bmw/common/utils/MapDataUtil.java index 4ca326e7d..431256182 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/MapDataUtil.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/MapDataUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.util.HashMap; import java.util.Iterator; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/MessageUtils.java similarity index 88% rename from bmw-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/MessageUtils.java index 7dac75a3b..537aba4ee 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/MessageUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.bmw.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/ServletUtils.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/ServletUtils.java index 3b1f5c848..95e2e621f 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.io.IOException; import javax.servlet.http.HttpServletRequest; @@ -7,7 +7,7 @@ import javax.servlet.http.HttpSession; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.ruoyi.common.core.text.Convert; +import com.bmw.common.core.text.Convert; /** * 客户端工具类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/StringUtils.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/StringUtils.java index fe39c1a93..0b518aa20 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/StringUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.util.Collection; import java.util.Map; -import com.ruoyi.common.core.text.StrFormatter; +import com.bmw.common.core.text.StrFormatter; /** * 字符串工具类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/Threads.java b/bmw-common/src/main/java/com/bmw/common/utils/Threads.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to bmw-common/src/main/java/com/bmw/common/utils/Threads.java index 193419506..19fbd529a 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java b/bmw-common/src/main/java/com/bmw/common/utils/YamlUtil.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java rename to bmw-common/src/main/java/com/bmw/common/utils/YamlUtil.java index d908233b4..01e1632ee 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/YamlUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.bmw.common.utils; import java.io.FileNotFoundException; import java.io.FileWriter; @@ -8,7 +8,6 @@ import java.util.LinkedHashMap; import java.util.Map; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; -import com.ruoyi.common.utils.StringUtils; /** * 配置处理工具类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/bean/BeanUtils.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/bean/BeanUtils.java index 4463662d4..88e50e07f 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.bmw.common.utils.bean; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/file/FileUploadUtils.java similarity index 94% rename from bmw-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/file/FileUploadUtils.java index dfe7e17eb..43468dcd0 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/file/FileUploadUtils.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.utils.file; +package com.bmw.common.utils.file; import java.io.File; import java.io.IOException; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.Global; -import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.exception.file.InvalidExtensionException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.security.Md5Utils; +import com.bmw.common.config.Global; +import com.bmw.common.exception.file.FileNameLengthLimitExceededException; +import com.bmw.common.exception.file.FileSizeLimitExceededException; +import com.bmw.common.exception.file.InvalidExtensionException; +import com.bmw.common.utils.DateUtils; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.security.Md5Utils; /** * 文件上传工具类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/file/FileUtils.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/file/FileUtils.java index 04d4703f8..5c1a483e6 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.bmw.common.utils.file; import java.io.File; import java.io.FileInputStream; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/file/MimeTypeUtils.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/file/MimeTypeUtils.java index 698464128..9a5d2adbf 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.bmw.common.utils.file; /** * 媒体类型工具类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/http/HttpUtils.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/http/HttpUtils.java index a0275185b..ab025cdc6 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/http/HttpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.bmw.common.utils.http; import java.io.BufferedReader; import java.io.IOException; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/bmw-common/src/main/java/com/bmw/common/utils/poi/ExcelUtil.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to bmw-common/src/main/java/com/bmw/common/utils/poi/ExcelUtil.java index 3cd26e1a9..a80730d79 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.bmw.common.utils.poi; import java.io.File; import java.io.FileOutputStream; @@ -39,16 +39,16 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.config.Global; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.BusinessException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.bmw.common.annotation.Excel; +import com.bmw.common.annotation.Excel.Type; +import com.bmw.common.annotation.Excels; +import com.bmw.common.config.Global; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.text.Convert; +import com.bmw.common.exception.BusinessException; +import com.bmw.common.utils.DateUtils; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.reflect.ReflectUtils; /** * Excel相关处理 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/reflect/ReflectUtils.java similarity index 99% rename from bmw-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/reflect/ReflectUtils.java index b78e53e10..d7cb8d19d 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/reflect/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.reflect; +package com.bmw.common.utils.reflect; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -12,8 +12,8 @@ import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; +import com.bmw.common.core.text.Convert; +import com.bmw.common.utils.DateUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java b/bmw-common/src/main/java/com/bmw/common/utils/security/Md5Utils.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java rename to bmw-common/src/main/java/com/bmw/common/utils/security/Md5Utils.java index 2bb1a8b20..7e9e23b0d 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/security/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.security; +package com.bmw.common.utils.security; import java.security.MessageDigest; import org.slf4j.Logger; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/security/PermissionUtils.java similarity index 96% rename from bmw-common/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/security/PermissionUtils.java index 296f2ca5d..512a64f9d 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/security/PermissionUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.security; +package com.bmw.common.utils.security; import java.beans.BeanInfo; import java.beans.Introspector; @@ -8,8 +8,8 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.PermissionConstants; -import com.ruoyi.common.utils.MessageUtils; +import com.bmw.common.constant.PermissionConstants; +import com.bmw.common.utils.MessageUtils; /** * permission 工具类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/bmw-common/src/main/java/com/bmw/common/utils/spring/SpringUtils.java similarity index 98% rename from bmw-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to bmw-common/src/main/java/com/bmw/common/utils/spring/SpringUtils.java index 19bd77ef3..7213158fe 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.bmw.common.utils.spring; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; diff --git a/bmw-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/bmw-common/src/main/java/com/bmw/common/utils/sql/SqlUtil.java similarity index 89% rename from bmw-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to bmw-common/src/main/java/com/bmw/common/utils/sql/SqlUtil.java index b31804b67..848737d34 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/bmw-common/src/main/java/com/bmw/common/utils/sql/SqlUtil.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.sql; +package com.bmw.common.utils.sql; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * sql操作工具类 diff --git a/bmw-common/src/main/java/com/ruoyi/common/xss/XssFilter.java b/bmw-common/src/main/java/com/bmw/common/xss/XssFilter.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/xss/XssFilter.java rename to bmw-common/src/main/java/com/bmw/common/xss/XssFilter.java index 931040256..438f9906e 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/xss/XssFilter.java +++ b/bmw-common/src/main/java/com/bmw/common/xss/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.bmw.common.xss; import java.io.IOException; import java.util.ArrayList; @@ -13,7 +13,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * 防止XSS攻击的过滤器 diff --git a/bmw-common/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java b/bmw-common/src/main/java/com/bmw/common/xss/XssHttpServletRequestWrapper.java similarity index 97% rename from bmw-common/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java rename to bmw-common/src/main/java/com/bmw/common/xss/XssHttpServletRequestWrapper.java index 68ff57e40..4d0d0439f 100644 --- a/bmw-common/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java +++ b/bmw-common/src/main/java/com/bmw/common/xss/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.bmw.common.xss; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/bmw-framework/src/main/java/com/bmw/framework/aspectj/DataScopeAspect.java similarity index 92% rename from bmw-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to bmw-framework/src/main/java/com/bmw/framework/aspectj/DataScopeAspect.java index 556159d45..004e59dbe 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/bmw-framework/src/main/java/com/bmw/framework/aspectj/DataScopeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.bmw.framework.aspectj; import java.lang.reflect.Method; import org.aspectj.lang.JoinPoint; @@ -8,12 +8,12 @@ import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUser; +import com.bmw.common.annotation.DataScope; +import com.bmw.common.core.domain.BaseEntity; +import com.bmw.common.utils.StringUtils; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysRole; +import com.bmw.system.domain.SysUser; /** * 数据过滤处理 @@ -55,7 +55,7 @@ public class DataScopeAspect public static final String DATA_SCOPE = "dataScope"; // 配置织入点 - @Pointcut("@annotation(com.ruoyi.common.annotation.DataScope)") + @Pointcut("@annotation(com.bmw.common.annotation.DataScope)") public void dataScopePointCut() { } diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/bmw-framework/src/main/java/com/bmw/framework/aspectj/DataSourceAspect.java similarity index 83% rename from bmw-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to bmw-framework/src/main/java/com/bmw/framework/aspectj/DataSourceAspect.java index bf18bbc23..74456f223 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/bmw-framework/src/main/java/com/bmw/framework/aspectj/DataSourceAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.bmw.framework.aspectj; import java.lang.reflect.Method; import org.aspectj.lang.ProceedingJoinPoint; @@ -10,9 +10,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.annotation.DataSource; +import com.bmw.common.config.datasource.DynamicDataSourceContextHolder; +import com.bmw.common.utils.StringUtils; /** * 多数据源处理 @@ -26,7 +26,7 @@ public class DataSourceAspect { protected Logger logger = LoggerFactory.getLogger(getClass()); - @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)") + @Pointcut("@annotation(com.bmw.common.annotation.DataSource)") public void dsPointCut() { diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/bmw-framework/src/main/java/com/bmw/framework/aspectj/LogAspect.java similarity index 90% rename from bmw-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to bmw-framework/src/main/java/com/bmw/framework/aspectj/LogAspect.java index 472c9ac95..8c5e4304c 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/bmw-framework/src/main/java/com/bmw/framework/aspectj/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.bmw.framework.aspectj; import java.lang.reflect.Method; import java.util.Map; @@ -12,16 +12,16 @@ import org.aspectj.lang.reflect.MethodSignature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.json.JSON; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.domain.SysUser; +import com.bmw.common.annotation.Log; +import com.bmw.common.enums.BusinessStatus; +import com.bmw.common.json.JSON; +import com.bmw.common.utils.ServletUtils; +import com.bmw.common.utils.StringUtils; +import com.bmw.framework.manager.AsyncManager; +import com.bmw.framework.manager.factory.AsyncFactory; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysOperLog; +import com.bmw.system.domain.SysUser; /** * 操作日志记录处理 @@ -35,7 +35,7 @@ public class LogAspect private static final Logger log = LoggerFactory.getLogger(LogAspect.class); // 配置织入点 - @Pointcut("@annotation(com.ruoyi.common.annotation.Log)") + @Pointcut("@annotation(com.bmw.common.annotation.Log)") public void logPointCut() { } diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/bmw-framework/src/main/java/com/bmw/framework/config/ApplicationConfig.java similarity index 86% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to bmw-framework/src/main/java/com/bmw/framework/config/ApplicationConfig.java index 4a84c5187..25d2a431f 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bmw.framework.config; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Configuration; @@ -13,7 +13,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.ruoyi.*.mapper") +@MapperScan("com.bmw.*.mapper") public class ApplicationConfig { diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/bmw-framework/src/main/java/com/bmw/framework/config/CaptchaConfig.java similarity index 96% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to bmw-framework/src/main/java/com/bmw/framework/config/CaptchaConfig.java index 43e78aebe..02fbc3c80 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bmw.framework.config; import java.util.Properties; import org.springframework.context.annotation.Bean; @@ -63,7 +63,7 @@ public class CaptchaConfig // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.bmw.framework.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/bmw-framework/src/main/java/com/bmw/framework/config/DruidConfig.java similarity index 95% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to bmw-framework/src/main/java/com/bmw/framework/config/DruidConfig.java index c571d5197..0ea7be8b6 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bmw.framework.config; import java.io.IOException; import java.util.HashMap; @@ -19,9 +19,9 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.util.Utils; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; +import com.bmw.common.enums.DataSourceType; +import com.bmw.framework.config.properties.DruidProperties; +import com.bmw.framework.datasource.DynamicDataSource; /** * druid 配置多数据源 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/bmw-framework/src/main/java/com/bmw/framework/config/FilterConfig.java similarity index 91% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to bmw-framework/src/main/java/com/bmw/framework/config/FilterConfig.java index 478b33c03..15a9fb1d7 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bmw.framework.config; import java.util.HashMap; import java.util.Map; @@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.xss.XssFilter; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.xss.XssFilter; /** * Filter配置 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/bmw-framework/src/main/java/com/bmw/framework/config/I18nConfig.java similarity index 97% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java rename to bmw-framework/src/main/java/com/bmw/framework/config/I18nConfig.java index c5c209e41..327f89182 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/I18nConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bmw.framework.config; import java.util.Locale; import org.springframework.context.annotation.Bean; diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/bmw-framework/src/main/java/com/bmw/framework/config/KaptchaTextCreator.java similarity index 98% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java rename to bmw-framework/src/main/java/com/bmw/framework/config/KaptchaTextCreator.java index ae89d3c50..3a3b73ffb 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bmw.framework.config; import java.security.SecureRandom; import java.util.Random; diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/bmw-framework/src/main/java/com/bmw/framework/config/ResourcesConfig.java similarity index 92% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to bmw-framework/src/main/java/com/bmw/framework/config/ResourcesConfig.java index fe42d3a88..218cc0051 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bmw.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -7,8 +7,8 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.config.Global; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.bmw.common.config.Global; +import com.bmw.framework.interceptor.RepeatSubmitInterceptor; /** * 通用配置 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/bmw-framework/src/main/java/com/bmw/framework/config/ShiroConfig.java similarity index 93% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java rename to bmw-framework/src/main/java/com/bmw/framework/config/ShiroConfig.java index 2867c7bf3..c4e413b0b 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/ShiroConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.bmw.framework.config; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -21,18 +21,18 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.shiro.realm.UserRealm; -import com.ruoyi.framework.shiro.session.OnlineSessionDAO; -import com.ruoyi.framework.shiro.session.OnlineSessionFactory; -import com.ruoyi.framework.shiro.web.filter.LogoutFilter; -import com.ruoyi.framework.shiro.web.filter.captcha.CaptchaValidateFilter; -import com.ruoyi.framework.shiro.web.filter.kickout.KickoutSessionFilter; -import com.ruoyi.framework.shiro.web.filter.online.OnlineSessionFilter; -import com.ruoyi.framework.shiro.web.filter.sync.SyncOnlineSessionFilter; -import com.ruoyi.framework.shiro.web.session.OnlineWebSessionManager; -import com.ruoyi.framework.shiro.web.session.SpringSessionValidationScheduler; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.spring.SpringUtils; +import com.bmw.framework.shiro.realm.UserRealm; +import com.bmw.framework.shiro.session.OnlineSessionDAO; +import com.bmw.framework.shiro.session.OnlineSessionFactory; +import com.bmw.framework.shiro.web.filter.LogoutFilter; +import com.bmw.framework.shiro.web.filter.captcha.CaptchaValidateFilter; +import com.bmw.framework.shiro.web.filter.kickout.KickoutSessionFilter; +import com.bmw.framework.shiro.web.filter.online.OnlineSessionFilter; +import com.bmw.framework.shiro.web.filter.sync.SyncOnlineSessionFilter; +import com.bmw.framework.shiro.web.session.OnlineWebSessionManager; +import com.bmw.framework.shiro.web.session.SpringSessionValidationScheduler; import at.pollux.thymeleaf.shiro.dialect.ShiroDialect; /** diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/bmw-framework/src/main/java/com/bmw/framework/config/properties/DruidProperties.java similarity index 98% rename from bmw-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to bmw-framework/src/main/java/com/bmw/framework/config/properties/DruidProperties.java index 84f7e0090..74e527b34 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/bmw-framework/src/main/java/com/bmw/framework/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.bmw.framework.config.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/bmw-framework/src/main/java/com/bmw/framework/datasource/DynamicDataSource.java similarity index 85% rename from bmw-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to bmw-framework/src/main/java/com/bmw/framework/datasource/DynamicDataSource.java index 94b3d0d3b..ade89a041 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/bmw-framework/src/main/java/com/bmw/framework/datasource/DynamicDataSource.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.datasource; +package com.bmw.framework.datasource; import java.util.Map; import javax.sql.DataSource; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; -import com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder; +import com.bmw.common.config.datasource.DynamicDataSourceContextHolder; /** * 动态数据源 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/bmw-framework/src/main/java/com/bmw/framework/interceptor/RepeatSubmitInterceptor.java similarity index 87% rename from bmw-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to bmw-framework/src/main/java/com/bmw/framework/interceptor/RepeatSubmitInterceptor.java index 1f0764d61..9f0ae7c07 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java +++ b/bmw-framework/src/main/java/com/bmw/framework/interceptor/RepeatSubmitInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor; +package com.bmw.framework.interceptor; import java.lang.reflect.Method; import javax.servlet.http.HttpServletRequest; @@ -6,10 +6,10 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.json.JSON; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.interceptor.annotation.RepeatSubmit; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.json.JSON; +import com.bmw.common.utils.ServletUtils; +import com.bmw.framework.interceptor.annotation.RepeatSubmit; /** * 防止重复提交拦截器 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java b/bmw-framework/src/main/java/com/bmw/framework/interceptor/annotation/RepeatSubmit.java similarity index 89% rename from bmw-framework/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java rename to bmw-framework/src/main/java/com/bmw/framework/interceptor/annotation/RepeatSubmit.java index 0fbd73b68..f93792b54 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java +++ b/bmw-framework/src/main/java/com/bmw/framework/interceptor/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor.annotation; +package com.bmw.framework.interceptor.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/bmw-framework/src/main/java/com/bmw/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 95% rename from bmw-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to bmw-framework/src/main/java/com/bmw/framework/interceptor/impl/SameUrlDataInterceptor.java index 1c490e66b..e2fc08f72 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/bmw-framework/src/main/java/com/bmw/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.interceptor.impl; +package com.bmw.framework.interceptor.impl; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.springframework.stereotype.Component; -import com.ruoyi.common.json.JSON; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.bmw.common.json.JSON; +import com.bmw.framework.interceptor.RepeatSubmitInterceptor; /** * 判断请求url和数据是否和上一次相同, diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/bmw-framework/src/main/java/com/bmw/framework/manager/AsyncManager.java similarity index 88% rename from bmw-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to bmw-framework/src/main/java/com/bmw/framework/manager/AsyncManager.java index 8f7830040..89fcc4a51 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/bmw-framework/src/main/java/com/bmw/framework/manager/AsyncManager.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.manager; +package com.bmw.framework.manager; import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.bmw.common.utils.Threads; +import com.bmw.common.utils.spring.SpringUtils; /** * 异步任务管理器 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/bmw-framework/src/main/java/com/bmw/framework/manager/ShutdownManager.java similarity index 92% rename from bmw-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to bmw-framework/src/main/java/com/bmw/framework/manager/ShutdownManager.java index 5c5905fda..575b8ed9d 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/bmw-framework/src/main/java/com/bmw/framework/manager/ShutdownManager.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.manager; +package com.bmw.framework.manager; -import com.ruoyi.framework.shiro.web.session.SpringSessionValidationScheduler; +import com.bmw.framework.shiro.web.session.SpringSessionValidationScheduler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/bmw-framework/src/main/java/com/bmw/framework/manager/factory/AsyncFactory.java similarity index 86% rename from bmw-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to bmw-framework/src/main/java/com/bmw/framework/manager/factory/AsyncFactory.java index 76a3eabcf..528f969cf 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/bmw-framework/src/main/java/com/bmw/framework/manager/factory/AsyncFactory.java @@ -1,21 +1,21 @@ -package com.ruoyi.framework.manager.factory; +package com.bmw.framework.manager.factory; import java.util.TimerTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.AddressUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.shiro.session.OnlineSession; -import com.ruoyi.framework.util.LogUtils; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysOperLogService; -import com.ruoyi.system.service.ISysUserOnlineService; -import com.ruoyi.system.service.impl.SysLogininforServiceImpl; +import com.bmw.common.constant.Constants; +import com.bmw.common.utils.AddressUtils; +import com.bmw.common.utils.ServletUtils; +import com.bmw.common.utils.spring.SpringUtils; +import com.bmw.framework.shiro.session.OnlineSession; +import com.bmw.framework.util.LogUtils; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysLogininfor; +import com.bmw.system.domain.SysOperLog; +import com.bmw.system.domain.SysUserOnline; +import com.bmw.system.service.ISysOperLogService; +import com.bmw.system.service.ISysUserOnlineService; +import com.bmw.system.service.impl.SysLogininforServiceImpl; import eu.bitwalker.useragentutils.UserAgent; /** diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/realm/UserRealm.java similarity index 85% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/realm/UserRealm.java index 68d096029..1613da57d 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/realm/UserRealm.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.realm; +package com.bmw.framework.shiro.realm; import java.util.HashSet; import java.util.Set; @@ -20,17 +20,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.RoleBlockedException; -import com.ruoyi.common.exception.user.UserBlockedException; -import com.ruoyi.common.exception.user.UserNotExistsException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; -import com.ruoyi.framework.shiro.service.SysLoginService; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysRoleService; +import com.bmw.common.exception.user.CaptchaException; +import com.bmw.common.exception.user.RoleBlockedException; +import com.bmw.common.exception.user.UserBlockedException; +import com.bmw.common.exception.user.UserNotExistsException; +import com.bmw.common.exception.user.UserPasswordNotMatchException; +import com.bmw.common.exception.user.UserPasswordRetryLimitExceedException; +import com.bmw.framework.shiro.service.SysLoginService; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysUser; +import com.bmw.system.service.ISysMenuService; +import com.bmw.system.service.ISysRoleService; /** * 自定义Realm 处理登录 权限 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysLoginService.java similarity index 81% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysLoginService.java index a24b2470b..1dfc3a3cc 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysLoginService.java @@ -1,25 +1,25 @@ -package com.ruoyi.framework.shiro.service; +package com.bmw.framework.shiro.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.UserBlockedException; -import com.ruoyi.common.exception.user.UserDeleteException; -import com.ruoyi.common.exception.user.UserNotExistsException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.service.ISysUserService; +import com.bmw.common.constant.Constants; +import com.bmw.common.constant.ShiroConstants; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.enums.UserStatus; +import com.bmw.common.exception.user.CaptchaException; +import com.bmw.common.exception.user.UserBlockedException; +import com.bmw.common.exception.user.UserDeleteException; +import com.bmw.common.exception.user.UserNotExistsException; +import com.bmw.common.exception.user.UserPasswordNotMatchException; +import com.bmw.common.utils.DateUtils; +import com.bmw.common.utils.MessageUtils; +import com.bmw.common.utils.ServletUtils; +import com.bmw.framework.manager.AsyncManager; +import com.bmw.framework.manager.factory.AsyncFactory; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysUser; +import com.bmw.system.service.ISysUserService; /** * 登录校验方法 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysPasswordService.java similarity index 83% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysPasswordService.java index 18caf65b7..dcdd9451f 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysPasswordService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.service; +package com.bmw.framework.shiro.service; import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.PostConstruct; @@ -8,14 +8,14 @@ import org.apache.shiro.crypto.hash.Md5Hash; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.domain.SysUser; +import com.bmw.common.constant.Constants; +import com.bmw.common.constant.ShiroConstants; +import com.bmw.common.exception.user.UserPasswordNotMatchException; +import com.bmw.common.exception.user.UserPasswordRetryLimitExceedException; +import com.bmw.common.utils.MessageUtils; +import com.bmw.framework.manager.AsyncManager; +import com.bmw.framework.manager.factory.AsyncFactory; +import com.bmw.system.domain.SysUser; /** * 登录密码方法 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysShiroService.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysShiroService.java similarity index 87% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysShiroService.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysShiroService.java index 1fb9c7e46..b803835ae 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/service/SysShiroService.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/service/SysShiroService.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.shiro.service; +package com.bmw.framework.shiro.service; import java.io.Serializable; import org.apache.shiro.session.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.shiro.session.OnlineSession; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.bmw.common.utils.StringUtils; +import com.bmw.framework.shiro.session.OnlineSession; +import com.bmw.system.domain.SysUserOnline; +import com.bmw.system.service.ISysUserOnlineService; /** * 会话db操作处理 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSession.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSession.java similarity index 96% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSession.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSession.java index 84cf0c0fb..89d93a0e4 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSession.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSession.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.shiro.session; +package com.bmw.framework.shiro.session; import org.apache.shiro.session.mgt.SimpleSession; -import com.ruoyi.common.enums.OnlineStatus; +import com.bmw.common.enums.OnlineStatus; /** * 在线用户会话属性 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSessionDAO.java similarity index 92% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSessionDAO.java index ce36b8df3..eba16315b 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSessionDAO.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.session; +package com.bmw.framework.shiro.session; import java.io.Serializable; import java.util.Date; @@ -7,10 +7,10 @@ import org.apache.shiro.session.UnknownSessionException; import org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import com.ruoyi.common.enums.OnlineStatus; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.shiro.service.SysShiroService; +import com.bmw.common.enums.OnlineStatus; +import com.bmw.framework.manager.AsyncManager; +import com.bmw.framework.manager.factory.AsyncFactory; +import com.bmw.framework.shiro.service.SysShiroService; /** * 针对自定义的ShiroSession的db操作 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSessionFactory.java similarity index 92% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSessionFactory.java index f59c5bf98..88e985bd7 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/session/OnlineSessionFactory.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.session; +package com.bmw.framework.shiro.session; import javax.servlet.http.HttpServletRequest; import org.apache.shiro.session.Session; @@ -6,8 +6,8 @@ import org.apache.shiro.session.mgt.SessionContext; import org.apache.shiro.session.mgt.SessionFactory; import org.apache.shiro.web.session.mgt.WebSessionContext; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.IpUtils; -import com.ruoyi.common.utils.ServletUtils; +import com.bmw.common.utils.IpUtils; +import com.bmw.common.utils.ServletUtils; import eu.bitwalker.useragentutils.UserAgent; diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/LogoutFilter.java similarity index 86% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/LogoutFilter.java index a84d9cbc3..f61b225df 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/LogoutFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.web.filter; +package com.bmw.framework.shiro.web.filter; import java.io.Serializable; import java.util.Deque; @@ -10,14 +10,14 @@ import org.apache.shiro.session.SessionException; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; +import com.bmw.common.constant.Constants; +import com.bmw.common.constant.ShiroConstants; +import com.bmw.common.utils.MessageUtils; +import com.bmw.common.utils.StringUtils; +import com.bmw.framework.manager.AsyncManager; +import com.bmw.framework.manager.factory.AsyncFactory; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysUser; /** * 退出过滤器 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java similarity index 92% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java index 69bd8e076..92cec53d3 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.shiro.web.filter.captcha; +package com.bmw.framework.shiro.web.filter.captcha; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import org.apache.shiro.web.filter.AccessControlFilter; import com.google.code.kaptcha.Constants; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.util.ShiroUtils; +import com.bmw.common.constant.ShiroConstants; +import com.bmw.common.utils.StringUtils; +import com.bmw.framework.util.ShiroUtils; /** * 验证码过滤器 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/kickout/KickoutSessionFilter.java similarity index 95% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/kickout/KickoutSessionFilter.java index 2c94499e6..012a62ee4 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/kickout/KickoutSessionFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.web.filter.kickout; +package com.bmw.framework.shiro.web.filter.kickout; import java.io.IOException; import java.io.Serializable; @@ -17,11 +17,11 @@ import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.AccessControlFilter; import org.apache.shiro.web.util.WebUtils; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; +import com.bmw.common.constant.ShiroConstants; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.utils.ServletUtils; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysUser; /** * 登录帐号控制过滤器 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/online/OnlineSessionFilter.java similarity index 89% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/online/OnlineSessionFilter.java index 720c34142..f17c78f37 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/online/OnlineSessionFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.web.filter.online; +package com.bmw.framework.shiro.web.filter.online; import java.io.IOException; import javax.servlet.ServletRequest; @@ -9,12 +9,12 @@ import org.apache.shiro.web.filter.AccessControlFilter; import org.apache.shiro.web.util.WebUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.common.enums.OnlineStatus; -import com.ruoyi.framework.shiro.session.OnlineSession; -import com.ruoyi.framework.shiro.session.OnlineSessionDAO; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; +import com.bmw.common.constant.ShiroConstants; +import com.bmw.common.enums.OnlineStatus; +import com.bmw.framework.shiro.session.OnlineSession; +import com.bmw.framework.shiro.session.OnlineSessionDAO; +import com.bmw.framework.util.ShiroUtils; +import com.bmw.system.domain.SysUser; /** * 自定义访问控制 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java similarity index 83% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java index 8569bbb9d..985361846 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.shiro.web.filter.sync; +package com.bmw.framework.shiro.web.filter.sync; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import org.apache.shiro.web.filter.PathMatchingFilter; import org.springframework.beans.factory.annotation.Autowired; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.framework.shiro.session.OnlineSession; -import com.ruoyi.framework.shiro.session.OnlineSessionDAO; +import com.bmw.common.constant.ShiroConstants; +import com.bmw.framework.shiro.session.OnlineSession; +import com.bmw.framework.shiro.session.OnlineSessionDAO; /** * 同步Session数据到Db diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/session/OnlineWebSessionManager.java similarity index 93% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/web/session/OnlineWebSessionManager.java index 26eaa9e2c..226522936 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/session/OnlineWebSessionManager.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/session/OnlineWebSessionManager.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.web.session; +package com.bmw.framework.shiro.web.session; import java.util.ArrayList; import java.util.Collection; @@ -13,11 +13,11 @@ import org.apache.shiro.session.mgt.SessionKey; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.shiro.session.OnlineSession; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.bmw.common.constant.ShiroConstants; +import com.bmw.common.utils.spring.SpringUtils; +import com.bmw.framework.shiro.session.OnlineSession; +import com.bmw.system.domain.SysUserOnline; +import com.bmw.system.service.ISysUserOnlineService; /** * 主要是在此如果会话的属性修改了 就标识下其修改了 然后方便 OnlineSessionDao同步 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/session/SpringSessionValidationScheduler.java similarity index 97% rename from bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java rename to bmw-framework/src/main/java/com/bmw/framework/shiro/web/session/SpringSessionValidationScheduler.java index 790ca59f4..701379d10 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java +++ b/bmw-framework/src/main/java/com/bmw/framework/shiro/web/session/SpringSessionValidationScheduler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.shiro.web.session; +package com.bmw.framework.shiro.web.session; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.Threads; +import com.bmw.common.utils.Threads; /** * 自定义任务调度器完成 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/util/LogUtils.java b/bmw-framework/src/main/java/com/bmw/framework/util/LogUtils.java similarity index 97% rename from bmw-framework/src/main/java/com/ruoyi/framework/util/LogUtils.java rename to bmw-framework/src/main/java/com/bmw/framework/util/LogUtils.java index 7fbd30afb..ed9986f65 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/util/LogUtils.java +++ b/bmw-framework/src/main/java/com/bmw/framework/util/LogUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.util; +package com.bmw.framework.util; import java.io.PrintWriter; import java.io.StringWriter; @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletRequest; import org.apache.shiro.SecurityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.json.JSON; -import com.ruoyi.common.utils.IpUtils; +import com.bmw.common.json.JSON; +import com.bmw.common.utils.IpUtils; /** * 处理并记录日志文件 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java b/bmw-framework/src/main/java/com/bmw/framework/util/ShiroUtils.java similarity index 92% rename from bmw-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java rename to bmw-framework/src/main/java/com/bmw/framework/util/ShiroUtils.java index ae0567730..f583ff1f5 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java +++ b/bmw-framework/src/main/java/com/bmw/framework/util/ShiroUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.util; +package com.bmw.framework.util; import org.apache.shiro.SecurityUtils; import org.apache.shiro.crypto.SecureRandomNumberGenerator; @@ -8,10 +8,10 @@ import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.subject.SimplePrincipalCollection; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.framework.shiro.realm.UserRealm; -import com.ruoyi.system.domain.SysUser; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.bean.BeanUtils; +import com.bmw.framework.shiro.realm.UserRealm; +import com.bmw.system.domain.SysUser; /** * shiro 工具类 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/bmw-framework/src/main/java/com/bmw/framework/web/domain/Server.java similarity index 94% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java rename to bmw-framework/src/main/java/com/bmw/framework/web/domain/Server.java index 1eb6ba974..4cc75b387 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/domain/Server.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.web.domain; +package com.bmw.framework.web.domain; import java.net.UnknownHostException; import java.util.LinkedList; import java.util.List; import java.util.Properties; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.IpUtils; -import com.ruoyi.framework.web.domain.server.Cpu; -import com.ruoyi.framework.web.domain.server.Jvm; -import com.ruoyi.framework.web.domain.server.Mem; -import com.ruoyi.framework.web.domain.server.Sys; -import com.ruoyi.framework.web.domain.server.SysFile; +import com.bmw.common.utils.Arith; +import com.bmw.common.utils.IpUtils; +import com.bmw.framework.web.domain.server.Cpu; +import com.bmw.framework.web.domain.server.Jvm; +import com.bmw.framework.web.domain.server.Mem; +import com.bmw.framework.web.domain.server.Sys; +import com.bmw.framework.web.domain.server.SysFile; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.hardware.CentralProcessor.TickType; diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Cpu.java similarity index 94% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Cpu.java index a13a66cf2..f9ea4f7af 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Cpu.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.web.domain.server; +package com.bmw.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.bmw.common.utils.Arith; /** * CPU相关信息 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Jvm.java similarity index 94% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Jvm.java index 485d201dd..9af0f7510 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Jvm.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.web.domain.server; +package com.bmw.framework.web.domain.server; import java.lang.management.ManagementFactory; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.DateUtils; +import com.bmw.common.utils.Arith; +import com.bmw.common.utils.DateUtils; /** * JVM相关信息 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Mem.java similarity index 91% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Mem.java index 13eec521a..6f45b9bf2 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Mem.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.web.domain.server; +package com.bmw.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.bmw.common.utils.Arith; /** * 內存相关信息 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Sys.java similarity index 96% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Sys.java index 45d64d9cd..ce8bdcd81 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/Sys.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.bmw.framework.web.domain.server; /** * 系统相关信息 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/SysFile.java similarity index 97% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to bmw-framework/src/main/java/com/bmw/framework/web/domain/server/SysFile.java index 1320cde6e..b0e34cadb 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/domain/server/SysFile.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.bmw.framework.web.domain.server; /** * 系统文件相关信息 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/bmw-framework/src/main/java/com/bmw/framework/web/exception/GlobalExceptionHandler.java similarity index 91% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to bmw-framework/src/main/java/com/bmw/framework/web/exception/GlobalExceptionHandler.java index 2ff357743..928f43102 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.exception; +package com.bmw.framework.web.exception; import javax.servlet.http.HttpServletRequest; import org.apache.shiro.authz.AuthorizationException; @@ -9,11 +9,11 @@ import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.ModelAndView; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.BusinessException; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.security.PermissionUtils; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.exception.BusinessException; +import com.bmw.common.exception.DemoModeException; +import com.bmw.common.utils.ServletUtils; +import com.bmw.common.utils.security.PermissionUtils; /** * 全局异常处理器 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/service/ConfigService.java b/bmw-framework/src/main/java/com/bmw/framework/web/service/ConfigService.java similarity index 85% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/service/ConfigService.java rename to bmw-framework/src/main/java/com/bmw/framework/web/service/ConfigService.java index 010312ee7..29ea8fc69 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/service/ConfigService.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/service/ConfigService.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.web.service; +package com.bmw.framework.web.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.service.ISysConfigService; +import com.bmw.system.service.ISysConfigService; /** * RuoYi首创 html调用 thymeleaf 实现参数管理 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/service/DictService.java b/bmw-framework/src/main/java/com/bmw/framework/web/service/DictService.java similarity index 87% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/service/DictService.java rename to bmw-framework/src/main/java/com/bmw/framework/web/service/DictService.java index b8aa4baec..1ea40a46a 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/service/DictService.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/service/DictService.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.web.service; +package com.bmw.framework.web.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysDictData; -import com.ruoyi.system.service.ISysDictDataService; +import com.bmw.system.domain.SysDictData; +import com.bmw.system.service.ISysDictDataService; /** * RuoYi首创 html调用 thymeleaf 实现字典读取 diff --git a/bmw-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/bmw-framework/src/main/java/com/bmw/framework/web/service/PermissionService.java similarity index 92% rename from bmw-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java rename to bmw-framework/src/main/java/com/bmw/framework/web/service/PermissionService.java index 90bd0554d..f0b0838e4 100644 --- a/bmw-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java +++ b/bmw-framework/src/main/java/com/bmw/framework/web/service/PermissionService.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.web.service; +package com.bmw.framework.web.service; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; -import com.ruoyi.common.utils.security.PermissionUtils; +import com.bmw.common.utils.security.PermissionUtils; /** * RuoYi首创 js调用 thymeleaf 实现按钮权限可见性 diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/bmw-generator/src/main/java/com/bmw/generator/config/GenConfig.java similarity index 96% rename from bmw-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to bmw-generator/src/main/java/com/bmw/generator/config/GenConfig.java index 2b5c801f0..701900b11 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/bmw-generator/src/main/java/com/bmw/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.config; +package com.bmw.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,6 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/bmw-generator/src/main/java/com/bmw/generator/controller/GenController.java similarity index 86% rename from bmw-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to bmw-generator/src/main/java/com/bmw/generator/controller/GenController.java index dffbd50df..d229d9ceb 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/bmw-generator/src/main/java/com/bmw/generator/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.controller; +package com.bmw.generator.controller; import java.io.IOException; import java.util.List; @@ -12,18 +12,17 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.generator.domain.TableInfo; -import com.ruoyi.generator.service.IGenService; +import com.bmw.common.annotation.Log; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.core.text.Convert; +import com.bmw.common.enums.BusinessType; +import com.bmw.generator.domain.TableInfo; +import com.bmw.generator.service.IGenService; /** * 代码生成 操作处理 * - * @author ruoyi */ @Controller @RequestMapping("/tool/gen") @@ -87,7 +86,7 @@ public class GenController extends BaseController private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"bmw.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/domain/ColumnConfigInfo.java b/bmw-generator/src/main/java/com/bmw/generator/domain/ColumnConfigInfo.java similarity index 95% rename from bmw-generator/src/main/java/com/ruoyi/generator/domain/ColumnConfigInfo.java rename to bmw-generator/src/main/java/com/bmw/generator/domain/ColumnConfigInfo.java index 7deb42d38..2a7b8a886 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/domain/ColumnConfigInfo.java +++ b/bmw-generator/src/main/java/com/bmw/generator/domain/ColumnConfigInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.domain; +package com.bmw.generator.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; * 字段类型配置 由数据库字段的注释解析而来 * 注释结构示例:{"title": "状态", "type": "dict", "value": "sys_common_status"} {"title": "登录时间", "type": "date"} * - * @author ruoyi - * */ @JsonIgnoreProperties(ignoreUnknown = true) public class ColumnConfigInfo diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java b/bmw-generator/src/main/java/com/bmw/generator/domain/ColumnInfo.java similarity index 94% rename from bmw-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java rename to bmw-generator/src/main/java/com/bmw/generator/domain/ColumnInfo.java index 13c9493ab..aa813157b 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java +++ b/bmw-generator/src/main/java/com/bmw/generator/domain/ColumnInfo.java @@ -1,12 +1,11 @@ -package com.ruoyi.generator.domain; +package com.bmw.generator.domain; -import com.ruoyi.common.json.JSON; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.json.JSON; +import com.bmw.common.utils.StringUtils; /** * ry数据库表列信息 * - * @author ruoyi */ public class ColumnInfo { diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/domain/TableInfo.java b/bmw-generator/src/main/java/com/bmw/generator/domain/TableInfo.java similarity index 92% rename from bmw-generator/src/main/java/com/ruoyi/generator/domain/TableInfo.java rename to bmw-generator/src/main/java/com/bmw/generator/domain/TableInfo.java index f416fb644..0fe0f6853 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/domain/TableInfo.java +++ b/bmw-generator/src/main/java/com/bmw/generator/domain/TableInfo.java @@ -1,13 +1,12 @@ -package com.ruoyi.generator.domain; +package com.bmw.generator.domain; import java.util.List; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.core.domain.BaseEntity; +import com.bmw.common.utils.StringUtils; /** * ry 数据库表 * - * @author ruoyi */ public class TableInfo extends BaseEntity { diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java b/bmw-generator/src/main/java/com/bmw/generator/mapper/GenMapper.java similarity index 82% rename from bmw-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java rename to bmw-generator/src/main/java/com/bmw/generator/mapper/GenMapper.java index 6233939d6..46e13e2cb 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/mapper/GenMapper.java +++ b/bmw-generator/src/main/java/com/bmw/generator/mapper/GenMapper.java @@ -1,13 +1,12 @@ -package com.ruoyi.generator.mapper; +package com.bmw.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.ColumnInfo; -import com.ruoyi.generator.domain.TableInfo; +import com.bmw.generator.domain.ColumnInfo; +import com.bmw.generator.domain.TableInfo; /** * 代码生成 数据层 * - * @author ruoyi */ public interface GenMapper { diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/service/IGenService.java b/bmw-generator/src/main/java/com/bmw/generator/service/IGenService.java similarity index 85% rename from bmw-generator/src/main/java/com/ruoyi/generator/service/IGenService.java rename to bmw-generator/src/main/java/com/bmw/generator/service/IGenService.java index b5e3f374d..81ab1dd2a 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/service/IGenService.java +++ b/bmw-generator/src/main/java/com/bmw/generator/service/IGenService.java @@ -1,12 +1,11 @@ -package com.ruoyi.generator.service; +package com.bmw.generator.service; import java.util.List; -import com.ruoyi.generator.domain.TableInfo; +import com.bmw.generator.domain.TableInfo; /** * 代码生成 服务层 * - * @author ruoyi */ public interface IGenService { diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java b/bmw-generator/src/main/java/com/bmw/generator/service/impl/GenServiceImpl.java similarity index 88% rename from bmw-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java rename to bmw-generator/src/main/java/com/bmw/generator/service/impl/GenServiceImpl.java index f960ea38d..05d8ef642 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java +++ b/bmw-generator/src/main/java/com/bmw/generator/service/impl/GenServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.service.impl; +package com.bmw.generator.service.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -14,20 +14,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.ColumnInfo; -import com.ruoyi.generator.domain.TableInfo; -import com.ruoyi.generator.mapper.GenMapper; -import com.ruoyi.generator.service.IGenService; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; +import com.bmw.common.constant.Constants; +import com.bmw.common.utils.StringUtils; +import com.bmw.generator.config.GenConfig; +import com.bmw.generator.domain.ColumnInfo; +import com.bmw.generator.domain.TableInfo; +import com.bmw.generator.mapper.GenMapper; +import com.bmw.generator.service.IGenService; +import com.bmw.generator.util.GenUtils; +import com.bmw.generator.util.VelocityInitializer; /** * 代码生成 服务层处理 * - * @author ruoyi */ @Service public class GenServiceImpl implements IGenService diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/bmw-generator/src/main/java/com/bmw/generator/util/GenUtils.java similarity index 96% rename from bmw-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to bmw-generator/src/main/java/com/bmw/generator/util/GenUtils.java index 8d23fa6be..21c379549 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/bmw-generator/src/main/java/com/bmw/generator/util/GenUtils.java @@ -1,21 +1,20 @@ -package com.ruoyi.generator.util; +package com.bmw.generator.util; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.velocity.VelocityContext; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.ColumnInfo; -import com.ruoyi.generator.domain.TableInfo; +import com.bmw.common.constant.Constants; +import com.bmw.common.utils.DateUtils; +import com.bmw.common.utils.StringUtils; +import com.bmw.generator.config.GenConfig; +import com.bmw.generator.domain.ColumnInfo; +import com.bmw.generator.domain.TableInfo; /** * 代码生成器 工具类 * - * @author ruoyi */ public class GenUtils { diff --git a/bmw-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/bmw-generator/src/main/java/com/bmw/generator/util/VelocityInitializer.java similarity index 90% rename from bmw-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to bmw-generator/src/main/java/com/bmw/generator/util/VelocityInitializer.java index 24004617b..297c309e4 100644 --- a/bmw-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/bmw-generator/src/main/java/com/bmw/generator/util/VelocityInitializer.java @@ -1,13 +1,12 @@ -package com.ruoyi.generator.util; +package com.bmw.generator.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.constant.Constants; +import com.bmw.common.constant.Constants; /** * VelocityEngine工厂 * - * @author RuoYi */ public class VelocityInitializer { diff --git a/bmw-generator/src/main/resources/generator.yml b/bmw-generator/src/main/resources/generator.yml index 94349f426..c403c613b 100644 --- a/bmw-generator/src/main/resources/generator.yml +++ b/bmw-generator/src/main/resources/generator.yml @@ -2,9 +2,9 @@ # 代码生成 gen: # 作者 - author: ruoyi + author: bmw # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system + packageName: com.bmw.system # 自动去除表前缀,默认是true autoRemovePre: true # 表前缀(类名不会包含表前缀) diff --git a/bmw-generator/src/main/resources/mapper/generator/GenMapper.xml b/bmw-generator/src/main/resources/mapper/generator/GenMapper.xml index 0dc1f675d..c4650ec08 100644 --- a/bmw-generator/src/main/resources/mapper/generator/GenMapper.xml +++ b/bmw-generator/src/main/resources/mapper/generator/GenMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-generator/src/main/resources/vm/java/Controller.java.vm b/bmw-generator/src/main/resources/vm/java/Controller.java.vm index 8987025e1..dc60d0a1a 100644 --- a/bmw-generator/src/main/resources/vm/java/Controller.java.vm +++ b/bmw-generator/src/main/resources/vm/java/Controller.java.vm @@ -3,21 +3,20 @@ package ${basePackage}.web.controller.${moduleName}; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; +import com.bmw.common.annotation.Log; +import com.bmw.common.enums.BusinessType; import ${package}.domain.${className}; import ${package}.service.I${className}Service; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.utils.poi.ExcelUtil; /** * ${tableComment} 信息操作处理 diff --git a/bmw-generator/src/main/resources/vm/java/ServiceImpl.java.vm b/bmw-generator/src/main/resources/vm/java/ServiceImpl.java.vm index 6bb90eed5..46b450398 100644 --- a/bmw-generator/src/main/resources/vm/java/ServiceImpl.java.vm +++ b/bmw-generator/src/main/resources/vm/java/ServiceImpl.java.vm @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import ${package}.mapper.${className}Mapper; import ${package}.domain.${className}; import ${package}.service.I${className}Service; -import com.ruoyi.common.core.text.Convert; +import com.bmw.common.core.text.Convert; /** * ${tableComment} 服务层实现 diff --git a/bmw-generator/src/main/resources/vm/java/domain.java.vm b/bmw-generator/src/main/resources/vm/java/domain.java.vm index e2e2b4a62..6ca560c24 100644 --- a/bmw-generator/src/main/resources/vm/java/domain.java.vm +++ b/bmw-generator/src/main/resources/vm/java/domain.java.vm @@ -1,18 +1,13 @@ package ${package}.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; #foreach ($column in $columns) #if($column.attrType == 'Date' && ($column.attrname != 'createBy' && $column.attrname != 'createTime' && $column.attrname != 'updateBy' && $column.attrname != 'updateTime' && $column.attrname != 'remark')) -import java.util.Date; -#break + #break #end #end #foreach ($column in $columns) #if($column.attrType == 'BigDecimal') -import java.math.BigDecimal; -#break + #break #end #end diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/bmw-quartz/src/main/java/com/bmw/quartz/config/ScheduleConfig.java similarity index 98% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to bmw-quartz/src/main/java/com/bmw/quartz/config/ScheduleConfig.java index 58c69bc34..e528f09d6 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.config; +package com.bmw.quartz.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/bmw-quartz/src/main/java/com/bmw/quartz/controller/SysJobController.java similarity index 90% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to bmw-quartz/src/main/java/com/bmw/quartz/controller/SysJobController.java index 906392d49..3f8438ff4 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/controller/SysJobController.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.controller; +package com.bmw.quartz.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.service.ISysJobService; +import com.bmw.common.annotation.Log; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.exception.job.TaskException; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.quartz.domain.SysJob; +import com.bmw.quartz.service.ISysJobService; /** * 调度任务信息操作处理 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/bmw-quartz/src/main/java/com/bmw/quartz/controller/SysJobLogController.java similarity index 85% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to bmw-quartz/src/main/java/com/bmw/quartz/controller/SysJobLogController.java index a74cf75ec..9f10ecef6 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/controller/SysJobLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.controller; +package com.bmw.quartz.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -10,14 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.bmw.common.annotation.Log; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.enums.BusinessType; +import com.bmw.common.utils.poi.ExcelUtil; +import com.bmw.quartz.domain.SysJobLog; +import com.bmw.quartz.service.ISysJobLogService; /** * 调度日志操作处理 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/bmw-quartz/src/main/java/com/bmw/quartz/domain/SysJob.java similarity index 94% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to bmw-quartz/src/main/java/com/bmw/quartz/domain/SysJob.java index b14295351..051001021 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/domain/SysJob.java @@ -1,15 +1,15 @@ -package com.ruoyi.quartz.domain; +package com.bmw.quartz.domain; import java.io.Serializable; import java.util.Date; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.quartz.util.CronUtils; +import com.bmw.common.annotation.Excel; +import com.bmw.common.constant.ScheduleConstants; +import com.bmw.common.core.domain.BaseEntity; +import com.bmw.common.utils.StringUtils; +import com.bmw.quartz.util.CronUtils; /** * 定时任务调度表 sys_job diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/bmw-quartz/src/main/java/com/bmw/quartz/domain/SysJobLog.java similarity index 96% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to bmw-quartz/src/main/java/com/bmw/quartz/domain/SysJobLog.java index 89602bde1..980c664a5 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/domain/SysJobLog.java @@ -1,10 +1,10 @@ -package com.ruoyi.quartz.domain; +package com.bmw.quartz.domain; import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.core.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/bmw-quartz/src/main/java/com/bmw/quartz/mapper/SysJobLogMapper.java similarity index 94% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to bmw-quartz/src/main/java/com/bmw/quartz/mapper/SysJobLogMapper.java index c2f79e62a..9894edc1e 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/mapper/SysJobLogMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.quartz.mapper; +package com.bmw.quartz.mapper; -import com.ruoyi.quartz.domain.SysJobLog; +import com.bmw.quartz.domain.SysJobLog; import java.util.List; /** diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/bmw-quartz/src/main/java/com/bmw/quartz/mapper/SysJobMapper.java similarity index 94% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to bmw-quartz/src/main/java/com/bmw/quartz/mapper/SysJobMapper.java index 5207c7ae8..de4112148 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/mapper/SysJobMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.quartz.mapper; +package com.bmw.quartz.mapper; -import com.ruoyi.quartz.domain.SysJob; +import com.bmw.quartz.domain.SysJob; import java.util.List; /** diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/bmw-quartz/src/main/java/com/bmw/quartz/service/ISysJobLogService.java similarity index 93% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to bmw-quartz/src/main/java/com/bmw/quartz/service/ISysJobLogService.java index 4e112d52b..b9dc2bd6f 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/service/ISysJobLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.quartz.service; +package com.bmw.quartz.service; import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; +import com.bmw.quartz.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/bmw-quartz/src/main/java/com/bmw/quartz/service/ISysJobService.java similarity index 94% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to bmw-quartz/src/main/java/com/bmw/quartz/service/ISysJobService.java index 785669710..63cb6c273 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/service/ISysJobService.java @@ -1,9 +1,9 @@ -package com.ruoyi.quartz.service; +package com.bmw.quartz.service; import java.util.List; import org.quartz.SchedulerException; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; +import com.bmw.common.exception.job.TaskException; +import com.bmw.quartz.domain.SysJob; /** * 定时任务调度信息信息 服务层 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/bmw-quartz/src/main/java/com/bmw/quartz/service/impl/SysJobLogServiceImpl.java similarity index 88% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to bmw-quartz/src/main/java/com/bmw/quartz/service/impl/SysJobLogServiceImpl.java index 387fb3e3f..adfca09e1 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/service/impl/SysJobLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.service.impl; +package com.bmw.quartz.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.mapper.SysJobLogMapper; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.bmw.common.core.text.Convert; +import com.bmw.quartz.domain.SysJobLog; +import com.bmw.quartz.mapper.SysJobLogMapper; +import com.bmw.quartz.service.ISysJobLogService; /** * 定时任务调度日志信息 服务层 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/bmw-quartz/src/main/java/com/bmw/quartz/service/impl/SysJobServiceImpl.java similarity index 94% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to bmw-quartz/src/main/java/com/bmw/quartz/service/impl/SysJobServiceImpl.java index d18b75ac0..c2f694319 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/service/impl/SysJobServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.service.impl; +package com.bmw.quartz.service.impl; import java.util.List; import javax.annotation.PostConstruct; @@ -9,14 +9,14 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.mapper.SysJobMapper; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; -import com.ruoyi.quartz.util.ScheduleUtils; +import com.bmw.common.constant.ScheduleConstants; +import com.bmw.common.core.text.Convert; +import com.bmw.common.exception.job.TaskException; +import com.bmw.quartz.domain.SysJob; +import com.bmw.quartz.mapper.SysJobMapper; +import com.bmw.quartz.service.ISysJobService; +import com.bmw.quartz.util.CronUtils; +import com.bmw.quartz.util.ScheduleUtils; /** * 定时任务调度信息 服务层 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/bmw-quartz/src/main/java/com/bmw/quartz/task/RyTask.java similarity index 89% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to bmw-quartz/src/main/java/com/bmw/quartz/task/RyTask.java index 853243baf..915a9cf09 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/task/RyTask.java @@ -1,7 +1,7 @@ -package com.ruoyi.quartz.task; +package com.bmw.quartz.task; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.bmw.common.utils.StringUtils; /** * 定时任务调度测试 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/bmw-quartz/src/main/java/com/bmw/quartz/util/AbstractQuartzJob.java similarity index 86% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to bmw-quartz/src/main/java/com/bmw/quartz/util/AbstractQuartzJob.java index 2cc926613..b79b736ae 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/util/AbstractQuartzJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.bmw.quartz.util; import java.util.Date; import org.quartz.Job; @@ -6,15 +6,15 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.utils.ExceptionUtil; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.bmw.common.constant.Constants; +import com.bmw.common.constant.ScheduleConstants; +import com.bmw.common.utils.ExceptionUtil; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.bean.BeanUtils; +import com.bmw.common.utils.spring.SpringUtils; +import com.bmw.quartz.domain.SysJob; +import com.bmw.quartz.domain.SysJobLog; +import com.bmw.quartz.service.ISysJobLogService; /** * 抽象quartz调用 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/bmw-quartz/src/main/java/com/bmw/quartz/util/CronUtils.java similarity index 98% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to bmw-quartz/src/main/java/com/bmw/quartz/util/CronUtils.java index dd5383979..927f84cfa 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/util/CronUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.bmw.quartz.util; import java.text.ParseException; import java.util.Date; diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/bmw-quartz/src/main/java/com/bmw/quartz/util/JobInvokeUtil.java similarity index 97% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to bmw-quartz/src/main/java/com/bmw/quartz/util/JobInvokeUtil.java index 40a19bdea..e7f3e79e4 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/util/JobInvokeUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.util; +package com.bmw.quartz.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.quartz.domain.SysJob; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.spring.SpringUtils; +import com.bmw.quartz.domain.SysJob; /** * 任务执行工具 diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/bmw-quartz/src/main/java/com/bmw/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 86% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to bmw-quartz/src/main/java/com/bmw/quartz/util/QuartzDisallowConcurrentExecution.java index 5e135580b..a83a68bf9 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/util/QuartzDisallowConcurrentExecution.java @@ -1,8 +1,8 @@ -package com.ruoyi.quartz.util; +package com.bmw.quartz.util; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; +import com.bmw.quartz.domain.SysJob; /** * 定时任务处理(禁止并发执行) diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/bmw-quartz/src/main/java/com/bmw/quartz/util/QuartzJobExecution.java similarity index 82% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to bmw-quartz/src/main/java/com/bmw/quartz/util/QuartzJobExecution.java index e97532617..954f7b877 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/util/QuartzJobExecution.java @@ -1,7 +1,7 @@ -package com.ruoyi.quartz.util; +package com.bmw.quartz.util; import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; +import com.bmw.quartz.domain.SysJob; /** * 定时任务处理(允许并发执行) diff --git a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/bmw-quartz/src/main/java/com/bmw/quartz/util/ScheduleUtils.java similarity index 94% rename from bmw-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to bmw-quartz/src/main/java/com/bmw/quartz/util/ScheduleUtils.java index 073629a8b..76b6690c4 100644 --- a/bmw-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java +++ b/bmw-quartz/src/main/java/com/bmw/quartz/util/ScheduleUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.bmw.quartz.util; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; @@ -10,10 +10,10 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.exception.job.TaskException.Code; -import com.ruoyi.quartz.domain.SysJob; +import com.bmw.common.constant.ScheduleConstants; +import com.bmw.common.exception.job.TaskException; +import com.bmw.common.exception.job.TaskException.Code; +import com.bmw.quartz.domain.SysJob; /** * 定时任务工具类 diff --git a/bmw-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/bmw-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index b412976fb..8b5435eba 100644 --- a/bmw-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/bmw-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/bmw-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 5605c4445..da4c35d0b 100644 --- a/bmw-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/bmw-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-quartz/src/main/resources/templates/monitor/job/add.html b/bmw-quartz/src/main/resources/templates/monitor/job/add.html index 9cb48c51f..7225dc4d3 100644 --- a/bmw-quartz/src/main/resources/templates/monitor/job/add.html +++ b/bmw-quartz/src/main/resources/templates/monitor/job/add.html @@ -26,7 +26,7 @@
Bean调用示例:ryTask.ryParams('ry') - Class类调用示例:com.ruoyi.quartz.task.RyTask.ryParams('ry') + Class类调用示例:com.bmw.quartz.task.RyTask.ryParams('ry') 参数说明:支持字符串,布尔类型,长整型,浮点型,整型
diff --git a/bmw-quartz/src/main/resources/templates/monitor/job/edit.html b/bmw-quartz/src/main/resources/templates/monitor/job/edit.html index 19f5acffe..65698c020 100644 --- a/bmw-quartz/src/main/resources/templates/monitor/job/edit.html +++ b/bmw-quartz/src/main/resources/templates/monitor/job/edit.html @@ -27,7 +27,7 @@
Bean调用示例:ryTask.ryParams('ry') - Class类调用示例:com.ruoyi.quartz.task.RyTask.ryParams('ry') + Class类调用示例:com.bmw.quartz.task.RyTask.ryParams('ry') 参数说明:支持字符串,布尔类型,长整型,浮点型,整型
diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/bmw-system/src/main/java/com/bmw/system/domain/SysConfig.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysConfig.java index 5eeb73362..72c724f5f 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.core.domain.BaseEntity; /** * 参数配置表 sys_config diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysDept.java b/bmw-system/src/main/java/com/bmw/system/domain/SysDept.java similarity index 97% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysDept.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysDept.java index 1e7bd7301..738de45bb 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysDept.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysDept.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.core.domain.BaseEntity; /** * 部门表 sys_dept diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysDictData.java b/bmw-system/src/main/java/com/bmw/system/domain/SysDictData.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysDictData.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysDictData.java index 6a37bf882..de777c9bc 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysDictData.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysDictData.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.domain.BaseEntity; /** * 字典数据表 sys_dict_data diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysDictType.java b/bmw-system/src/main/java/com/bmw/system/domain/SysDictType.java similarity index 94% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysDictType.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysDictType.java index e83bdc4b1..ab5af8b44 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysDictType.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysDictType.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.core.domain.BaseEntity; /** * 字典类型表 sys_dict_type diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/bmw-system/src/main/java/com/bmw/system/domain/SysLogininfor.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysLogininfor.java index 436488594..f6c3329f4 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysLogininfor.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.core.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/bmw-system/src/main/java/com/bmw/system/domain/SysMenu.java similarity index 98% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysMenu.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysMenu.java index 03a938d8e..987eb7a68 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysMenu.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import java.util.List; import java.util.ArrayList; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.core.domain.BaseEntity; /** * 菜单权限表 sys_menu diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/bmw-system/src/main/java/com/bmw/system/domain/SysNotice.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysNotice.java index 520d3f815..e86f39587 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysNotice.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.core.domain.BaseEntity; /** * 通知公告表 sys_notice diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/bmw-system/src/main/java/com/bmw/system/domain/SysOperLog.java similarity index 97% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysOperLog.java index 74f25b516..c4ff87b0c 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysOperLog.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.core.domain.BaseEntity; /** * 操作日志记录表 oper_log diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/bmw-system/src/main/java/com/bmw/system/domain/SysPost.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysPost.java index 45c25cc62..15f9e6ff3 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysPost.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.core.domain.BaseEntity; /** * 岗位表 sys_post diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysRole.java b/bmw-system/src/main/java/com/bmw/system/domain/SysRole.java similarity index 97% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysRole.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysRole.java index 7102c845f..7591dd879 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysRole.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysRole.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.core.domain.BaseEntity; /** * 角色表 sys_role diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/bmw-system/src/main/java/com/bmw/system/domain/SysRoleDept.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysRoleDept.java index 47b21bf79..724ecc5d0 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/bmw-system/src/main/java/com/bmw/system/domain/SysRoleMenu.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysRoleMenu.java index de10a7470..484b28843 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/bmw-system/src/main/java/com/bmw/system/domain/SysUser.java similarity index 97% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysUser.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysUser.java index 6ced3dc8c..0c37b5c1e 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysUser.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysUser.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import java.util.Date; import java.util.List; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.core.domain.BaseEntity; +import com.bmw.common.annotation.Excel; +import com.bmw.common.annotation.Excel.Type; +import com.bmw.common.annotation.Excels; +import com.bmw.common.core.domain.BaseEntity; /** * 用户对象 sys_user diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/bmw-system/src/main/java/com/bmw/system/domain/SysUserOnline.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysUserOnline.java index e13506e4f..d3e85eb2e 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysUserOnline.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.enums.OnlineStatus; +import com.bmw.common.core.domain.BaseEntity; +import com.bmw.common.enums.OnlineStatus; /** * 当前在线会话 sys_user_online diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/bmw-system/src/main/java/com/bmw/system/domain/SysUserPost.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysUserPost.java index 6e8c416f2..9081c030a 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/bmw-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/bmw-system/src/main/java/com/bmw/system/domain/SysUserRole.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to bmw-system/src/main/java/com/bmw/system/domain/SysUserRole.java index 4d1581014..d423be1db 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/bmw-system/src/main/java/com/bmw/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.bmw.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysConfigMapper.java similarity index 94% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysConfigMapper.java index 36cab8fd0..bf429c14d 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.bmw.system.domain.SysConfig; /** * 参数配置 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysDeptMapper.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysDeptMapper.java index 593ef75f3..fb94883ce 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysDeptMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysDept; +import com.bmw.system.domain.SysDept; /** * 部门管理 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysDictDataMapper.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysDictDataMapper.java index 4c3691f41..c7244de00 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysDictDataMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysDictData; +import com.bmw.system.domain.SysDictData; /** * 字典表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysDictTypeMapper.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysDictTypeMapper.java index 51f068466..78158d449 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysDictTypeMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Mapper; -import com.ruoyi.system.domain.SysDictType; +import com.bmw.system.domain.SysDictType; /** * 字典表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysLogininforMapper.java similarity index 91% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysLogininforMapper.java index 7ee47dc23..79ae0aa99 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysLogininforMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.bmw.system.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysMenuMapper.java similarity index 97% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysMenuMapper.java index a5f69ed2e..665b4c59d 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysMenuMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysMenu; +import com.bmw.system.domain.SysMenu; /** * 菜单表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysNoticeMapper.java similarity index 92% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysNoticeMapper.java index dd402e2c5..74c2fda24 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysNoticeMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.bmw.system.domain.SysNotice; /** * 公告 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysOperLogMapper.java similarity index 92% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysOperLogMapper.java index b40bd29c4..3ec046bf8 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysOperLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.bmw.system.domain.SysOperLog; /** * 操作日志 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysPostMapper.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysPostMapper.java index 188f3355f..aad236c48 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.bmw.system.domain.SysPost; /** * 岗位信息 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysRoleDeptMapper.java similarity index 91% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysRoleDeptMapper.java index f9d3a2f39..beab9d662 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; +import com.bmw.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysRoleMapper.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysRoleMapper.java index eca02da99..563b1e1a9 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRole; +import com.bmw.system.domain.SysRole; /** * 角色表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysRoleMenuMapper.java similarity index 91% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysRoleMenuMapper.java index 9b8879663..cc6a4b8ef 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleMenu; +import com.bmw.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysUserMapper.java similarity index 97% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysUserMapper.java index c7ebaf039..fd42b4e76 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysUserMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUser; +import com.bmw.system.domain.SysUser; /** * 用户表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysUserOnlineMapper.java similarity index 92% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysUserOnlineMapper.java index 5bd68edff..9d26b27ea 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysUserOnlineMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUserOnline; +import com.bmw.system.domain.SysUserOnline; /** * 在线用户 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysUserPostMapper.java similarity index 91% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysUserPostMapper.java index 348c44f20..3735bb657 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUserPost; +import com.bmw.system.domain.SysUserPost; /** * 用户与岗位 表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/bmw-system/src/main/java/com/bmw/system/mapper/SysUserRoleMapper.java similarity index 94% rename from bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to bmw-system/src/main/java/com/bmw/system/mapper/SysUserRoleMapper.java index e2b1c0ca5..641fc3f1a 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/bmw-system/src/main/java/com/bmw/system/mapper/SysUserRoleMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.bmw.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysUserRole; +import com.bmw.system.domain.SysUserRole; /** * 用户表 数据层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysConfigService.java similarity index 94% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysConfigService.java index a1e269b89..1db7e04a4 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.bmw.system.domain.SysConfig; /** * 参数配置 服务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysDeptService.java similarity index 91% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysDeptService.java index f73a0b7d8..b81238b56 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysDeptService.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.common.core.domain.Ztree; -import com.ruoyi.system.domain.SysDept; -import com.ruoyi.system.domain.SysRole; +import com.bmw.common.core.domain.Ztree; +import com.bmw.system.domain.SysDept; +import com.bmw.system.domain.SysRole; /** * 部门管理 服务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysDictDataService.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysDictDataService.java index 5403a0f9b..bb40669f3 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.system.domain.SysDictData; +import com.bmw.system.domain.SysDictData; /** * 字典 业务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysDictTypeService.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysDictTypeService.java index 3b15d3462..fedffde21 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysDictTypeService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.system.domain.SysDictType; +import com.bmw.system.domain.SysDictType; /** * 字典 业务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysLogininforService.java similarity index 90% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysLogininforService.java index 159bb458b..e05d8cc12 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysLogininforService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.bmw.system.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysMenuService.java similarity index 92% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysMenuService.java index b63def943..ea3019e0e 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysMenuService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; import java.util.Map; import java.util.Set; -import com.ruoyi.common.core.domain.Ztree; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUser; +import com.bmw.common.core.domain.Ztree; +import com.bmw.system.domain.SysMenu; +import com.bmw.system.domain.SysRole; +import com.bmw.system.domain.SysUser; /** * 菜单 业务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysNoticeService.java similarity index 92% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysNoticeService.java index 6398b5a81..0d9c579df 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.bmw.system.domain.SysNotice; /** * 公告 服务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysOperLogService.java similarity index 92% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysOperLogService.java index 3cdc5d269..7df1cf0cd 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.bmw.system.domain.SysOperLog; /** * 操作日志 服务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysPostService.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysPostService.java index 53013cb4a..590b1a9c2 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysPostService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.bmw.system.domain.SysPost; /** * 岗位信息 服务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysRoleService.java similarity index 96% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysRoleService.java index c16f5ccf5..c2558525b 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysRoleService.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUserRole; +import com.bmw.system.domain.SysRole; +import com.bmw.system.domain.SysUserRole; /** * 角色业务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysUserOnlineService.java similarity index 94% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysUserOnlineService.java index 2b3545c1c..a942ca603 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysUserOnlineService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.Date; import java.util.List; -import com.ruoyi.system.domain.SysUserOnline; +import com.bmw.system.domain.SysUserOnline; /** * 在线用户 服务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/bmw-system/src/main/java/com/bmw/system/service/ISysUserService.java similarity index 98% rename from bmw-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to bmw-system/src/main/java/com/bmw/system/service/ISysUserService.java index 3b34be679..6c727706e 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/bmw-system/src/main/java/com/bmw/system/service/ISysUserService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.bmw.system.service; import java.util.List; -import com.ruoyi.system.domain.SysUser; +import com.bmw.system.domain.SysUser; /** * 用户 业务层 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysConfigServiceImpl.java similarity index 89% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysConfigServiceImpl.java index bd3fd164a..ab736cfab 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysConfigServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.text.Convert; +import com.bmw.common.utils.StringUtils; +import com.bmw.system.domain.SysConfig; +import com.bmw.system.mapper.SysConfigMapper; +import com.bmw.system.service.ISysConfigService; /** * 参数配置 服务层实现 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysDeptServiceImpl.java similarity index 94% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysDeptServiceImpl.java index 768eb26a8..faba6fd2b 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysDeptServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.Ztree; -import com.ruoyi.common.exception.BusinessException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysDept; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.bmw.common.annotation.DataScope; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.domain.Ztree; +import com.bmw.common.exception.BusinessException; +import com.bmw.common.utils.StringUtils; +import com.bmw.system.domain.SysDept; +import com.bmw.system.domain.SysRole; +import com.bmw.system.mapper.SysDeptMapper; +import com.bmw.system.service.ISysDeptService; /** * 部门管理 服务实现 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysDictDataServiceImpl.java similarity index 91% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysDictDataServiceImpl.java index 2bc1691c3..e5e10259f 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysDictDataServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.SysDictData; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.bmw.common.core.text.Convert; +import com.bmw.system.domain.SysDictData; +import com.bmw.system.mapper.SysDictDataMapper; +import com.bmw.system.service.ISysDictDataService; /** * 字典 业务层处理 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysDictTypeServiceImpl.java similarity index 89% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysDictTypeServiceImpl.java index a1063f87f..b563523c6 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysDictTypeServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.BusinessException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysDictType; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.text.Convert; +import com.bmw.common.exception.BusinessException; +import com.bmw.common.utils.StringUtils; +import com.bmw.system.domain.SysDictType; +import com.bmw.system.mapper.SysDictDataMapper; +import com.bmw.system.mapper.SysDictTypeMapper; +import com.bmw.system.service.ISysDictTypeService; /** * 字典 业务层处理 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysLogininforServiceImpl.java similarity index 85% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysLogininforServiceImpl.java index f225fe98d..f5334f4b2 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysLogininforServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.bmw.common.core.text.Convert; +import com.bmw.system.domain.SysLogininfor; +import com.bmw.system.mapper.SysLogininforMapper; +import com.bmw.system.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysMenuServiceImpl.java similarity index 95% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysMenuServiceImpl.java index c1d537791..6427c44c4 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.text.MessageFormat; import java.util.ArrayList; @@ -11,15 +11,15 @@ import java.util.List; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.Ztree; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.domain.Ztree; +import com.bmw.common.utils.StringUtils; +import com.bmw.system.domain.SysMenu; +import com.bmw.system.domain.SysRole; +import com.bmw.system.domain.SysUser; +import com.bmw.system.mapper.SysMenuMapper; +import com.bmw.system.mapper.SysRoleMenuMapper; +import com.bmw.system.service.ISysMenuService; /** * 菜单 业务层处理 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysNoticeServiceImpl.java similarity index 87% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysNoticeServiceImpl.java index 7968b9a70..b41b4530d 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysNoticeServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.bmw.common.core.text.Convert; +import com.bmw.system.domain.SysNotice; +import com.bmw.system.mapper.SysNoticeMapper; +import com.bmw.system.service.ISysNoticeService; /** * 公告 服务层实现 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysOperLogServiceImpl.java similarity index 86% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysOperLogServiceImpl.java index 78ae353a5..03f0c171f 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysOperLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.bmw.common.core.text.Convert; +import com.bmw.system.domain.SysOperLog; +import com.bmw.system.mapper.SysOperLogMapper; +import com.bmw.system.service.ISysOperLogService; /** * 操作日志 服务层处理 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysPostServiceImpl.java similarity index 91% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysPostServiceImpl.java index 8cbfc89f2..52a72245c 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysPostServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.BusinessException; -import com.ruoyi.common.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.bmw.common.constant.UserConstants; +import com.bmw.common.core.text.Convert; +import com.bmw.common.exception.BusinessException; +import com.bmw.common.utils.StringUtils; +import com.bmw.system.domain.SysPost; +import com.bmw.system.mapper.SysPostMapper; +import com.bmw.system.mapper.SysUserPostMapper; +import com.bmw.system.service.ISysPostService; /** * 岗位信息 服务层处理 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysRoleServiceImpl.java similarity index 92% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysRoleServiceImpl.java index 4b3ed745f..9d214a557 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,21 +8,21 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.BusinessException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; +import com.bmw.common.annotation.DataScope; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.text.Convert; +import com.bmw.common.exception.BusinessException; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.spring.SpringUtils; +import com.bmw.system.domain.SysRole; +import com.bmw.system.domain.SysRoleDept; +import com.bmw.system.domain.SysRoleMenu; +import com.bmw.system.domain.SysUserRole; +import com.bmw.system.mapper.SysRoleDeptMapper; +import com.bmw.system.mapper.SysRoleMapper; +import com.bmw.system.mapper.SysRoleMenuMapper; +import com.bmw.system.mapper.SysUserRoleMapper; +import com.bmw.system.service.ISysRoleService; /** * 角色 业务层处理 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysUserOnlineServiceImpl.java similarity index 90% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysUserOnlineServiceImpl.java index 3a0216cf0..74eb4c866 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.Date; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.mapper.SysUserOnlineMapper; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.bmw.common.utils.DateUtils; +import com.bmw.common.utils.StringUtils; +import com.bmw.system.domain.SysUserOnline; +import com.bmw.system.mapper.SysUserOnlineMapper; +import com.bmw.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 diff --git a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/bmw-system/src/main/java/com/bmw/system/service/impl/SysUserServiceImpl.java similarity index 93% rename from bmw-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to bmw-system/src/main/java/com/bmw/system/service/impl/SysUserServiceImpl.java index 35d0307a7..12438ae2c 100644 --- a/bmw-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/bmw-system/src/main/java/com/bmw/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.bmw.system.service.impl; import java.util.ArrayList; import java.util.List; @@ -7,24 +7,24 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.BusinessException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.security.Md5Utils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.bmw.common.annotation.DataScope; +import com.bmw.common.constant.UserConstants; +import com.bmw.common.core.text.Convert; +import com.bmw.common.exception.BusinessException; +import com.bmw.common.utils.StringUtils; +import com.bmw.common.utils.security.Md5Utils; +import com.bmw.system.domain.SysPost; +import com.bmw.system.domain.SysRole; +import com.bmw.system.domain.SysUser; +import com.bmw.system.domain.SysUserPost; +import com.bmw.system.domain.SysUserRole; +import com.bmw.system.mapper.SysPostMapper; +import com.bmw.system.mapper.SysRoleMapper; +import com.bmw.system.mapper.SysUserMapper; +import com.bmw.system.mapper.SysUserPostMapper; +import com.bmw.system.mapper.SysUserRoleMapper; +import com.bmw.system.service.ISysConfigService; +import com.bmw.system.service.ISysUserService; /** * 用户 业务层处理 diff --git a/bmw-system/src/main/resources/mapper/system/SysConfigMapper.xml b/bmw-system/src/main/resources/mapper/system/SysConfigMapper.xml index 33cb5658b..6a37f7637 100644 --- a/bmw-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bmw-system/src/main/resources/mapper/system/SysDeptMapper.xml index a90ddfb79..6c42d5a6a 100644 --- a/bmw-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/bmw-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 5f9c09dae..65e71ed77 100644 --- a/bmw-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/bmw-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 1f110e3f0..fdc4e432d 100644 --- a/bmw-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/bmw-system/src/main/resources/mapper/system/SysLogininforMapper.xml index cd42fff48..f44b16704 100644 --- a/bmw-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysMenuMapper.xml b/bmw-system/src/main/resources/mapper/system/SysMenuMapper.xml index dd2cf40cc..f73d2e23f 100644 --- a/bmw-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/bmw-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 588357393..cf1ce6905 100644 --- a/bmw-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/bmw-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 02e890b9e..a61914a4f 100644 --- a/bmw-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysPostMapper.xml b/bmw-system/src/main/resources/mapper/system/SysPostMapper.xml index c45491972..f41c6d4f7 100644 --- a/bmw-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/bmw-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 7c4139bce..58f196564 100644 --- a/bmw-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bmw-system/src/main/resources/mapper/system/SysRoleMapper.xml index d1bca839c..3529f390a 100644 --- a/bmw-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/bmw-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index d213bdde0..4c59b8b1c 100644 --- a/bmw-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysUserMapper.xml b/bmw-system/src/main/resources/mapper/system/SysUserMapper.xml index b4b211492..1db93b875 100644 --- a/bmw-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysUserOnlineMapper.xml b/bmw-system/src/main/resources/mapper/system/SysUserOnlineMapper.xml index 6098ee84a..37e142a65 100644 --- a/bmw-system/src/main/resources/mapper/system/SysUserOnlineMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysUserOnlineMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/bmw-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc40b..00777d1c4 100644 --- a/bmw-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/bmw-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/bmw-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd726891a..e44e73ec1 100644 --- a/bmw-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/bmw-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - +