1

Author: wujun728

doc/README.md

@@ -6,7 +6,7 @@ fork自若依/RuoYi ,兼具RuoYi,不定期更新源项目代码保持同步,在
 ###### 多数据源切面
 根据方法名自动切换，默认主从分离（当然主从地址一样），当只有一个数据源的时候虽然会打印日志，实际主从还是同一个
 ###### 集成通用mapper
-一开始想整合mybatis-plus，这玩意太重了，而且crud和本项目很多地方八字不合。mapper继承com.royal.common.base.BaseMapper<T>后就可以策马奔腾啦，谁用谁知道
+一开始想整合mybatis-plus，这玩意太重了，而且crud和本项目很多地方八字不合。mapper继承com.jun.plugin.common.base.BaseMapper<T>后就可以策马奔腾啦，谁用谁知道
 ###### 控制台日志分等级彩色渲染和多环境修改
 具体看logback-spring.xml和application.xml改动
 ###### 集成七牛云，阿里云，腾讯云OSS

jun_springboot_app/src/main/java/com/royal/RoyalApplication.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/RoyalApplication.java

@@ -1,4 +1,4 @@
-package com.royal;
+package com.jun.plugin;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,10 +8,10 @@
 /**
  * 启动程序
  * 
- * @author royal
+ * @author admin
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-@MapperScan("com.royal.**.mapper")
+@MapperScan("com.jun.plugin.**.mapper")
 public class RoyalApplication
 {
     public static void main(String[] args)

jun_springboot_rbac/src/main/java/com/royal/RoyalServletInitializer.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/RoyalServletInitializer.java

@@ -1,12 +1,12 @@
-package com.royal;
+package com.jun.plugin;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 /**
  * web容器中进行部署
  * 
- * @author royal
+ * @author admin
  */
 public class RoyalServletInitializer extends SpringBootServletInitializer
 {

jun_springboot_app/src/main/java/com/royal/app/common/base/BaseController.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/app/common/base/BaseController.java

@@ -1,14 +1,14 @@
-package com.royal.app.common.base;
+package com.jun.plugin.app.common.base;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.royal.app.common.page.PageDomain;
-import com.royal.app.common.page.PageSupport;
-import com.royal.app.common.page.ResultData;
-import com.royal.app.common.page.TableDataInfo;
-import com.royal.app.common.util.ShiroUtils;
-import com.royal.common.base.AjaxResult;
-import com.royal.common.utils.StringUtils;
+import com.jun.plugin.app.common.page.PageDomain;
+import com.jun.plugin.app.common.page.PageSupport;
+import com.jun.plugin.app.common.page.ResultData;
+import com.jun.plugin.app.common.page.TableDataInfo;
+import com.jun.plugin.app.common.util.ShiroUtils;
+import com.jun.plugin.common.base.AjaxResult;
+import com.jun.plugin.common.utils.StringUtils;
 
 import java.util.List;
 

jun_springboot_app/src/main/java/com/royal/app/common/config/FilterConfig.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/app/common/config/FilterConfig.java

@@ -1,4 +1,4 @@
-package com.royal.app.common.config;
+package com.jun.plugin.app.common.config;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,13 +7,14 @@
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.royal.common.utils.StringUtils;
-import com.royal.common.xss.XssFilter;
+
+import com.jun.plugin.common.utils.StringUtils;
+import com.jun.plugin.common.xss.XssFilter;
 
 /**
  * Filter配置
  *
- * @author royal
+ * @author admin
  */
 @Configuration
 public class FilterConfig

jun_springboot_app/src/main/java/com/royal/app/common/config/JacksonConfig.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/app/common/config/JacksonConfig.java

@@ -1,4 +1,4 @@
-package com.royal.app.common.config;
+package com.jun.plugin.app.common.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;

jun_springboot_app/src/main/java/com/royal/app/common/config/ShiroConfig.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/app/common/config/ShiroConfig.java

@@ -1,4 +1,4 @@
-package com.royal.app.common.config;
+package com.jun.plugin.app.common.config;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,8 +14,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.royal.app.common.shiro.JwtFilter;
-import com.royal.app.common.shiro.MyRealm;
+import com.jun.plugin.app.common.shiro.JwtFilter;
+import com.jun.plugin.app.common.shiro.MyRealm;
 
 @Configuration
 public class ShiroConfig

jun_springboot_rbac/src/main/java/com/royal/web/core/config/SwaggerConfig.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/app/common/config/SwaggerConfig.java

@@ -1,12 +1,12 @@
-package com.royal.web.core.config;
+package com.jun.plugin.app.common.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
-import com.royal.common.config.Global;
+import com.jun.plugin.common.config.Global;
 
 import io.swagger.annotations.ApiOperation;
 import springfox.documentation.RequestHandler;
@@ -22,7 +22,7 @@
 /**
  * Swagger2的接口配置
  * 
- * @author royal
+ * @author admin
  */
 @Configuration
 @EnableSwagger2
@@ -38,8 +38,8 @@ public Docket createRestApi()
                 // 详细定制
                 .apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                 // 指定当前包路径
-                // .apis(RequestHandlerSelectors.basePackage("com.royal.web.controller.tool"))
-                // .apis(basePackage("com.royal.web.controller.system,com.royal.web.controller.tool"))
+                // .apis(RequestHandlerSelectors.basePackage("com.jun.plugin.web.controller.tool"))
+                // .apis(basePackage("com.jun.plugin.web.controller.system,com.jun.plugin.web.controller.tool"))
                 // 扫描所有 .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any()).build();
     }

jun_springboot_app/src/main/java/com/royal/app/common/exception/GloablExceptionHandler.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/app/common/exception/GloablExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.royal.app.common.exception;
+package com.jun.plugin.app.common.exception;
 
 import org.apache.shiro.ShiroException;
 import org.springframework.http.HttpStatus;
@@ -7,7 +7,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import com.royal.app.common.page.ResultData;
+import com.jun.plugin.app.common.page.ResultData;
 
 /**
  * <p>File：GloablExceptionHandler.java</p>

jun_springboot_app/src/main/java/com/royal/app/common/exception/UnauthorizedException.java renamed to jun_springboot_app/src/main/java/com/jun/plugin/app/common/exception/UnauthorizedException.java

@@ -1,4 +1,4 @@
-package com.royal.app.common.exception;
+package com.jun.plugin.app.common.exception;
 
 public class UnauthorizedException extends RuntimeException
 {