更新包结构

manager/src/main/java/cn/reghao/devops/manager/spring/config/CacheConfig.java → manager/src/main/java/cn/reghao/devops/manager/config/CacheConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring.config;
+package cn.reghao.devops.manager.config;
 
 import com.github.benmanes.caffeine.cache.*;
 import org.springframework.cache.CacheManager;

manager/src/main/java/cn/reghao/devops/manager/spring/config/ScheduledConfig.java → manager/src/main/java/cn/reghao/devops/manager/config/ScheduledConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring.config;
+package cn.reghao.devops.manager.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

manager/src/main/java/cn/reghao/devops/manager/spring/config/SwaggerConfig.java → manager/src/main/java/cn/reghao/devops/manager/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring.config;
+package cn.reghao.devops.manager.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

manager/src/main/java/cn/reghao/devops/manager/spring/BeansConfig.java → manager/src/main/java/cn/reghao/devops/manager/config/spring/BeansConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring;
+package cn.reghao.devops.manager.config.spring;
 
 import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.http.WebClient;

manager/src/main/java/cn/reghao/devops/manager/spring/ManagerLifecycle.java → manager/src/main/java/cn/reghao/devops/manager/config/spring/ManagerLifecycle.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring;
+package cn.reghao.devops.manager.config.spring;
 
 import cn.reghao.devops.common.machine.Machine;
 import cn.reghao.devops.manager.app.db.repository.AppEnvRepository;

manager/src/main/java/cn/reghao/devops/manager/spring/config/MvcDataConverter.java → manager/src/main/java/cn/reghao/devops/manager/config/spring/MvcDataConverter.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring.config;
+package cn.reghao.devops.manager.config.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

manager/src/main/java/cn/reghao/devops/manager/spring/exception/ControllerExceptionHandler.java → manager/src/main/java/cn/reghao/devops/manager/config/web/ControllerExceptionHandler.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring.exception;
+package cn.reghao.devops.manager.config.web;
 
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
 import cn.reghao.jutil.jdk.result.WebResult;

manager/src/main/java/cn/reghao/devops/manager/spring/exception/FilterExceptionHandler.java → manager/src/main/java/cn/reghao/devops/manager/config/web/FilterExceptionHandler.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring.exception;
+package cn.reghao.devops.manager.config.web;
 
 import io.swagger.annotations.Api;
 import org.springframework.boot.autoconfigure.web.ErrorProperties;

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/TimoDialect.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/TimoDialect.java

@@ -1,7 +1,7 @@
-package cn.reghao.devops.manager.rbac.thymeleaf;
+package cn.reghao.devops.manager.thymeleaf;
 
-import cn.reghao.devops.manager.rbac.thymeleaf.attribute.SelectDictAttrProcessor;
-import cn.reghao.devops.manager.rbac.thymeleaf.attribute.SelectListAttrProcessor;
+import cn.reghao.devops.manager.thymeleaf.attribute.SelectDictAttrProcessor;
+import cn.reghao.devops.manager.thymeleaf.attribute.SelectListAttrProcessor;
 import org.thymeleaf.dialect.AbstractProcessorDialect;
 import org.thymeleaf.dialect.IExpressionObjectDialect;
 import org.thymeleaf.expression.IExpressionObjectFactory;

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/TimoExpressionObjectFactory.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/TimoExpressionObjectFactory.java

@@ -1,8 +1,8 @@
-package cn.reghao.devops.manager.rbac.thymeleaf;
+package cn.reghao.devops.manager.thymeleaf;
 
-import cn.reghao.devops.manager.rbac.thymeleaf.utility.DictUtil;
-import cn.reghao.devops.manager.rbac.thymeleaf.utility.LogUtil;
-import cn.reghao.devops.manager.rbac.thymeleaf.utility.PageUtil;
+import cn.reghao.devops.manager.thymeleaf.utility.DictUtil;
+import cn.reghao.devops.manager.thymeleaf.utility.LogUtil;
+import cn.reghao.devops.manager.thymeleaf.utility.PageUtil;
 import org.thymeleaf.context.IExpressionContext;
 import org.thymeleaf.expression.IExpressionObjectFactory;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/attribute/SelectDictAttrProcessor.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/attribute/SelectDictAttrProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.thymeleaf.attribute;
+package cn.reghao.devops.manager.thymeleaf.attribute;
 
 import cn.reghao.devops.manager.app.model.constant.AppType;
 import cn.reghao.devops.manager.app.model.constant.EnvMap;

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/attribute/SelectListAttrProcessor.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/attribute/SelectListAttrProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.thymeleaf.attribute;
+package cn.reghao.devops.manager.thymeleaf.attribute;
 
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.context.ITemplateContext;

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/config/ThymeleafAutoConfig.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/config/ThymeleafAutoConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.thymeleaf.config;
+package cn.reghao.devops.manager.thymeleaf.config;
 
 import org.springframework.context.annotation.ComponentScan;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/config/ThymeleafConfig.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/config/ThymeleafConfig.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.manager.rbac.thymeleaf.config;
+package cn.reghao.devops.manager.thymeleaf.config;
 
-import cn.reghao.devops.manager.rbac.thymeleaf.TimoDialect;
+import cn.reghao.devops.manager.thymeleaf.TimoDialect;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/utility/DictUtil.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/utility/DictUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.thymeleaf.utility;
+package cn.reghao.devops.manager.thymeleaf.utility;
 
 /*import com.linln.common.utils.EhCacheUtil;
 import com.linln.modules.system.domain.Dict;

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/utility/LogUtil.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/utility/LogUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.thymeleaf.utility;
+package cn.reghao.devops.manager.thymeleaf.utility;
 
 /*import com.linln.common.utils.EntityBeanUtil;
 import com.linln.common.utils.SpringContextUtil;

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/utility/PageUtil.java → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/utility/PageUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.rbac.thymeleaf.utility;
+package cn.reghao.devops.manager.thymeleaf.utility;
 
 import org.springframework.data.domain.Page;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/thymeleaf/xml/Timo-Dialect.xml → manager/src/main/java/cn/reghao/devops/manager/thymeleaf/xml/Timo-Dialect.xml

@@ -23,11 +23,11 @@
         xmlns="http://www.thymeleaf.org/extras/dialect"
         prefix="mo"
         namespace-uri="https://gitee.com/aun/Timo"
-        class="cn.reghao.devops.manager.rbac.thymeleaf.TimoDialect">
+        class="cn.reghao.devops.manager.thymeleaf.TimoDialect">
 
     <!-- 自定义属性标签 -->
     <attribute-processor name="list"
-                         class="cn.reghao.devops.manager.rbac.thymeleaf.attribute.SelectListAttrProcessor">
+                         class="cn.reghao.devops.manager.thymeleaf.attribute.SelectListAttrProcessor">
         <documentation><![CDATA[
 		自定义下拉列表生成标签，值可以为数组和集合！
 		mo-selected属性：默认选择的值
@@ -35,7 +35,7 @@
 		]]></documentation>
     </attribute-processor>
     <attribute-processor name="dict"
-                         class="cn.reghao.devops.manager.rbac.thymeleaf.attribute.SelectDictAttrProcessor">
+                         class="cn.reghao.devops.manager.thymeleaf.attribute.SelectDictAttrProcessor">
         <documentation><![CDATA[
 		根据字典标识生成下拉列表，值可以为数组和集合！
 		mo-selected属性：默认选择的值
@@ -44,8 +44,8 @@
     </attribute-processor>
 
     <!-- 自定义对象工具 -->
-    <expression-object name="pageUtil" class="cn.reghao.devops.manager.rbac.thymeleaf.utility.PageUtil"/>
-    <expression-object name="dicts" class="cn.reghao.devops.manager.rbac.thymeleaf.utility.DictUtil"/>
+    <expression-object name="pageUtil" class="cn.reghao.devops.manager.thymeleaf.utility.PageUtil"/>
+    <expression-object name="dicts" class="cn.reghao.devops.manager.thymeleaf.utility.DictUtil"/>
 
 
 </dialect>

manager/src/main/java/cn/reghao/devops/manager/spring/HttpUtil.java → manager/src/main/java/cn/reghao/devops/manager/util/HttpUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.spring;
+package cn.reghao.devops.manager.util;
 
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;

manager/src/main/java/cn/reghao/devops/manager/util/db/PageSort.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.util.db;
 
-import cn.reghao.devops.manager.spring.HttpUtil;
+import cn.reghao.devops.manager.util.HttpUtil;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 

manager/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.reghao.devops.manager.rbac.thymeleaf.config.ThymeleafAutoConfig
+cn.reghao.devops.manager.thymeleaf.config.ThymeleafAutoConfig