diff --git a/README.md b/README.md index b9eef10ad..633a17f02 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ - admin/admin123 - 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 -演示地址：http://vue.ruoyi.vip -文档地址：http://doc.ruoyi.vip +演示地址：http://vue.muster.vip +文档地址：http://doc.muster.vip ## 演示图 diff --git a/bin/run.bat b/bin/run.bat index e5fb6a6b2..f1650656a 100644 --- a/bin/run.bat +++ b/bin/run.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [Ϣ] Web̡ +echo [��Ϣ] ����Web���̡� echo. cd %~dp0 -cd ../ruoyi-admin/target +cd ../muster-admin/target set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -jar %JAVA_OPTS% ruoyi-admin.jar +java -jar %JAVA_OPTS% muster-admin.jar cd bin pause \ No newline at end of file diff --git a/ruoyi-admin/pom.xml b/muster-admin/pom.xml similarity index 85% rename from ruoyi-admin/pom.xml rename to muster-admin/pom.xml index 1ed741f4f..17c12b148 100644 --- a/ruoyi-admin/pom.xml +++ b/muster-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + muster + com.muster 3.0.0 4.0.0 jar - ruoyi-admin + muster-admin web服务入口 @@ -57,20 +57,20 @@ - com.ruoyi - ruoyi-framework + com.muster + muster-framework - com.ruoyi - ruoyi-quartz + com.muster + muster-quartz - com.ruoyi - ruoyi-generator + com.muster + muster-generator diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/muster-admin/src/main/java/com/muster/MusterApplication.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java rename to muster-admin/src/main/java/com/muster/MusterApplication.java index e3c56ee54..85940c09e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/muster-admin/src/main/java/com/muster/MusterApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.muster; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,15 +7,15 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 启动程序 * - * @author ruoyi + * @author muster */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication +public class MusterApplication { public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(RuoYiApplication.class, args); + SpringApplication.run(MusterApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/muster-admin/src/main/java/com/muster/MusterServletInitializer.java similarity index 61% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to muster-admin/src/main/java/com/muster/MusterServletInitializer.java index 9d82a2378..f638dd7b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/muster-admin/src/main/java/com/muster/MusterServletInitializer.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.muster; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 * - * @author ruoyi + * @author muster */ -public class RuoYiServletInitializer extends SpringBootServletInitializer +public class MusterServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(RuoYiApplication.class); + return application.sources(MusterApplication.class); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/muster-admin/src/main/java/com/muster/web/controller/common/CaptchaController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to muster-admin/src/main/java/com/muster/web/controller/common/CaptchaController.java index 035cfd284..165f2fe3a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/common/CaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.muster.web.controller.common; import java.awt.image.BufferedImage; import java.io.IOException; @@ -12,16 +12,16 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.sign.Base64; -import com.ruoyi.common.utils.uuid.IdUtils; +import com.muster.common.constant.Constants; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.redis.RedisCache; +import com.muster.common.utils.sign.Base64; +import com.muster.common.utils.uuid.IdUtils; /** * 验证码操作处理 * - * @author ruoyi + * @author muster */ @RestController public class CaptchaController @@ -36,7 +36,7 @@ public class CaptchaController private RedisCache redisCache; // 验证码类型 - @Value("${ruoyi.captchaType}") + @Value("${muster.captchaType}") private String captchaType; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/muster-admin/src/main/java/com/muster/web/controller/common/CommonController.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java rename to muster-admin/src/main/java/com/muster/web/controller/common/CommonController.java index 9cba04dca..a2bfa89e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/common/CommonController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.muster.web.controller.common; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -9,18 +9,18 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -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.ruoyi.framework.config.ServerConfig; +import com.muster.common.config.RuoYiConfig; +import com.muster.common.constant.Constants; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.file.FileUploadUtils; +import com.muster.common.utils.file.FileUtils; +import com.muster.framework.config.ServerConfig; /** * 通用请求处理 * - * @author ruoyi + * @author muster */ @RestController public class CommonController diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/muster-admin/src/main/java/com/muster/web/controller/monitor/ServerController.java similarity index 72% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java rename to muster-admin/src/main/java/com/muster/web/controller/monitor/ServerController.java index 2f0c86e73..6373de4d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/monitor/ServerController.java @@ -1,17 +1,17 @@ -package com.ruoyi.web.controller.monitor; +package com.muster.web.controller.monitor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; 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.framework.web.domain.Server; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.framework.web.domain.Server; /** * 服务器监控 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/monitor/server") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/muster-admin/src/main/java/com/muster/web/controller/monitor/SysLogininforController.java similarity index 79% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to muster-admin/src/main/java/com/muster/web/controller/monitor/SysLogininforController.java index 560c4b585..814033650 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/monitor/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.muster.web.controller.monitor; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,19 +8,19 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.muster.common.annotation.Log; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.system.domain.SysLogininfor; +import com.muster.system.service.ISysLogininforService; /** * 系统访问记录 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/monitor/logininfor") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/muster-admin/src/main/java/com/muster/web/controller/monitor/SysOperlogController.java similarity index 78% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to muster-admin/src/main/java/com/muster/web/controller/monitor/SysOperlogController.java index 194285613..a484cbaf9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/monitor/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.muster.web.controller.monitor; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,19 +8,19 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.muster.common.annotation.Log; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.system.domain.SysOperLog; +import com.muster.system.service.ISysOperLogService; /** * 操作日志记录 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/monitor/operlog") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/muster-admin/src/main/java/com/muster/web/controller/monitor/SysUserOnlineController.java similarity index 80% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to muster-admin/src/main/java/com/muster/web/controller/monitor/SysUserOnlineController.java index 7f73813a0..42f63546c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/monitor/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.muster.web.controller.monitor; import java.util.ArrayList; import java.util.Collection; @@ -11,22 +11,22 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.muster.common.annotation.Log; +import com.muster.common.constant.Constants; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.core.redis.RedisCache; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.StringUtils; +import com.muster.system.domain.SysUserOnline; +import com.muster.system.service.ISysUserOnlineService; /** * 在线用户监控 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/monitor/online") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysConfigController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysConfigController.java index 41b82098e..98e335c51 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,22 +12,22 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -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.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.muster.common.annotation.Log; +import com.muster.common.annotation.RepeatSubmit; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.system.domain.SysConfig; +import com.muster.system.service.ISysConfigService; /** * 参数配置 信息操作处理 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/config") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysDeptController.java similarity index 88% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysDeptController.java index 60bd1a5b5..ab9662707 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.Iterator; import java.util.List; @@ -14,20 +14,20 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.entity.SysDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; +import com.muster.common.annotation.Log; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.entity.SysDept; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.StringUtils; +import com.muster.system.service.ISysDeptService; /** * 部门信息 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/dept") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysDictDataController.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysDictDataController.java index 58cf43d22..7b1992650 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.muster.common.annotation.Log; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.entity.SysDictData; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.system.service.ISysDictDataService; +import com.muster.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/dict/data") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysDictTypeController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysDictTypeController.java index efde2d49f..f8705b2cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictTypeService; +import com.muster.common.annotation.Log; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.entity.SysDictType; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/dict/type") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysLoginController.java similarity index 75% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysLoginController.java index 4ade9f683..977fb5769 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import java.util.Set; @@ -7,22 +7,22 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.web.service.SysLoginService; -import com.ruoyi.framework.web.service.SysPermissionService; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysMenuService; +import com.muster.common.constant.Constants; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.entity.SysMenu; +import com.muster.common.core.domain.entity.SysUser; +import com.muster.common.core.domain.model.LoginBody; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.utils.ServletUtils; +import com.muster.framework.web.service.SysLoginService; +import com.muster.framework.web.service.SysPermissionService; +import com.muster.framework.web.service.TokenService; +import com.muster.system.service.ISysMenuService; /** * 登录验证 * - * @author ruoyi + * @author muster */ @RestController public class SysLoginController diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysMenuController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysMenuController.java index 8bdfe9169..66f0efb2e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,24 +12,24 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -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.entity.SysMenu; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysMenuService; +import com.muster.common.annotation.Log; +import com.muster.common.constant.Constants; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.entity.SysMenu; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.StringUtils; +import com.muster.framework.web.service.TokenService; +import com.muster.system.service.ISysMenuService; /** * 菜单信息 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/menu") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysNoticeController.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysNoticeController.java index 029ee385b..d956f8ebf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.SecurityUtils; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.muster.common.annotation.Log; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.system.domain.SysNotice; +import com.muster.system.service.ISysNoticeService; /** * 公告 信息操作处理 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/notice") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysPostController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysPostController.java index 67d76ee0b..d69a17b28 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.muster.common.annotation.Log; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.system.domain.SysPost; +import com.muster.system.service.ISysPostService; /** * 岗位信息操作处理 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/post") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysProfileController.java similarity index 84% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysProfileController.java index bfedddfdd..d6e96a5b0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.io.IOException; import org.springframework.beans.factory.annotation.Autowired; @@ -10,23 +10,23 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysUserService; +import com.muster.common.annotation.Log; +import com.muster.common.config.RuoYiConfig; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.entity.SysUser; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.file.FileUploadUtils; +import com.muster.framework.web.service.TokenService; +import com.muster.system.service.ISysUserService; /** * 个人信息 业务处理 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/user/profile") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysRoleController.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysRoleController.java index 927a6c283..1142890cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.entity.SysRole; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysRoleService; +import com.muster.common.annotation.Log; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.entity.SysRole; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.system.service.ISysRoleService; /** * 角色信息 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/role") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/muster-admin/src/main/java/com/muster/web/controller/system/SysUserController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to muster-admin/src/main/java/com/muster/web/controller/system/SysUserController.java index 946df4d60..0f355694b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/system/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.muster.web.controller.system; import java.util.List; import java.util.stream.Collectors; @@ -14,28 +14,28 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; 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.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.muster.common.annotation.Log; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.entity.SysRole; +import com.muster.common.core.domain.entity.SysUser; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.framework.web.service.TokenService; +import com.muster.system.service.ISysPostService; +import com.muster.system.service.ISysRoleService; +import com.muster.system.service.ISysUserService; /** * 用户信息 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/system/user") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/muster-admin/src/main/java/com/muster/web/controller/tool/SwaggerController.java similarity index 79% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java rename to muster-admin/src/main/java/com/muster/web/controller/tool/SwaggerController.java index e901fedd7..40883b27c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/tool/SwaggerController.java @@ -1,15 +1,15 @@ -package com.ruoyi.web.controller.tool; +package com.muster.web.controller.tool; import org.springframework.security.access.prepost.PreAuthorize; 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.muster.common.core.controller.BaseController; /** * swagger 接口 * - * @author ruoyi + * @author muster */ @Controller @RequestMapping("/tool/swagger") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/muster-admin/src/main/java/com/muster/web/controller/tool/TestController.java similarity index 92% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java rename to muster-admin/src/main/java/com/muster/web/controller/tool/TestController.java index 2ae0c54ac..01d0362f5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/muster-admin/src/main/java/com/muster/web/controller/tool/TestController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.tool; +package com.muster.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.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiModel; @@ -23,7 +23,7 @@ import io.swagger.annotations.ApiOperation; /** * swagger 用户测试方法 * - * @author ruoyi + * @author muster */ @Api("用户信息管理") @RestController diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/muster-admin/src/main/java/com/muster/web/core/config/SwaggerConfig.java similarity index 94% rename from ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java rename to muster-admin/src/main/java/com/muster/web/core/config/SwaggerConfig.java index 86acc3f0b..0ab3599f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/muster-admin/src/main/java/com/muster/web/core/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.core.config; +package com.muster.web.core.config; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.RuoYiConfig; +import com.muster.common.config.RuoYiConfig; import io.swagger.annotations.ApiOperation; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; @@ -24,7 +24,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * Swagger2的接口配置 * - * @author ruoyi + * @author muster */ @Configuration @EnableSwagger2 @@ -58,7 +58,7 @@ public class SwaggerConfig // 扫描所有有注解的api，用这种方式更灵活 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 扫描指定包中的swagger注解 - // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) + // .apis(RequestHandlerSelectors.basePackage("com.muster.project.tool.swagger")) // 扫描所有 .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build() diff --git a/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties b/muster-admin/src/main/resources/META-INF/spring-devtools.properties similarity index 100% rename from ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties rename to muster-admin/src/main/resources/META-INF/spring-devtools.properties diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/muster-admin/src/main/resources/application-druid.yml similarity index 88% rename from ruoyi-admin/src/main/resources/application-druid.yml rename to muster-admin/src/main/resources/application-druid.yml index cdfb3390b..ef075d51c 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/muster-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.92.6.215:3306/muster_manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: gywj@1qaz@WSX # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/muster-admin/src/main/resources/application.yml similarity index 87% rename from ruoyi-admin/src/main/resources/application.yml rename to muster-admin/src/main/resources/application.yml index 51c37e69a..92a6157a1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/muster-admin/src/main/resources/application.yml @@ -1,15 +1,15 @@ # 项目相关配置 -ruoyi: +muster: # 名称 - name: RuoYi + name: muster # 版本 version: 3.0.0 # 版权年份 copyrightYear: 2019 # 实例演示开关 demoEnabled: true - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + # 文件路径 示例（ Windows配置D:/muster/uploadPath，Linux配置 /home/muster/uploadPath） + profile: /Users/liujiangtao/project/mishang/muster-vue # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 @@ -33,7 +33,7 @@ server: # 日志配置 logging: level: - com.ruoyi: debug + com.muster: debug org.springframework: warn # Spring配置 @@ -89,7 +89,7 @@ token: # MyBatis配置 mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.muster.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/muster-admin/src/main/resources/banner.txt similarity index 95% rename from ruoyi-admin/src/main/resources/banner.txt rename to muster-admin/src/main/resources/banner.txt index 94662592f..f6367d0fe 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/muster-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi.version} +Application Version: ${muster.version} Spring Boot Version: ${spring-boot.version} //////////////////////////////////////////////////////////////////// // _ooOoo_ // @@ -20,5 +20,5 @@ Spring Boot Version: ${spring-boot.version} // ========`-.____`-.___\_____/___.-`____.-'======== // // `=---=' // // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 佛祖保佑 永不宕机 永无BUG // +// 佛祖保佑 永不宕机 永无BUG // //////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/muster-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to muster-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/logback.xml b/muster-admin/src/main/resources/logback.xml similarity index 94% rename from ruoyi-admin/src/main/resources/logback.xml rename to muster-admin/src/main/resources/logback.xml index d69a57207..919eee7ad 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/muster-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/muster-admin/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml rename to muster-admin/src/main/resources/mybatis/mybatis-config.xml diff --git a/ruoyi-common/pom.xml b/muster-common/pom.xml similarity index 93% rename from ruoyi-common/pom.xml rename to muster-common/pom.xml index e4c677a2a..e933c59f1 100644 --- a/ruoyi-common/pom.xml +++ b/muster-common/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + muster + com.muster 3.0.0 4.0.0 - ruoyi-common + muster-common common通用工具 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/muster-common/src/main/java/com/muster/common/annotation/DataScope.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java rename to muster-common/src/main/java/com/muster/common/annotation/DataScope.java index fe5a01f55..3a4d5140c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/muster-common/src/main/java/com/muster/common/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.muster.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 数据权限过滤注解 * - * @author ruoyi + * @author muster */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/muster-common/src/main/java/com/muster/common/annotation/DataSource.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java rename to muster-common/src/main/java/com/muster/common/annotation/DataSource.java index 6b41ee739..2228c07bc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java +++ b/muster-common/src/main/java/com/muster/common/annotation/DataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.muster.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -6,14 +6,14 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.enums.DataSourceType; +import com.muster.common.enums.DataSourceType; /** * 自定义多数据源切换注解 * * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准 * - * @author ruoyi + * @author muster */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/muster-common/src/main/java/com/muster/common/annotation/Excel.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java rename to muster-common/src/main/java/com/muster/common/annotation/Excel.java index eed41a2ab..511a3750c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/muster-common/src/main/java/com/muster/common/annotation/Excel.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.muster.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 自定义导出Excel数据注解 * - * @author ruoyi + * @author muster */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/muster-common/src/main/java/com/muster/common/annotation/Excels.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java rename to muster-common/src/main/java/com/muster/common/annotation/Excels.java index 940763f06..ffdadf5d1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java +++ b/muster-common/src/main/java/com/muster/common/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.muster.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * Excel注解集 * - * @author ruoyi + * @author muster */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/muster-common/src/main/java/com/muster/common/annotation/Log.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to muster-common/src/main/java/com/muster/common/annotation/Log.java index 3458c882d..fbf199e62 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/muster-common/src/main/java/com/muster/common/annotation/Log.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.annotation; +package com.muster.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.muster.common.enums.BusinessType; +import com.muster.common.enums.OperatorType; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author muster * */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/muster-common/src/main/java/com/muster/common/annotation/RepeatSubmit.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to muster-common/src/main/java/com/muster/common/annotation/RepeatSubmit.java index 628eef1ef..661f9b9f8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ b/muster-common/src/main/java/com/muster/common/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.muster.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义注解防止表单重复提交 * - * @author ruoyi + * @author muster * */ @Inherited diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/muster-common/src/main/java/com/muster/common/config/RuoYiConfig.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to muster-common/src/main/java/com/muster/common/config/RuoYiConfig.java index c64ce71d6..4e6107747 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/muster-common/src/main/java/com/muster/common/config/RuoYiConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config; +package com.muster.common.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -6,10 +6,10 @@ import org.springframework.stereotype.Component; /** * 读取项目相关配置 * - * @author ruoyi + * @author muster */ @Component -@ConfigurationProperties(prefix = "ruoyi") +@ConfigurationProperties(prefix = "muster") public class RuoYiConfig { /** 项目名称 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/muster-common/src/main/java/com/muster/common/constant/Constants.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to muster-common/src/main/java/com/muster/common/constant/Constants.java index 9ee27077a..7bc954822 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/muster-common/src/main/java/com/muster/common/constant/Constants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.muster.common.constant; /** * 通用常量信息 * - * @author ruoyi + * @author muster */ public class Constants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/muster-common/src/main/java/com/muster/common/constant/GenConstants.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to muster-common/src/main/java/com/muster/common/constant/GenConstants.java index 8e95f379b..9b315d571 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/muster-common/src/main/java/com/muster/common/constant/GenConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.muster.common.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author muster */ public class GenConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/muster-common/src/main/java/com/muster/common/constant/HttpStatus.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to muster-common/src/main/java/com/muster/common/constant/HttpStatus.java index 77a479b3c..507b0f5b9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/muster-common/src/main/java/com/muster/common/constant/HttpStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.muster.common.constant; /** * 返回状态码 * - * @author ruoyi + * @author muster */ public class HttpStatus { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/muster-common/src/main/java/com/muster/common/constant/ScheduleConstants.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to muster-common/src/main/java/com/muster/common/constant/ScheduleConstants.java index 8318b8f5f..4e07c483b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/muster-common/src/main/java/com/muster/common/constant/ScheduleConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.muster.common.constant; /** * 任务调度通用常量 * - * @author ruoyi + * @author muster */ public class ScheduleConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/muster-common/src/main/java/com/muster/common/constant/UserConstants.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to muster-common/src/main/java/com/muster/common/constant/UserConstants.java index 69c2b9653..2f57b9880 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/muster-common/src/main/java/com/muster/common/constant/UserConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.muster.common.constant; /** * 用户常量信息 * - * @author ruoyi + * @author muster */ public class UserConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/muster-common/src/main/java/com/muster/common/core/controller/BaseController.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to muster-common/src/main/java/com/muster/common/core/controller/BaseController.java index ab78abdad..cddab92b6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/muster-common/src/main/java/com/muster/common/core/controller/BaseController.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.controller; +package com.muster.common.core.controller; import java.beans.PropertyEditorSupport; import java.util.Date; @@ -9,19 +9,19 @@ 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.constant.HttpStatus; -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.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.muster.common.constant.HttpStatus; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.PageDomain; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.core.page.TableSupport; +import com.muster.common.utils.DateUtils; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.sql.SqlUtil; /** * web层通用数据处理 * - * @author ruoyi + * @author muster */ public class BaseController { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/muster-common/src/main/java/com/muster/common/core/domain/AjaxResult.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java rename to muster-common/src/main/java/com/muster/common/core/domain/AjaxResult.java index b26e066ab..a416d8449 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/AjaxResult.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain; +package com.muster.common.core.domain; import java.util.HashMap; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.constant.HttpStatus; +import com.muster.common.utils.StringUtils; /** * 操作消息提醒 * - * @author ruoyi + * @author muster */ public class AjaxResult extends HashMap { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/muster-common/src/main/java/com/muster/common/core/domain/BaseEntity.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to muster-common/src/main/java/com/muster/common/core/domain/BaseEntity.java index a8c51a7b6..3eed005f4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.muster.common.core.domain; import java.io.Serializable; import java.util.Date; @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; /** * Entity基类 * - * @author ruoyi + * @author muster */ public class BaseEntity implements Serializable { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/muster-common/src/main/java/com/muster/common/core/domain/TreeEntity.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to muster-common/src/main/java/com/muster/common/core/domain/TreeEntity.java index 171f04c9b..b74f1125c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.muster.common.core.domain; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * Tree基类 * - * @author ruoyi + * @author muster */ public class TreeEntity extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/muster-common/src/main/java/com/muster/common/core/domain/TreeSelect.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java rename to muster-common/src/main/java/com/muster/common/core/domain/TreeSelect.java index 4a59e402a..387ff8196 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/TreeSelect.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.core.domain; +package com.muster.common.core.domain; import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysMenu; +import com.muster.common.core.domain.entity.SysDept; +import com.muster.common.core.domain.entity.SysMenu; /** * Treeselect树结构实体类 * - * @author ruoyi + * @author muster */ public class TreeSelect implements Serializable { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysDept.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to muster-common/src/main/java/com/muster/common/core/domain/entity/SysDept.java index 423ef6852..99987b16b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.muster.common.core.domain.entity; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,12 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.core.domain.BaseEntity; /** * 部门表 sys_dept * - * @author ruoyi + * @author muster */ public class SysDept extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysDictData.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to muster-common/src/main/java/com/muster/common/core/domain/entity/SysDictData.java index 4fa5f0bd8..8532b316e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysDictData.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.core.domain.entity; +package com.muster.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; 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.ColumnType; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.domain.BaseEntity; /** * 字典数据表 sys_dict_data * - * @author ruoyi + * @author muster */ public class SysDictData extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysDictType.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to muster-common/src/main/java/com/muster/common/core/domain/entity/SysDictType.java index 6683c9194..56a34813f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysDictType.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.core.domain.entity; +package com.muster.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; 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.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.core.domain.BaseEntity; /** * 字典类型表 sys_dict_type * - * @author ruoyi + * @author muster */ public class SysDictType extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysMenu.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to muster-common/src/main/java/com/muster/common/core/domain/entity/SysMenu.java index b8ad1f389..667490abc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.muster.common.core.domain.entity; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.core.domain.BaseEntity; /** * 菜单权限表 sys_menu * - * @author ruoyi + * @author muster */ public class SysMenu extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysRole.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to muster-common/src/main/java/com/muster/common/core/domain/entity/SysRole.java index 9330f8ea9..06bbf7449 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysRole.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.core.domain.entity; +package com.muster.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; 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.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.core.domain.BaseEntity; /** * 角色表 sys_role * - * @author ruoyi + * @author muster */ public class SysRole extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysUser.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to muster-common/src/main/java/com/muster/common/core/domain/entity/SysUser.java index f7e68e7b0..c49e3d887 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.muster.common.core.domain.entity; import java.util.Date; import java.util.List; @@ -9,16 +9,16 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.annotation.Excel.Type; +import com.muster.common.annotation.Excels; +import com.muster.common.core.domain.BaseEntity; /** * 用户对象 sys_user * - * @author ruoyi + * @author muster */ public class SysUser extends BaseEntity { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/muster-common/src/main/java/com/muster/common/core/domain/model/LoginBody.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to muster-common/src/main/java/com/muster/common/core/domain/model/LoginBody.java index a1f8b8337..7b742ef8e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/model/LoginBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.model; +package com.muster.common.core.domain.model; /** * 用户登录对象 * - * @author ruoyi + * @author muster */ public class LoginBody { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/muster-common/src/main/java/com/muster/common/core/domain/model/LoginUser.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to muster-common/src/main/java/com/muster/common/core/domain/model/LoginUser.java index a8b112692..444c24918 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/muster-common/src/main/java/com/muster/common/core/domain/model/LoginUser.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.core.domain.model; +package com.muster.common.core.domain.model; import java.util.Collection; import java.util.Set; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.muster.common.core.domain.entity.SysUser; /** * 登录用户身份权限 * - * @author ruoyi + * @author muster */ public class LoginUser implements UserDetails { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/muster-common/src/main/java/com/muster/common/core/page/PageDomain.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java rename to muster-common/src/main/java/com/muster/common/core/page/PageDomain.java index e6dd98e22..ef7f19d3b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/muster-common/src/main/java/com/muster/common/core/page/PageDomain.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.page; +package com.muster.common.core.page; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.utils.StringUtils; /** * 分页数据 * - * @author ruoyi + * @author muster */ public class PageDomain { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/muster-common/src/main/java/com/muster/common/core/page/TableDataInfo.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to muster-common/src/main/java/com/muster/common/core/page/TableDataInfo.java index a3487b8ed..b09854975 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/muster-common/src/main/java/com/muster/common/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.page; +package com.muster.common.core.page; import java.io.Serializable; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 表格分页数据对象 * - * @author ruoyi + * @author muster */ public class TableDataInfo implements Serializable { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/muster-common/src/main/java/com/muster/common/core/page/TableSupport.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java rename to muster-common/src/main/java/com/muster/common/core/page/TableSupport.java index 511e24b8d..fdbf47c76 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java +++ b/muster-common/src/main/java/com/muster/common/core/page/TableSupport.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.page; +package com.muster.common.core.page; -import com.ruoyi.common.utils.ServletUtils; +import com.muster.common.utils.ServletUtils; /** * 表格数据处理 * - * @author ruoyi + * @author muster */ public class TableSupport { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/muster-common/src/main/java/com/muster/common/core/redis/RedisCache.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java rename to muster-common/src/main/java/com/muster/common/core/redis/RedisCache.java index 1f91350ab..c431fbd7f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ b/muster-common/src/main/java/com/muster/common/core/redis/RedisCache.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.redis; +package com.muster.common.core.redis; import java.util.Collection; import java.util.List; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; /** * spring redis 工具类 * - * @author ruoyi + * @author muster **/ @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/muster-common/src/main/java/com/muster/common/core/text/CharsetKit.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to muster-common/src/main/java/com/muster/common/core/text/CharsetKit.java index 8297661af..b3f6cd42d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/muster-common/src/main/java/com/muster/common/core/text/CharsetKit.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.text; +package com.muster.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.utils.StringUtils; /** * 字符集工具类 * - * @author ruoyi + * @author muster */ public class CharsetKit { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/muster-common/src/main/java/com/muster/common/core/text/Convert.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java rename to muster-common/src/main/java/com/muster/common/core/text/Convert.java index 9dd076d04..3b12ba9c9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/muster-common/src/main/java/com/muster/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.muster.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -6,12 +6,12 @@ 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.muster.common.utils.StringUtils; /** * 类型转换器 * - * @author ruoyi + * @author muster */ public class Convert { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/muster-common/src/main/java/com/muster/common/core/text/StrFormatter.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to muster-common/src/main/java/com/muster/common/core/text/StrFormatter.java index dbf3e2375..0525c8ecd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/muster-common/src/main/java/com/muster/common/core/text/StrFormatter.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.text; +package com.muster.common.core.text; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.utils.StringUtils; /** * 字符串格式化 * - * @author ruoyi + * @author muster */ public class StrFormatter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/muster-common/src/main/java/com/muster/common/enums/BusinessStatus.java similarity index 67% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to muster-common/src/main/java/com/muster/common/enums/BusinessStatus.java index 78188fc16..fb87a2afd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/muster-common/src/main/java/com/muster/common/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.muster.common.enums; /** * 操作状态 * - * @author ruoyi + * @author muster * */ public enum BusinessStatus diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/muster-common/src/main/java/com/muster/common/enums/BusinessType.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to muster-common/src/main/java/com/muster/common/enums/BusinessType.java index 2bbeaf7d3..81e79adf9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/muster-common/src/main/java/com/muster/common/enums/BusinessType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.muster.common.enums; /** * 业务操作类型 * - * @author ruoyi + * @author muster */ public enum BusinessType { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/muster-common/src/main/java/com/muster/common/enums/DataSourceType.java similarity index 66% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java rename to muster-common/src/main/java/com/muster/common/enums/DataSourceType.java index 4b5341d19..3b9698408 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java +++ b/muster-common/src/main/java/com/muster/common/enums/DataSourceType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.muster.common.enums; /** * 数据源 * - * @author ruoyi + * @author muster */ public enum DataSourceType { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/muster-common/src/main/java/com/muster/common/enums/HttpMethod.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to muster-common/src/main/java/com/muster/common/enums/HttpMethod.java index 2fa9f867c..f6c487a81 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/muster-common/src/main/java/com/muster/common/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.muster.common.enums; import java.util.HashMap; import java.util.Map; @@ -7,7 +7,7 @@ import org.springframework.lang.Nullable; /** * 请求方式 * - * @author ruoyi + * @author muster */ public enum HttpMethod { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/muster-common/src/main/java/com/muster/common/enums/OperatorType.java similarity index 72% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to muster-common/src/main/java/com/muster/common/enums/OperatorType.java index 06532af8f..e7a8fa5e6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/muster-common/src/main/java/com/muster/common/enums/OperatorType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.muster.common.enums; /** * 操作人类别 * - * @author ruoyi + * @author muster */ public enum OperatorType { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/muster-common/src/main/java/com/muster/common/enums/UserStatus.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to muster-common/src/main/java/com/muster/common/enums/UserStatus.java index a4613ff9c..70c2eb2f6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/muster-common/src/main/java/com/muster/common/enums/UserStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.muster.common.enums; /** * 用户状态 * - * @author ruoyi + * @author muster */ public enum UserStatus { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java b/muster-common/src/main/java/com/muster/common/exception/BaseException.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java rename to muster-common/src/main/java/com/muster/common/exception/BaseException.java index c1e55c176..cb181e68e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java +++ b/muster-common/src/main/java/com/muster/common/exception/BaseException.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.exception; +package com.muster.common.exception; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.utils.MessageUtils; +import com.muster.common.utils.StringUtils; /** * 基础异常 * - * @author ruoyi + * @author muster */ public class BaseException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java b/muster-common/src/main/java/com/muster/common/exception/CustomException.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java rename to muster-common/src/main/java/com/muster/common/exception/CustomException.java index a99a1001c..4ab8db77d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java +++ b/muster-common/src/main/java/com/muster/common/exception/CustomException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.muster.common.exception; /** * 自定义异常 * - * @author ruoyi + * @author muster */ public class CustomException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/muster-common/src/main/java/com/muster/common/exception/DemoModeException.java similarity index 73% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to muster-common/src/main/java/com/muster/common/exception/DemoModeException.java index 57bffc47b..22eb5c943 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/muster-common/src/main/java/com/muster/common/exception/DemoModeException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.muster.common.exception; /** * 演示模式异常 * - * @author ruoyi + * @author muster */ public class DemoModeException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/muster-common/src/main/java/com/muster/common/exception/UtilException.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to muster-common/src/main/java/com/muster/common/exception/UtilException.java index a544fb645..29738c655 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/muster-common/src/main/java/com/muster/common/exception/UtilException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.muster.common.exception; /** * 工具类异常 * - * @author ruoyi + * @author muster */ public class UtilException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/muster-common/src/main/java/com/muster/common/exception/file/FileException.java similarity index 66% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to muster-common/src/main/java/com/muster/common/exception/file/FileException.java index f0ae563aa..41dde14e2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/muster-common/src/main/java/com/muster/common/exception/file/FileException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.file; +package com.muster.common.exception.file; -import com.ruoyi.common.exception.BaseException; +import com.muster.common.exception.BaseException; /** * 文件信息异常类 * - * @author ruoyi + * @author muster */ public class FileException extends BaseException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/muster-common/src/main/java/com/muster/common/exception/file/FileNameLengthLimitExceededException.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to muster-common/src/main/java/com/muster/common/exception/file/FileNameLengthLimitExceededException.java index 44941b8bc..7191f09db 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/muster-common/src/main/java/com/muster/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.muster.common.exception.file; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author muster */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/muster-common/src/main/java/com/muster/common/exception/file/FileSizeLimitExceededException.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to muster-common/src/main/java/com/muster/common/exception/file/FileSizeLimitExceededException.java index f855e72f2..211f6c9fd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/muster-common/src/main/java/com/muster/common/exception/file/FileSizeLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.muster.common.exception.file; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author muster */ public class FileSizeLimitExceededException extends FileException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/muster-common/src/main/java/com/muster/common/exception/file/InvalidExtensionException.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to muster-common/src/main/java/com/muster/common/exception/file/InvalidExtensionException.java index 81cd78b81..37d21d56e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/muster-common/src/main/java/com/muster/common/exception/file/InvalidExtensionException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.muster.common.exception.file; import java.util.Arrays; import org.apache.commons.fileupload.FileUploadException; @@ -6,7 +6,7 @@ import org.apache.commons.fileupload.FileUploadException; /** * 文件上传 误异常类 * - * @author ruoyi + * @author muster */ public class InvalidExtensionException extends FileUploadException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/muster-common/src/main/java/com/muster/common/exception/job/TaskException.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to muster-common/src/main/java/com/muster/common/exception/job/TaskException.java index 14b2361d0..1e117e044 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ b/muster-common/src/main/java/com/muster/common/exception/job/TaskException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.job; +package com.muster.common.exception.job; /** * 计划策略异常 * - * @author ruoyi + * @author muster */ public class TaskException extends Exception { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/muster-common/src/main/java/com/muster/common/exception/user/CaptchaException.java similarity index 75% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to muster-common/src/main/java/com/muster/common/exception/user/CaptchaException.java index e3334ae37..b4ce32916 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/muster-common/src/main/java/com/muster/common/exception/user/CaptchaException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.muster.common.exception.user; /** * 验证码错误异常类 * - * @author ruoyi + * @author muster */ public class CaptchaException extends UserException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/muster-common/src/main/java/com/muster/common/exception/user/CaptchaExpireException.java similarity index 76% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to muster-common/src/main/java/com/muster/common/exception/user/CaptchaExpireException.java index 5e6fd0f79..ab606e5ca 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/muster-common/src/main/java/com/muster/common/exception/user/CaptchaExpireException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.muster.common.exception.user; /** * 验证码失效异常类 * - * @author ruoyi + * @author muster */ public class CaptchaExpireException extends UserException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/muster-common/src/main/java/com/muster/common/exception/user/UserException.java similarity index 66% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to muster-common/src/main/java/com/muster/common/exception/user/UserException.java index b85dab6dd..8ff3ad2e6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/muster-common/src/main/java/com/muster/common/exception/user/UserException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.user; +package com.muster.common.exception.user; -import com.ruoyi.common.exception.BaseException; +import com.muster.common.exception.BaseException; /** * 用户信息异常类 * - * @author ruoyi + * @author muster */ public class UserException extends BaseException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/muster-common/src/main/java/com/muster/common/exception/user/UserPasswordNotMatchException.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to muster-common/src/main/java/com/muster/common/exception/user/UserPasswordNotMatchException.java index 71449e293..a3a09be4f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/muster-common/src/main/java/com/muster/common/exception/user/UserPasswordNotMatchException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.muster.common.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author ruoyi + * @author muster */ public class UserPasswordNotMatchException extends UserException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/muster-common/src/main/java/com/muster/common/filter/RepeatableFilter.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to muster-common/src/main/java/com/muster/common/filter/RepeatableFilter.java index 15a6804f2..19f711da2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/muster-common/src/main/java/com/muster/common/filter/RepeatableFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.muster.common.filter; import java.io.IOException; import javax.servlet.Filter; @@ -9,12 +9,12 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.utils.StringUtils; /** * Repeatable 过滤器 * - * @author ruoyi + * @author muster */ public class RepeatableFilter implements Filter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/muster-common/src/main/java/com/muster/common/filter/RepeatedlyRequestWrapper.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to muster-common/src/main/java/com/muster/common/filter/RepeatedlyRequestWrapper.java index 9ad6f4940..7afcc5754 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/muster-common/src/main/java/com/muster/common/filter/RepeatedlyRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.muster.common.filter; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -9,12 +9,12 @@ import javax.servlet.ServletInputStream; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import com.ruoyi.common.utils.http.HttpHelper; +import com.muster.common.utils.http.HttpHelper; /** * 构建可重复读取inputStream的request * - * @author ruoyi + * @author muster */ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/muster-common/src/main/java/com/muster/common/filter/XssFilter.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to muster-common/src/main/java/com/muster/common/filter/XssFilter.java index 14954125c..3d9b05c8b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/muster-common/src/main/java/com/muster/common/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.muster.common.filter; import java.io.IOException; import java.util.ArrayList; @@ -13,12 +13,12 @@ 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.muster.common.utils.StringUtils; /** * 防止XSS攻击的过滤器 * - * @author ruoyi + * @author muster */ public class XssFilter implements Filter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/muster-common/src/main/java/com/muster/common/filter/XssHttpServletRequestWrapper.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to muster-common/src/main/java/com/muster/common/filter/XssHttpServletRequestWrapper.java index 12ef5517c..20f24625f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/muster-common/src/main/java/com/muster/common/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.muster.common.filter; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -9,13 +9,13 @@ import javax.servlet.http.HttpServletRequestWrapper; import org.apache.commons.io.IOUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.html.EscapeUtil; /** * XSS过滤处理 * - * @author ruoyi + * @author muster */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/muster-common/src/main/java/com/muster/common/utils/Arith.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java rename to muster-common/src/main/java/com/muster/common/utils/Arith.java index 866831977..1d4d64a37 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java +++ b/muster-common/src/main/java/com/muster/common/utils/Arith.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import java.math.BigDecimal; import java.math.RoundingMode; @@ -6,7 +6,7 @@ import java.math.RoundingMode; /** * 精确的浮点数运算 * - * @author ruoyi + * @author muster */ public class Arith { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/muster-common/src/main/java/com/muster/common/utils/DateUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to muster-common/src/main/java/com/muster/common/utils/DateUtils.java index 8ff95f1b7..974d0a601 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; @@ -9,7 +9,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; /** * 时间工具类 * - * @author ruoyi + * @author muster */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/muster-common/src/main/java/com/muster/common/utils/DictUtils.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java rename to muster-common/src/main/java/com/muster/common/utils/DictUtils.java index 0d3a23d51..ea859f391 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/DictUtils.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import java.util.Collection; import java.util.List; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.muster.common.constant.Constants; +import com.muster.common.core.domain.entity.SysDictData; +import com.muster.common.core.redis.RedisCache; +import com.muster.common.utils.spring.SpringUtils; /** * 字典工具类 * - * @author ruoyi + * @author muster */ public class DictUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/muster-common/src/main/java/com/muster/common/utils/ExceptionUtil.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to muster-common/src/main/java/com/muster/common/utils/ExceptionUtil.java index 4ca52838a..6a5860e7f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/muster-common/src/main/java/com/muster/common/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import java.io.PrintWriter; import java.io.StringWriter; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; /** * 错误信息处理类。 * - * @author ruoyi + * @author muster */ public class ExceptionUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/muster-common/src/main/java/com/muster/common/utils/LogUtils.java similarity index 77% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java rename to muster-common/src/main/java/com/muster/common/utils/LogUtils.java index e415c9c38..990efdd1b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/LogUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; /** * 处理并记录日志文件 * - * @author ruoyi + * @author muster */ public class LogUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/muster-common/src/main/java/com/muster/common/utils/MessageUtils.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to muster-common/src/main/java/com/muster/common/utils/MessageUtils.java index 5f2d9ea24..54942354f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/MessageUtils.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.muster.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 * - * @author ruoyi + * @author muster */ public class MessageUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/muster-common/src/main/java/com/muster/common/utils/SecurityUtils.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to muster-common/src/main/java/com/muster/common/utils/SecurityUtils.java index ce7f3b64f..a9c5543a4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/SecurityUtils.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.CustomException; +import com.muster.common.constant.HttpStatus; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.exception.CustomException; /** * 安全服务工具类 * - * @author ruoyi + * @author muster */ public class SecurityUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/muster-common/src/main/java/com/muster/common/utils/ServletUtils.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to muster-common/src/main/java/com/muster/common/utils/ServletUtils.java index 9e6fd59a2..b8d76e0aa 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import java.io.IOException; import javax.servlet.http.HttpServletRequest; @@ -7,12 +7,12 @@ 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.muster.common.core.text.Convert; /** * 客户端工具类 * - * @author ruoyi + * @author muster */ public class ServletUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/muster-common/src/main/java/com/muster/common/utils/StringUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to muster-common/src/main/java/com/muster/common/utils/StringUtils.java index 36b3e0983..86d8dbe73 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import java.util.ArrayList; import java.util.Collection; @@ -6,12 +6,12 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import com.ruoyi.common.core.text.StrFormatter; +import com.muster.common.core.text.StrFormatter; /** * 字符串工具类 * - * @author ruoyi + * @author muster */ public class StringUtils extends org.apache.commons.lang3.StringUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/muster-common/src/main/java/com/muster/common/utils/Threads.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to muster-common/src/main/java/com/muster/common/utils/Threads.java index 395920a24..a41ae7042 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/muster-common/src/main/java/com/muster/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; /** * 线程相关工具类. * - * @author ruoyi + * @author muster */ public class Threads { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java b/muster-common/src/main/java/com/muster/common/utils/VerifyCodeUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java rename to muster-common/src/main/java/com/muster/common/utils/VerifyCodeUtils.java index 04171810f..256b9231a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/VerifyCodeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.muster.common.utils; import java.awt.Color; import java.awt.Font; @@ -17,7 +17,7 @@ import javax.imageio.ImageIO; /** * 验证码工具类 * - * @author ruoyi + * @author muster */ public class VerifyCodeUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/muster-common/src/main/java/com/muster/common/utils/bean/BeanUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to muster-common/src/main/java/com/muster/common/utils/bean/BeanUtils.java index 51cdc2fb1..94738cc0a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.muster.common.utils.bean; import java.lang.reflect.Method; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Bean 工具类 * - * @author ruoyi + * @author muster */ public class BeanUtils extends org.springframework.beans.BeanUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/muster-common/src/main/java/com/muster/common/utils/file/FileUploadUtils.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to muster-common/src/main/java/com/muster/common/utils/file/FileUploadUtils.java index cb2f0239b..107de7b3e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/file/FileUploadUtils.java @@ -1,22 +1,22 @@ -package com.ruoyi.common.utils.file; +package com.muster.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.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -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.uuid.IdUtils; +import com.muster.common.config.RuoYiConfig; +import com.muster.common.constant.Constants; +import com.muster.common.exception.file.FileNameLengthLimitExceededException; +import com.muster.common.exception.file.FileSizeLimitExceededException; +import com.muster.common.exception.file.InvalidExtensionException; +import com.muster.common.utils.DateUtils; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.uuid.IdUtils; /** * 文件上传工具类 * - * @author ruoyi + * @author muster */ public class FileUploadUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/muster-common/src/main/java/com/muster/common/utils/file/FileUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to muster-common/src/main/java/com/muster/common/utils/file/FileUtils.java index 03f5aa2a2..5c4b8e7ad 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.muster.common.utils.file; import java.io.File; import java.io.FileInputStream; @@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest; /** * 文件处理工具类 * - * @author ruoyi + * @author muster */ public class FileUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/muster-common/src/main/java/com/muster/common/utils/file/MimeTypeUtils.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to muster-common/src/main/java/com/muster/common/utils/file/MimeTypeUtils.java index d179a9188..21641a270 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/file/MimeTypeUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.file; +package com.muster.common.utils.file; /** * 媒体类型工具类 * - * @author ruoyi + * @author muster */ public class MimeTypeUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/muster-common/src/main/java/com/muster/common/utils/html/EscapeUtil.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java rename to muster-common/src/main/java/com/muster/common/utils/html/EscapeUtil.java index 8989ca1e1..6f1d77c0d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ b/muster-common/src/main/java/com/muster/common/utils/html/EscapeUtil.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.html; +package com.muster.common.utils.html; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.utils.StringUtils; /** * 转义和反转义工具类 * - * @author ruoyi + * @author muster */ public class EscapeUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/muster-common/src/main/java/com/muster/common/utils/html/HTMLFilter.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java rename to muster-common/src/main/java/com/muster/common/utils/html/HTMLFilter.java index 41739569d..23354011b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java +++ b/muster-common/src/main/java/com/muster/common/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.html; +package com.muster.common.utils.html; import java.util.ArrayList; import java.util.Collections; @@ -13,7 +13,7 @@ import java.util.regex.Pattern; /** * HTML过滤器，用于去除XSS漏洞隐患。 * - * @author ruoyi + * @author muster */ public final class HTMLFilter { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/muster-common/src/main/java/com/muster/common/utils/http/HttpHelper.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java rename to muster-common/src/main/java/com/muster/common/utils/http/HttpHelper.java index e34fa5ae6..931dacb2b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java +++ b/muster-common/src/main/java/com/muster/common/utils/http/HttpHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.muster.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory; /** * 通用http工具封装 * - * @author ruoyi + * @author muster */ public class HttpHelper { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/muster-common/src/main/java/com/muster/common/utils/http/HttpUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to muster-common/src/main/java/com/muster/common/utils/http/HttpUtils.java index 200374328..742beeedb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/http/HttpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.muster.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -18,12 +18,12 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; +import com.muster.common.constant.Constants; /** * 通用http发送方法 * - * @author ruoyi + * @author muster */ public class HttpUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/muster-common/src/main/java/com/muster/common/utils/ip/AddressUtils.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to muster-common/src/main/java/com/muster/common/utils/ip/AddressUtils.java index 11faa3236..436942b38 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/ip/AddressUtils.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.utils.ip; +package com.muster.common.utils.ip; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpUtils; +import com.muster.common.config.RuoYiConfig; +import com.muster.common.constant.Constants; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.http.HttpUtils; /** * 获取地址类 * - * @author ruoyi + * @author muster */ public class AddressUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/muster-common/src/main/java/com/muster/common/utils/ip/IpUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java rename to muster-common/src/main/java/com/muster/common/utils/ip/IpUtils.java index 771e3f840..db683a2df 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/ip/IpUtils.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.utils.ip; +package com.muster.common.utils.ip; import java.net.InetAddress; import java.net.UnknownHostException; import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.html.EscapeUtil; /** * 获取IP方法 * - * @author ruoyi + * @author muster */ public class IpUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/muster-common/src/main/java/com/muster/common/utils/poi/ExcelUtil.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to muster-common/src/main/java/com/muster/common/utils/poi/ExcelUtil.java index 13af48617..beb2d6815 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/muster-common/src/main/java/com/muster/common/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.muster.common.utils.poi; import java.io.File; import java.io.FileOutputStream; @@ -42,23 +42,23 @@ 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.ColumnType; -import com.ruoyi.common.annotation.Excel.Type; -import com.ruoyi.common.annotation.Excels; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.annotation.Excel.Type; +import com.muster.common.annotation.Excels; +import com.muster.common.config.RuoYiConfig; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.text.Convert; +import com.muster.common.exception.CustomException; +import com.muster.common.utils.DateUtils; +import com.muster.common.utils.DictUtils; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.reflect.ReflectUtils; /** * Excel相关处理 * - * @author ruoyi + * @author muster */ public class ExcelUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/muster-common/src/main/java/com/muster/common/utils/reflect/ReflectUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to muster-common/src/main/java/com/muster/common/utils/reflect/ReflectUtils.java index 5241101be..069a1a062 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/reflect/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.reflect; +package com.muster.common.utils.reflect; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -12,13 +12,13 @@ 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.muster.common.core.text.Convert; +import com.muster.common.utils.DateUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * - * @author ruoyi + * @author muster */ @SuppressWarnings("rawtypes") public class ReflectUtils diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/muster-common/src/main/java/com/muster/common/utils/sign/Base64.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java rename to muster-common/src/main/java/com/muster/common/utils/sign/Base64.java index f2c1bfe01..01087e958 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java +++ b/muster-common/src/main/java/com/muster/common/utils/sign/Base64.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.sign; +package com.muster.common.utils.sign; /** * Base64工具类 * - * @author ruoyi + * @author muster */ public final class Base64 { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/muster-common/src/main/java/com/muster/common/utils/sign/Md5Utils.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java rename to muster-common/src/main/java/com/muster/common/utils/sign/Md5Utils.java index df1e23f8d..56fa5f09d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/muster-common/src/main/java/com/muster/common/utils/sign/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.sign; +package com.muster.common.utils.sign; import java.security.MessageDigest; import org.slf4j.Logger; @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; /** * Md5加密方法 * - * @author ruoyi + * @author muster */ public class Md5Utils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/muster-common/src/main/java/com/muster/common/utils/spring/SpringUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to muster-common/src/main/java/com/muster/common/utils/spring/SpringUtils.java index e0311595a..a3637c993 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.muster.common.utils.spring; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** * spring工具类 方便在非spring管理环境中获取bean * - * @author ruoyi + * @author muster */ @Component public final class SpringUtils implements BeanFactoryPostProcessor diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/muster-common/src/main/java/com/muster/common/utils/sql/SqlUtil.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to muster-common/src/main/java/com/muster/common/utils/sql/SqlUtil.java index 39e88ef76..5bebbb387 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/muster-common/src/main/java/com/muster/common/utils/sql/SqlUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.sql; +package com.muster.common.utils.sql; -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.exception.BaseException; +import com.muster.common.utils.StringUtils; /** * sql操作工具类 * - * @author ruoyi + * @author muster */ public class SqlUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/muster-common/src/main/java/com/muster/common/utils/uuid/IdUtils.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java rename to muster-common/src/main/java/com/muster/common/utils/uuid/IdUtils.java index eb78f6fed..68a07df82 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java +++ b/muster-common/src/main/java/com/muster/common/utils/uuid/IdUtils.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.uuid; +package com.muster.common.utils.uuid; -import com.ruoyi.common.utils.uuid.UUID; +import com.muster.common.utils.uuid.UUID; /** * ID生成器工具类 * - * @author ruoyi + * @author muster */ public class IdUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/muster-common/src/main/java/com/muster/common/utils/uuid/UUID.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java rename to muster-common/src/main/java/com/muster/common/utils/uuid/UUID.java index eef72ee0b..f69605f62 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java +++ b/muster-common/src/main/java/com/muster/common/utils/uuid/UUID.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.utils.uuid; +package com.muster.common.utils.uuid; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.exception.UtilException; +import com.muster.common.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 * - * @author ruoyi + * @author muster */ public final class UUID implements java.io.Serializable, Comparable { diff --git a/ruoyi-framework/pom.xml b/muster-framework/pom.xml similarity index 87% rename from ruoyi-framework/pom.xml rename to muster-framework/pom.xml index ba2e0ab7b..1c0befb85 100644 --- a/ruoyi-framework/pom.xml +++ b/muster-framework/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + muster + com.muster 3.0.0 4.0.0 - ruoyi-framework + muster-framework framework框架核心 @@ -65,8 +65,8 @@ - com.ruoyi - ruoyi-system + com.muster + muster-system diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/muster-framework/src/main/java/com/muster/framework/aspectj/DataScopeAspect.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to muster-framework/src/main/java/com/muster/framework/aspectj/DataScopeAspect.java index 469494749..cff8ad8bf 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/muster-framework/src/main/java/com/muster/framework/aspectj/DataScopeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.muster.framework.aspectj; import java.lang.reflect.Method; import org.aspectj.lang.JoinPoint; @@ -8,20 +8,20 @@ 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.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.web.service.TokenService; +import com.muster.common.annotation.DataScope; +import com.muster.common.core.domain.BaseEntity; +import com.muster.common.core.domain.entity.SysRole; +import com.muster.common.core.domain.entity.SysUser; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.spring.SpringUtils; +import com.muster.framework.web.service.TokenService; /** * 数据过滤处理 * - * @author ruoyi + * @author muster */ @Aspect @Component @@ -58,7 +58,7 @@ public class DataScopeAspect public static final String DATA_SCOPE = "dataScope"; // 配置织入点 - @Pointcut("@annotation(com.ruoyi.common.annotation.DataScope)") + @Pointcut("@annotation(com.muster.common.annotation.DataScope)") public void dataScopePointCut() { } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/muster-framework/src/main/java/com/muster/framework/aspectj/DataSourceAspect.java similarity index 80% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to muster-framework/src/main/java/com/muster/framework/aspectj/DataSourceAspect.java index 4648fcd3c..c90d8c94c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/muster-framework/src/main/java/com/muster/framework/aspectj/DataSourceAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.muster.framework.aspectj; import java.util.Objects; import org.aspectj.lang.ProceedingJoinPoint; @@ -11,14 +11,14 @@ import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; +import com.muster.common.annotation.DataSource; +import com.muster.common.utils.StringUtils; +import com.muster.framework.datasource.DynamicDataSourceContextHolder; /** * 多数据源处理 * - * @author ruoyi + * @author muster */ @Aspect @Order(1) @@ -27,8 +27,8 @@ public class DataSourceAspect { protected Logger logger = LoggerFactory.getLogger(getClass()); - @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)" - + "|| @within(com.ruoyi.common.annotation.DataSource)") + @Pointcut("@annotation(com.muster.common.annotation.DataSource)" + + "|| @within(com.muster.common.annotation.DataSource)") public void dsPointCut() { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/muster-framework/src/main/java/com/muster/framework/aspectj/LogAspect.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to muster-framework/src/main/java/com/muster/framework/aspectj/LogAspect.java index 51a7cd2bf..1b74c5918 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/muster-framework/src/main/java/com/muster/framework/aspectj/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.muster.framework.aspectj; import java.lang.reflect.Method; import java.util.Map; @@ -17,23 +17,23 @@ import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.HandlerMapping; import com.alibaba.fastjson.JSON; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.system.domain.SysOperLog; +import com.muster.common.annotation.Log; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.enums.BusinessStatus; +import com.muster.common.enums.HttpMethod; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.ip.IpUtils; +import com.muster.common.utils.spring.SpringUtils; +import com.muster.framework.manager.AsyncManager; +import com.muster.framework.manager.factory.AsyncFactory; +import com.muster.framework.web.service.TokenService; +import com.muster.system.domain.SysOperLog; /** * 操作日志记录处理 * - * @author ruoyi + * @author muster */ @Aspect @Component @@ -42,7 +42,7 @@ public class LogAspect private static final Logger log = LoggerFactory.getLogger(LogAspect.class); // 配置织入点 - @Pointcut("@annotation(com.ruoyi.common.annotation.Log)") + @Pointcut("@annotation(com.muster.common.annotation.Log)") public void logPointCut() { } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/muster-framework/src/main/java/com/muster/framework/config/ApplicationConfig.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/ApplicationConfig.java index 66a00e7cb..6ec10f0ea 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import java.util.TimeZone; import org.mybatis.spring.annotation.MapperScan; @@ -10,13 +10,13 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * 程序注解配置 * - * @author ruoyi + * @author muster */ @Configuration // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.ruoyi.**.mapper") +@MapperScan("com.muster.**.mapper") public class ApplicationConfig { /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/muster-framework/src/main/java/com/muster/framework/config/CaptchaConfig.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/CaptchaConfig.java index 43e78aebe..799aa66f0 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import java.util.Properties; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ import static com.google.code.kaptcha.Constants.*; /** * 验证码配置 * - * @author ruoyi + * @author muster */ @Configuration public class CaptchaConfig @@ -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.muster.framework.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/muster-framework/src/main/java/com/muster/framework/config/DruidConfig.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/DruidConfig.java index f671b3a30..3b6d91c82 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import java.io.IOException; import java.util.HashMap; @@ -19,15 +19,15 @@ 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.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; +import com.muster.common.enums.DataSourceType; +import com.muster.common.utils.spring.SpringUtils; +import com.muster.framework.config.properties.DruidProperties; +import com.muster.framework.datasource.DynamicDataSource; /** * druid 配置多数据源 * - * @author ruoyi + * @author muster */ @Configuration public class DruidConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/muster-framework/src/main/java/com/muster/framework/config/FastJson2JsonRedisSerializer.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java rename to muster-framework/src/main/java/com/muster/framework/config/FastJson2JsonRedisSerializer.java index 56bbdbfab..d38ace027 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/muster-framework/src/main/java/com/muster/framework/config/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; @@ -14,7 +14,7 @@ import java.nio.charset.Charset; /** * Redis使用FastJson序列化 * - * @author ruoyi + * @author muster */ public class FastJson2JsonRedisSerializer implements RedisSerializer { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/muster-framework/src/main/java/com/muster/framework/config/FilterConfig.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/FilterConfig.java index 8b1783424..51b47d485 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import java.util.HashMap; import java.util.Map; @@ -7,14 +7,14 @@ 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.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.filter.RepeatableFilter; +import com.muster.common.filter.XssFilter; +import com.muster.common.utils.StringUtils; /** * Filter配置 * - * @author ruoyi + * @author muster */ @Configuration public class FilterConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/muster-framework/src/main/java/com/muster/framework/config/KaptchaTextCreator.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java rename to muster-framework/src/main/java/com/muster/framework/config/KaptchaTextCreator.java index 3e7458003..c09d660af 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ b/muster-framework/src/main/java/com/muster/framework/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import java.util.Random; import com.google.code.kaptcha.text.impl.DefaultTextCreator; @@ -6,7 +6,7 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator; /** * 验证码文本生成器 * - * @author ruoyi + * @author muster */ public class KaptchaTextCreator extends DefaultTextCreator { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/muster-framework/src/main/java/com/muster/framework/config/MyBatisConfig.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/MyBatisConfig.java index 508bc457b..2cf569278 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/MyBatisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import java.io.IOException; import java.util.ArrayList; @@ -25,7 +25,7 @@ import org.springframework.util.ClassUtils; /** * Mybatis支持*匹配扫描包 * - * @author ruoyi + * @author muster */ @Configuration public class MyBatisConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/muster-framework/src/main/java/com/muster/framework/config/RedisConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/RedisConfig.java index 6322686fb..04c297518 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; /** * redis配置 * - * @author ruoyi + * @author muster */ @Configuration @EnableCaching diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/muster-framework/src/main/java/com/muster/framework/config/ResourcesConfig.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/ResourcesConfig.java index 1082ea51c..5242a42e0 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -9,14 +9,14 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.muster.common.config.RuoYiConfig; +import com.muster.common.constant.Constants; +import com.muster.framework.interceptor.RepeatSubmitInterceptor; /** * 通用配置 * - * @author ruoyi + * @author muster */ @Configuration public class ResourcesConfig implements WebMvcConfigurer diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/muster-framework/src/main/java/com/muster/framework/config/SecurityConfig.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/SecurityConfig.java index 10531590f..ee1be7009 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -14,14 +14,14 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; +import com.muster.framework.security.filter.JwtAuthenticationTokenFilter; +import com.muster.framework.security.handle.AuthenticationEntryPointImpl; +import com.muster.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security配置 * - * @author ruoyi + * @author muster */ @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) public class SecurityConfig extends WebSecurityConfigurerAdapter diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/muster-framework/src/main/java/com/muster/framework/config/ServerConfig.java similarity index 85% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/ServerConfig.java index 157e9f46d..738173f2c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/ServerConfig.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.ServletUtils; +import com.muster.common.utils.ServletUtils; /** * 服务相关配置 * - * @author ruoyi + * @author muster */ @Component public class ServerConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/muster-framework/src/main/java/com/muster/framework/config/ThreadPoolConfig.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to muster-framework/src/main/java/com/muster/framework/config/ThreadPoolConfig.java index 618a925dc..5d3f74ffd 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/muster-framework/src/main/java/com/muster/framework/config/ThreadPoolConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.muster.framework.config; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; @@ -7,12 +7,12 @@ 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.muster.common.utils.Threads; /** * 线程池配置 * - * @author ruoyi + * @author muster **/ @Configuration public class ThreadPoolConfig diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/muster-framework/src/main/java/com/muster/framework/config/properties/DruidProperties.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to muster-framework/src/main/java/com/muster/framework/config/properties/DruidProperties.java index ae6e02fd3..0b8f7ad05 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/muster-framework/src/main/java/com/muster/framework/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.muster.framework.config.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import com.alibaba.druid.pool.DruidDataSource; /** * druid 配置属性 * - * @author ruoyi + * @author muster */ @Configuration public class DruidProperties diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/muster-framework/src/main/java/com/muster/framework/datasource/DynamicDataSource.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to muster-framework/src/main/java/com/muster/framework/datasource/DynamicDataSource.java index 014ae3804..dd0d8b46f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/muster-framework/src/main/java/com/muster/framework/datasource/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.muster.framework.datasource; import java.util.Map; import javax.sql.DataSource; @@ -7,7 +7,7 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; /** * 动态数据源 * - * @author ruoyi + * @author muster */ public class DynamicDataSource extends AbstractRoutingDataSource { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/muster-framework/src/main/java/com/muster/framework/datasource/DynamicDataSourceContextHolder.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java rename to muster-framework/src/main/java/com/muster/framework/datasource/DynamicDataSourceContextHolder.java index 20a0dda4e..edc6f86da 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java +++ b/muster-framework/src/main/java/com/muster/framework/datasource/DynamicDataSourceContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.muster.framework.datasource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; /** * 数据源切换处理 * - * @author ruoyi + * @author muster */ public class DynamicDataSourceContextHolder { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/muster-framework/src/main/java/com/muster/framework/interceptor/RepeatSubmitInterceptor.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to muster-framework/src/main/java/com/muster/framework/interceptor/RepeatSubmitInterceptor.java index d310382f8..310c8058c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java +++ b/muster-framework/src/main/java/com/muster/framework/interceptor/RepeatSubmitInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor; +package com.muster.framework.interceptor; import java.lang.reflect.Method; import javax.servlet.http.HttpServletRequest; @@ -7,14 +7,14 @@ import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; +import com.muster.common.annotation.RepeatSubmit; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.utils.ServletUtils; /** * 防止重复提交拦截器 * - * @author ruoyi + * @author muster */ @Component public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/muster-framework/src/main/java/com/muster/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to muster-framework/src/main/java/com/muster/framework/interceptor/impl/SameUrlDataInterceptor.java index 5f78380b9..881e5af45 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/muster-framework/src/main/java/com/muster/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor.impl; +package com.muster.framework.interceptor.impl; import java.util.HashMap; import java.util.Map; @@ -7,17 +7,17 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.muster.common.core.redis.RedisCache; +import com.muster.common.filter.RepeatedlyRequestWrapper; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.http.HttpHelper; +import com.muster.framework.interceptor.RepeatSubmitInterceptor; /** * 判断请求url和数据是否和上一次相同， * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。 * - * @author ruoyi + * @author muster */ @Component public class SameUrlDataInterceptor extends RepeatSubmitInterceptor diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/muster-framework/src/main/java/com/muster/framework/manager/AsyncManager.java similarity index 82% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to muster-framework/src/main/java/com/muster/framework/manager/AsyncManager.java index 6ed6d5b74..de0426575 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/muster-framework/src/main/java/com/muster/framework/manager/AsyncManager.java @@ -1,15 +1,15 @@ -package com.ruoyi.framework.manager; +package com.muster.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.muster.common.utils.Threads; +import com.muster.common.utils.spring.SpringUtils; /** * 异步任务管理器 * - * @author ruoyi + * @author muster */ public class AsyncManager { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/muster-framework/src/main/java/com/muster/framework/manager/ShutdownManager.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to muster-framework/src/main/java/com/muster/framework/manager/ShutdownManager.java index 8d8fb5a3f..f63c5c5b6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/muster-framework/src/main/java/com/muster/framework/manager/ShutdownManager.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.manager; +package com.muster.framework.manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,7 @@ import javax.annotation.PreDestroy; /** * 确保应用退出时能关闭后台线程 * - * @author ruoyi + * @author muster */ @Component public class ShutdownManager diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/muster-framework/src/main/java/com/muster/framework/manager/factory/AsyncFactory.java similarity index 82% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to muster-framework/src/main/java/com/muster/framework/manager/factory/AsyncFactory.java index 3d6cef9f0..4b2c77c47 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/muster-framework/src/main/java/com/muster/framework/manager/factory/AsyncFactory.java @@ -1,24 +1,24 @@ -package com.ruoyi.framework.manager.factory; +package com.muster.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.LogUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysLogininforService; -import com.ruoyi.system.service.ISysOperLogService; +import com.muster.common.constant.Constants; +import com.muster.common.utils.LogUtils; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.ip.AddressUtils; +import com.muster.common.utils.ip.IpUtils; +import com.muster.common.utils.spring.SpringUtils; +import com.muster.system.domain.SysLogininfor; +import com.muster.system.domain.SysOperLog; +import com.muster.system.service.ISysLogininforService; +import com.muster.system.service.ISysOperLogService; import eu.bitwalker.useragentutils.UserAgent; /** * 异步工厂（产生任务用） * - * @author ruoyi + * @author muster */ public class AsyncFactory { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/muster-framework/src/main/java/com/muster/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 84% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to muster-framework/src/main/java/com/muster/framework/security/filter/JwtAuthenticationTokenFilter.java index 75fd00d16..3cf00846c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/muster-framework/src/main/java/com/muster/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.filter; +package com.muster.framework.security.filter; import java.io.IOException; import javax.servlet.FilterChain; @@ -11,15 +11,15 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.service.TokenService; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.StringUtils; +import com.muster.framework.web.service.TokenService; /** * token过滤器 验证token有效性 * - * @author ruoyi + * @author muster */ @Component public class JwtAuthenticationTokenFilter extends OncePerRequestFilter diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/muster-framework/src/main/java/com/muster/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 78% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to muster-framework/src/main/java/com/muster/framework/security/handle/AuthenticationEntryPointImpl.java index bf9965d31..73a927ef6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/muster-framework/src/main/java/com/muster/framework/security/handle/AuthenticationEntryPointImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.muster.framework.security.handle; import java.io.IOException; import java.io.Serializable; @@ -8,15 +8,15 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; import com.alibaba.fastjson.JSON; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.constant.HttpStatus; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.StringUtils; /** * 认证失败处理类 返回未授权 * - * @author ruoyi + * @author muster */ @Component public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/muster-framework/src/main/java/com/muster/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 72% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to muster-framework/src/main/java/com/muster/framework/security/handle/LogoutSuccessHandlerImpl.java index 1d5b1f9c6..498b666ea 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/muster-framework/src/main/java/com/muster/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.muster.framework.security.handle; import java.io.IOException; import javax.servlet.ServletException; @@ -9,20 +9,20 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import com.alibaba.fastjson.JSON; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -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.web.service.TokenService; +import com.muster.common.constant.Constants; +import com.muster.common.constant.HttpStatus; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.StringUtils; +import com.muster.framework.manager.AsyncManager; +import com.muster.framework.manager.factory.AsyncFactory; +import com.muster.framework.web.service.TokenService; /** * 自定义退出处理类 返回成功 * - * @author ruoyi + * @author muster */ @Configuration public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/muster-framework/src/main/java/com/muster/framework/web/domain/Server.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java rename to muster-framework/src/main/java/com/muster/framework/web/domain/Server.java index 93e411bbd..94adb5a19 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/muster-framework/src/main/java/com/muster/framework/web/domain/Server.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.web.domain; +package com.muster.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.ip.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.muster.common.utils.Arith; +import com.muster.common.utils.ip.IpUtils; +import com.muster.framework.web.domain.server.Cpu; +import com.muster.framework.web.domain.server.Jvm; +import com.muster.framework.web.domain.server.Mem; +import com.muster.framework.web.domain.server.Sys; +import com.muster.framework.web.domain.server.SysFile; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.hardware.CentralProcessor.TickType; @@ -24,7 +24,7 @@ import oshi.util.Util; /** * 服务器相关信息 * - * @author ruoyi + * @author muster */ public class Server { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/muster-framework/src/main/java/com/muster/framework/web/domain/server/Cpu.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to muster-framework/src/main/java/com/muster/framework/web/domain/server/Cpu.java index cf7b46e1e..9db1c971c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ b/muster-framework/src/main/java/com/muster/framework/web/domain/server/Cpu.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.domain.server; +package com.muster.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.muster.common.utils.Arith; /** * CPU相关信息 * - * @author ruoyi + * @author muster */ public class Cpu { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/muster-framework/src/main/java/com/muster/framework/web/domain/server/Jvm.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to muster-framework/src/main/java/com/muster/framework/web/domain/server/Jvm.java index f29d2cbe6..66cd12674 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/muster-framework/src/main/java/com/muster/framework/web/domain/server/Jvm.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.web.domain.server; +package com.muster.framework.web.domain.server; import java.lang.management.ManagementFactory; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.DateUtils; +import com.muster.common.utils.Arith; +import com.muster.common.utils.DateUtils; /** * JVM相关信息 * - * @author ruoyi + * @author muster */ public class Jvm { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/muster-framework/src/main/java/com/muster/framework/web/domain/server/Mem.java similarity index 83% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to muster-framework/src/main/java/com/muster/framework/web/domain/server/Mem.java index ac715049a..cc6ec8b04 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ b/muster-framework/src/main/java/com/muster/framework/web/domain/server/Mem.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.domain.server; +package com.muster.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.muster.common.utils.Arith; /** * 內存相关信息 * - * @author ruoyi + * @author muster */ public class Mem { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/muster-framework/src/main/java/com/muster/framework/web/domain/server/Sys.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to muster-framework/src/main/java/com/muster/framework/web/domain/server/Sys.java index a5f65e46e..344962057 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ b/muster-framework/src/main/java/com/muster/framework/web/domain/server/Sys.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain.server; +package com.muster.framework.web.domain.server; /** * 系统相关信息 * - * @author ruoyi + * @author muster */ public class Sys { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/muster-framework/src/main/java/com/muster/framework/web/domain/server/SysFile.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to muster-framework/src/main/java/com/muster/framework/web/domain/server/SysFile.java index 47ecf3f3e..0872dc6fa 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ b/muster-framework/src/main/java/com/muster/framework/web/domain/server/SysFile.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain.server; +package com.muster.framework.web.domain.server; /** * 系统文件相关信息 * - * @author ruoyi + * @author muster */ public class SysFile { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/muster-framework/src/main/java/com/muster/framework/web/exception/GlobalExceptionHandler.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to muster-framework/src/main/java/com/muster/framework/web/exception/GlobalExceptionHandler.java index 300fe9d29..e51b8daff 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/muster-framework/src/main/java/com/muster/framework/web/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.exception; +package com.muster.framework.web.exception; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,17 +10,17 @@ import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.NoHandlerFoundException; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.constant.HttpStatus; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.exception.BaseException; +import com.muster.common.exception.CustomException; +import com.muster.common.exception.DemoModeException; +import com.muster.common.utils.StringUtils; /** * 全局异常处理器 * - * @author ruoyi + * @author muster */ @RestControllerAdvice public class GlobalExceptionHandler diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/muster-framework/src/main/java/com/muster/framework/web/service/PermissionService.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java rename to muster-framework/src/main/java/com/muster/framework/web/service/PermissionService.java index 2b7ad7ebb..63b02d297 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java +++ b/muster-framework/src/main/java/com/muster/framework/web/service/PermissionService.java @@ -1,18 +1,18 @@ -package com.ruoyi.framework.web.service; +package com.muster.framework.web.service; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.core.domain.entity.SysRole; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.StringUtils; /** * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 * - * @author ruoyi + * @author muster */ @Service("ss") public class PermissionService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/muster-framework/src/main/java/com/muster/framework/web/service/SysLoginService.java similarity index 80% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java rename to muster-framework/src/main/java/com/muster/framework/web/service/SysLoginService.java index 020831036..f4045282e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/muster-framework/src/main/java/com/muster/framework/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.muster.framework.web.service; import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; @@ -7,21 +7,21 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.muster.common.constant.Constants; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.core.redis.RedisCache; +import com.muster.common.exception.CustomException; +import com.muster.common.exception.user.CaptchaException; +import com.muster.common.exception.user.CaptchaExpireException; +import com.muster.common.exception.user.UserPasswordNotMatchException; +import com.muster.common.utils.MessageUtils; +import com.muster.framework.manager.AsyncManager; +import com.muster.framework.manager.factory.AsyncFactory; /** * 登录校验方法 * - * @author ruoyi + * @author muster */ @Component public class SysLoginService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/muster-framework/src/main/java/com/muster/framework/web/service/SysPermissionService.java similarity index 82% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java rename to muster-framework/src/main/java/com/muster/framework/web/service/SysPermissionService.java index 19c4a5158..9ddf2de54 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java +++ b/muster-framework/src/main/java/com/muster/framework/web/service/SysPermissionService.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.web.service; +package com.muster.framework.web.service; import java.util.HashSet; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysRoleService; +import com.muster.common.core.domain.entity.SysUser; +import com.muster.system.service.ISysMenuService; +import com.muster.system.service.ISysRoleService; /** * 用户权限处理 * - * @author ruoyi + * @author muster */ @Component public class SysPermissionService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/muster-framework/src/main/java/com/muster/framework/web/service/TokenService.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java rename to muster-framework/src/main/java/com/muster/framework/web/service/TokenService.java index 943eae213..4fc93e8b8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/muster-framework/src/main/java/com/muster/framework/web/service/TokenService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.muster.framework.web.service; import java.util.HashMap; import java.util.Map; @@ -7,14 +7,14 @@ import javax.servlet.http.HttpServletRequest; 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.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.uuid.IdUtils; +import com.muster.common.constant.Constants; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.core.redis.RedisCache; +import com.muster.common.utils.ServletUtils; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.ip.AddressUtils; +import com.muster.common.utils.ip.IpUtils; +import com.muster.common.utils.uuid.IdUtils; import eu.bitwalker.useragentutils.UserAgent; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -23,7 +23,7 @@ import io.jsonwebtoken.SignatureAlgorithm; /** * token验证处理 * - * @author ruoyi + * @author muster */ @Component public class TokenService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/muster-framework/src/main/java/com/muster/framework/web/service/UserDetailsServiceImpl.java similarity index 81% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java rename to muster-framework/src/main/java/com/muster/framework/web/service/UserDetailsServiceImpl.java index a78f2c753..a7f9ec098 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/muster-framework/src/main/java/com/muster/framework/web/service/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.service; +package com.muster.framework.web.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,17 +7,17 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.BaseException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysUserService; +import com.muster.common.core.domain.entity.SysUser; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.enums.UserStatus; +import com.muster.common.exception.BaseException; +import com.muster.common.utils.StringUtils; +import com.muster.system.service.ISysUserService; /** * 用户验证处理 * - * @author ruoyi + * @author muster */ @Service public class UserDetailsServiceImpl implements UserDetailsService diff --git a/ruoyi-generator/pom.xml b/muster-generator/pom.xml similarity index 74% rename from ruoyi-generator/pom.xml rename to muster-generator/pom.xml index 5929f4dd8..310781043 100644 --- a/ruoyi-generator/pom.xml +++ b/muster-generator/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + muster + com.muster 3.0.0 4.0.0 - ruoyi-generator + muster-generator generator代码生成 @@ -25,8 +25,8 @@ - com.ruoyi - ruoyi-common + com.muster + muster-common diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/muster-generator/src/main/java/com/muster/generator/config/GenConfig.java similarity index 92% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to muster-generator/src/main/java/com/muster/generator/config/GenConfig.java index 1b144deb9..69c9f17ae 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/muster-generator/src/main/java/com/muster/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.config; +package com.muster.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi + * @author muster */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/muster-generator/src/main/java/com/muster/generator/controller/GenController.java similarity index 88% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to muster-generator/src/main/java/com/muster/generator/controller/GenController.java index c2f502303..29c0cb390 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/muster-generator/src/main/java/com/muster/generator/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.controller; +package com.muster.generator.controller; import java.io.IOException; import java.util.HashMap; @@ -17,21 +17,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.core.text.Convert; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableColumnService; -import com.ruoyi.generator.service.IGenTableService; +import com.muster.common.annotation.Log; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.core.text.Convert; +import com.muster.common.enums.BusinessType; +import com.muster.generator.domain.GenTable; +import com.muster.generator.domain.GenTableColumn; +import com.muster.generator.service.IGenTableColumnService; +import com.muster.generator.service.IGenTableService; /** * 代码生成 操作处理 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/tool/gen") @@ -180,7 +180,7 @@ public class GenController extends BaseController response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"muster.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/muster-generator/src/main/java/com/muster/generator/domain/GenTable.java similarity index 92% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to muster-generator/src/main/java/com/muster/generator/domain/GenTable.java index aa05e701f..3941aa073 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/muster-generator/src/main/java/com/muster/generator/domain/GenTable.java @@ -1,17 +1,17 @@ -package com.ruoyi.generator.domain; +package com.muster.generator.domain; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.constant.GenConstants; +import com.muster.common.core.domain.BaseEntity; +import com.muster.common.utils.StringUtils; /** * 业务表 gen_table * - * @author ruoyi + * @author muster */ public class GenTable extends BaseEntity { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/muster-generator/src/main/java/com/muster/generator/domain/GenTableColumn.java similarity index 93% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to muster-generator/src/main/java/com/muster/generator/domain/GenTableColumn.java index bee9ae12b..5a21a0899 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/muster-generator/src/main/java/com/muster/generator/domain/GenTableColumn.java @@ -1,13 +1,13 @@ -package com.ruoyi.generator.domain; +package com.muster.generator.domain; import javax.validation.constraints.NotBlank; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.core.domain.BaseEntity; +import com.muster.common.utils.StringUtils; /** * 代码生成业务字段表 gen_table_column * - * @author ruoyi + * @author muster */ public class GenTableColumn extends BaseEntity { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/muster-generator/src/main/java/com/muster/generator/mapper/GenTableColumnMapper.java similarity index 87% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to muster-generator/src/main/java/com/muster/generator/mapper/GenTableColumnMapper.java index 1366453c8..756aa1be8 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/muster-generator/src/main/java/com/muster/generator/mapper/GenTableColumnMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.mapper; +package com.muster.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; +import com.muster.generator.domain.GenTableColumn; /** * 业务字段 数据层 * - * @author ruoyi + * @author muster */ public interface GenTableColumnMapper { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/muster-generator/src/main/java/com/muster/generator/mapper/GenTableMapper.java similarity index 89% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to muster-generator/src/main/java/com/muster/generator/mapper/GenTableMapper.java index 4288d889b..70adaefa5 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/muster-generator/src/main/java/com/muster/generator/mapper/GenTableMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.mapper; +package com.muster.generator.mapper; import java.util.List; -import com.ruoyi.generator.domain.GenTable; +import com.muster.generator.domain.GenTable; /** * 业务 数据层 * - * @author ruoyi + * @author muster */ public interface GenTableMapper { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/muster-generator/src/main/java/com/muster/generator/service/GenTableColumnServiceImpl.java similarity index 83% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to muster-generator/src/main/java/com/muster/generator/service/GenTableColumnServiceImpl.java index 3a2d66a59..52116bb0a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java +++ b/muster-generator/src/main/java/com/muster/generator/service/GenTableColumnServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.generator.service; +package com.muster.generator.service; 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.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; +import com.muster.common.core.text.Convert; +import com.muster.generator.domain.GenTableColumn; +import com.muster.generator.mapper.GenTableColumnMapper; /** * 业务字段 服务层实现 * - * @author ruoyi + * @author muster */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/muster-generator/src/main/java/com/muster/generator/service/GenTableServiceImpl.java similarity index 91% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to muster-generator/src/main/java/com/muster/generator/service/GenTableServiceImpl.java index e7531847e..17fcdf61d 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/muster-generator/src/main/java/com/muster/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.service; +package com.muster.generator.service; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -19,23 +19,23 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; -import com.ruoyi.generator.mapper.GenTableMapper; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; -import com.ruoyi.generator.util.VelocityUtils; +import com.muster.common.constant.Constants; +import com.muster.common.constant.GenConstants; +import com.muster.common.exception.CustomException; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.StringUtils; +import com.muster.generator.domain.GenTable; +import com.muster.generator.domain.GenTableColumn; +import com.muster.generator.mapper.GenTableColumnMapper; +import com.muster.generator.mapper.GenTableMapper; +import com.muster.generator.util.GenUtils; +import com.muster.generator.util.VelocityInitializer; +import com.muster.generator.util.VelocityUtils; /** * 业务 服务层实现 * - * @author ruoyi + * @author muster */ @Service public class GenTableServiceImpl implements IGenTableService diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/muster-generator/src/main/java/com/muster/generator/service/IGenTableColumnService.java similarity index 85% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to muster-generator/src/main/java/com/muster/generator/service/IGenTableColumnService.java index 2130d0431..c1fc408c9 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java +++ b/muster-generator/src/main/java/com/muster/generator/service/IGenTableColumnService.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.service; +package com.muster.generator.service; import java.util.List; -import com.ruoyi.generator.domain.GenTableColumn; +import com.muster.generator.domain.GenTableColumn; /** * 业务字段 服务层 * - * @author ruoyi + * @author muster */ public interface IGenTableColumnService { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/muster-generator/src/main/java/com/muster/generator/service/IGenTableService.java similarity index 90% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to muster-generator/src/main/java/com/muster/generator/service/IGenTableService.java index 2bff5976c..ee906b9b9 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/muster-generator/src/main/java/com/muster/generator/service/IGenTableService.java @@ -1,13 +1,13 @@ -package com.ruoyi.generator.service; +package com.muster.generator.service; import java.util.List; import java.util.Map; -import com.ruoyi.generator.domain.GenTable; +import com.muster.generator.domain.GenTable; /** * 业务 服务层 * - * @author ruoyi + * @author muster */ public interface IGenTableService { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/muster-generator/src/main/java/com/muster/generator/util/GenUtils.java similarity index 93% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to muster-generator/src/main/java/com/muster/generator/util/GenUtils.java index e141dffa7..92ff0ed56 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/muster-generator/src/main/java/com/muster/generator/util/GenUtils.java @@ -1,17 +1,17 @@ -package com.ruoyi.generator.util; +package com.muster.generator.util; import java.util.Arrays; import org.apache.commons.lang3.RegExUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.muster.common.constant.GenConstants; +import com.muster.common.utils.StringUtils; +import com.muster.generator.config.GenConfig; +import com.muster.generator.domain.GenTable; +import com.muster.generator.domain.GenTableColumn; /** * 代码生成器 工具类 * - * @author ruoyi + * @author muster */ public class GenUtils { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/muster-generator/src/main/java/com/muster/generator/util/VelocityInitializer.java similarity index 88% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to muster-generator/src/main/java/com/muster/generator/util/VelocityInitializer.java index 8f9ee07b8..2e186e544 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/muster-generator/src/main/java/com/muster/generator/util/VelocityInitializer.java @@ -1,8 +1,8 @@ -package com.ruoyi.generator.util; +package com.muster.generator.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.constant.Constants; +import com.muster.common.constant.Constants; /** * VelocityEngine工厂 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/muster-generator/src/main/java/com/muster/generator/util/VelocityUtils.java similarity index 94% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to muster-generator/src/main/java/com/muster/generator/util/VelocityUtils.java index 15c23d0f4..f7777fdbf 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/muster-generator/src/main/java/com/muster/generator/util/VelocityUtils.java @@ -1,20 +1,20 @@ -package com.ruoyi.generator.util; +package com.muster.generator.util; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.muster.common.constant.GenConstants; +import com.muster.common.utils.DateUtils; +import com.muster.common.utils.StringUtils; +import com.muster.generator.domain.GenTable; +import com.muster.generator.domain.GenTableColumn; /** * 模板处理工具类 * - * @author ruoyi + * @author muster */ public class VelocityUtils { diff --git a/ruoyi-generator/src/main/resources/generator.yml b/muster-generator/src/main/resources/generator.yml similarity index 82% rename from ruoyi-generator/src/main/resources/generator.yml rename to muster-generator/src/main/resources/generator.yml index 4544c8c24..4a5135adb 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/muster-generator/src/main/resources/generator.yml @@ -1,9 +1,9 @@ # 代码生成 gen: # 作者 - author: ruoyi + author: muster # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system + packageName: com.muster.system # 自动去除表前缀，默认是false autoRemovePre: false # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/muster-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 97% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to muster-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 513275653..65cdef72e 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/muster-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/muster-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 97% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to muster-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 503bb15c9..080096f37 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/muster-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/muster-generator/src/main/resources/vm/java/controller.java.vm similarity index 90% rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to muster-generator/src/main/resources/vm/java/controller.java.vm index 6c349df1e..78fe87360 100644 --- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/muster-generator/src/main/resources/vm/java/controller.java.vm @@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; +import com.muster.common.annotation.Log; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.enums.BusinessType; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.muster.common.utils.poi.ExcelUtil; #if($table.crud) -import com.ruoyi.common.core.page.TableDataInfo; +import com.muster.common.core.page.TableDataInfo; #elseif($table.tree) #end diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/muster-generator/src/main/resources/vm/java/domain.java.vm similarity index 90% rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to muster-generator/src/main/resources/vm/java/domain.java.vm index 9dd824786..6366b05aa 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/muster-generator/src/main/resources/vm/java/domain.java.vm @@ -5,11 +5,11 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; +import com.muster.common.annotation.Excel; #if($table.crud) -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.core.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.domain.TreeEntity; +import com.muster.common.core.domain.TreeEntity; #end /** diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/muster-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to muster-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/muster-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to muster-generator/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/muster-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 94% rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to muster-generator/src/main/resources/vm/java/serviceImpl.java.vm index 05a3de84c..725334575 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/muster-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service.impl; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.ruoyi.common.utils.DateUtils; +import com.muster.common.utils.DateUtils; #break #end #end diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/muster-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to muster-generator/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/muster-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to muster-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/muster-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to muster-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/muster-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to muster-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/muster-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to muster-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-quartz/pom.xml b/muster-quartz/pom.xml similarity index 78% rename from ruoyi-quartz/pom.xml rename to muster-quartz/pom.xml index b62c7f7f0..827385563 100644 --- a/ruoyi-quartz/pom.xml +++ b/muster-quartz/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + muster + com.muster 3.0.0 4.0.0 - ruoyi-quartz + muster-quartz quartz定时任务 @@ -31,8 +31,8 @@ - com.ruoyi - ruoyi-common + com.muster + muster-common diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/muster-quartz/src/main/java/com/muster/quartz/config/ScheduleConfig.java similarity index 95% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to muster-quartz/src/main/java/com/muster/quartz/config/ScheduleConfig.java index e466ed057..95a3e29ae 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java +++ b/muster-quartz/src/main/java/com/muster/quartz/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.config; +package com.muster.quartz.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -9,7 +9,7 @@ import java.util.Properties; /** * 定时任务配置 * - * @author ruoyi + * @author muster */ @Configuration public class ScheduleConfig diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/muster-quartz/src/main/java/com/muster/quartz/controller/SysJobController.java similarity index 85% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to muster-quartz/src/main/java/com/muster/quartz/controller/SysJobController.java index f770a7d8f..8373b5f26 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/muster-quartz/src/main/java/com/muster/quartz/controller/SysJobController.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.controller; +package com.muster.quartz.controller; import java.util.List; import org.quartz.SchedulerException; @@ -12,22 +12,22 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.SecurityUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.quartz.domain.SysJob; -import com.ruoyi.quartz.service.ISysJobService; -import com.ruoyi.quartz.util.CronUtils; +import com.muster.common.annotation.Log; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.exception.job.TaskException; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.quartz.domain.SysJob; +import com.muster.quartz.service.ISysJobService; +import com.muster.quartz.util.CronUtils; /** * 调度任务信息操作处理 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/monitor/job") diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/muster-quartz/src/main/java/com/muster/quartz/controller/SysJobLogController.java similarity index 82% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to muster-quartz/src/main/java/com/muster/quartz/controller/SysJobLogController.java index 10a842b6d..67ad08238 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java +++ b/muster-quartz/src/main/java/com/muster/quartz/controller/SysJobLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.controller; +package com.muster.quartz.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,19 +8,19 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.muster.common.annotation.Log; +import com.muster.common.core.controller.BaseController; +import com.muster.common.core.domain.AjaxResult; +import com.muster.common.core.page.TableDataInfo; +import com.muster.common.enums.BusinessType; +import com.muster.common.utils.poi.ExcelUtil; +import com.muster.quartz.domain.SysJobLog; +import com.muster.quartz.service.ISysJobLogService; /** * 调度日志操作处理 * - * @author ruoyi + * @author muster */ @RestController @RequestMapping("/monitor/jobLog") diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/muster-quartz/src/main/java/com/muster/quartz/domain/SysJob.java similarity index 89% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to muster-quartz/src/main/java/com/muster/quartz/domain/SysJob.java index 8e0048bec..67689392a 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/muster-quartz/src/main/java/com/muster/quartz/domain/SysJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.domain; +package com.muster.quartz.domain; import java.io.Serializable; import java.util.Date; @@ -7,17 +7,17 @@ import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -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.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.constant.ScheduleConstants; +import com.muster.common.core.domain.BaseEntity; +import com.muster.common.utils.StringUtils; +import com.muster.quartz.util.CronUtils; /** * 定时任务调度表 sys_job * - * @author ruoyi + * @author muster */ public class SysJob extends BaseEntity implements Serializable { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/muster-quartz/src/main/java/com/muster/quartz/domain/SysJobLog.java similarity index 91% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to muster-quartz/src/main/java/com/muster/quartz/domain/SysJobLog.java index 63c4cd69d..0577c11de 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ b/muster-quartz/src/main/java/com/muster/quartz/domain/SysJobLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.quartz.domain; +package com.muster.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.muster.common.annotation.Excel; +import com.muster.common.core.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log * - * @author ruoyi + * @author muster */ public class SysJobLog extends BaseEntity { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/muster-quartz/src/main/java/com/muster/quartz/mapper/SysJobLogMapper.java similarity index 88% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to muster-quartz/src/main/java/com/muster/quartz/mapper/SysJobLogMapper.java index ed01ef72e..5bc291269 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java +++ b/muster-quartz/src/main/java/com/muster/quartz/mapper/SysJobLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.mapper; +package com.muster.quartz.mapper; import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; +import com.muster.quartz.domain.SysJobLog; /** * 调度任务日志信息 数据层 * - * @author ruoyi + * @author muster */ public interface SysJobLogMapper { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/muster-quartz/src/main/java/com/muster/quartz/mapper/SysJobMapper.java similarity index 88% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to muster-quartz/src/main/java/com/muster/quartz/mapper/SysJobMapper.java index f481ea12e..b5d4279e4 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java +++ b/muster-quartz/src/main/java/com/muster/quartz/mapper/SysJobMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.mapper; +package com.muster.quartz.mapper; import java.util.List; -import com.ruoyi.quartz.domain.SysJob; +import com.muster.quartz.domain.SysJob; /** * 调度任务信息 数据层 * - * @author ruoyi + * @author muster */ public interface SysJobMapper { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/muster-quartz/src/main/java/com/muster/quartz/service/ISysJobLogService.java similarity index 87% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to muster-quartz/src/main/java/com/muster/quartz/service/ISysJobLogService.java index 5291a63ac..b7227627a 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java +++ b/muster-quartz/src/main/java/com/muster/quartz/service/ISysJobLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.service; +package com.muster.quartz.service; import java.util.List; -import com.ruoyi.quartz.domain.SysJobLog; +import com.muster.quartz.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 * - * @author ruoyi + * @author muster */ public interface ISysJobLogService { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/muster-quartz/src/main/java/com/muster/quartz/service/ISysJobService.java similarity index 89% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to muster-quartz/src/main/java/com/muster/quartz/service/ISysJobService.java index 53f098956..d29ec479c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java +++ b/muster-quartz/src/main/java/com/muster/quartz/service/ISysJobService.java @@ -1,14 +1,14 @@ -package com.ruoyi.quartz.service; +package com.muster.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.muster.common.exception.job.TaskException; +import com.muster.quartz.domain.SysJob; /** * 定时任务调度信息信息 服务层 * - * @author ruoyi + * @author muster */ public interface ISysJobService { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/muster-quartz/src/main/java/com/muster/quartz/service/impl/SysJobLogServiceImpl.java similarity index 85% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to muster-quartz/src/main/java/com/muster/quartz/service/impl/SysJobLogServiceImpl.java index f68a5482b..a32e97937 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java +++ b/muster-quartz/src/main/java/com/muster/quartz/service/impl/SysJobLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.quartz.service.impl; +package com.muster.quartz.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.quartz.domain.SysJobLog; -import com.ruoyi.quartz.mapper.SysJobLogMapper; -import com.ruoyi.quartz.service.ISysJobLogService; +import com.muster.quartz.domain.SysJobLog; +import com.muster.quartz.mapper.SysJobLogMapper; +import com.muster.quartz.service.ISysJobLogService; /** * 定时任务调度日志信息 服务层 * - * @author ruoyi + * @author muster */ @Service public class SysJobLogServiceImpl implements ISysJobLogService diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/muster-quartz/src/main/java/com/muster/quartz/service/impl/SysJobServiceImpl.java similarity index 90% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to muster-quartz/src/main/java/com/muster/quartz/service/impl/SysJobServiceImpl.java index d7bc6c984..c19df979c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/muster-quartz/src/main/java/com/muster/quartz/service/impl/SysJobServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.service.impl; +package com.muster.quartz.service.impl; import java.util.List; import javax.annotation.PostConstruct; @@ -9,18 +9,18 @@ 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.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.muster.common.constant.ScheduleConstants; +import com.muster.common.exception.job.TaskException; +import com.muster.quartz.domain.SysJob; +import com.muster.quartz.mapper.SysJobMapper; +import com.muster.quartz.service.ISysJobService; +import com.muster.quartz.util.CronUtils; +import com.muster.quartz.util.ScheduleUtils; /** * 定时任务调度信息 服务层 * - * @author ruoyi + * @author muster */ @Service public class SysJobServiceImpl implements ISysJobService diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/muster-quartz/src/main/java/com/muster/quartz/task/RyTask.java similarity index 83% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to muster-quartz/src/main/java/com/muster/quartz/task/RyTask.java index 25d1ddd02..9454cec7c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/muster-quartz/src/main/java/com/muster/quartz/task/RyTask.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.task; +package com.muster.quartz.task; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.muster.common.utils.StringUtils; /** * 定时任务调度测试 * - * @author ruoyi + * @author muster */ @Component("ryTask") public class RyTask diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/muster-quartz/src/main/java/com/muster/quartz/util/AbstractQuartzJob.java similarity index 83% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to muster-quartz/src/main/java/com/muster/quartz/util/AbstractQuartzJob.java index fd652d677..9b5c44c63 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java +++ b/muster-quartz/src/main/java/com/muster/quartz/util/AbstractQuartzJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.muster.quartz.util; import java.util.Date; import org.quartz.Job; @@ -6,20 +6,20 @@ 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.muster.common.constant.Constants; +import com.muster.common.constant.ScheduleConstants; +import com.muster.common.utils.ExceptionUtil; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.bean.BeanUtils; +import com.muster.common.utils.spring.SpringUtils; +import com.muster.quartz.domain.SysJob; +import com.muster.quartz.domain.SysJobLog; +import com.muster.quartz.service.ISysJobLogService; /** * 抽象quartz调用 * - * @author ruoyi + * @author muster */ public abstract class AbstractQuartzJob implements Job { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/muster-quartz/src/main/java/com/muster/quartz/util/CronUtils.java similarity index 93% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to muster-quartz/src/main/java/com/muster/quartz/util/CronUtils.java index 6826787a6..113df5c13 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java +++ b/muster-quartz/src/main/java/com/muster/quartz/util/CronUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.muster.quartz.util; import java.text.ParseException; import java.util.Date; @@ -7,7 +7,7 @@ import org.quartz.CronExpression; /** * cron表达式工具类 * - * @author ruoyi + * @author muster * */ public class CronUtils diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/muster-quartz/src/main/java/com/muster/quartz/util/JobInvokeUtil.java similarity index 93% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to muster-quartz/src/main/java/com/muster/quartz/util/JobInvokeUtil.java index 5519c672f..9656ad810 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ b/muster-quartz/src/main/java/com/muster/quartz/util/JobInvokeUtil.java @@ -1,17 +1,17 @@ -package com.ruoyi.quartz.util; +package com.muster.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.muster.common.utils.StringUtils; +import com.muster.common.utils.spring.SpringUtils; +import com.muster.quartz.domain.SysJob; /** * 任务执行工具 * - * @author ruoyi + * @author muster */ public class JobInvokeUtil { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/muster-quartz/src/main/java/com/muster/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 78% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to muster-quartz/src/main/java/com/muster/quartz/util/QuartzDisallowConcurrentExecution.java index 96a6dcf8e..b1aa0141c 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java +++ b/muster-quartz/src/main/java/com/muster/quartz/util/QuartzDisallowConcurrentExecution.java @@ -1,13 +1,13 @@ -package com.ruoyi.quartz.util; +package com.muster.quartz.util; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; +import com.muster.quartz.domain.SysJob; /** * 定时任务处理（禁止并发执行） * - * @author ruoyi + * @author muster * */ @DisallowConcurrentExecution diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/muster-quartz/src/main/java/com/muster/quartz/util/QuartzJobExecution.java similarity index 74% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to muster-quartz/src/main/java/com/muster/quartz/util/QuartzJobExecution.java index 87a06bc13..d1d3fda00 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java +++ b/muster-quartz/src/main/java/com/muster/quartz/util/QuartzJobExecution.java @@ -1,12 +1,12 @@ -package com.ruoyi.quartz.util; +package com.muster.quartz.util; import org.quartz.JobExecutionContext; -import com.ruoyi.quartz.domain.SysJob; +import com.muster.quartz.domain.SysJob; /** * 定时任务处理（允许并发执行） * - * @author ruoyi + * @author muster * */ public class QuartzJobExecution extends AbstractQuartzJob diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/muster-quartz/src/main/java/com/muster/quartz/util/ScheduleUtils.java similarity index 90% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to muster-quartz/src/main/java/com/muster/quartz/util/ScheduleUtils.java index 37fe72e04..9e62313a0 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java +++ b/muster-quartz/src/main/java/com/muster/quartz/util/ScheduleUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.quartz.util; +package com.muster.quartz.util; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; @@ -10,15 +10,15 @@ 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.muster.common.constant.ScheduleConstants; +import com.muster.common.exception.job.TaskException; +import com.muster.common.exception.job.TaskException.Code; +import com.muster.quartz.domain.SysJob; /** * 定时任务工具类 * - * @author ruoyi + * @author muster * */ public class ScheduleUtils diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/muster-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml similarity index 95% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml rename to muster-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index 7601e63d9..34eb9b491 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/muster-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/muster-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml similarity index 96% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml rename to muster-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 69233bdf7..584e697a6 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/muster-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/pom.xml b/muster-system/pom.xml similarity index 69% rename from ruoyi-system/pom.xml rename to muster-system/pom.xml index ebcee00c6..e480a4dd2 100644 --- a/ruoyi-system/pom.xml +++ b/muster-system/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + muster + com.muster 3.0.0 4.0.0 - ruoyi-system + muster-system system系统模块 @@ -19,8 +19,8 @@ - com.ruoyi - ruoyi-common + com.muster + muster-common diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/muster-system/src/main/java/com/muster/system/domain/SysConfig.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to muster-system/src/main/java/com/muster/system/domain/SysConfig.java index 676a8916b..6af0d0008 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysConfig.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; 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.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.core.domain.BaseEntity; /** * 参数配置表 sys_config * - * @author ruoyi + * @author muster */ public class SysConfig extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/muster-system/src/main/java/com/muster/system/domain/SysLogininfor.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to muster-system/src/main/java/com/muster/system/domain/SysLogininfor.java index 02a7fb5c0..60fe56a3c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysLogininfor.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.core.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor * - * @author ruoyi + * @author muster */ public class SysLogininfor extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/muster-system/src/main/java/com/muster/system/domain/SysNotice.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to muster-system/src/main/java/com/muster/system/domain/SysNotice.java index cb739dc41..df160ffdf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysNotice.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.core.domain.BaseEntity; /** * 通知公告表 sys_notice * - * @author ruoyi + * @author muster */ public class SysNotice extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/muster-system/src/main/java/com/muster/system/domain/SysOperLog.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to muster-system/src/main/java/com/muster/system/domain/SysOperLog.java index 4110b8aca..23bb10e8c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysOperLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.annotation.Excel.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.core.domain.BaseEntity; /** * 操作日志记录表 oper_log * - * @author ruoyi + * @author muster */ public class SysOperLog extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/muster-system/src/main/java/com/muster/system/domain/SysPost.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to muster-system/src/main/java/com/muster/system/domain/SysPost.java index 1e7556b8d..56f8e61c4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysPost.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; 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.ColumnType; -import com.ruoyi.common.core.domain.BaseEntity; +import com.muster.common.annotation.Excel; +import com.muster.common.annotation.Excel.ColumnType; +import com.muster.common.core.domain.BaseEntity; /** * 岗位表 sys_post * - * @author ruoyi + * @author muster */ public class SysPost extends BaseEntity { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/muster-system/src/main/java/com/muster/system/domain/SysRoleDept.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to muster-system/src/main/java/com/muster/system/domain/SysRoleDept.java index 8ed8e473e..d8d7b298e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept * - * @author ruoyi + * @author muster */ public class SysRoleDept { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/muster-system/src/main/java/com/muster/system/domain/SysRoleMenu.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to muster-system/src/main/java/com/muster/system/domain/SysRoleMenu.java index 59d286999..8298cfe61 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和菜单关联 sys_role_menu * - * @author ruoyi + * @author muster */ public class SysRoleMenu { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/muster-system/src/main/java/com/muster/system/domain/SysUserOnline.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to muster-system/src/main/java/com/muster/system/domain/SysUserOnline.java index e1495aaa7..4a9cd5057 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysUserOnline.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; /** * 当前在线会话 * - * @author ruoyi + * @author muster */ public class SysUserOnline { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/muster-system/src/main/java/com/muster/system/domain/SysUserPost.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to muster-system/src/main/java/com/muster/system/domain/SysUserPost.java index 07ceb85cc..9935c6cf1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post * - * @author ruoyi + * @author muster */ public class SysUserPost { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/muster-system/src/main/java/com/muster/system/domain/SysUserRole.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to muster-system/src/main/java/com/muster/system/domain/SysUserRole.java index ce2af2bda..5090fe7da 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/muster-system/src/main/java/com/muster/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.muster.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role * - * @author ruoyi + * @author muster */ public class SysUserRole { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/muster-system/src/main/java/com/muster/system/domain/vo/MetaVo.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to muster-system/src/main/java/com/muster/system/domain/vo/MetaVo.java index e83ef10c0..95c99cc63 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/muster-system/src/main/java/com/muster/system/domain/vo/MetaVo.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain.vo; +package com.muster.system.domain.vo; /** * 路由显示信息 * - * @author ruoyi + * @author muster */ public class MetaVo { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/muster-system/src/main/java/com/muster/system/domain/vo/RouterVo.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to muster-system/src/main/java/com/muster/system/domain/vo/RouterVo.java index 21ff6b59a..f430e32ed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/muster-system/src/main/java/com/muster/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.muster.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 路由配置信息 * - * @author ruoyi + * @author muster */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysConfigMapper.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysConfigMapper.java index 0c395f65b..551f83bc8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysConfigMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.muster.system.domain.SysConfig; /** * 参数配置 数据层 * - * @author ruoyi + * @author muster */ public interface SysConfigMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysDeptMapper.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysDeptMapper.java index 6261a873a..7f2c43a4f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysDeptMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.muster.common.core.domain.entity.SysDept; /** * 部门管理 数据层 * - * @author ruoyi + * @author muster */ public interface SysDeptMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysDictDataMapper.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysDictDataMapper.java index 92f799e55..8c6cc3b70 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysDictDataMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.muster.common.core.domain.entity.SysDictData; /** * 字典表 数据层 * - * @author ruoyi + * @author muster */ public interface SysDictDataMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysDictTypeMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysDictTypeMapper.java index 81bc78090..3e6a22de7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysDictTypeMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Mapper; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.muster.common.core.domain.entity.SysDictType; /** * 字典表 数据层 * - * @author ruoyi + * @author muster */ @Mapper public interface SysDictTypeMapper diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysLogininforMapper.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysLogininforMapper.java index 480dd9ff6..c577a6ed3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysLogininforMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.muster.system.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 * - * @author ruoyi + * @author muster */ public interface SysLogininforMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysMenuMapper.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysMenuMapper.java index ebb25464e..8d8db8f8d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysMenuMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysMenu; +import com.muster.common.core.domain.entity.SysMenu; /** * 菜单表 数据层 * - * @author ruoyi + * @author muster */ public interface SysMenuMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysNoticeMapper.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysNoticeMapper.java index cc267ac0c..52b3377f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysNoticeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.muster.system.domain.SysNotice; /** * 通知公告表 数据层 * - * @author ruoyi + * @author muster */ public interface SysNoticeMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysOperLogMapper.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysOperLogMapper.java index 3bf69bb8e..e89998196 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysOperLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.muster.system.domain.SysOperLog; /** * 操作日志 数据层 * - * @author ruoyi + * @author muster */ public interface SysOperLogMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysPostMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysPostMapper.java index a98326f8b..21644bf7f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.muster.system.domain.SysPost; /** * 岗位信息 数据层 * - * @author ruoyi + * @author muster */ public interface SysPostMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysRoleDeptMapper.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysRoleDeptMapper.java index a4ad4de24..84c2f5b3d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysRoleDeptMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; +import com.muster.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 * - * @author ruoyi + * @author muster */ public interface SysRoleDeptMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysRoleMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysRoleMapper.java index e4379c97b..29d9405e0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysRoleMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysRole; +import com.muster.common.core.domain.entity.SysRole; /** * 角色表 数据层 * - * @author ruoyi + * @author muster */ public interface SysRoleMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysRoleMenuMapper.java similarity index 82% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysRoleMenuMapper.java index 99de1dece..3ae1b4834 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysRoleMenuMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleMenu; +import com.muster.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 * - * @author ruoyi + * @author muster */ public interface SysRoleMenuMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysUserMapper.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysUserMapper.java index b9937f399..0ae50afa6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysUserMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.muster.common.core.domain.entity.SysUser; /** * 用户表 数据层 * - * @author ruoyi + * @author muster */ public interface SysUserMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysUserPostMapper.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysUserPostMapper.java index 9c33e546d..bf420faa2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysUserPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUserPost; +import com.muster.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 * - * @author ruoyi + * @author muster */ public interface SysUserPostMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/muster-system/src/main/java/com/muster/system/mapper/SysUserRoleMapper.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to muster-system/src/main/java/com/muster/system/mapper/SysUserRoleMapper.java index ad3fe62c1..40985b533 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/muster-system/src/main/java/com/muster/system/mapper/SysUserRoleMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.mapper; +package com.muster.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysUserRole; +import com.muster.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 * - * @author ruoyi + * @author muster */ public interface SysUserRoleMapper { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/muster-system/src/main/java/com/muster/system/service/ISysConfigService.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to muster-system/src/main/java/com/muster/system/service/ISysConfigService.java index a937e8308..2ea5afd63 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysConfigService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.muster.system.domain.SysConfig; /** * 参数配置 服务层 * - * @author ruoyi + * @author muster */ public interface ISysConfigService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/muster-system/src/main/java/com/muster/system/service/ISysDeptService.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to muster-system/src/main/java/com/muster/system/service/ISysDeptService.java index e3850cf22..28fd91055 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysDeptService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.muster.common.core.domain.TreeSelect; +import com.muster.common.core.domain.entity.SysDept; /** * 部门管理 服务层 * - * @author ruoyi + * @author muster */ public interface ISysDeptService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/muster-system/src/main/java/com/muster/system/service/ISysDictDataService.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to muster-system/src/main/java/com/muster/system/service/ISysDictDataService.java index 5fe8956be..5ea61b8ab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysDictDataService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.muster.common.core.domain.entity.SysDictData; /** * 字典 业务层 * - * @author ruoyi + * @author muster */ public interface ISysDictDataService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/muster-system/src/main/java/com/muster/system/service/ISysDictTypeService.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to muster-system/src/main/java/com/muster/system/service/ISysDictTypeService.java index 3603d896d..56a95d5d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysDictTypeService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.muster.common.core.domain.entity.SysDictData; +import com.muster.common.core.domain.entity.SysDictType; /** * 字典 业务层 * - * @author ruoyi + * @author muster */ public interface ISysDictTypeService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/muster-system/src/main/java/com/muster/system/service/ISysLogininforService.java similarity index 84% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to muster-system/src/main/java/com/muster/system/service/ISysLogininforService.java index f77aaa7e1..fdfde52b0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysLogininforService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.system.domain.SysLogininfor; +import com.muster.system.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 * - * @author ruoyi + * @author muster */ public interface ISysLogininforService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/muster-system/src/main/java/com/muster/system/service/ISysMenuService.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to muster-system/src/main/java/com/muster/system/service/ISysMenuService.java index 78553d59d..d2b5c37cf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysMenuService.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.system.domain.vo.RouterVo; +import com.muster.common.core.domain.TreeSelect; +import com.muster.common.core.domain.entity.SysMenu; +import com.muster.system.domain.vo.RouterVo; /** * 菜单 业务层 * - * @author ruoyi + * @author muster */ public interface ISysMenuService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/muster-system/src/main/java/com/muster/system/service/ISysNoticeService.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to muster-system/src/main/java/com/muster/system/service/ISysNoticeService.java index fb1e420fd..ee3e296c2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysNoticeService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.muster.system.domain.SysNotice; /** * 公告 服务层 * - * @author ruoyi + * @author muster */ public interface ISysNoticeService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/muster-system/src/main/java/com/muster/system/service/ISysOperLogService.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to muster-system/src/main/java/com/muster/system/service/ISysOperLogService.java index 241f121ae..7dff82dd6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysOperLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.system.domain.SysOperLog; +import com.muster.system.domain.SysOperLog; /** * 操作日志 服务层 * - * @author ruoyi + * @author muster */ public interface ISysOperLogService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/muster-system/src/main/java/com/muster/system/service/ISysPostService.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to muster-system/src/main/java/com/muster/system/service/ISysPostService.java index 2fb9a540d..6e2202c9f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysPostService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.muster.system.domain.SysPost; /** * 岗位信息 服务层 * - * @author ruoyi + * @author muster */ public interface ISysPostService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/muster-system/src/main/java/com/muster/system/service/ISysRoleService.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to muster-system/src/main/java/com/muster/system/service/ISysRoleService.java index 4a4bee261..de56b0f2d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysRoleService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.common.core.domain.entity.SysRole; +import com.muster.common.core.domain.entity.SysRole; /** * 角色业务层 * - * @author ruoyi + * @author muster */ public interface ISysRoleService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/muster-system/src/main/java/com/muster/system/service/ISysUserOnlineService.java similarity index 83% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to muster-system/src/main/java/com/muster/system/service/ISysUserOnlineService.java index 12095ff5e..85fda3d40 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysUserOnlineService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.muster.system.service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.system.domain.SysUserOnline; /** * 在线用户 服务层 * - * @author ruoyi + * @author muster */ public interface ISysUserOnlineService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/muster-system/src/main/java/com/muster/system/service/ISysUserService.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to muster-system/src/main/java/com/muster/system/service/ISysUserService.java index 00afa0011..d7be88ef6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/muster-system/src/main/java/com/muster/system/service/ISysUserService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service; +package com.muster.system.service; import java.util.List; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.muster.common.core.domain.entity.SysUser; /** * 用户 业务层 * - * @author ruoyi + * @author muster */ public interface ISysUserService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysConfigServiceImpl.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysConfigServiceImpl.java index 1c113fa92..a260ed1ba 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysConfigServiceImpl.java @@ -1,25 +1,25 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DataSourceType; -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.muster.common.annotation.DataSource; +import com.muster.common.constant.Constants; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.redis.RedisCache; +import com.muster.common.core.text.Convert; +import com.muster.common.enums.DataSourceType; +import com.muster.common.utils.StringUtils; +import com.muster.system.domain.SysConfig; +import com.muster.system.mapper.SysConfigMapper; +import com.muster.system.service.ISysConfigService; /** * 参数配置 服务层实现 * - * @author ruoyi + * @author muster */ @Service public class SysConfigServiceImpl implements ISysConfigService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysDeptServiceImpl.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysDeptServiceImpl.java index ec8113ec1..a9dc5dd98 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -6,19 +6,19 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.muster.common.annotation.DataScope; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.domain.TreeSelect; +import com.muster.common.core.domain.entity.SysDept; +import com.muster.common.exception.CustomException; +import com.muster.common.utils.StringUtils; +import com.muster.system.mapper.SysDeptMapper; +import com.muster.system.service.ISysDeptService; /** * 部门管理 服务实现 * - * @author ruoyi + * @author muster */ @Service public class SysDeptServiceImpl implements ISysDeptService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysDictDataServiceImpl.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysDictDataServiceImpl.java index 39d950531..4b925cfed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysDictDataServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.muster.common.core.domain.entity.SysDictData; +import com.muster.common.utils.DictUtils; +import com.muster.system.mapper.SysDictDataMapper; +import com.muster.system.service.ISysDictDataService; /** * 字典 业务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysDictDataServiceImpl implements ISysDictDataService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysDictTypeServiceImpl.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysDictTypeServiceImpl.java index c38951bc4..9679a4077 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysDictTypeServiceImpl.java @@ -1,24 +1,24 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.List; import javax.annotation.PostConstruct; 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.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.domain.entity.SysDictData; +import com.muster.common.core.domain.entity.SysDictType; +import com.muster.common.exception.CustomException; +import com.muster.common.utils.DictUtils; +import com.muster.common.utils.StringUtils; +import com.muster.system.mapper.SysDictDataMapper; +import com.muster.system.mapper.SysDictTypeMapper; +import com.muster.system.service.ISysDictTypeService; /** * 字典 业务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysDictTypeServiceImpl implements ISysDictTypeService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysLogininforServiceImpl.java similarity index 82% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysLogininforServiceImpl.java index f69fd1aff..e9fca5dbe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysLogininforServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.muster.system.domain.SysLogininfor; +import com.muster.system.mapper.SysLogininforMapper; +import com.muster.system.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysLogininforServiceImpl implements ISysLogininforService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysMenuServiceImpl.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysMenuServiceImpl.java index d3fb074ba..8a1681734 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -10,22 +10,22 @@ import java.util.Set; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.vo.MetaVo; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.domain.TreeSelect; +import com.muster.common.core.domain.entity.SysMenu; +import com.muster.common.core.domain.entity.SysUser; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.StringUtils; +import com.muster.system.domain.vo.MetaVo; +import com.muster.system.domain.vo.RouterVo; +import com.muster.system.mapper.SysMenuMapper; +import com.muster.system.mapper.SysRoleMenuMapper; +import com.muster.system.service.ISysMenuService; /** * 菜单 业务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysMenuServiceImpl implements ISysMenuService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysNoticeServiceImpl.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysNoticeServiceImpl.java index 8bebd9c69..40cd22c35 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysNoticeServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.muster.system.domain.SysNotice; +import com.muster.system.mapper.SysNoticeMapper; +import com.muster.system.service.ISysNoticeService; /** * 公告 服务层实现 * - * @author ruoyi + * @author muster */ @Service public class SysNoticeServiceImpl implements ISysNoticeService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysOperLogServiceImpl.java similarity index 84% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysOperLogServiceImpl.java index 785ee1ed7..c5fa01c27 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysOperLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.muster.system.domain.SysOperLog; +import com.muster.system.mapper.SysOperLogMapper; +import com.muster.system.service.ISysOperLogService; /** * 操作日志 服务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysOperLogServiceImpl implements ISysOperLogService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysPostServiceImpl.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysPostServiceImpl.java index 127ed3fbd..1b709e807 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysPostServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.system.service.impl; +package com.muster.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.exception.CustomException; -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.muster.common.constant.UserConstants; +import com.muster.common.exception.CustomException; +import com.muster.common.utils.StringUtils; +import com.muster.system.domain.SysPost; +import com.muster.system.mapper.SysPostMapper; +import com.muster.system.mapper.SysUserPostMapper; +import com.muster.system.service.ISysPostService; /** * 岗位信息 服务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysPostServiceImpl implements ISysPostService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysRoleServiceImpl.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysRoleServiceImpl.java index 8bfc5a410..4aebdfd70 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,24 +8,24 @@ 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.domain.entity.SysRole; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -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.muster.common.annotation.DataScope; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.domain.entity.SysRole; +import com.muster.common.exception.CustomException; +import com.muster.common.utils.StringUtils; +import com.muster.common.utils.spring.SpringUtils; +import com.muster.system.domain.SysRoleDept; +import com.muster.system.domain.SysRoleMenu; +import com.muster.system.mapper.SysRoleDeptMapper; +import com.muster.system.mapper.SysRoleMapper; +import com.muster.system.mapper.SysRoleMenuMapper; +import com.muster.system.mapper.SysUserRoleMapper; +import com.muster.system.service.ISysRoleService; /** * 角色 业务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysRoleServiceImpl implements ISysRoleService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysUserOnlineServiceImpl.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysUserOnlineServiceImpl.java index 2747f6a8b..262d06bc6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.muster.common.core.domain.model.LoginUser; +import com.muster.common.utils.StringUtils; +import com.muster.system.domain.SysUserOnline; +import com.muster.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysUserOnlineServiceImpl implements ISysUserOnlineService diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/muster-system/src/main/java/com/muster/system/service/impl/SysUserServiceImpl.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to muster-system/src/main/java/com/muster/system/service/impl/SysUserServiceImpl.java index 9c77dd8d1..47ff1bc1c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/muster-system/src/main/java/com/muster/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.muster.system.service.impl; import java.util.ArrayList; import java.util.List; @@ -7,28 +7,28 @@ 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.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -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.muster.common.annotation.DataScope; +import com.muster.common.constant.UserConstants; +import com.muster.common.core.domain.entity.SysRole; +import com.muster.common.core.domain.entity.SysUser; +import com.muster.common.exception.CustomException; +import com.muster.common.utils.SecurityUtils; +import com.muster.common.utils.StringUtils; +import com.muster.system.domain.SysPost; +import com.muster.system.domain.SysUserPost; +import com.muster.system.domain.SysUserRole; +import com.muster.system.mapper.SysPostMapper; +import com.muster.system.mapper.SysRoleMapper; +import com.muster.system.mapper.SysUserMapper; +import com.muster.system.mapper.SysUserPostMapper; +import com.muster.system.mapper.SysUserRoleMapper; +import com.muster.system.service.ISysConfigService; +import com.muster.system.service.ISysUserService; /** * 用户 业务层处理 * - * @author ruoyi + * @author muster */ @Service public class SysUserServiceImpl implements ISysUserService diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/muster-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to muster-system/src/main/resources/mapper/system/SysConfigMapper.xml index 2f0c8be86..4fde0ed62 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/muster-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to muster-system/src/main/resources/mapper/system/SysDeptMapper.xml index d78d7da25..e3a5810b9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/muster-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to muster-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 75d80a157..dd12a1e61 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/muster-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 95% rename from ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to muster-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index cf7fc06a3..e078983d9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/muster-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 95% rename from ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to muster-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 6f0a24115..05742e632 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/muster-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 97% rename from ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to muster-system/src/main/resources/mapper/system/SysMenuMapper.xml index 7c97ff5e0..afcb42a5f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/muster-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to muster-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 76caf2d2c..5a029c5c4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/muster-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to muster-system/src/main/resources/mapper/system/SysOperLogMapper.xml index e70b7bff3..9c38d20e6 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/muster-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to muster-system/src/main/resources/mapper/system/SysPostMapper.xml index e845b0a51..a809b3469 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/muster-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 91% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to muster-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 700671e15..ced8ddd4b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/muster-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to muster-system/src/main/resources/mapper/system/SysRoleMapper.xml index 8958c6bad..f2d251c5c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/muster-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 90% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to muster-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index 5f6c047a5..cbbd47abe 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/muster-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 97% rename from ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to muster-system/src/main/resources/mapper/system/SysUserMapper.xml index a6aeb6280..2b780aa63 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/muster-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 91% rename from ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to muster-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 21c40981b..57f2d0c8d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/muster-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to muster-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 95e07adb1..cb3385d17 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/muster-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-ui/.editorconfig b/muster-ui/.editorconfig similarity index 100% rename from ruoyi-ui/.editorconfig rename to muster-ui/.editorconfig diff --git a/ruoyi-ui/.env.development b/muster-ui/.env.development similarity index 100% rename from ruoyi-ui/.env.development rename to muster-ui/.env.development diff --git a/ruoyi-ui/.env.production b/muster-ui/.env.production similarity index 100% rename from ruoyi-ui/.env.production rename to muster-ui/.env.production diff --git a/ruoyi-ui/.env.staging b/muster-ui/.env.staging similarity index 100% rename from ruoyi-ui/.env.staging rename to muster-ui/.env.staging diff --git a/ruoyi-ui/.eslintignore b/muster-ui/.eslintignore similarity index 100% rename from ruoyi-ui/.eslintignore rename to muster-ui/.eslintignore diff --git a/ruoyi-ui/.eslintrc.js b/muster-ui/.eslintrc.js similarity index 100% rename from ruoyi-ui/.eslintrc.js rename to muster-ui/.eslintrc.js diff --git a/ruoyi-ui/.gitignore b/muster-ui/.gitignore similarity index 100% rename from ruoyi-ui/.gitignore rename to muster-ui/.gitignore diff --git a/ruoyi-ui/README.md b/muster-ui/README.md similarity index 92% rename from ruoyi-ui/README.md rename to muster-ui/README.md index 5b5b5bda7..1b298b7b8 100644 --- a/ruoyi-ui/README.md +++ b/muster-ui/README.md @@ -1,30 +1,30 @@ -## 开发 - -```bash -# 克隆项目 -git clone https://gitee.com/y_project/RuoYi-Vue - -# 进入项目目录 -cd ruoyi-ui - -# 安装依赖 -npm install - -# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 -npm install --registry=https://registry.npm.taobao.org - -# 启动服务 -npm run dev -``` - -浏览器访问 http://localhost:80 - -## 发布 - -```bash -# 构建测试环境 -npm run build:stage - -# 构建生产环境 -npm run build:prod +## 开发 + +```bash +# 克隆项目 +git clone https://gitee.com/y_project/RuoYi-Vue + +# 进入项目目录 +cd muster-ui + +# 安装依赖 +npm install + +# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 +npm install --registry=https://registry.npm.taobao.org + +# 启动服务 +npm run dev +``` + +浏览器访问 http://localhost:80 + +## 发布 + +```bash +# 构建测试环境 +npm run build:stage + +# 构建生产环境 +npm run build:prod ``` \ No newline at end of file diff --git a/ruoyi-ui/babel.config.js b/muster-ui/babel.config.js similarity index 100% rename from ruoyi-ui/babel.config.js rename to muster-ui/babel.config.js diff --git a/ruoyi-ui/bin/build.bat b/muster-ui/bin/build.bat similarity index 100% rename from ruoyi-ui/bin/build.bat rename to muster-ui/bin/build.bat diff --git a/ruoyi-ui/bin/package.bat b/muster-ui/bin/package.bat similarity index 100% rename from ruoyi-ui/bin/package.bat rename to muster-ui/bin/package.bat diff --git a/ruoyi-ui/bin/run-web.bat b/muster-ui/bin/run-web.bat similarity index 100% rename from ruoyi-ui/bin/run-web.bat rename to muster-ui/bin/run-web.bat diff --git a/ruoyi-ui/build/index.js b/muster-ui/build/index.js similarity index 100% rename from ruoyi-ui/build/index.js rename to muster-ui/build/index.js diff --git a/ruoyi-ui/package.json b/muster-ui/package.json similarity index 95% rename from ruoyi-ui/package.json rename to muster-ui/package.json index 9f0db892b..fcff52e5e 100644 --- a/ruoyi-ui/package.json +++ b/muster-ui/package.json @@ -1,106 +1,106 @@ -{ - "name": "ruoyi", - "version": "3.0.0", - "description": "若依管理系统", - "author": "若依", - "license": "MIT", - "scripts": { - "dev": "vue-cli-service serve --open", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src", - "test:unit": "jest --clearCache && vue-cli-service test:unit", - "test:ci": "npm run lint && npm run test:unit", - "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml", - "new": "plop" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" - ] - }, - "keywords": [ - "vue", - "admin", - "dashboard", - "element-ui", - "boilerplate", - "admin-template", - "management-system" - ], - "repository": { - "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Vue.git" - }, - "dependencies": { - "@riophae/vue-treeselect": "0.4.0", - "axios": "0.18.1", - "clipboard": "2.0.4", - "echarts": "4.2.1", - "element-ui": "2.13.2", - "file-saver": "2.0.1", - "js-beautify": "^1.10.2", - "fuse.js": "3.4.4", - "js-cookie": "2.2.0", - "jsencrypt": "3.0.0-rc.1", - "normalize.css": "7.0.0", - "nprogress": "0.2.0", - "path-to-regexp": "2.4.0", - "screenfull": "4.2.0", - "sortablejs": "1.8.4", - "vue": "2.6.10", - "vue-count-to": "1.0.13", - "vue-quill-editor": "3.0.6", - "vue-cropper": "0.4.9", - "vue-router": "3.0.2", - "vue-splitpane": "1.0.4", - "vuedraggable": "2.20.0", - "vuex": "3.1.0" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "3.5.3", - "@vue/cli-plugin-eslint": "^3.9.1", - "@vue/cli-plugin-unit-jest": "3.5.3", - "@vue/cli-service": "3.5.3", - "@vue/test-utils": "1.0.0-beta.29", - "autoprefixer": "^9.5.1", - "babel-core": "7.0.0-bridge.0", - "babel-eslint": "10.0.1", - "babel-jest": "23.6.0", - "chalk": "2.4.2", - "chokidar": "2.1.5", - "connect": "3.6.6", - "eslint": "5.15.3", - "eslint-plugin-vue": "5.2.2", - "html-webpack-plugin": "3.2.0", - "http-proxy-middleware": "^0.19.1", - "husky": "1.3.1", - "lint-staged": "8.1.5", - "mockjs": "1.0.1-beta3", - "node-sass": "^4.9.0", - "plop": "2.3.0", - "runjs": "^4.3.2", - "sass-loader": "^7.1.0", - "script-ext-html-webpack-plugin": "2.1.3", - "script-loader": "0.7.2", - "serve-static": "^1.13.2", - "svg-sprite-loader": "4.1.3", - "svgo": "1.2.0", - "vue-template-compiler": "2.6.10" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] -} +{ + "name": "muster", + "version": "3.0.0", + "description": "若依管理系统", + "author": "若依", + "license": "MIT", + "scripts": { + "dev": "vue-cli-service serve --open", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src", + "test:unit": "jest --clearCache && vue-cli-service test:unit", + "test:ci": "npm run lint && npm run test:unit", + "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml", + "new": "plop" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "git add" + ] + }, + "keywords": [ + "vue", + "admin", + "dashboard", + "element-ui", + "boilerplate", + "admin-template", + "management-system" + ], + "repository": { + "type": "git", + "url": "https://gitee.com/y_project/RuoYi-Vue.git" + }, + "dependencies": { + "@riophae/vue-treeselect": "0.4.0", + "axios": "0.18.1", + "clipboard": "2.0.4", + "echarts": "4.2.1", + "element-ui": "2.13.2", + "file-saver": "2.0.1", + "js-beautify": "^1.10.2", + "fuse.js": "3.4.4", + "js-cookie": "2.2.0", + "jsencrypt": "3.0.0-rc.1", + "normalize.css": "7.0.0", + "nprogress": "0.2.0", + "path-to-regexp": "2.4.0", + "screenfull": "4.2.0", + "sortablejs": "1.8.4", + "vue": "2.6.10", + "vue-count-to": "1.0.13", + "vue-quill-editor": "3.0.6", + "vue-cropper": "0.4.9", + "vue-router": "3.0.2", + "vue-splitpane": "1.0.4", + "vuedraggable": "2.20.0", + "vuex": "3.1.0" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "3.5.3", + "@vue/cli-plugin-eslint": "^3.9.1", + "@vue/cli-plugin-unit-jest": "3.5.3", + "@vue/cli-service": "3.5.3", + "@vue/test-utils": "1.0.0-beta.29", + "autoprefixer": "^9.5.1", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "10.0.1", + "babel-jest": "23.6.0", + "chalk": "2.4.2", + "chokidar": "2.1.5", + "connect": "3.6.6", + "eslint": "5.15.3", + "eslint-plugin-vue": "5.2.2", + "html-webpack-plugin": "3.2.0", + "http-proxy-middleware": "^0.19.1", + "husky": "1.3.1", + "lint-staged": "8.1.5", + "mockjs": "1.0.1-beta3", + "node-sass": "^4.9.0", + "plop": "2.3.0", + "runjs": "^4.3.2", + "sass-loader": "^7.1.0", + "script-ext-html-webpack-plugin": "2.1.3", + "script-loader": "0.7.2", + "serve-static": "^1.13.2", + "svg-sprite-loader": "4.1.3", + "svgo": "1.2.0", + "vue-template-compiler": "2.6.10" + }, + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ] +} diff --git a/ruoyi-ui/public/favicon.ico b/muster-ui/public/favicon.ico similarity index 100% rename from ruoyi-ui/public/favicon.ico rename to muster-ui/public/favicon.ico diff --git a/ruoyi-ui/public/index.html b/muster-ui/public/index.html similarity index 100% rename from ruoyi-ui/public/index.html rename to muster-ui/public/index.html diff --git a/ruoyi-ui/public/robots.txt b/muster-ui/public/robots.txt similarity index 100% rename from ruoyi-ui/public/robots.txt rename to muster-ui/public/robots.txt diff --git a/ruoyi-ui/src/App.vue b/muster-ui/src/App.vue similarity index 100% rename from ruoyi-ui/src/App.vue rename to muster-ui/src/App.vue diff --git a/ruoyi-ui/src/api/login.js b/muster-ui/src/api/login.js similarity index 100% rename from ruoyi-ui/src/api/login.js rename to muster-ui/src/api/login.js diff --git a/ruoyi-ui/src/api/menu.js b/muster-ui/src/api/menu.js similarity index 100% rename from ruoyi-ui/src/api/menu.js rename to muster-ui/src/api/menu.js diff --git a/ruoyi-ui/src/api/monitor/job.js b/muster-ui/src/api/monitor/job.js similarity index 100% rename from ruoyi-ui/src/api/monitor/job.js rename to muster-ui/src/api/monitor/job.js diff --git a/ruoyi-ui/src/api/monitor/jobLog.js b/muster-ui/src/api/monitor/jobLog.js similarity index 100% rename from ruoyi-ui/src/api/monitor/jobLog.js rename to muster-ui/src/api/monitor/jobLog.js diff --git a/ruoyi-ui/src/api/monitor/logininfor.js b/muster-ui/src/api/monitor/logininfor.js similarity index 100% rename from ruoyi-ui/src/api/monitor/logininfor.js rename to muster-ui/src/api/monitor/logininfor.js diff --git a/ruoyi-ui/src/api/monitor/online.js b/muster-ui/src/api/monitor/online.js similarity index 100% rename from ruoyi-ui/src/api/monitor/online.js rename to muster-ui/src/api/monitor/online.js diff --git a/ruoyi-ui/src/api/monitor/operlog.js b/muster-ui/src/api/monitor/operlog.js similarity index 100% rename from ruoyi-ui/src/api/monitor/operlog.js rename to muster-ui/src/api/monitor/operlog.js diff --git a/ruoyi-ui/src/api/monitor/server.js b/muster-ui/src/api/monitor/server.js similarity index 100% rename from ruoyi-ui/src/api/monitor/server.js rename to muster-ui/src/api/monitor/server.js diff --git a/ruoyi-ui/src/api/system/config.js b/muster-ui/src/api/system/config.js similarity index 100% rename from ruoyi-ui/src/api/system/config.js rename to muster-ui/src/api/system/config.js diff --git a/ruoyi-ui/src/api/system/dept.js b/muster-ui/src/api/system/dept.js similarity index 100% rename from ruoyi-ui/src/api/system/dept.js rename to muster-ui/src/api/system/dept.js diff --git a/ruoyi-ui/src/api/system/dict/data.js b/muster-ui/src/api/system/dict/data.js similarity index 100% rename from ruoyi-ui/src/api/system/dict/data.js rename to muster-ui/src/api/system/dict/data.js diff --git a/ruoyi-ui/src/api/system/dict/type.js b/muster-ui/src/api/system/dict/type.js similarity index 100% rename from ruoyi-ui/src/api/system/dict/type.js rename to muster-ui/src/api/system/dict/type.js diff --git a/ruoyi-ui/src/api/system/menu.js b/muster-ui/src/api/system/menu.js similarity index 100% rename from ruoyi-ui/src/api/system/menu.js rename to muster-ui/src/api/system/menu.js diff --git a/ruoyi-ui/src/api/system/notice.js b/muster-ui/src/api/system/notice.js similarity index 100% rename from ruoyi-ui/src/api/system/notice.js rename to muster-ui/src/api/system/notice.js diff --git a/ruoyi-ui/src/api/system/post.js b/muster-ui/src/api/system/post.js similarity index 100% rename from ruoyi-ui/src/api/system/post.js rename to muster-ui/src/api/system/post.js diff --git a/ruoyi-ui/src/api/system/role.js b/muster-ui/src/api/system/role.js similarity index 100% rename from ruoyi-ui/src/api/system/role.js rename to muster-ui/src/api/system/role.js diff --git a/ruoyi-ui/src/api/system/user.js b/muster-ui/src/api/system/user.js similarity index 92% rename from ruoyi-ui/src/api/system/user.js rename to muster-ui/src/api/system/user.js index 7f8db39ee..9d7b0f9d2 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/muster-ui/src/api/system/user.js @@ -1,127 +1,127 @@ -import request from '@/utils/request' -import { praseStrEmpty } from "@/utils/ruoyi"; - -// 查询用户列表 -export function listUser(query) { - return request({ - url: '/system/user/list', - method: 'get', - params: query - }) -} - -// 查询用户详细 -export function getUser(userId) { - return request({ - url: '/system/user/' + praseStrEmpty(userId), - method: 'get' - }) -} - -// 新增用户 -export function addUser(data) { - return request({ - url: '/system/user', - method: 'post', - data: data - }) -} - -// 修改用户 -export function updateUser(data) { - return request({ - url: '/system/user', - method: 'put', - data: data - }) -} - -// 删除用户 -export function delUser(userId) { - return request({ - url: '/system/user/' + userId, - method: 'delete' - }) -} - -// 导出用户 -export function exportUser(query) { - return request({ - url: '/system/user/export', - method: 'get', - params: query - }) -} - -// 用户密码重置 -export function resetUserPwd(userId, password) { - const data = { - userId, - password - } - return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) -} - -// 用户状态修改 -export function changeUserStatus(userId, status) { - const data = { - userId, - status - } - return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data - }) -} - -// 查询用户个人信息 -export function getUserProfile() { - return request({ - url: '/system/user/profile', - method: 'get' - }) -} - -// 修改用户个人信息 -export function updateUserProfile(data) { - return request({ - url: '/system/user/profile', - method: 'put', - data: data - }) -} - -// 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } - return request({ - url: '/system/user/profile/updatePwd', - method: 'put', - params: data - }) -} - -// 用户头像上传 -export function uploadAvatar(data) { - return request({ - url: '/system/user/profile/avatar', - method: 'post', - data: data - }) -} - -// 下载用户导入模板 -export function importTemplate() { - return request({ - url: '/system/user/importTemplate', - method: 'get' - }) -} +import request from '@/utils/request' +import { praseStrEmpty } from "@/utils/muster"; + +// 查询用户列表 +export function listUser(query) { + return request({ + url: '/system/user/list', + method: 'get', + params: query + }) +} + +// 查询用户详细 +export function getUser(userId) { + return request({ + url: '/system/user/' + praseStrEmpty(userId), + method: 'get' + }) +} + +// 新增用户 +export function addUser(data) { + return request({ + url: '/system/user', + method: 'post', + data: data + }) +} + +// 修改用户 +export function updateUser(data) { + return request({ + url: '/system/user', + method: 'put', + data: data + }) +} + +// 删除用户 +export function delUser(userId) { + return request({ + url: '/system/user/' + userId, + method: 'delete' + }) +} + +// 导出用户 +export function exportUser(query) { + return request({ + url: '/system/user/export', + method: 'get', + params: query + }) +} + +// 用户密码重置 +export function resetUserPwd(userId, password) { + const data = { + userId, + password + } + return request({ + url: '/system/user/resetPwd', + method: 'put', + data: data + }) +} + +// 用户状态修改 +export function changeUserStatus(userId, status) { + const data = { + userId, + status + } + return request({ + url: '/system/user/changeStatus', + method: 'put', + data: data + }) +} + +// 查询用户个人信息 +export function getUserProfile() { + return request({ + url: '/system/user/profile', + method: 'get' + }) +} + +// 修改用户个人信息 +export function updateUserProfile(data) { + return request({ + url: '/system/user/profile', + method: 'put', + data: data + }) +} + +// 用户密码重置 +export function updateUserPwd(oldPassword, newPassword) { + const data = { + oldPassword, + newPassword + } + return request({ + url: '/system/user/profile/updatePwd', + method: 'put', + params: data + }) +} + +// 用户头像上传 +export function uploadAvatar(data) { + return request({ + url: '/system/user/profile/avatar', + method: 'post', + data: data + }) +} + +// 下载用户导入模板 +export function importTemplate() { + return request({ + url: '/system/user/importTemplate', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/tool/gen.js b/muster-ui/src/api/tool/gen.js similarity index 100% rename from ruoyi-ui/src/api/tool/gen.js rename to muster-ui/src/api/tool/gen.js diff --git a/ruoyi-ui/src/assets/401_images/401.gif b/muster-ui/src/assets/401_images/401.gif similarity index 100% rename from ruoyi-ui/src/assets/401_images/401.gif rename to muster-ui/src/assets/401_images/401.gif diff --git a/ruoyi-ui/src/assets/404_images/404.png b/muster-ui/src/assets/404_images/404.png similarity index 100% rename from ruoyi-ui/src/assets/404_images/404.png rename to muster-ui/src/assets/404_images/404.png diff --git a/ruoyi-ui/src/assets/404_images/404_cloud.png b/muster-ui/src/assets/404_images/404_cloud.png similarity index 100% rename from ruoyi-ui/src/assets/404_images/404_cloud.png rename to muster-ui/src/assets/404_images/404_cloud.png diff --git a/ruoyi-ui/src/assets/icons/index.js b/muster-ui/src/assets/icons/index.js similarity index 100% rename from ruoyi-ui/src/assets/icons/index.js rename to muster-ui/src/assets/icons/index.js diff --git a/ruoyi-ui/src/assets/icons/svg/404.svg b/muster-ui/src/assets/icons/svg/404.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/404.svg rename to muster-ui/src/assets/icons/svg/404.svg diff --git a/ruoyi-ui/src/assets/icons/svg/bug.svg b/muster-ui/src/assets/icons/svg/bug.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/bug.svg rename to muster-ui/src/assets/icons/svg/bug.svg diff --git a/ruoyi-ui/src/assets/icons/svg/build.svg b/muster-ui/src/assets/icons/svg/build.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/build.svg rename to muster-ui/src/assets/icons/svg/build.svg diff --git a/ruoyi-ui/src/assets/icons/svg/cascader.svg b/muster-ui/src/assets/icons/svg/cascader.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/cascader.svg rename to muster-ui/src/assets/icons/svg/cascader.svg diff --git a/ruoyi-ui/src/assets/icons/svg/chart.svg b/muster-ui/src/assets/icons/svg/chart.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/chart.svg rename to muster-ui/src/assets/icons/svg/chart.svg diff --git a/ruoyi-ui/src/assets/icons/svg/checkbox.svg b/muster-ui/src/assets/icons/svg/checkbox.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/checkbox.svg rename to muster-ui/src/assets/icons/svg/checkbox.svg diff --git a/ruoyi-ui/src/assets/icons/svg/clipboard.svg b/muster-ui/src/assets/icons/svg/clipboard.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/clipboard.svg rename to muster-ui/src/assets/icons/svg/clipboard.svg diff --git a/ruoyi-ui/src/assets/icons/svg/code.svg b/muster-ui/src/assets/icons/svg/code.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/code.svg rename to muster-ui/src/assets/icons/svg/code.svg diff --git a/ruoyi-ui/src/assets/icons/svg/color.svg b/muster-ui/src/assets/icons/svg/color.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/color.svg rename to muster-ui/src/assets/icons/svg/color.svg diff --git a/ruoyi-ui/src/assets/icons/svg/component.svg b/muster-ui/src/assets/icons/svg/component.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/component.svg rename to muster-ui/src/assets/icons/svg/component.svg diff --git a/ruoyi-ui/src/assets/icons/svg/dashboard.svg b/muster-ui/src/assets/icons/svg/dashboard.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/dashboard.svg rename to muster-ui/src/assets/icons/svg/dashboard.svg diff --git a/ruoyi-ui/src/assets/icons/svg/date-range.svg b/muster-ui/src/assets/icons/svg/date-range.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/date-range.svg rename to muster-ui/src/assets/icons/svg/date-range.svg diff --git a/ruoyi-ui/src/assets/icons/svg/date.svg b/muster-ui/src/assets/icons/svg/date.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/date.svg rename to muster-ui/src/assets/icons/svg/date.svg diff --git a/ruoyi-ui/src/assets/icons/svg/dict.svg b/muster-ui/src/assets/icons/svg/dict.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/dict.svg rename to muster-ui/src/assets/icons/svg/dict.svg diff --git a/ruoyi-ui/src/assets/icons/svg/documentation.svg b/muster-ui/src/assets/icons/svg/documentation.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/documentation.svg rename to muster-ui/src/assets/icons/svg/documentation.svg diff --git a/ruoyi-ui/src/assets/icons/svg/download.svg b/muster-ui/src/assets/icons/svg/download.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/download.svg rename to muster-ui/src/assets/icons/svg/download.svg diff --git a/ruoyi-ui/src/assets/icons/svg/drag.svg b/muster-ui/src/assets/icons/svg/drag.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/drag.svg rename to muster-ui/src/assets/icons/svg/drag.svg diff --git a/ruoyi-ui/src/assets/icons/svg/druid.svg b/muster-ui/src/assets/icons/svg/druid.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/druid.svg rename to muster-ui/src/assets/icons/svg/druid.svg diff --git a/ruoyi-ui/src/assets/icons/svg/edit.svg b/muster-ui/src/assets/icons/svg/edit.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/edit.svg rename to muster-ui/src/assets/icons/svg/edit.svg diff --git a/ruoyi-ui/src/assets/icons/svg/education.svg b/muster-ui/src/assets/icons/svg/education.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/education.svg rename to muster-ui/src/assets/icons/svg/education.svg diff --git a/ruoyi-ui/src/assets/icons/svg/email.svg b/muster-ui/src/assets/icons/svg/email.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/email.svg rename to muster-ui/src/assets/icons/svg/email.svg diff --git a/ruoyi-ui/src/assets/icons/svg/example.svg b/muster-ui/src/assets/icons/svg/example.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/example.svg rename to muster-ui/src/assets/icons/svg/example.svg diff --git a/ruoyi-ui/src/assets/icons/svg/excel.svg b/muster-ui/src/assets/icons/svg/excel.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/excel.svg rename to muster-ui/src/assets/icons/svg/excel.svg diff --git a/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg b/muster-ui/src/assets/icons/svg/exit-fullscreen.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg rename to muster-ui/src/assets/icons/svg/exit-fullscreen.svg diff --git a/ruoyi-ui/src/assets/icons/svg/eye-open.svg b/muster-ui/src/assets/icons/svg/eye-open.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/eye-open.svg rename to muster-ui/src/assets/icons/svg/eye-open.svg diff --git a/ruoyi-ui/src/assets/icons/svg/eye.svg b/muster-ui/src/assets/icons/svg/eye.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/eye.svg rename to muster-ui/src/assets/icons/svg/eye.svg diff --git a/ruoyi-ui/src/assets/icons/svg/form.svg b/muster-ui/src/assets/icons/svg/form.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/form.svg rename to muster-ui/src/assets/icons/svg/form.svg diff --git a/ruoyi-ui/src/assets/icons/svg/fullscreen.svg b/muster-ui/src/assets/icons/svg/fullscreen.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/fullscreen.svg rename to muster-ui/src/assets/icons/svg/fullscreen.svg diff --git a/ruoyi-ui/src/assets/icons/svg/github.svg b/muster-ui/src/assets/icons/svg/github.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/github.svg rename to muster-ui/src/assets/icons/svg/github.svg diff --git a/ruoyi-ui/src/assets/icons/svg/guide.svg b/muster-ui/src/assets/icons/svg/guide.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/guide.svg rename to muster-ui/src/assets/icons/svg/guide.svg diff --git a/ruoyi-ui/src/assets/icons/svg/icon.svg b/muster-ui/src/assets/icons/svg/icon.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/icon.svg rename to muster-ui/src/assets/icons/svg/icon.svg diff --git a/ruoyi-ui/src/assets/icons/svg/input.svg b/muster-ui/src/assets/icons/svg/input.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/input.svg rename to muster-ui/src/assets/icons/svg/input.svg diff --git a/ruoyi-ui/src/assets/icons/svg/international.svg b/muster-ui/src/assets/icons/svg/international.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/international.svg rename to muster-ui/src/assets/icons/svg/international.svg diff --git a/ruoyi-ui/src/assets/icons/svg/job.svg b/muster-ui/src/assets/icons/svg/job.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/job.svg rename to muster-ui/src/assets/icons/svg/job.svg diff --git a/ruoyi-ui/src/assets/icons/svg/language.svg b/muster-ui/src/assets/icons/svg/language.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/language.svg rename to muster-ui/src/assets/icons/svg/language.svg diff --git a/ruoyi-ui/src/assets/icons/svg/link.svg b/muster-ui/src/assets/icons/svg/link.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/link.svg rename to muster-ui/src/assets/icons/svg/link.svg diff --git a/ruoyi-ui/src/assets/icons/svg/list.svg b/muster-ui/src/assets/icons/svg/list.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/list.svg rename to muster-ui/src/assets/icons/svg/list.svg diff --git a/ruoyi-ui/src/assets/icons/svg/lock.svg b/muster-ui/src/assets/icons/svg/lock.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/lock.svg rename to muster-ui/src/assets/icons/svg/lock.svg diff --git a/ruoyi-ui/src/assets/icons/svg/log.svg b/muster-ui/src/assets/icons/svg/log.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/log.svg rename to muster-ui/src/assets/icons/svg/log.svg diff --git a/ruoyi-ui/src/assets/icons/svg/logininfor.svg b/muster-ui/src/assets/icons/svg/logininfor.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/logininfor.svg rename to muster-ui/src/assets/icons/svg/logininfor.svg diff --git a/ruoyi-ui/src/assets/icons/svg/message.svg b/muster-ui/src/assets/icons/svg/message.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/message.svg rename to muster-ui/src/assets/icons/svg/message.svg diff --git a/ruoyi-ui/src/assets/icons/svg/money.svg b/muster-ui/src/assets/icons/svg/money.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/money.svg rename to muster-ui/src/assets/icons/svg/money.svg diff --git a/ruoyi-ui/src/assets/icons/svg/monitor.svg b/muster-ui/src/assets/icons/svg/monitor.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/monitor.svg rename to muster-ui/src/assets/icons/svg/monitor.svg diff --git a/ruoyi-ui/src/assets/icons/svg/nested.svg b/muster-ui/src/assets/icons/svg/nested.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/nested.svg rename to muster-ui/src/assets/icons/svg/nested.svg diff --git a/ruoyi-ui/src/assets/icons/svg/number.svg b/muster-ui/src/assets/icons/svg/number.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/number.svg rename to muster-ui/src/assets/icons/svg/number.svg diff --git a/ruoyi-ui/src/assets/icons/svg/online.svg b/muster-ui/src/assets/icons/svg/online.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/online.svg rename to muster-ui/src/assets/icons/svg/online.svg diff --git a/ruoyi-ui/src/assets/icons/svg/password.svg b/muster-ui/src/assets/icons/svg/password.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/password.svg rename to muster-ui/src/assets/icons/svg/password.svg diff --git a/ruoyi-ui/src/assets/icons/svg/pdf.svg b/muster-ui/src/assets/icons/svg/pdf.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/pdf.svg rename to muster-ui/src/assets/icons/svg/pdf.svg diff --git a/ruoyi-ui/src/assets/icons/svg/people.svg b/muster-ui/src/assets/icons/svg/people.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/people.svg rename to muster-ui/src/assets/icons/svg/people.svg diff --git a/ruoyi-ui/src/assets/icons/svg/peoples.svg b/muster-ui/src/assets/icons/svg/peoples.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/peoples.svg rename to muster-ui/src/assets/icons/svg/peoples.svg diff --git a/ruoyi-ui/src/assets/icons/svg/phone.svg b/muster-ui/src/assets/icons/svg/phone.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/phone.svg rename to muster-ui/src/assets/icons/svg/phone.svg diff --git a/ruoyi-ui/src/assets/icons/svg/post.svg b/muster-ui/src/assets/icons/svg/post.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/post.svg rename to muster-ui/src/assets/icons/svg/post.svg diff --git a/ruoyi-ui/src/assets/icons/svg/qq.svg b/muster-ui/src/assets/icons/svg/qq.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/qq.svg rename to muster-ui/src/assets/icons/svg/qq.svg diff --git a/ruoyi-ui/src/assets/icons/svg/question.svg b/muster-ui/src/assets/icons/svg/question.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/question.svg rename to muster-ui/src/assets/icons/svg/question.svg diff --git a/ruoyi-ui/src/assets/icons/svg/radio.svg b/muster-ui/src/assets/icons/svg/radio.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/radio.svg rename to muster-ui/src/assets/icons/svg/radio.svg diff --git a/ruoyi-ui/src/assets/icons/svg/rate.svg b/muster-ui/src/assets/icons/svg/rate.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/rate.svg rename to muster-ui/src/assets/icons/svg/rate.svg diff --git a/ruoyi-ui/src/assets/icons/svg/row.svg b/muster-ui/src/assets/icons/svg/row.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/row.svg rename to muster-ui/src/assets/icons/svg/row.svg diff --git a/ruoyi-ui/src/assets/icons/svg/search.svg b/muster-ui/src/assets/icons/svg/search.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/search.svg rename to muster-ui/src/assets/icons/svg/search.svg diff --git a/ruoyi-ui/src/assets/icons/svg/select.svg b/muster-ui/src/assets/icons/svg/select.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/select.svg rename to muster-ui/src/assets/icons/svg/select.svg diff --git a/ruoyi-ui/src/assets/icons/svg/server.svg b/muster-ui/src/assets/icons/svg/server.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/server.svg rename to muster-ui/src/assets/icons/svg/server.svg diff --git a/ruoyi-ui/src/assets/icons/svg/shopping.svg b/muster-ui/src/assets/icons/svg/shopping.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/shopping.svg rename to muster-ui/src/assets/icons/svg/shopping.svg diff --git a/ruoyi-ui/src/assets/icons/svg/size.svg b/muster-ui/src/assets/icons/svg/size.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/size.svg rename to muster-ui/src/assets/icons/svg/size.svg diff --git a/ruoyi-ui/src/assets/icons/svg/skill.svg b/muster-ui/src/assets/icons/svg/skill.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/skill.svg rename to muster-ui/src/assets/icons/svg/skill.svg diff --git a/ruoyi-ui/src/assets/icons/svg/slider.svg b/muster-ui/src/assets/icons/svg/slider.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/slider.svg rename to muster-ui/src/assets/icons/svg/slider.svg diff --git a/ruoyi-ui/src/assets/icons/svg/star.svg b/muster-ui/src/assets/icons/svg/star.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/star.svg rename to muster-ui/src/assets/icons/svg/star.svg diff --git a/ruoyi-ui/src/assets/icons/svg/swagger.svg b/muster-ui/src/assets/icons/svg/swagger.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/swagger.svg rename to muster-ui/src/assets/icons/svg/swagger.svg diff --git a/ruoyi-ui/src/assets/icons/svg/switch.svg b/muster-ui/src/assets/icons/svg/switch.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/switch.svg rename to muster-ui/src/assets/icons/svg/switch.svg diff --git a/ruoyi-ui/src/assets/icons/svg/system.svg b/muster-ui/src/assets/icons/svg/system.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/system.svg rename to muster-ui/src/assets/icons/svg/system.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tab.svg b/muster-ui/src/assets/icons/svg/tab.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tab.svg rename to muster-ui/src/assets/icons/svg/tab.svg diff --git a/ruoyi-ui/src/assets/icons/svg/table.svg b/muster-ui/src/assets/icons/svg/table.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/table.svg rename to muster-ui/src/assets/icons/svg/table.svg diff --git a/ruoyi-ui/src/assets/icons/svg/textarea.svg b/muster-ui/src/assets/icons/svg/textarea.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/textarea.svg rename to muster-ui/src/assets/icons/svg/textarea.svg diff --git a/ruoyi-ui/src/assets/icons/svg/theme.svg b/muster-ui/src/assets/icons/svg/theme.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/theme.svg rename to muster-ui/src/assets/icons/svg/theme.svg diff --git a/ruoyi-ui/src/assets/icons/svg/time-range.svg b/muster-ui/src/assets/icons/svg/time-range.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/time-range.svg rename to muster-ui/src/assets/icons/svg/time-range.svg diff --git a/ruoyi-ui/src/assets/icons/svg/time.svg b/muster-ui/src/assets/icons/svg/time.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/time.svg rename to muster-ui/src/assets/icons/svg/time.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tool.svg b/muster-ui/src/assets/icons/svg/tool.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tool.svg rename to muster-ui/src/assets/icons/svg/tool.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tree-table.svg b/muster-ui/src/assets/icons/svg/tree-table.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tree-table.svg rename to muster-ui/src/assets/icons/svg/tree-table.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tree.svg b/muster-ui/src/assets/icons/svg/tree.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tree.svg rename to muster-ui/src/assets/icons/svg/tree.svg diff --git a/ruoyi-ui/src/assets/icons/svg/upload.svg b/muster-ui/src/assets/icons/svg/upload.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/upload.svg rename to muster-ui/src/assets/icons/svg/upload.svg diff --git a/ruoyi-ui/src/assets/icons/svg/user.svg b/muster-ui/src/assets/icons/svg/user.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/user.svg rename to muster-ui/src/assets/icons/svg/user.svg diff --git a/ruoyi-ui/src/assets/icons/svg/validCode.svg b/muster-ui/src/assets/icons/svg/validCode.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/validCode.svg rename to muster-ui/src/assets/icons/svg/validCode.svg diff --git a/ruoyi-ui/src/assets/icons/svg/wechat.svg b/muster-ui/src/assets/icons/svg/wechat.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/wechat.svg rename to muster-ui/src/assets/icons/svg/wechat.svg diff --git a/ruoyi-ui/src/assets/icons/svg/zip.svg b/muster-ui/src/assets/icons/svg/zip.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/zip.svg rename to muster-ui/src/assets/icons/svg/zip.svg diff --git a/ruoyi-ui/src/assets/icons/svgo.yml b/muster-ui/src/assets/icons/svgo.yml similarity index 100% rename from ruoyi-ui/src/assets/icons/svgo.yml rename to muster-ui/src/assets/icons/svgo.yml diff --git a/ruoyi-ui/src/assets/image/login-background.jpg b/muster-ui/src/assets/image/login-background.jpg similarity index 100% rename from ruoyi-ui/src/assets/image/login-background.jpg rename to muster-ui/src/assets/image/login-background.jpg diff --git a/ruoyi-ui/src/assets/image/profile.jpg b/muster-ui/src/assets/image/profile.jpg similarity index 100% rename from ruoyi-ui/src/assets/image/profile.jpg rename to muster-ui/src/assets/image/profile.jpg diff --git a/ruoyi-ui/src/assets/logo/logo.png b/muster-ui/src/assets/logo/logo.png similarity index 100% rename from ruoyi-ui/src/assets/logo/logo.png rename to muster-ui/src/assets/logo/logo.png diff --git a/ruoyi-ui/src/assets/styles/btn.scss b/muster-ui/src/assets/styles/btn.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/btn.scss rename to muster-ui/src/assets/styles/btn.scss diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/muster-ui/src/assets/styles/element-ui.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/element-ui.scss rename to muster-ui/src/assets/styles/element-ui.scss diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/muster-ui/src/assets/styles/element-variables.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/element-variables.scss rename to muster-ui/src/assets/styles/element-variables.scss diff --git a/ruoyi-ui/src/assets/styles/index.scss b/muster-ui/src/assets/styles/index.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/index.scss rename to muster-ui/src/assets/styles/index.scss diff --git a/ruoyi-ui/src/assets/styles/mixin.scss b/muster-ui/src/assets/styles/mixin.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/mixin.scss rename to muster-ui/src/assets/styles/mixin.scss diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/muster-ui/src/assets/styles/ruoyi.scss similarity index 91% rename from ruoyi-ui/src/assets/styles/ruoyi.scss rename to muster-ui/src/assets/styles/ruoyi.scss index 18dff3afe..06c724608 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/muster-ui/src/assets/styles/ruoyi.scss @@ -1,201 +1,201 @@ - /** - * 通用css样式布局处理 - * Copyright (c) 2019 ruoyi - */ - - /** 基础通用 **/ -.pt5 { - padding-top: 5px; -} -.pr5 { - padding-right: 5px; -} -.pb5 { - padding-bottom: 5px; -} -.mt5 { - margin-top: 5px; -} -.mr5 { - margin-right: 5px; -} -.mb5 { - margin-bottom: 5px; -} -.mb8 { - margin-bottom: 8px; -} -.ml5 { - margin-left: 5px; -} -.mt10 { - margin-top: 10px; -} -.mr10 { - margin-right: 10px; -} -.mb10 { - margin-bottom: 10px; -} -.ml0 { - margin-left: 10px; -} -.mt20 { - margin-top: 20px; -} -.mr20 { - margin-right: 20px; -} -.mb20 { - margin-bottom: 20px; -} -.m20 { - margin-left: 20px; -} - -.el-dialog:not(.is-fullscreen){ - margin-top: 6vh !important; -} - -.el-table { - .el-table__header-wrapper, .el-table__fixed-header-wrapper { - th { - word-break: break-word; - background-color: #f8f8f9; - color: #515a6e; - height: 40px; - font-size: 13px; - } - } -} - -/** 表单布局 **/ -.form-header { - font-size:15px; - color:#6379bb; - border-bottom:1px solid #ddd; - margin:8px 10px 25px 10px; - padding-bottom:5px -} - -/** 表格布局 **/ -.pagination-container { - position: relative; - height: 25px; - margin-bottom: 10px; - margin-top: 15px; - padding: 10px 20px !important; -} - -.pagination-container .el-pagination { - right: 0; - position: absolute; -} - -.el-table .fixed-width .el-button--mini { - color: #409EFF; - padding-left: 0; - padding-right: 0; - width: inherit; -} - -.el-tree-node__content > .el-checkbox { - margin-right: 8px; -} - -.list-group-striped > .list-group-item { - border-left: 0; - border-right: 0; - border-radius: 0; - padding-left: 0; - padding-right: 0; -} - -.list-group { - padding-left: 0px; - list-style: none; -} - -.list-group-item { - border-bottom: 1px solid #e7eaec; - border-top: 1px solid #e7eaec; - margin-bottom: -1px; - padding: 11px 0px; - font-size: 13px; -} - -.pull-right { - float: right !important; -} - -.el-card__header { - padding: 14px 15px 7px; - min-height: 40px; -} - -.el-card__body { - padding: 15px 20px 20px 20px; -} - -.card-box { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 10px; -} - -/* text color */ -.text-navy { - color: #1ab394; -} - -.text-primary { - color: inherit; -} - -.text-success { - color: #1c84c6; -} - -.text-info { - color: #23c6c8; -} - -.text-warning { - color: #f8ac59; -} - -.text-danger { - color: #ed5565; -} - -.text-muted { - color: #888888; -} - -/* image */ -.img-circle { - border-radius: 50%; -} - -.img-lg { - width: 120px; - height: 120px; -} - -.avatar-upload-preview { - position: absolute; - top: 50%; - transform: translate(50%, -50%); - width: 180px; - height: 180px; - border-radius: 50%; - box-shadow: 0 0 4px #ccc; - overflow: hidden; -} - -/* 拖拽列样式 */ -.sortable-ghost{ - opacity: .8; - color: #fff!important; - background: #42b983!important; -} \ No newline at end of file + /** + * 通用css样式布局处理 + * Copyright (c) 2019 muster + */ + + /** 基础通用 **/ +.pt5 { + padding-top: 5px; +} +.pr5 { + padding-right: 5px; +} +.pb5 { + padding-bottom: 5px; +} +.mt5 { + margin-top: 5px; +} +.mr5 { + margin-right: 5px; +} +.mb5 { + margin-bottom: 5px; +} +.mb8 { + margin-bottom: 8px; +} +.ml5 { + margin-left: 5px; +} +.mt10 { + margin-top: 10px; +} +.mr10 { + margin-right: 10px; +} +.mb10 { + margin-bottom: 10px; +} +.ml0 { + margin-left: 10px; +} +.mt20 { + margin-top: 20px; +} +.mr20 { + margin-right: 20px; +} +.mb20 { + margin-bottom: 20px; +} +.m20 { + margin-left: 20px; +} + +.el-dialog:not(.is-fullscreen){ + margin-top: 6vh !important; +} + +.el-table { + .el-table__header-wrapper, .el-table__fixed-header-wrapper { + th { + word-break: break-word; + background-color: #f8f8f9; + color: #515a6e; + height: 40px; + font-size: 13px; + } + } +} + +/** 表单布局 **/ +.form-header { + font-size:15px; + color:#6379bb; + border-bottom:1px solid #ddd; + margin:8px 10px 25px 10px; + padding-bottom:5px +} + +/** 表格布局 **/ +.pagination-container { + position: relative; + height: 25px; + margin-bottom: 10px; + margin-top: 15px; + padding: 10px 20px !important; +} + +.pagination-container .el-pagination { + right: 0; + position: absolute; +} + +.el-table .fixed-width .el-button--mini { + color: #409EFF; + padding-left: 0; + padding-right: 0; + width: inherit; +} + +.el-tree-node__content > .el-checkbox { + margin-right: 8px; +} + +.list-group-striped > .list-group-item { + border-left: 0; + border-right: 0; + border-radius: 0; + padding-left: 0; + padding-right: 0; +} + +.list-group { + padding-left: 0px; + list-style: none; +} + +.list-group-item { + border-bottom: 1px solid #e7eaec; + border-top: 1px solid #e7eaec; + margin-bottom: -1px; + padding: 11px 0px; + font-size: 13px; +} + +.pull-right { + float: right !important; +} + +.el-card__header { + padding: 14px 15px 7px; + min-height: 40px; +} + +.el-card__body { + padding: 15px 20px 20px 20px; +} + +.card-box { + padding-right: 15px; + padding-left: 15px; + margin-bottom: 10px; +} + +/* text color */ +.text-navy { + color: #1ab394; +} + +.text-primary { + color: inherit; +} + +.text-success { + color: #1c84c6; +} + +.text-info { + color: #23c6c8; +} + +.text-warning { + color: #f8ac59; +} + +.text-danger { + color: #ed5565; +} + +.text-muted { + color: #888888; +} + +/* image */ +.img-circle { + border-radius: 50%; +} + +.img-lg { + width: 120px; + height: 120px; +} + +.avatar-upload-preview { + position: absolute; + top: 50%; + transform: translate(50%, -50%); + width: 180px; + height: 180px; + border-radius: 50%; + box-shadow: 0 0 4px #ccc; + overflow: hidden; +} + +/* 拖拽列样式 */ +.sortable-ghost{ + opacity: .8; + color: #fff!important; + background: #42b983!important; +} diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/muster-ui/src/assets/styles/sidebar.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/sidebar.scss rename to muster-ui/src/assets/styles/sidebar.scss diff --git a/ruoyi-ui/src/assets/styles/transition.scss b/muster-ui/src/assets/styles/transition.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/transition.scss rename to muster-ui/src/assets/styles/transition.scss diff --git a/ruoyi-ui/src/assets/styles/variables.scss b/muster-ui/src/assets/styles/variables.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/variables.scss rename to muster-ui/src/assets/styles/variables.scss diff --git a/ruoyi-ui/src/components/Breadcrumb/index.vue b/muster-ui/src/components/Breadcrumb/index.vue similarity index 100% rename from ruoyi-ui/src/components/Breadcrumb/index.vue rename to muster-ui/src/components/Breadcrumb/index.vue diff --git a/ruoyi-ui/src/components/Editor/index.vue b/muster-ui/src/components/Editor/index.vue similarity index 100% rename from ruoyi-ui/src/components/Editor/index.vue rename to muster-ui/src/components/Editor/index.vue diff --git a/ruoyi-ui/src/components/Hamburger/index.vue b/muster-ui/src/components/Hamburger/index.vue similarity index 100% rename from ruoyi-ui/src/components/Hamburger/index.vue rename to muster-ui/src/components/Hamburger/index.vue diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/muster-ui/src/components/HeaderSearch/index.vue similarity index 100% rename from ruoyi-ui/src/components/HeaderSearch/index.vue rename to muster-ui/src/components/HeaderSearch/index.vue diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/muster-ui/src/components/IconSelect/index.vue similarity index 100% rename from ruoyi-ui/src/components/IconSelect/index.vue rename to muster-ui/src/components/IconSelect/index.vue diff --git a/ruoyi-ui/src/components/IconSelect/requireIcons.js b/muster-ui/src/components/IconSelect/requireIcons.js similarity index 100% rename from ruoyi-ui/src/components/IconSelect/requireIcons.js rename to muster-ui/src/components/IconSelect/requireIcons.js diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/muster-ui/src/components/Pagination/index.vue similarity index 100% rename from ruoyi-ui/src/components/Pagination/index.vue rename to muster-ui/src/components/Pagination/index.vue diff --git a/ruoyi-ui/src/components/PanThumb/index.vue b/muster-ui/src/components/PanThumb/index.vue similarity index 100% rename from ruoyi-ui/src/components/PanThumb/index.vue rename to muster-ui/src/components/PanThumb/index.vue diff --git a/ruoyi-ui/src/components/RightPanel/index.vue b/muster-ui/src/components/RightPanel/index.vue similarity index 100% rename from ruoyi-ui/src/components/RightPanel/index.vue rename to muster-ui/src/components/RightPanel/index.vue diff --git a/ruoyi-ui/src/components/RuoYi/Doc/index.vue b/muster-ui/src/components/RuoYi/Doc/index.vue similarity index 76% rename from ruoyi-ui/src/components/RuoYi/Doc/index.vue rename to muster-ui/src/components/RuoYi/Doc/index.vue index 3915c2965..c026d262c 100644 --- a/ruoyi-ui/src/components/RuoYi/Doc/index.vue +++ b/muster-ui/src/components/RuoYi/Doc/index.vue @@ -1,21 +1,21 @@ - - - \ No newline at end of file + + + diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/muster-ui/src/components/RuoYi/Git/index.vue similarity index 100% rename from ruoyi-ui/src/components/RuoYi/Git/index.vue rename to muster-ui/src/components/RuoYi/Git/index.vue diff --git a/ruoyi-ui/src/components/Screenfull/index.vue b/muster-ui/src/components/Screenfull/index.vue similarity index 100% rename from ruoyi-ui/src/components/Screenfull/index.vue rename to muster-ui/src/components/Screenfull/index.vue diff --git a/ruoyi-ui/src/components/SizeSelect/index.vue b/muster-ui/src/components/SizeSelect/index.vue similarity index 100% rename from ruoyi-ui/src/components/SizeSelect/index.vue rename to muster-ui/src/components/SizeSelect/index.vue diff --git a/ruoyi-ui/src/components/SvgIcon/index.vue b/muster-ui/src/components/SvgIcon/index.vue similarity index 100% rename from ruoyi-ui/src/components/SvgIcon/index.vue rename to muster-ui/src/components/SvgIcon/index.vue diff --git a/ruoyi-ui/src/components/ThemePicker/index.vue b/muster-ui/src/components/ThemePicker/index.vue similarity index 100% rename from ruoyi-ui/src/components/ThemePicker/index.vue rename to muster-ui/src/components/ThemePicker/index.vue diff --git a/ruoyi-ui/src/directive/permission/hasPermi.js b/muster-ui/src/directive/permission/hasPermi.js similarity index 92% rename from ruoyi-ui/src/directive/permission/hasPermi.js rename to muster-ui/src/directive/permission/hasPermi.js index 74f9d325d..4bdbc3fef 100644 --- a/ruoyi-ui/src/directive/permission/hasPermi.js +++ b/muster-ui/src/directive/permission/hasPermi.js @@ -1,28 +1,28 @@ - /** - * 操作权限处理 - * Copyright (c) 2019 ruoyi - */ - -import store from '@/store' - -export default { - inserted(el, binding, vnode) { - const { value } = binding - const all_permission = "*:*:*"; - const permissions = store.getters && store.getters.permissions - - if (value && value instanceof Array && value.length > 0) { - const permissionFlag = value - - const hasPermissions = permissions.some(permission => { - return all_permission === permission || permissionFlag.includes(permission) - }) - - if (!hasPermissions) { - el.parentNode && el.parentNode.removeChild(el) - } - } else { - throw new Error(`请设置操作权限标签值`) - } - } -} + /** + * 操作权限处理 + * Copyright (c) 2019 muster + */ + +import store from '@/store' + +export default { + inserted(el, binding, vnode) { + const { value } = binding + const all_permission = "*:*:*"; + const permissions = store.getters && store.getters.permissions + + if (value && value instanceof Array && value.length > 0) { + const permissionFlag = value + + const hasPermissions = permissions.some(permission => { + return all_permission === permission || permissionFlag.includes(permission) + }) + + if (!hasPermissions) { + el.parentNode && el.parentNode.removeChild(el) + } + } else { + throw new Error(`请设置操作权限标签值`) + } + } +} diff --git a/ruoyi-ui/src/directive/permission/hasRole.js b/muster-ui/src/directive/permission/hasRole.js similarity index 91% rename from ruoyi-ui/src/directive/permission/hasRole.js rename to muster-ui/src/directive/permission/hasRole.js index ea966a34a..18dd6ad5b 100644 --- a/ruoyi-ui/src/directive/permission/hasRole.js +++ b/muster-ui/src/directive/permission/hasRole.js @@ -1,28 +1,28 @@ - /** - * 角色权限处理 - * Copyright (c) 2019 ruoyi - */ - -import store from '@/store' - -export default { - inserted(el, binding, vnode) { - const { value } = binding - const super_admin = "admin"; - const roles = store.getters && store.getters.roles - - if (value && value instanceof Array && value.length > 0) { - const roleFlag = value - - const hasRole = roles.some(role => { - return super_admin === role || roleFlag.includes(role) - }) - - if (!hasRole) { - el.parentNode && el.parentNode.removeChild(el) - } - } else { - throw new Error(`请设置角色权限标签值"`) - } - } -} + /** + * 角色权限处理 + * Copyright (c) 2019 muster + */ + +import store from '@/store' + +export default { + inserted(el, binding, vnode) { + const { value } = binding + const super_admin = "admin"; + const roles = store.getters && store.getters.roles + + if (value && value instanceof Array && value.length > 0) { + const roleFlag = value + + const hasRole = roles.some(role => { + return super_admin === role || roleFlag.includes(role) + }) + + if (!hasRole) { + el.parentNode && el.parentNode.removeChild(el) + } + } else { + throw new Error(`请设置角色权限标签值"`) + } + } +} diff --git a/ruoyi-ui/src/directive/permission/index.js b/muster-ui/src/directive/permission/index.js similarity index 100% rename from ruoyi-ui/src/directive/permission/index.js rename to muster-ui/src/directive/permission/index.js diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/muster-ui/src/layout/components/AppMain.vue similarity index 100% rename from ruoyi-ui/src/layout/components/AppMain.vue rename to muster-ui/src/layout/components/AppMain.vue diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/muster-ui/src/layout/components/Navbar.vue similarity index 92% rename from ruoyi-ui/src/layout/components/Navbar.vue rename to muster-ui/src/layout/components/Navbar.vue index db46ec556..c8d81233e 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/muster-ui/src/layout/components/Navbar.vue @@ -1,187 +1,187 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/muster-ui/src/layout/components/Settings/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Settings/index.vue rename to muster-ui/src/layout/components/Settings/index.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js b/muster-ui/src/layout/components/Sidebar/FixiOSBug.js similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js rename to muster-ui/src/layout/components/Sidebar/FixiOSBug.js diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/muster-ui/src/layout/components/Sidebar/Item.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/Item.vue rename to muster-ui/src/layout/components/Sidebar/Item.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/Link.vue b/muster-ui/src/layout/components/Sidebar/Link.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/Link.vue rename to muster-ui/src/layout/components/Sidebar/Link.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/muster-ui/src/layout/components/Sidebar/Logo.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/Logo.vue rename to muster-ui/src/layout/components/Sidebar/Logo.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/muster-ui/src/layout/components/Sidebar/SidebarItem.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue rename to muster-ui/src/layout/components/Sidebar/SidebarItem.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/muster-ui/src/layout/components/Sidebar/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/index.vue rename to muster-ui/src/layout/components/Sidebar/index.vue diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/muster-ui/src/layout/components/TagsView/ScrollPane.vue similarity index 100% rename from ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue rename to muster-ui/src/layout/components/TagsView/ScrollPane.vue diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/muster-ui/src/layout/components/TagsView/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/TagsView/index.vue rename to muster-ui/src/layout/components/TagsView/index.vue diff --git a/ruoyi-ui/src/layout/components/index.js b/muster-ui/src/layout/components/index.js similarity index 100% rename from ruoyi-ui/src/layout/components/index.js rename to muster-ui/src/layout/components/index.js diff --git a/ruoyi-ui/src/layout/index.vue b/muster-ui/src/layout/index.vue similarity index 100% rename from ruoyi-ui/src/layout/index.vue rename to muster-ui/src/layout/index.vue diff --git a/ruoyi-ui/src/layout/mixin/ResizeHandler.js b/muster-ui/src/layout/mixin/ResizeHandler.js similarity index 100% rename from ruoyi-ui/src/layout/mixin/ResizeHandler.js rename to muster-ui/src/layout/mixin/ResizeHandler.js diff --git a/ruoyi-ui/src/main.js b/muster-ui/src/main.js similarity index 91% rename from ruoyi-ui/src/main.js rename to muster-ui/src/main.js index 7a28b51f8..d2fa0582c 100644 --- a/ruoyi-ui/src/main.js +++ b/muster-ui/src/main.js @@ -1,72 +1,72 @@ -import Vue from 'vue' - -import Cookies from 'js-cookie' - -import 'normalize.css/normalize.css' // a modern alternative to CSS resets - -import Element from 'element-ui' -import './assets/styles/element-variables.scss' - -import '@/assets/styles/index.scss' // global css -import '@/assets/styles/ruoyi.scss' // ruoyi css -import App from './App' -import store from './store' -import router from './router' -import permission from './directive/permission' - -import './assets/icons' // icon -import './permission' // permission control -import { getDicts } from "@/api/system/dict/data"; -import { getConfigKey } from "@/api/system/config"; -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi"; -import Pagination from "@/components/Pagination"; - -// 全局方法挂载 -Vue.prototype.getDicts = getDicts -Vue.prototype.getConfigKey = getConfigKey -Vue.prototype.parseTime = parseTime -Vue.prototype.resetForm = resetForm -Vue.prototype.addDateRange = addDateRange -Vue.prototype.selectDictLabel = selectDictLabel -Vue.prototype.selectDictLabels = selectDictLabels -Vue.prototype.download = download -Vue.prototype.handleTree = handleTree - -Vue.prototype.msgSuccess = function (msg) { - this.$message({ showClose: true, message: msg, type: "success" }); -} - -Vue.prototype.msgError = function (msg) { - this.$message({ showClose: true, message: msg, type: "error" }); -} - -Vue.prototype.msgInfo = function (msg) { - this.$message.info(msg); -} - -// 全局组件挂载 -Vue.component('Pagination', Pagination) - -Vue.use(permission) - -/** - * If you don't want to use mock-server - * you want to use MockJs for mock api - * you can execute: mockXHR() - * - * Currently MockJs will be used in the production environment, - * please remove it before going online! ! ! - */ - -Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size -}) - -Vue.config.productionTip = false - -new Vue({ - el: '#app', - router, - store, - render: h => h(App) -}) +import Vue from 'vue' + +import Cookies from 'js-cookie' + +import 'normalize.css/normalize.css' // a modern alternative to CSS resets + +import Element from 'element-ui' +import './assets/styles/element-variables.scss' + +import '@/assets/styles/index.scss' // global css +import '@/assets/styles/muster.scss' // muster css +import App from './App' +import store from './store' +import router from './router' +import permission from './directive/permission' + +import './assets/icons' // icon +import './permission' // permission control +import { getDicts } from "@/api/system/dict/data"; +import { getConfigKey } from "@/api/system/config"; +import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/muster"; +import Pagination from "@/components/Pagination"; + +// 全局方法挂载 +Vue.prototype.getDicts = getDicts +Vue.prototype.getConfigKey = getConfigKey +Vue.prototype.parseTime = parseTime +Vue.prototype.resetForm = resetForm +Vue.prototype.addDateRange = addDateRange +Vue.prototype.selectDictLabel = selectDictLabel +Vue.prototype.selectDictLabels = selectDictLabels +Vue.prototype.download = download +Vue.prototype.handleTree = handleTree + +Vue.prototype.msgSuccess = function (msg) { + this.$message({ showClose: true, message: msg, type: "success" }); +} + +Vue.prototype.msgError = function (msg) { + this.$message({ showClose: true, message: msg, type: "error" }); +} + +Vue.prototype.msgInfo = function (msg) { + this.$message.info(msg); +} + +// 全局组件挂载 +Vue.component('Pagination', Pagination) + +Vue.use(permission) + +/** + * If you don't want to use mock-server + * you want to use MockJs for mock api + * you can execute: mockXHR() + * + * Currently MockJs will be used in the production environment, + * please remove it before going online! ! ! + */ + +Vue.use(Element, { + size: Cookies.get('size') || 'medium' // set element-ui default size +}) + +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/ruoyi-ui/src/permission.js b/muster-ui/src/permission.js similarity index 100% rename from ruoyi-ui/src/permission.js rename to muster-ui/src/permission.js diff --git a/ruoyi-ui/src/router/index.js b/muster-ui/src/router/index.js similarity index 100% rename from ruoyi-ui/src/router/index.js rename to muster-ui/src/router/index.js diff --git a/ruoyi-ui/src/settings.js b/muster-ui/src/settings.js similarity index 100% rename from ruoyi-ui/src/settings.js rename to muster-ui/src/settings.js diff --git a/ruoyi-ui/src/store/getters.js b/muster-ui/src/store/getters.js similarity index 100% rename from ruoyi-ui/src/store/getters.js rename to muster-ui/src/store/getters.js diff --git a/ruoyi-ui/src/store/index.js b/muster-ui/src/store/index.js similarity index 100% rename from ruoyi-ui/src/store/index.js rename to muster-ui/src/store/index.js diff --git a/ruoyi-ui/src/store/modules/app.js b/muster-ui/src/store/modules/app.js similarity index 100% rename from ruoyi-ui/src/store/modules/app.js rename to muster-ui/src/store/modules/app.js diff --git a/ruoyi-ui/src/store/modules/permission.js b/muster-ui/src/store/modules/permission.js similarity index 100% rename from ruoyi-ui/src/store/modules/permission.js rename to muster-ui/src/store/modules/permission.js diff --git a/ruoyi-ui/src/store/modules/settings.js b/muster-ui/src/store/modules/settings.js similarity index 100% rename from ruoyi-ui/src/store/modules/settings.js rename to muster-ui/src/store/modules/settings.js diff --git a/ruoyi-ui/src/store/modules/tagsView.js b/muster-ui/src/store/modules/tagsView.js similarity index 100% rename from ruoyi-ui/src/store/modules/tagsView.js rename to muster-ui/src/store/modules/tagsView.js diff --git a/ruoyi-ui/src/store/modules/user.js b/muster-ui/src/store/modules/user.js similarity index 100% rename from ruoyi-ui/src/store/modules/user.js rename to muster-ui/src/store/modules/user.js diff --git a/ruoyi-ui/src/utils/auth.js b/muster-ui/src/utils/auth.js similarity index 100% rename from ruoyi-ui/src/utils/auth.js rename to muster-ui/src/utils/auth.js diff --git a/ruoyi-ui/src/utils/errorCode.js b/muster-ui/src/utils/errorCode.js similarity index 100% rename from ruoyi-ui/src/utils/errorCode.js rename to muster-ui/src/utils/errorCode.js diff --git a/ruoyi-ui/src/utils/generator/config.js b/muster-ui/src/utils/generator/config.js similarity index 100% rename from ruoyi-ui/src/utils/generator/config.js rename to muster-ui/src/utils/generator/config.js diff --git a/ruoyi-ui/src/utils/generator/css.js b/muster-ui/src/utils/generator/css.js similarity index 100% rename from ruoyi-ui/src/utils/generator/css.js rename to muster-ui/src/utils/generator/css.js diff --git a/ruoyi-ui/src/utils/generator/drawingDefalut.js b/muster-ui/src/utils/generator/drawingDefalut.js similarity index 100% rename from ruoyi-ui/src/utils/generator/drawingDefalut.js rename to muster-ui/src/utils/generator/drawingDefalut.js diff --git a/ruoyi-ui/src/utils/generator/html.js b/muster-ui/src/utils/generator/html.js similarity index 100% rename from ruoyi-ui/src/utils/generator/html.js rename to muster-ui/src/utils/generator/html.js diff --git a/ruoyi-ui/src/utils/generator/icon.json b/muster-ui/src/utils/generator/icon.json similarity index 100% rename from ruoyi-ui/src/utils/generator/icon.json rename to muster-ui/src/utils/generator/icon.json diff --git a/ruoyi-ui/src/utils/generator/js.js b/muster-ui/src/utils/generator/js.js similarity index 100% rename from ruoyi-ui/src/utils/generator/js.js rename to muster-ui/src/utils/generator/js.js diff --git a/ruoyi-ui/src/utils/generator/render.js b/muster-ui/src/utils/generator/render.js similarity index 100% rename from ruoyi-ui/src/utils/generator/render.js rename to muster-ui/src/utils/generator/render.js diff --git a/ruoyi-ui/src/utils/index.js b/muster-ui/src/utils/index.js similarity index 95% rename from ruoyi-ui/src/utils/index.js rename to muster-ui/src/utils/index.js index 2893bc83a..6240a28a9 100644 --- a/ruoyi-ui/src/utils/index.js +++ b/muster-ui/src/utils/index.js @@ -1,390 +1,390 @@ -import { parseTime } from './ruoyi' - -/** - * 表格时间格式化 - */ -export function formatDate(cellValue) { - if (cellValue == null || cellValue == "") return ""; - var date = new Date(cellValue) - var year = date.getFullYear() - var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 - var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() - var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() - var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() - var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() - return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds -} - -/** - * @param {number} time - * @param {string} option - * @returns {string} - */ -export function formatTime(time, option) { - if (('' + time).length === 10) { - time = parseInt(time) * 1000 - } else { - time = +time - } - const d = new Date(time) - const now = Date.now() - - const diff = (now - d) / 1000 - - if (diff < 30) { - return '刚刚' - } else if (diff < 3600) { - // less 1 hour - return Math.ceil(diff / 60) + '分钟前' - } else if (diff < 3600 * 24) { - return Math.ceil(diff / 3600) + '小时前' - } else if (diff < 3600 * 24 * 2) { - return '1天前' - } - if (option) { - return parseTime(time, option) - } else { - return ( - d.getMonth() + - 1 + - '月' + - d.getDate() + - '日' + - d.getHours() + - '时' + - d.getMinutes() + - '分' - ) - } -} - -/** - * @param {string} url - * @returns {Object} - */ -export function getQueryObject(url) { - url = url == null ? window.location.href : url - const search = url.substring(url.lastIndexOf('?') + 1) - const obj = {} - const reg = /([^?&=]+)=([^?&=]*)/g - search.replace(reg, (rs, $1, $2) => { - const name = decodeURIComponent($1) - let val = decodeURIComponent($2) - val = String(val) - obj[name] = val - return rs - }) - return obj -} - -/** - * @param {string} input value - * @returns {number} output value - */ -export function byteLength(str) { - // returns the byte length of an utf8 string - let s = str.length - for (var i = str.length - 1; i >= 0; i--) { - const code = str.charCodeAt(i) - if (code > 0x7f && code <= 0x7ff) s++ - else if (code > 0x7ff && code <= 0xffff) s += 2 - if (code >= 0xDC00 && code <= 0xDFFF) i-- - } - return s -} - -/** - * @param {Array} actual - * @returns {Array} - */ -export function cleanArray(actual) { - const newArray = [] - for (let i = 0; i < actual.length; i++) { - if (actual[i]) { - newArray.push(actual[i]) - } - } - return newArray -} - -/** - * @param {Object} json - * @returns {Array} - */ -export function param(json) { - if (!json) return '' - return cleanArray( - Object.keys(json).map(key => { - if (json[key] === undefined) return '' - return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) - }) - ).join('&') -} - -/** - * @param {string} url - * @returns {Object} - */ -export function param2Obj(url) { - const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') - if (!search) { - return {} - } - const obj = {} - const searchArr = search.split('&') - searchArr.forEach(v => { - const index = v.indexOf('=') - if (index !== -1) { - const name = v.substring(0, index) - const val = v.substring(index + 1, v.length) - obj[name] = val - } - }) - return obj -} - -/** - * @param {string} val - * @returns {string} - */ -export function html2Text(val) { - const div = document.createElement('div') - div.innerHTML = val - return div.textContent || div.innerText -} - -/** - * Merges two objects, giving the last one precedence - * @param {Object} target - * @param {(Object|Array)} source - * @returns {Object} - */ -export function objectMerge(target, source) { - if (typeof target !== 'object') { - target = {} - } - if (Array.isArray(source)) { - return source.slice() - } - Object.keys(source).forEach(property => { - const sourceProperty = source[property] - if (typeof sourceProperty === 'object') { - target[property] = objectMerge(target[property], sourceProperty) - } else { - target[property] = sourceProperty - } - }) - return target -} - -/** - * @param {HTMLElement} element - * @param {string} className - */ -export function toggleClass(element, className) { - if (!element || !className) { - return - } - let classString = element.className - const nameIndex = classString.indexOf(className) - if (nameIndex === -1) { - classString += '' + className - } else { - classString = - classString.substr(0, nameIndex) + - classString.substr(nameIndex + className.length) - } - element.className = classString -} - -/** - * @param {string} type - * @returns {Date} - */ -export function getTime(type) { - if (type === 'start') { - return new Date().getTime() - 3600 * 1000 * 24 * 90 - } else { - return new Date(new Date().toDateString()) - } -} - -/** - * @param {Function} func - * @param {number} wait - * @param {boolean} immediate - * @return {*} - */ -export function debounce(func, wait, immediate) { - let timeout, args, context, timestamp, result - - const later = function() { - // 据上一次触发时间间隔 - const last = +new Date() - timestamp - - // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait - if (last < wait && last > 0) { - timeout = setTimeout(later, wait - last) - } else { - timeout = null - // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用 - if (!immediate) { - result = func.apply(context, args) - if (!timeout) context = args = null - } - } - } - - return function(...args) { - context = this - timestamp = +new Date() - const callNow = immediate && !timeout - // 如果延时不存在，重新设定延时 - if (!timeout) timeout = setTimeout(later, wait) - if (callNow) { - result = func.apply(context, args) - context = args = null - } - - return result - } -} - -/** - * This is just a simple version of deep copy - * Has a lot of edge cases bug - * If you want to use a perfect deep copy, use lodash's _.cloneDeep - * @param {Object} source - * @returns {Object} - */ -export function deepClone(source) { - if (!source && typeof source !== 'object') { - throw new Error('error arguments', 'deepClone') - } - const targetObj = source.constructor === Array ? [] : {} - Object.keys(source).forEach(keys => { - if (source[keys] && typeof source[keys] === 'object') { - targetObj[keys] = deepClone(source[keys]) - } else { - targetObj[keys] = source[keys] - } - }) - return targetObj -} - -/** - * @param {Array} arr - * @returns {Array} - */ -export function uniqueArr(arr) { - return Array.from(new Set(arr)) -} - -/** - * @returns {string} - */ -export function createUniqueString() { - const timestamp = +new Date() + '' - const randomNum = parseInt((1 + Math.random()) * 65536) + '' - return (+(randomNum + timestamp)).toString(32) -} - -/** - * Check if an element has a class - * @param {HTMLElement} elm - * @param {string} cls - * @returns {boolean} - */ -export function hasClass(ele, cls) { - return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) -} - -/** - * Add class to element - * @param {HTMLElement} elm - * @param {string} cls - */ -export function addClass(ele, cls) { - if (!hasClass(ele, cls)) ele.className += ' ' + cls -} - -/** - * Remove class from element - * @param {HTMLElement} elm - * @param {string} cls - */ -export function removeClass(ele, cls) { - if (hasClass(ele, cls)) { - const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') - ele.className = ele.className.replace(reg, ' ') - } -} - -export function makeMap(str, expectsLowerCase) { - const map = Object.create(null) - const list = str.split(',') - for (let i = 0; i < list.length; i++) { - map[list[i]] = true - } - return expectsLowerCase - ? val => map[val.toLowerCase()] - : val => map[val] -} - -export const exportDefault = 'export default ' - -export const beautifierConf = { - html: { - indent_size: '2', - indent_char: ' ', - max_preserve_newlines: '-1', - preserve_newlines: false, - keep_array_indentation: false, - break_chained_methods: false, - indent_scripts: 'separate', - brace_style: 'end-expand', - space_before_conditional: true, - unescape_strings: false, - jslint_happy: false, - end_with_newline: true, - wrap_line_length: '110', - indent_inner_html: true, - comma_first: false, - e4x: true, - indent_empty_lines: true - }, - js: { - indent_size: '2', - indent_char: ' ', - max_preserve_newlines: '-1', - preserve_newlines: false, - keep_array_indentation: false, - break_chained_methods: false, - indent_scripts: 'normal', - brace_style: 'end-expand', - space_before_conditional: true, - unescape_strings: false, - jslint_happy: true, - end_with_newline: true, - wrap_line_length: '110', - indent_inner_html: true, - comma_first: false, - e4x: true, - indent_empty_lines: true - } -} - -// 首字母大小 -export function titleCase(str) { - return str.replace(/( |^)[a-z]/g, L => L.toUpperCase()) -} - -// 下划转驼峰 -export function camelCase(str) { - return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase()) -} - -export function isNumberStr(str) { - return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) -} - +import { parseTime } from './muster' + +/** + * 表格时间格式化 + */ +export function formatDate(cellValue) { + if (cellValue == null || cellValue == "") return ""; + var date = new Date(cellValue) + var year = date.getFullYear() + var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 + var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() + var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() + var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() + var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function getQueryObject(url) { + url = url == null ? window.location.href : url + const search = url.substring(url.lastIndexOf('?') + 1) + const obj = {} + const reg = /([^?&=]+)=([^?&=]*)/g + search.replace(reg, (rs, $1, $2) => { + const name = decodeURIComponent($1) + let val = decodeURIComponent($2) + val = String(val) + obj[name] = val + return rs + }) + return obj +} + +/** + * @param {string} input value + * @returns {number} output value + */ +export function byteLength(str) { + // returns the byte length of an utf8 string + let s = str.length + for (var i = str.length - 1; i >= 0; i--) { + const code = str.charCodeAt(i) + if (code > 0x7f && code <= 0x7ff) s++ + else if (code > 0x7ff && code <= 0xffff) s += 2 + if (code >= 0xDC00 && code <= 0xDFFF) i-- + } + return s +} + +/** + * @param {Array} actual + * @returns {Array} + */ +export function cleanArray(actual) { + const newArray = [] + for (let i = 0; i < actual.length; i++) { + if (actual[i]) { + newArray.push(actual[i]) + } + } + return newArray +} + +/** + * @param {Object} json + * @returns {Array} + */ +export function param(json) { + if (!json) return '' + return cleanArray( + Object.keys(json).map(key => { + if (json[key] === undefined) return '' + return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) + }) + ).join('&') +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} + +/** + * @param {string} val + * @returns {string} + */ +export function html2Text(val) { + const div = document.createElement('div') + div.innerHTML = val + return div.textContent || div.innerText +} + +/** + * Merges two objects, giving the last one precedence + * @param {Object} target + * @param {(Object|Array)} source + * @returns {Object} + */ +export function objectMerge(target, source) { + if (typeof target !== 'object') { + target = {} + } + if (Array.isArray(source)) { + return source.slice() + } + Object.keys(source).forEach(property => { + const sourceProperty = source[property] + if (typeof sourceProperty === 'object') { + target[property] = objectMerge(target[property], sourceProperty) + } else { + target[property] = sourceProperty + } + }) + return target +} + +/** + * @param {HTMLElement} element + * @param {string} className + */ +export function toggleClass(element, className) { + if (!element || !className) { + return + } + let classString = element.className + const nameIndex = classString.indexOf(className) + if (nameIndex === -1) { + classString += '' + className + } else { + classString = + classString.substr(0, nameIndex) + + classString.substr(nameIndex + className.length) + } + element.className = classString +} + +/** + * @param {string} type + * @returns {Date} + */ +export function getTime(type) { + if (type === 'start') { + return new Date().getTime() - 3600 * 1000 * 24 * 90 + } else { + return new Date(new Date().toDateString()) + } +} + +/** + * @param {Function} func + * @param {number} wait + * @param {boolean} immediate + * @return {*} + */ +export function debounce(func, wait, immediate) { + let timeout, args, context, timestamp, result + + const later = function() { + // 据上一次触发时间间隔 + const last = +new Date() - timestamp + + // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait + if (last < wait && last > 0) { + timeout = setTimeout(later, wait - last) + } else { + timeout = null + // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用 + if (!immediate) { + result = func.apply(context, args) + if (!timeout) context = args = null + } + } + } + + return function(...args) { + context = this + timestamp = +new Date() + const callNow = immediate && !timeout + // 如果延时不存在，重新设定延时 + if (!timeout) timeout = setTimeout(later, wait) + if (callNow) { + result = func.apply(context, args) + context = args = null + } + + return result + } +} + +/** + * This is just a simple version of deep copy + * Has a lot of edge cases bug + * If you want to use a perfect deep copy, use lodash's _.cloneDeep + * @param {Object} source + * @returns {Object} + */ +export function deepClone(source) { + if (!source && typeof source !== 'object') { + throw new Error('error arguments', 'deepClone') + } + const targetObj = source.constructor === Array ? [] : {} + Object.keys(source).forEach(keys => { + if (source[keys] && typeof source[keys] === 'object') { + targetObj[keys] = deepClone(source[keys]) + } else { + targetObj[keys] = source[keys] + } + }) + return targetObj +} + +/** + * @param {Array} arr + * @returns {Array} + */ +export function uniqueArr(arr) { + return Array.from(new Set(arr)) +} + +/** + * @returns {string} + */ +export function createUniqueString() { + const timestamp = +new Date() + '' + const randomNum = parseInt((1 + Math.random()) * 65536) + '' + return (+(randomNum + timestamp)).toString(32) +} + +/** + * Check if an element has a class + * @param {HTMLElement} elm + * @param {string} cls + * @returns {boolean} + */ +export function hasClass(ele, cls) { + return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) +} + +/** + * Add class to element + * @param {HTMLElement} elm + * @param {string} cls + */ +export function addClass(ele, cls) { + if (!hasClass(ele, cls)) ele.className += ' ' + cls +} + +/** + * Remove class from element + * @param {HTMLElement} elm + * @param {string} cls + */ +export function removeClass(ele, cls) { + if (hasClass(ele, cls)) { + const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') + ele.className = ele.className.replace(reg, ' ') + } +} + +export function makeMap(str, expectsLowerCase) { + const map = Object.create(null) + const list = str.split(',') + for (let i = 0; i < list.length; i++) { + map[list[i]] = true + } + return expectsLowerCase + ? val => map[val.toLowerCase()] + : val => map[val] +} + +export const exportDefault = 'export default ' + +export const beautifierConf = { + html: { + indent_size: '2', + indent_char: ' ', + max_preserve_newlines: '-1', + preserve_newlines: false, + keep_array_indentation: false, + break_chained_methods: false, + indent_scripts: 'separate', + brace_style: 'end-expand', + space_before_conditional: true, + unescape_strings: false, + jslint_happy: false, + end_with_newline: true, + wrap_line_length: '110', + indent_inner_html: true, + comma_first: false, + e4x: true, + indent_empty_lines: true + }, + js: { + indent_size: '2', + indent_char: ' ', + max_preserve_newlines: '-1', + preserve_newlines: false, + keep_array_indentation: false, + break_chained_methods: false, + indent_scripts: 'normal', + brace_style: 'end-expand', + space_before_conditional: true, + unescape_strings: false, + jslint_happy: true, + end_with_newline: true, + wrap_line_length: '110', + indent_inner_html: true, + comma_first: false, + e4x: true, + indent_empty_lines: true + } +} + +// 首字母大小 +export function titleCase(str) { + return str.replace(/( |^)[a-z]/g, L => L.toUpperCase()) +} + +// 下划转驼峰 +export function camelCase(str) { + return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase()) +} + +export function isNumberStr(str) { + return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) +} + diff --git a/ruoyi-ui/src/utils/jsencrypt.js b/muster-ui/src/utils/jsencrypt.js similarity index 100% rename from ruoyi-ui/src/utils/jsencrypt.js rename to muster-ui/src/utils/jsencrypt.js diff --git a/ruoyi-ui/src/utils/permission.js b/muster-ui/src/utils/permission.js similarity index 100% rename from ruoyi-ui/src/utils/permission.js rename to muster-ui/src/utils/permission.js diff --git a/ruoyi-ui/src/utils/request.js b/muster-ui/src/utils/request.js similarity index 100% rename from ruoyi-ui/src/utils/request.js rename to muster-ui/src/utils/request.js diff --git a/ruoyi-ui/src/utils/ruoyi.js b/muster-ui/src/utils/ruoyi.js similarity index 95% rename from ruoyi-ui/src/utils/ruoyi.js rename to muster-ui/src/utils/ruoyi.js index 23879aaf8..8f0e79693 100644 --- a/ruoyi-ui/src/utils/ruoyi.js +++ b/muster-ui/src/utils/ruoyi.js @@ -1,149 +1,149 @@ -/** - * 通用js方法封装处理 - * Copyright (c) 2019 ruoyi - */ - -const baseURL = process.env.VUE_APP_BASE_API - -// 日期格式化 -export function parseTime(time, pattern) { - if (arguments.length === 0 || !time) { - return null - } - const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' - let date - if (typeof time === 'object') { - date = time - } else { - if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { - time = parseInt(time) - } else if (typeof time === 'string') { - time = time.replace(new RegExp(/-/gm), '/'); - } - if ((typeof time === 'number') && (time.toString().length === 10)) { - time = time * 1000 - } - date = new Date(time) - } - const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() - } - const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { - let value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } - if (result.length > 0 && value < 10) { - value = '0' + value - } - return value || 0 - }) - return time_str -} - -// 表单重置 -export function resetForm(refName) { - if (this.$refs[refName]) { - this.$refs[refName].resetFields(); - } -} - -// 添加日期范围 -export function addDateRange(params, dateRange) { - var search = params; - search.beginTime = ""; - search.endTime = ""; - if (null != dateRange && '' != dateRange) { - search.beginTime = this.dateRange[0]; - search.endTime = this.dateRange[1]; - } - return search; -} - -// 回显数据字典 -export function selectDictLabel(datas, value) { - var actions = []; - Object.keys(datas).some((key) => { - if (datas[key].dictValue == ('' + value)) { - actions.push(datas[key].dictLabel); - return true; - } - }) - return actions.join(''); -} - -// 回显数据字典（字符串数组） -export function selectDictLabels(datas, value, separator) { - var actions = []; - var currentSeparator = undefined === separator ? "," : separator; - var temp = value.split(currentSeparator); - Object.keys(value.split(currentSeparator)).some((val) => { - Object.keys(datas).some((key) => { - if (datas[key].dictValue == ('' + temp[val])) { - actions.push(datas[key].dictLabel + currentSeparator); - } - }) - }) - return actions.join('').substring(0, actions.join('').length - 1); -} - -// 通用下载方法 -export function download(fileName) { - window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; -} - -// 字符串格式化(%s ) -export function sprintf(str) { - var args = arguments, flag = true, i = 1; - str = str.replace(/%s/g, function () { - var arg = args[i++]; - if (typeof arg === 'undefined') { - flag = false; - return ''; - } - return arg; - }); - return flag ? str : ''; -} - -// 转换字符串，undefined,null等转化为"" -export function praseStrEmpty(str) { - if (!str || str == "undefined" || str == "null") { - return ""; - } - return str; -} - -/** - * 构造树型结构数据 - * @param {*} data 数据源 - * @param {*} id id字段 默认 'id' - * @param {*} parentId 父节点字段 默认 'parentId' - * @param {*} children 孩子节点字段 默认 'children' - * @param {*} rootId 根Id 默认 0 - */ -export function handleTree(data, id, parentId, children, rootId) { - id = id || 'id' - parentId = parentId || 'parentId' - children = children || 'children' - rootId = rootId || 0 - //对源数据深度克隆 - const cloneData = JSON.parse(JSON.stringify(data)) - //循环所有项 - const treeData = cloneData.filter(father => { - let branchArr = cloneData.filter(child => { - //返回每一项的子级数组 - return father[id] === child[parentId] - }); - branchArr.length > 0 ? father.children = branchArr : ''; - //返回第一层 - return father[parentId] === rootId; - }); - return treeData != '' ? treeData : data; -} - +/** + * 通用js方法封装处理 + * Copyright (c) 2019 muster + */ + +const baseURL = process.env.VUE_APP_BASE_API + +// 日期格式化 +export function parseTime(time, pattern) { + if (arguments.length === 0 || !time) { + return null + } + const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } else if (typeof time === 'string') { + time = time.replace(new RegExp(/-/gm), '/'); + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return time_str +} + +// 表单重置 +export function resetForm(refName) { + if (this.$refs[refName]) { + this.$refs[refName].resetFields(); + } +} + +// 添加日期范围 +export function addDateRange(params, dateRange) { + var search = params; + search.beginTime = ""; + search.endTime = ""; + if (null != dateRange && '' != dateRange) { + search.beginTime = this.dateRange[0]; + search.endTime = this.dateRange[1]; + } + return search; +} + +// 回显数据字典 +export function selectDictLabel(datas, value) { + var actions = []; + Object.keys(datas).some((key) => { + if (datas[key].dictValue == ('' + value)) { + actions.push(datas[key].dictLabel); + return true; + } + }) + return actions.join(''); +} + +// 回显数据字典（字符串数组） +export function selectDictLabels(datas, value, separator) { + var actions = []; + var currentSeparator = undefined === separator ? "," : separator; + var temp = value.split(currentSeparator); + Object.keys(value.split(currentSeparator)).some((val) => { + Object.keys(datas).some((key) => { + if (datas[key].dictValue == ('' + temp[val])) { + actions.push(datas[key].dictLabel + currentSeparator); + } + }) + }) + return actions.join('').substring(0, actions.join('').length - 1); +} + +// 通用下载方法 +export function download(fileName) { + window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; +} + +// 字符串格式化(%s ) +export function sprintf(str) { + var args = arguments, flag = true, i = 1; + str = str.replace(/%s/g, function () { + var arg = args[i++]; + if (typeof arg === 'undefined') { + flag = false; + return ''; + } + return arg; + }); + return flag ? str : ''; +} + +// 转换字符串，undefined,null等转化为"" +export function praseStrEmpty(str) { + if (!str || str == "undefined" || str == "null") { + return ""; + } + return str; +} + +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + * @param {*} rootId 根Id 默认 0 + */ +export function handleTree(data, id, parentId, children, rootId) { + id = id || 'id' + parentId = parentId || 'parentId' + children = children || 'children' + rootId = rootId || 0 + //对源数据深度克隆 + const cloneData = JSON.parse(JSON.stringify(data)) + //循环所有项 + const treeData = cloneData.filter(father => { + let branchArr = cloneData.filter(child => { + //返回每一项的子级数组 + return father[id] === child[parentId] + }); + branchArr.length > 0 ? father.children = branchArr : ''; + //返回第一层 + return father[parentId] === rootId; + }); + return treeData != '' ? treeData : data; +} + diff --git a/ruoyi-ui/src/utils/scroll-to.js b/muster-ui/src/utils/scroll-to.js similarity index 100% rename from ruoyi-ui/src/utils/scroll-to.js rename to muster-ui/src/utils/scroll-to.js diff --git a/ruoyi-ui/src/utils/validate.js b/muster-ui/src/utils/validate.js similarity index 100% rename from ruoyi-ui/src/utils/validate.js rename to muster-ui/src/utils/validate.js diff --git a/ruoyi-ui/src/utils/zipdownload.js b/muster-ui/src/utils/zipdownload.js similarity index 100% rename from ruoyi-ui/src/utils/zipdownload.js rename to muster-ui/src/utils/zipdownload.js diff --git a/ruoyi-ui/src/views/components/icons/element-icons.js b/muster-ui/src/views/components/icons/element-icons.js similarity index 100% rename from ruoyi-ui/src/views/components/icons/element-icons.js rename to muster-ui/src/views/components/icons/element-icons.js diff --git a/ruoyi-ui/src/views/components/icons/index.vue b/muster-ui/src/views/components/icons/index.vue similarity index 100% rename from ruoyi-ui/src/views/components/icons/index.vue rename to muster-ui/src/views/components/icons/index.vue diff --git a/ruoyi-ui/src/views/components/icons/svg-icons.js b/muster-ui/src/views/components/icons/svg-icons.js similarity index 100% rename from ruoyi-ui/src/views/components/icons/svg-icons.js rename to muster-ui/src/views/components/icons/svg-icons.js diff --git a/ruoyi-ui/src/views/dashboard/BarChart.vue b/muster-ui/src/views/dashboard/BarChart.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/BarChart.vue rename to muster-ui/src/views/dashboard/BarChart.vue diff --git a/ruoyi-ui/src/views/dashboard/LineChart.vue b/muster-ui/src/views/dashboard/LineChart.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/LineChart.vue rename to muster-ui/src/views/dashboard/LineChart.vue diff --git a/ruoyi-ui/src/views/dashboard/PanelGroup.vue b/muster-ui/src/views/dashboard/PanelGroup.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/PanelGroup.vue rename to muster-ui/src/views/dashboard/PanelGroup.vue diff --git a/ruoyi-ui/src/views/dashboard/PieChart.vue b/muster-ui/src/views/dashboard/PieChart.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/PieChart.vue rename to muster-ui/src/views/dashboard/PieChart.vue diff --git a/ruoyi-ui/src/views/dashboard/RaddarChart.vue b/muster-ui/src/views/dashboard/RaddarChart.vue similarity index 100% rename from ruoyi-ui/src/views/dashboard/RaddarChart.vue rename to muster-ui/src/views/dashboard/RaddarChart.vue diff --git a/ruoyi-ui/src/views/dashboard/mixins/resize.js b/muster-ui/src/views/dashboard/mixins/resize.js similarity index 100% rename from ruoyi-ui/src/views/dashboard/mixins/resize.js rename to muster-ui/src/views/dashboard/mixins/resize.js diff --git a/ruoyi-ui/src/views/error/401.vue b/muster-ui/src/views/error/401.vue similarity index 100% rename from ruoyi-ui/src/views/error/401.vue rename to muster-ui/src/views/error/401.vue diff --git a/ruoyi-ui/src/views/error/404.vue b/muster-ui/src/views/error/404.vue similarity index 100% rename from ruoyi-ui/src/views/error/404.vue rename to muster-ui/src/views/error/404.vue diff --git a/ruoyi-ui/src/views/index.vue b/muster-ui/src/views/index.vue similarity index 100% rename from ruoyi-ui/src/views/index.vue rename to muster-ui/src/views/index.vue diff --git a/ruoyi-ui/src/views/login.vue b/muster-ui/src/views/login.vue similarity index 95% rename from ruoyi-ui/src/views/login.vue rename to muster-ui/src/views/login.vue index 64ecbc47c..cad835f86 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/muster-ui/src/views/login.vue @@ -1,206 +1,206 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/monitor/druid/index.vue b/muster-ui/src/views/monitor/druid/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/druid/index.vue rename to muster-ui/src/views/monitor/druid/index.vue diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/muster-ui/src/views/monitor/job/index.vue similarity index 96% rename from ruoyi-ui/src/views/monitor/job/index.vue rename to muster-ui/src/views/monitor/job/index.vue index 3a35e85b2..945241c52 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/muster-ui/src/views/monitor/job/index.vue @@ -1,484 +1,484 @@ - - - \ No newline at end of file + + + diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/muster-ui/src/views/monitor/job/log.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/job/log.vue rename to muster-ui/src/views/monitor/job/log.vue diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/muster-ui/src/views/monitor/logininfor/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/logininfor/index.vue rename to muster-ui/src/views/monitor/logininfor/index.vue diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/muster-ui/src/views/monitor/online/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/online/index.vue rename to muster-ui/src/views/monitor/online/index.vue diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/muster-ui/src/views/monitor/operlog/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/operlog/index.vue rename to muster-ui/src/views/monitor/operlog/index.vue diff --git a/ruoyi-ui/src/views/monitor/server/index.vue b/muster-ui/src/views/monitor/server/index.vue similarity index 100% rename from ruoyi-ui/src/views/monitor/server/index.vue rename to muster-ui/src/views/monitor/server/index.vue diff --git a/ruoyi-ui/src/views/redirect.vue b/muster-ui/src/views/redirect.vue similarity index 100% rename from ruoyi-ui/src/views/redirect.vue rename to muster-ui/src/views/redirect.vue diff --git a/ruoyi-ui/src/views/system/config/index.vue b/muster-ui/src/views/system/config/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/config/index.vue rename to muster-ui/src/views/system/config/index.vue diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/muster-ui/src/views/system/dept/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/dept/index.vue rename to muster-ui/src/views/system/dept/index.vue diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/muster-ui/src/views/system/dict/data.vue similarity index 100% rename from ruoyi-ui/src/views/system/dict/data.vue rename to muster-ui/src/views/system/dict/data.vue diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/muster-ui/src/views/system/dict/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/dict/index.vue rename to muster-ui/src/views/system/dict/index.vue diff --git a/ruoyi-ui/src/views/system/log/index.vue b/muster-ui/src/views/system/log/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/log/index.vue rename to muster-ui/src/views/system/log/index.vue diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/muster-ui/src/views/system/menu/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/menu/index.vue rename to muster-ui/src/views/system/menu/index.vue diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/muster-ui/src/views/system/notice/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/notice/index.vue rename to muster-ui/src/views/system/notice/index.vue diff --git a/ruoyi-ui/src/views/system/post/index.vue b/muster-ui/src/views/system/post/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/post/index.vue rename to muster-ui/src/views/system/post/index.vue diff --git a/ruoyi-ui/src/views/system/role/index.vue b/muster-ui/src/views/system/role/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/role/index.vue rename to muster-ui/src/views/system/role/index.vue diff --git a/ruoyi-ui/src/views/system/user/index.vue b/muster-ui/src/views/system/user/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/index.vue rename to muster-ui/src/views/system/user/index.vue diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/muster-ui/src/views/system/user/profile/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/profile/index.vue rename to muster-ui/src/views/system/user/profile/index.vue diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/muster-ui/src/views/system/user/profile/resetPwd.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/profile/resetPwd.vue rename to muster-ui/src/views/system/user/profile/resetPwd.vue diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/muster-ui/src/views/system/user/profile/userAvatar.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/profile/userAvatar.vue rename to muster-ui/src/views/system/user/profile/userAvatar.vue diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/muster-ui/src/views/system/user/profile/userInfo.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/profile/userInfo.vue rename to muster-ui/src/views/system/user/profile/userInfo.vue diff --git a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue b/muster-ui/src/views/tool/build/CodeTypeDialog.vue similarity index 100% rename from ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue rename to muster-ui/src/views/tool/build/CodeTypeDialog.vue diff --git a/ruoyi-ui/src/views/tool/build/DraggableItem.vue b/muster-ui/src/views/tool/build/DraggableItem.vue similarity index 100% rename from ruoyi-ui/src/views/tool/build/DraggableItem.vue rename to muster-ui/src/views/tool/build/DraggableItem.vue diff --git a/ruoyi-ui/src/views/tool/build/IconsDialog.vue b/muster-ui/src/views/tool/build/IconsDialog.vue similarity index 100% rename from ruoyi-ui/src/views/tool/build/IconsDialog.vue rename to muster-ui/src/views/tool/build/IconsDialog.vue diff --git a/ruoyi-ui/src/views/tool/build/RightPanel.vue b/muster-ui/src/views/tool/build/RightPanel.vue similarity index 100% rename from ruoyi-ui/src/views/tool/build/RightPanel.vue rename to muster-ui/src/views/tool/build/RightPanel.vue diff --git a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue b/muster-ui/src/views/tool/build/TreeNodeDialog.vue similarity index 100% rename from ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue rename to muster-ui/src/views/tool/build/TreeNodeDialog.vue diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/muster-ui/src/views/tool/build/index.vue similarity index 100% rename from ruoyi-ui/src/views/tool/build/index.vue rename to muster-ui/src/views/tool/build/index.vue diff --git a/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue b/muster-ui/src/views/tool/gen/basicInfoForm.vue similarity index 100% rename from ruoyi-ui/src/views/tool/gen/basicInfoForm.vue rename to muster-ui/src/views/tool/gen/basicInfoForm.vue diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/muster-ui/src/views/tool/gen/editTable.vue similarity index 100% rename from ruoyi-ui/src/views/tool/gen/editTable.vue rename to muster-ui/src/views/tool/gen/editTable.vue diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/muster-ui/src/views/tool/gen/genInfoForm.vue similarity index 96% rename from ruoyi-ui/src/views/tool/gen/genInfoForm.vue rename to muster-ui/src/views/tool/gen/genInfoForm.vue index d53561160..efe537c91 100644 --- a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue +++ b/muster-ui/src/views/tool/gen/genInfoForm.vue @@ -1,187 +1,187 @@ - - + + diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/muster-ui/src/views/tool/gen/importTable.vue similarity index 100% rename from ruoyi-ui/src/views/tool/gen/importTable.vue rename to muster-ui/src/views/tool/gen/importTable.vue diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/muster-ui/src/views/tool/gen/index.vue similarity index 96% rename from ruoyi-ui/src/views/tool/gen/index.vue rename to muster-ui/src/views/tool/gen/index.vue index a819f51e0..f0b9e0123 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/muster-ui/src/views/tool/gen/index.vue @@ -1,291 +1,291 @@ - - - \ No newline at end of file + + + diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/muster-ui/src/views/tool/swagger/index.vue similarity index 100% rename from ruoyi-ui/src/views/tool/swagger/index.vue rename to muster-ui/src/views/tool/swagger/index.vue diff --git a/ruoyi-ui/vue.config.js b/muster-ui/vue.config.js similarity index 92% rename from ruoyi-ui/vue.config.js rename to muster-ui/vue.config.js index b7f16f3e8..64362baf7 100644 --- a/ruoyi-ui/vue.config.js +++ b/muster-ui/vue.config.js @@ -1,128 +1,128 @@ -'use strict' -const path = require('path') -const defaultSettings = require('./src/settings.js') - -function resolve(dir) { - return path.join(__dirname, dir) -} - -const name = defaultSettings.title || '若依管理系统' // 标题 - -const port = process.env.port || process.env.npm_config_port || 80 // 端口 - -// vue.config.js 配置说明 -//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions -// 这里只列一部分，具体配置参考文档 -module.exports = { - // 部署生产环境和开发环境下的URL。 - // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", - // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'dist', - // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: 'static', - // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', - // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 - productionSourceMap: false, - // webpack-dev-server 相关配置 - devServer: { - host: '0.0.0.0', - port: port, - proxy: { - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, - changeOrigin: true, - pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } - } - }, - disableHostCheck: true - }, - configureWebpack: { - name: name, - resolve: { - alias: { - '@': resolve('src') - } - } - }, - chainWebpack(config) { - config.plugins.delete('preload') // TODO: need test - config.plugins.delete('prefetch') // TODO: need test - - // set svg-sprite-loader - config.module - .rule('svg') - .exclude.add(resolve('src/assets/icons')) - .end() - config.module - .rule('icons') - .test(/\.svg$/) - .include.add(resolve('src/assets/icons')) - .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') - .options({ - symbolId: 'icon-[name]' - }) - .end() - - // set preserveWhitespace - config.module - .rule('vue') - .use('vue-loader') - .loader('vue-loader') - .tap(options => { - options.compilerOptions.preserveWhitespace = true - return options - }) - .end() - - config - .when(process.env.NODE_ENV !== 'development', - config => { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - }]) - .end() - config - .optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true - } - } - }) - config.optimization.runtimeChunk('single'), - { - from: path.resolve(__dirname, './public/robots.txt'),//防爬虫文件 - to:'./',//到根目录下 - } - } - ) - } -} +'use strict' +const path = require('path') +const defaultSettings = require('./src/settings.js') + +function resolve(dir) { + return path.join(__dirname, dir) +} + +const name = defaultSettings.title || '若依管理系统' // 标题 + +const port = process.env.port || process.env.npm_config_port || 80 // 端口 + +// vue.config.js 配置说明 +//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions +// 这里只列一部分，具体配置参考文档 +module.exports = { + // 部署生产环境和开发环境下的URL。 + // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.muster.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.muster.vip/admin/，则设置 baseUrl 为 /admin/。 + publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: 'dist', + // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） + assetsDir: 'static', + // 是否开启eslint保存检测，有效值：ture | false | 'error' + lintOnSave: process.env.NODE_ENV === 'development', + // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 + productionSourceMap: false, + // webpack-dev-server 相关配置 + devServer: { + host: '0.0.0.0', + port: port, + proxy: { + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://localhost:8080`, + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' + } + } + }, + disableHostCheck: true + }, + configureWebpack: { + name: name, + resolve: { + alias: { + '@': resolve('src') + } + } + }, + chainWebpack(config) { + config.plugins.delete('preload') // TODO: need test + config.plugins.delete('prefetch') // TODO: need test + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/assets/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/assets/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + // set preserveWhitespace + config.module + .rule('vue') + .use('vue-loader') + .loader('vue-loader') + .tap(options => { + options.compilerOptions.preserveWhitespace = true + return options + }) + .end() + + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + config.optimization.runtimeChunk('single'), + { + from: path.resolve(__dirname, './public/robots.txt'),//防爬虫文件 + to:'./',//到根目录下 + } + } + ) + } +} diff --git a/pom.xml b/pom.xml index bde1e1b39..4777da02a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + com.muster + muster 3.0.0 - ruoyi - http://www.ruoyi.vip + muster + http://www.muster.vip 若依管理系统 - 3.0.0 + 3.0.0 UTF-8 UTF-8 1.8 @@ -148,49 +148,49 @@ - com.ruoyi - ruoyi-quartz - ${ruoyi.version} + com.muster + muster-quartz + ${muster.version} - com.ruoyi - ruoyi-generator - ${ruoyi.version} + com.muster + muster-generator + ${muster.version} - com.ruoyi - ruoyi-framework - ${ruoyi.version} + com.muster + muster-framework + ${muster.version} - com.ruoyi - ruoyi-system - ${ruoyi.version} + com.muster + muster-system + ${muster.version} - com.ruoyi - ruoyi-common - ${ruoyi.version} + com.muster + muster-common + ${muster.version} - ruoyi-admin - ruoyi-framework - ruoyi-system - ruoyi-quartz - ruoyi-generator - ruoyi-common + muster-admin + muster-framework + muster-system + muster-quartz + muster-generator + muster-common pom diff --git a/ry.sh b/ry.sh index 6558b9785..01ffd06a9 100644 --- a/ry.sh +++ b/ry.sh @@ -1,6 +1,6 @@ #!/bin/bash -AppName=ruoyi-admin.jar +AppName=muster-admin.jar #JVM参数 JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" diff --git a/sql/ry_20200723.sql b/sql/ry_20200723.sql index 727ac6cb8..42fdd72eb 100644 --- a/sql/ry_20200723.sql +++ b/sql/ry_20200723.sql @@ -156,7 +156,7 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, 1, 'M', '0', '0', '', 'system', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, 1, 'M', '0', '0', '', 'monitor', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, 1, 'M', '0', '0', '', 'tool', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统工具目录'); -insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null , 0, 'M', '0', '0', '', 'guide', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '若依官网地址'); +insert into sys_menu values('4', '若依官网', '0', '4', 'http://muster.vip', null , 0, 'M', '0', '0', '', 'guide', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '若依官网地址'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', 1, 'C', '0', '0', 'system:user:list', 'user', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '用户管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', 1, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '角色管理菜单');