diff --git a/logs/demo-app.log b/logs/demo-app.log new file mode 100644 index 0000000..bba46ce --- /dev/null +++ b/logs/demo-app.log @@ -0,0 +1,32 @@ +INFO 2025-03-24 21:04:11.629 [-main][*][o.noear.solon.Solon]: +App: Start loading +INFO 2025-03-24 21:04:11.675 [-main][*][o.noear.solon.Solon]: +App: Plugin starting +INFO 2025-03-24 21:04:11.768 [-main][*][o.noear.solon.Solon]: +Render mapping: @json=StringSerializerRender#snack3-json +INFO 2025-03-24 21:04:11.770 [-main][*][o.noear.solon.Solon]: +Render mapping: @type_json=StringSerializerRender#snack3-json +INFO 2025-03-24 21:04:11.772 [-main][*][o.noear.solon.Solon]: +Session: Local session state plugin is loaded +INFO 2025-03-24 21:04:12.098 [-main][*][o.noear.solon.Solon]: +Render mapping: @json=StringSerializerRender#jackson-json +INFO 2025-03-24 21:04:12.112 [-main][*][o.noear.solon.Solon]: +Render mapping: @type_json=StringSerializerRender#jackson-json +INFO 2025-03-24 21:04:12.151 [-main][*][o.noear.solon.Solon]: +View: load: ThymeleafRender +INFO 2025-03-24 21:04:12.151 [-main][*][o.noear.solon.Solon]: +View: load: org.noear.solon.view.thymeleaf.ThymeleafRender +INFO 2025-03-24 21:04:12.151 [-main][*][o.noear.solon.Solon]: +Render mapping: .html=ThymeleafRender +INFO 2025-03-24 21:04:12.192 [-main][*][o.noear.solon.Solon]: +App: Bean scanning +INFO 2025-03-24 21:04:12.557 [-main][*][o.noear.solon.Solon]: +solon.connector:main: smarthttp: Started ServerConnector@{HTTP/1.1,[http/1.1]}{http://localhost:8080} +INFO 2025-03-24 21:04:12.558 [-main][*][o.noear.solon.Solon]: +Server:main: smarthttp: Started (smart http 2.5/3.1.0) @340ms +INFO 2025-03-24 21:04:12.561 [-main][*][o.noear.solon.Solon]: +App: End loading elapsed=1267ms pid=20956 v=3.1.0 +INFO 2025-03-24 21:04:16.945 [-Thread-1][*][o.noear.solon.Solon]: +Server:main: smarthttp: Has Stopped (smart http 2.5/3.1.0) +INFO 2025-03-24 21:04:16.948 [-Thread-1][*][o.noear.solon.Solon]: +App: Stopped diff --git a/plugins/cms/pom.xml b/plugins/cms/pom.xml new file mode 100644 index 0000000..bde1e9b --- /dev/null +++ b/plugins/cms/pom.xml @@ -0,0 +1,86 @@ + + + 4.0.0 + + + vip.fuck.sm.plugins + plugins + 1.0 + ../pom.xml + + + vip.fuck.sm.plugins.cms + cms + 1.0 + + jar + + Demo project for Solon + + + 1.8 + + + + + org.noear + solon-lib + + + + org.noear + solon-logging-logback + + + + + + org.noear + solon-test + test + + + + + + ${project.artifactId} + + + + + org.apache.maven.plugins + maven-assembly-plugin + + ${project.artifactId} + false + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + + + + + tencent + https://mirrors.cloud.tencent.com/nexus/repository/maven-public/ + + false + + + + + \ No newline at end of file diff --git a/plugins/cms/src/main/java/vip/fuck/sm/plugins/cms/App.java b/plugins/cms/src/main/java/vip/fuck/sm/plugins/cms/App.java new file mode 100644 index 0000000..98ec31f --- /dev/null +++ b/plugins/cms/src/main/java/vip/fuck/sm/plugins/cms/App.java @@ -0,0 +1,11 @@ +package vip.fuck.sm.plugins.cms; + +import org.noear.solon.Solon; +import org.noear.solon.annotation.SolonMain; + +//@SolonMain +public class App { + public static void main(String[] args) { + Solon.start(App.class, args); + } +} \ No newline at end of file diff --git a/plugins/cms/src/main/java/vip/fuck/sm/plugins/cms/CmsPlugin.java b/plugins/cms/src/main/java/vip/fuck/sm/plugins/cms/CmsPlugin.java new file mode 100644 index 0000000..8e244e8 --- /dev/null +++ b/plugins/cms/src/main/java/vip/fuck/sm/plugins/cms/CmsPlugin.java @@ -0,0 +1,11 @@ +package vip.fuck.sm.plugins.cms; + +import org.noear.solon.core.AppContext; +import org.noear.solon.core.Plugin; + +public class CmsPlugin implements Plugin { + @Override + public void start(AppContext context) throws Throwable { + System.out.println("cms.test.plugins"); + } +} diff --git a/plugins/cms/src/main/resources/META-INF/solon/plugins.cms.properties b/plugins/cms/src/main/resources/META-INF/solon/plugins.cms.properties new file mode 100644 index 0000000..0dcc3b3 --- /dev/null +++ b/plugins/cms/src/main/resources/META-INF/solon/plugins.cms.properties @@ -0,0 +1,2 @@ +solon.plugin=vip.fuck.sm.plugins.cms.CmsPlugin +solon.plugin.priority=999 \ No newline at end of file diff --git a/plugins/cms/src/main/resources/apps.yml b/plugins/cms/src/main/resources/apps.yml new file mode 100644 index 0000000..d81a94b --- /dev/null +++ b/plugins/cms/src/main/resources/apps.yml @@ -0,0 +1,12 @@ +server.port: 8080 + +solon.app: + name: 'demo-app' + group: 'demo' + +solon.logging: + appender: + console: + level: INFO + file: + level: INFO \ No newline at end of file diff --git a/plugins/cms/src/main/resources/plugin-info.properties b/plugins/cms/src/main/resources/plugin-info.properties new file mode 100644 index 0000000..9ac2cc1 --- /dev/null +++ b/plugins/cms/src/main/resources/plugin-info.properties @@ -0,0 +1,6 @@ +plugin.author: xian.zi.ming@qq.com +plugin.description: content manager system +plugin.version: 1.0 +plugin.qualified: fuckcms +plugin.siteUrl: http://fuck.vip +plugin.docUrl: http://fuck.vip \ No newline at end of file diff --git a/plugins/pom.xml b/plugins/pom.xml new file mode 100644 index 0000000..2d0c480 --- /dev/null +++ b/plugins/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + vip.fuck.sm + solon-manager + 1.0 + ../pom.xml + + + vip.fuck.sm.plugins + plugins + 1.0 + + pom + + Demo project for Solon + + cms + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 788d5bb..c7c969c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,10 @@ vip.fuck.sm solon-manager - 0.0.1-SNAPSHOT + 1.0 solon-manager Demo project for Solon + pom 1.8 3.4.0 @@ -30,25 +31,30 @@ 2.0.2 1.6.2 + + solon-system + plugins + + + + - org.noear solon-web + 3.1.0 - + + org.noear + solon-hotplug + 3.1.0 + org.dromara.autotable auto-table-solon-plugin 2.3.1 - - - org.projectlombok - lombok - - @@ -61,30 +67,29 @@ org.dromara.autotable auto-table-core 2.3.1 - - - org.projectlombok - lombok - - org.noear solon-view-thymeleaf + 3.1.0 + org.noear solon-logging-logback + 3.1.0 org.noear solon-serialization-jackson + 3.1.0 org.noear solon-security-validation + 3.1.0 @@ -99,13 +104,7 @@ 3.5.9 - - - org.projectlombok - lombok - 1.18.34 - provided - + mysql @@ -134,6 +133,7 @@ org.noear solon-openapi2-knife4j + 3.1.0 commons-lang @@ -170,6 +170,7 @@ org.noear sa-token-solon-plugin + 3.1.0 @@ -178,6 +179,7 @@ + 3.1.0 @@ -187,11 +189,11 @@ - - + + - manager + ${project.artifactId} org.noear diff --git a/solon-system/pom.xml b/solon-system/pom.xml new file mode 100644 index 0000000..440090a --- /dev/null +++ b/solon-system/pom.xml @@ -0,0 +1,190 @@ + + + 4.0.0 + + vip.fuck.sm + solon-manager + 1.0 + ../pom.xml + + solon-system + 1.0 + solon-system + Demo project for Solon + + jar + + + org.noear + solon-web + + + + org.noear + solon-hotplug + + + + org.dromara.autotable + auto-table-solon-plugin + + + + org.dromara.autotable + auto-table-annotation + + + + org.dromara.autotable + auto-table-core + + + + + org.noear + solon-view-thymeleaf + + + + org.noear + solon-logging-logback + + + org.noear + solon-serialization-jackson + + + org.noear + solon-security-validation + + + + com.baomidou + mybatis-plus-solon-plugin + 3.5.10.1 + + + + com.baomidou + mybatis-plus-jsqlparser-4.9 + 3.5.9 + + + + + + mysql + mysql-connector-java + runtime + + + com.zaxxer + HikariCP + + + + com.oracle + ojdbc6 + + + com.microsoft.sqlserver + sqljdbc4 + runtime + + + + org.noear + solon-openapi2-knife4j + + + commons-lang + commons-lang + + + commons-io + commons-io + + + commons-configuration + commons-configuration + + + velocity + org.apache.velocity + + + com.github.whvcse + easy-captcha + + + commons-codec + commons-codec + + + + + org.noear + sa-token-solon-plugin + + + + org.noear + solon-cache-jedis + + + + + cn.hutool + hutool-all + + + vip.fuck.sm.plugins.cms + cms + 1.0 + compile + + + + + + ${project.artifactId} + + + org.noear + solon-maven-plugin + + + org.apache.maven.plugins + maven-assembly-plugin + + ${project.artifactId} + false + + jar-with-dependencies + + + + vip.fuck.sm.SolonManagerApplication + + + + + + make-assembly + package + + single + + + + + + + + + + + diff --git a/src/main/java/vip/fuck/sm/SolonManagerApplication.java b/solon-system/src/main/java/vip/fuck/sm/SolonManagerApplication.java similarity index 96% rename from src/main/java/vip/fuck/sm/SolonManagerApplication.java rename to solon-system/src/main/java/vip/fuck/sm/SolonManagerApplication.java index efac741..15ce8e7 100644 --- a/src/main/java/vip/fuck/sm/SolonManagerApplication.java +++ b/solon-system/src/main/java/vip/fuck/sm/SolonManagerApplication.java @@ -1,6 +1,6 @@ package vip.fuck.sm; -import lombok.extern.slf4j.Slf4j; + import org.dromara.autotable.solon.annotation.EnableAutoTable; import org.noear.solon.Solon; import org.noear.solon.annotation.Inject; @@ -12,12 +12,13 @@ import org.noear.solon.web.staticfiles.repository.ClassPathStaticRepository; import org.noear.solon.web.staticfiles.repository.FileStaticRepository; import vip.fuck.sm.common.utils.FileConfig; + /** * 启动类 * * @author xian.zi.ming@qq.com fuck.vip */ -@Slf4j + @SolonMain @EnableAutoTable public class SolonManagerApplication { diff --git a/src/main/java/vip/fuck/sm/common/aop/annotation/LogAnnotation.java b/solon-system/src/main/java/vip/fuck/sm/common/aop/annotation/LogAnnotation.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/aop/annotation/LogAnnotation.java rename to solon-system/src/main/java/vip/fuck/sm/common/aop/annotation/LogAnnotation.java diff --git a/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java b/solon-system/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java similarity index 97% rename from src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java rename to solon-system/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java index 7ec8561..cd30fa6 100644 --- a/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java +++ b/solon-system/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java @@ -10,7 +10,7 @@ import vip.fuck.sm.common.aop.annotation.LogAnnotation; import vip.fuck.sm.entity.SysLog; import vip.fuck.sm.entity.SysUser; import vip.fuck.sm.mapper.SysLogMapper; -import lombok.extern.slf4j.Slf4j; + import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.core.handle.Action; @@ -25,9 +25,9 @@ import java.lang.reflect.Parameter; import static org.noear.solon.validation.annotation.HttpPart.params; @Component(index = -99) -@Slf4j public class LoggingRouterInterceptor implements RouterInterceptor { + @Db private SysLogMapper sysLogMapper; @@ -82,7 +82,7 @@ public class LoggingRouterInterceptor implements RouterInterceptor { sysLog.setUserId(userId); sysLog.setTime((int) timespan); - log.info(sysLog.toString()); +// log.info(sysLog.toString()); sysLogMapper.insert(sysLog); } diff --git a/src/main/java/vip/fuck/sm/common/config/GlobalResultInterceptor.java b/solon-system/src/main/java/vip/fuck/sm/common/config/GlobalResultInterceptor.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/config/GlobalResultInterceptor.java rename to solon-system/src/main/java/vip/fuck/sm/common/config/GlobalResultInterceptor.java diff --git a/src/main/java/vip/fuck/sm/common/config/MetaObjectHandlerConfig.java b/solon-system/src/main/java/vip/fuck/sm/common/config/MetaObjectHandlerConfig.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/config/MetaObjectHandlerConfig.java rename to solon-system/src/main/java/vip/fuck/sm/common/config/MetaObjectHandlerConfig.java diff --git a/src/main/java/vip/fuck/sm/common/config/MyBatisPlusConfig.java b/solon-system/src/main/java/vip/fuck/sm/common/config/MyBatisPlusConfig.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/config/MyBatisPlusConfig.java rename to solon-system/src/main/java/vip/fuck/sm/common/config/MyBatisPlusConfig.java diff --git a/src/main/java/vip/fuck/sm/common/config/RedisCacheConfig.java b/solon-system/src/main/java/vip/fuck/sm/common/config/RedisCacheConfig.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/config/RedisCacheConfig.java rename to solon-system/src/main/java/vip/fuck/sm/common/config/RedisCacheConfig.java diff --git a/src/main/java/vip/fuck/sm/common/config/StpInterfaceImpl.java b/solon-system/src/main/java/vip/fuck/sm/common/config/StpInterfaceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/config/StpInterfaceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/common/config/StpInterfaceImpl.java diff --git a/src/main/java/vip/fuck/sm/common/config/SwaggerConfiguration.java b/solon-system/src/main/java/vip/fuck/sm/common/config/SwaggerConfiguration.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/config/SwaggerConfiguration.java rename to solon-system/src/main/java/vip/fuck/sm/common/config/SwaggerConfiguration.java diff --git a/src/main/java/vip/fuck/sm/common/config/WebMvcConfigurer.java b/solon-system/src/main/java/vip/fuck/sm/common/config/WebMvcConfigurer.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/config/WebMvcConfigurer.java rename to solon-system/src/main/java/vip/fuck/sm/common/config/WebMvcConfigurer.java diff --git a/src/main/java/vip/fuck/sm/common/exception/BusinessException.java b/solon-system/src/main/java/vip/fuck/sm/common/exception/BusinessException.java similarity index 81% rename from src/main/java/vip/fuck/sm/common/exception/BusinessException.java rename to solon-system/src/main/java/vip/fuck/sm/common/exception/BusinessException.java index 26d68c0..5432042 100644 --- a/src/main/java/vip/fuck/sm/common/exception/BusinessException.java +++ b/solon-system/src/main/java/vip/fuck/sm/common/exception/BusinessException.java @@ -1,7 +1,6 @@ package vip.fuck.sm.common.exception; -import lombok.Data; -import lombok.EqualsAndHashCode; + import vip.fuck.sm.common.exception.code.BaseResponseCode; import vip.fuck.sm.common.exception.code.ResponseCodeInterface; @@ -12,8 +11,7 @@ import vip.fuck.sm.common.exception.code.ResponseCodeInterface; * @version V1.0 * @date 2020年3月18日 */ -@EqualsAndHashCode(callSuper = true) -@Data + public class BusinessException extends RuntimeException { /** * 异常编号 @@ -55,5 +53,19 @@ public class BusinessException extends RuntimeException { this(code.getCode(), code.getMsg()); } + public int getMessageCode() { + return messageCode; + } + public String getDetailMessage() { + return detailMessage; + } + + public Throwable getThrowable() { + return throwable; + } + + public void setThrowable(Throwable throwable) { + this.throwable = throwable; + } } diff --git a/src/main/java/vip/fuck/sm/common/exception/code/BaseResponseCode.java b/solon-system/src/main/java/vip/fuck/sm/common/exception/code/BaseResponseCode.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/exception/code/BaseResponseCode.java rename to solon-system/src/main/java/vip/fuck/sm/common/exception/code/BaseResponseCode.java diff --git a/src/main/java/vip/fuck/sm/common/exception/code/ResponseCodeInterface.java b/solon-system/src/main/java/vip/fuck/sm/common/exception/code/ResponseCodeInterface.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/exception/code/ResponseCodeInterface.java rename to solon-system/src/main/java/vip/fuck/sm/common/exception/code/ResponseCodeInterface.java diff --git a/src/main/java/vip/fuck/sm/common/exception/handler/AppFilter.java b/solon-system/src/main/java/vip/fuck/sm/common/exception/handler/AppFilter.java similarity index 91% rename from src/main/java/vip/fuck/sm/common/exception/handler/AppFilter.java rename to solon-system/src/main/java/vip/fuck/sm/common/exception/handler/AppFilter.java index 065bf97..c83e93a 100644 --- a/src/main/java/vip/fuck/sm/common/exception/handler/AppFilter.java +++ b/solon-system/src/main/java/vip/fuck/sm/common/exception/handler/AppFilter.java @@ -6,7 +6,7 @@ import org.apache.ibatis.exceptions.PersistenceException; import vip.fuck.sm.common.exception.BusinessException; import vip.fuck.sm.common.exception.code.BaseResponseCode; import vip.fuck.sm.common.utils.DataResult; -import lombok.extern.slf4j.Slf4j; + import org.noear.solon.annotation.Component; import org.noear.solon.core.exception.StatusException; import org.noear.solon.core.handle.*; @@ -16,7 +16,6 @@ import org.thymeleaf.exceptions.TemplateEngineException; import java.sql.SQLIntegrityConstraintViolationException; @Component(index = 0) //index 为顺序位（不加，则默认为0） -@Slf4j public class AppFilter implements Filter { @Override public void doFilter(Context ctx, FilterChain chain) throws Throwable { @@ -45,20 +44,20 @@ public class AppFilter implements Filter { StatusException se = (StatusException) e; ctx.status(se.getCode()); if (se.getCode() == 400){ - log.error("400:{}",pathNew); +// log.error("400:{}",pathNew); ctx.status(200); ctx.render(new DataResult(BaseResponseCode.DATA_ERROR.getCode(), "参数错误", null,null)); return; }else if (se.getCode() == 404){ - log.error("404:{}",pathNew); +// log.error("404:{}",pathNew); ctx.redirect("/index/404"); return; } else if (se.getCode() == 403){ - log.error("403:{}",pathNew); +// log.error("403:{}",pathNew); ctx.redirect("/index/404"); return; } else if(se.getCode() == 500){ - log.error("500:{}",pathNew); +// log.error("500:{}",pathNew); ctx.redirect("/index/500"); return; } @@ -69,7 +68,8 @@ public class AppFilter implements Filter { return; } } - log.error(e.getMessage(),e); +// log.error(e.getMessage(),e); + e.printStackTrace(); ctx.status(500); ctx.render(DataResult.getResult(BaseResponseCode.SYSTEM_BUSY)); } diff --git a/src/main/java/vip/fuck/sm/common/utils/AssertUtil.java b/solon-system/src/main/java/vip/fuck/sm/common/utils/AssertUtil.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/utils/AssertUtil.java rename to solon-system/src/main/java/vip/fuck/sm/common/utils/AssertUtil.java diff --git a/src/main/java/vip/fuck/sm/common/utils/Constant.java b/solon-system/src/main/java/vip/fuck/sm/common/utils/Constant.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/utils/Constant.java rename to solon-system/src/main/java/vip/fuck/sm/common/utils/Constant.java diff --git a/src/main/java/vip/fuck/sm/common/utils/DataResult.java b/solon-system/src/main/java/vip/fuck/sm/common/utils/DataResult.java similarity index 85% rename from src/main/java/vip/fuck/sm/common/utils/DataResult.java rename to solon-system/src/main/java/vip/fuck/sm/common/utils/DataResult.java index bfb5f70..fca7894 100644 --- a/src/main/java/vip/fuck/sm/common/utils/DataResult.java +++ b/solon-system/src/main/java/vip/fuck/sm/common/utils/DataResult.java @@ -1,9 +1,10 @@ package vip.fuck.sm.common.utils; + import vip.fuck.sm.common.exception.code.BaseResponseCode; import vip.fuck.sm.common.exception.code.ResponseCodeInterface; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; + /** * 返回值DataResult @@ -12,7 +13,7 @@ import lombok.Data; * @version V1.0 * @date 2020年3月18日 */ -@Data + public class DataResult { /** @@ -118,5 +119,35 @@ public class DataResult { return new DataResult(responseCode); } + public int getCode() { + return code; + } + public void setCode(int code) { + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + public String getDevErrorMsg() { + return devErrorMsg; + } + + public void setDevErrorMsg(String devErrorMsg) { + this.devErrorMsg = devErrorMsg; + } } diff --git a/src/main/java/vip/fuck/sm/common/utils/DateUtils.java b/solon-system/src/main/java/vip/fuck/sm/common/utils/DateUtils.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/utils/DateUtils.java rename to solon-system/src/main/java/vip/fuck/sm/common/utils/DateUtils.java diff --git a/src/main/java/vip/fuck/sm/common/utils/FileConfig.java b/solon-system/src/main/java/vip/fuck/sm/common/utils/FileConfig.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/utils/FileConfig.java rename to solon-system/src/main/java/vip/fuck/sm/common/utils/FileConfig.java diff --git a/src/main/java/vip/fuck/sm/common/utils/GenUtils.java b/solon-system/src/main/java/vip/fuck/sm/common/utils/GenUtils.java similarity index 99% rename from src/main/java/vip/fuck/sm/common/utils/GenUtils.java rename to solon-system/src/main/java/vip/fuck/sm/common/utils/GenUtils.java index 86fe468..61d1c13 100644 --- a/src/main/java/vip/fuck/sm/common/utils/GenUtils.java +++ b/solon-system/src/main/java/vip/fuck/sm/common/utils/GenUtils.java @@ -2,8 +2,8 @@ package vip.fuck.sm.common.utils; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import vip.fuck.sm.common.exception.BusinessException; -import vip.fuck.sm.entity.ColumnEntity; -import vip.fuck.sm.entity.TableEntity; +import vip.fuck.sm.gen.ColumnEntity; +import vip.fuck.sm.gen.TableEntity; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; diff --git a/src/main/java/vip/fuck/sm/common/utils/PasswordEncoder.java b/solon-system/src/main/java/vip/fuck/sm/common/utils/PasswordEncoder.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/utils/PasswordEncoder.java rename to solon-system/src/main/java/vip/fuck/sm/common/utils/PasswordEncoder.java diff --git a/src/main/java/vip/fuck/sm/common/utils/PasswordUtils.java b/solon-system/src/main/java/vip/fuck/sm/common/utils/PasswordUtils.java similarity index 100% rename from src/main/java/vip/fuck/sm/common/utils/PasswordUtils.java rename to solon-system/src/main/java/vip/fuck/sm/common/utils/PasswordUtils.java diff --git a/src/main/java/vip/fuck/sm/controller/DeptController.java b/solon-system/src/main/java/vip/fuck/sm/controller/DeptController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/DeptController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/DeptController.java diff --git a/src/main/java/vip/fuck/sm/controller/IndexController.java b/solon-system/src/main/java/vip/fuck/sm/controller/IndexController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/IndexController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/IndexController.java diff --git a/src/main/java/vip/fuck/sm/controller/PermissionController.java b/solon-system/src/main/java/vip/fuck/sm/controller/PermissionController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/PermissionController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/PermissionController.java diff --git a/src/main/java/vip/fuck/sm/controller/RoleController.java b/solon-system/src/main/java/vip/fuck/sm/controller/RoleController.java similarity index 96% rename from src/main/java/vip/fuck/sm/controller/RoleController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/RoleController.java index f029f3b..0c8a01a 100644 --- a/src/main/java/vip/fuck/sm/controller/RoleController.java +++ b/solon-system/src/main/java/vip/fuck/sm/controller/RoleController.java @@ -96,7 +96,10 @@ public class RoleController { } sysRoleDeptService.saveBatch(list); } - roleService.updateById(new SysRole().setId(vo.getId()).setDataScope(vo.getDataScope())); + SysRole sysRole = new SysRole(); + sysRole.setId(vo.getId()); + sysRole.setDataScope(vo.getDataScope()); + roleService.updateById(sysRole); } @Get diff --git a/src/main/java/vip/fuck/sm/controller/SysContentController.java b/solon-system/src/main/java/vip/fuck/sm/controller/SysContentController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/SysContentController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/SysContentController.java diff --git a/src/main/java/vip/fuck/sm/controller/SysDictController.java b/solon-system/src/main/java/vip/fuck/sm/controller/SysDictController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/SysDictController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/SysDictController.java diff --git a/src/main/java/vip/fuck/sm/controller/SysDictDetailController.java b/solon-system/src/main/java/vip/fuck/sm/controller/SysDictDetailController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/SysDictDetailController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/SysDictDetailController.java diff --git a/src/main/java/vip/fuck/sm/controller/SysFilesController.java b/solon-system/src/main/java/vip/fuck/sm/controller/SysFilesController.java similarity index 97% rename from src/main/java/vip/fuck/sm/controller/SysFilesController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/SysFilesController.java index fa38fa4..ffa2081 100644 --- a/src/main/java/vip/fuck/sm/controller/SysFilesController.java +++ b/solon-system/src/main/java/vip/fuck/sm/controller/SysFilesController.java @@ -42,7 +42,7 @@ public class SysFilesController { @Post @Mapping("/upload") @SaCheckPermission(value = {"sysFiles:add", "sysContent:update", "sysContent:add"}, mode = SaMode.OR) - public SysFilesEntity add(UploadedFile file) { + public SysFilesEntity add(@Param("file") UploadedFile file) { //判断文件是否空 if (file == null || file.getName() == null || "".equalsIgnoreCase(file.getName().trim())) { throw new BusinessException("文件为空"); diff --git a/src/main/java/vip/fuck/sm/controller/SysGeneratorController.java b/solon-system/src/main/java/vip/fuck/sm/controller/SysGeneratorController.java similarity index 97% rename from src/main/java/vip/fuck/sm/controller/SysGeneratorController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/SysGeneratorController.java index 44cc15d..9866167 100644 --- a/src/main/java/vip/fuck/sm/controller/SysGeneratorController.java +++ b/solon-system/src/main/java/vip/fuck/sm/controller/SysGeneratorController.java @@ -6,7 +6,7 @@ import vip.fuck.sm.entity.SysGenerator; import vip.fuck.sm.service.ISysGeneratorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.IOUtils; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Get; @@ -25,7 +25,6 @@ import java.io.IOException; * @date 2020年3月18日 */ @Api(tags = "系统模块-代码生成") -@Slf4j @Controller @Mapping("/sysGenerator") @Valid diff --git a/src/main/java/vip/fuck/sm/controller/SysLogController.java b/solon-system/src/main/java/vip/fuck/sm/controller/SysLogController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/SysLogController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/SysLogController.java diff --git a/src/main/java/vip/fuck/sm/controller/SysPlugsController.java b/solon-system/src/main/java/vip/fuck/sm/controller/SysPlugsController.java similarity index 84% rename from src/main/java/vip/fuck/sm/controller/SysPlugsController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/SysPlugsController.java index c9a55f2..585d67f 100644 --- a/src/main/java/vip/fuck/sm/controller/SysPlugsController.java +++ b/solon-system/src/main/java/vip/fuck/sm/controller/SysPlugsController.java @@ -17,6 +17,7 @@ import java.util.List; import org.noear.solon.core.handle.ModelAndView; import org.noear.solon.core.handle.UploadedFile; import org.smartboot.http.server.HttpRequest; +import vip.fuck.sm.common.aop.annotation.LogAnnotation; import vip.fuck.sm.common.exception.BusinessException; import vip.fuck.sm.common.utils.DataResult; @@ -49,14 +50,25 @@ public class SysPlugsController { return new ModelAndView("sysplugs/list.html"); } - @ApiOperation(value = "新增") + @ApiOperation(value = "上传插件") @Post @Mapping("sysPlugs/upload") + @LogAnnotation(action = "上传插件") // @SaCheckPermission(value = {"sysFiles:add", "sysContent:update", "sysContent:add"}, mode = SaMode.OR) - public SysPlugsEntity add(UploadedFile file) throws Exception { + public SysPlugsEntity upload(@Param("file") UploadedFile file) throws Exception { return sysPlugsService.uploadJar(file); } + @ApiOperation(value = "启动插件") + @Get + @Mapping("sysPlugs/startPlugin/{qn}") + @LogAnnotation(action = "启动插件") +// @SaCheckPermission(value = {"sysFiles:add", "sysContent:update", "sysContent:add"}, mode = SaMode.OR) + public DataResult startPlugin(@Path("qn") String qn) throws Exception { + sysPlugsService.startPlugin(qn); + return DataResult.success(); + } + @ApiOperation(value = "查询分页数据") @Post @Mapping ("sysPlugs/listByPage") diff --git a/src/main/java/vip/fuck/sm/controller/UserController.java b/solon-system/src/main/java/vip/fuck/sm/controller/UserController.java similarity index 99% rename from src/main/java/vip/fuck/sm/controller/UserController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/UserController.java index a63ab39..82bff49 100644 --- a/src/main/java/vip/fuck/sm/controller/UserController.java +++ b/solon-system/src/main/java/vip/fuck/sm/controller/UserController.java @@ -26,7 +26,7 @@ import com.wf.captcha.utils.CaptchaUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; + import org.noear.solon.annotation.*; import org.noear.solon.boot.smarthttp.http.SmHttpContext; import org.noear.solon.core.handle.Context; @@ -49,7 +49,6 @@ import java.util.List; @Controller @Api(tags = "组织模块-用户管理") @Mapping("/sys") -@Slf4j @Valid public class UserController { @Inject diff --git a/src/main/java/vip/fuck/sm/controller/UserRoleController.java b/solon-system/src/main/java/vip/fuck/sm/controller/UserRoleController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/UserRoleController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/UserRoleController.java diff --git a/src/main/java/vip/fuck/sm/controller/api/TestController.java b/solon-system/src/main/java/vip/fuck/sm/controller/api/TestController.java similarity index 100% rename from src/main/java/vip/fuck/sm/controller/api/TestController.java rename to solon-system/src/main/java/vip/fuck/sm/controller/api/TestController.java diff --git a/src/main/java/vip/fuck/sm/entity/BasePageEntity.java b/solon-system/src/main/java/vip/fuck/sm/entity/BasePageEntity.java similarity index 79% rename from src/main/java/vip/fuck/sm/entity/BasePageEntity.java rename to solon-system/src/main/java/vip/fuck/sm/entity/BasePageEntity.java index 9542479..496281e 100644 --- a/src/main/java/vip/fuck/sm/entity/BasePageEntity.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/BasePageEntity.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; + import org.dromara.autotable.annotation.Ignore; /** @@ -15,7 +15,6 @@ import org.dromara.autotable.annotation.Ignore; * @version V1.0 * @date 2020年3月18日 */ -@Data @JsonIgnoreProperties(value = { "getQueryPage"}) public class BasePageEntity { @TableField(exist = false) @@ -38,4 +37,20 @@ public class BasePageEntity { public Page getQueryPage() { return new Page(page == null ? 1 : page, limit == null ? 10 : limit); } + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } } diff --git a/src/main/java/vip/fuck/sm/entity/SysContentEntity.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysContentEntity.java similarity index 51% rename from src/main/java/vip/fuck/sm/entity/SysContentEntity.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysContentEntity.java index 2d44780..9de7947 100644 --- a/src/main/java/vip/fuck/sm/entity/SysContentEntity.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysContentEntity.java @@ -1,8 +1,7 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; + import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.PrimaryKey; @@ -16,8 +15,6 @@ import java.util.Date; * @version V1.0 * @date 2020年3月18日 */ -@EqualsAndHashCode(callSuper = true) -@Data @TableName("sys_content") @AutoTable(value = "sys_content",comment = "内容管理") public class SysContentEntity extends BasePageEntity implements Serializable { @@ -75,5 +72,75 @@ public class SysContentEntity extends BasePageEntity implements Serializable { @TableField(value = "create_time", fill = FieldFill.INSERT) private Date createTime; + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getOneImg() { + return oneImg; + } + + public void setOneImg(String oneImg) { + this.oneImg = oneImg; + } + + public String getMultipleImg() { + return multipleImg; + } + + public void setMultipleImg(String multipleImg) { + this.multipleImg = multipleImg; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Long getCreateId() { + return createId; + } + + public void setCreateId(Long createId) { + this.createId = createId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/solon-system/src/main/java/vip/fuck/sm/entity/SysDept.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysDept.java new file mode 100644 index 0000000..394df68 --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysDept.java @@ -0,0 +1,160 @@ +package vip.fuck.sm.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import org.dromara.autotable.annotation.*; +import org.noear.solon.validation.annotation.NotBlank; + +import java.io.Serializable; +import java.util.Date; + +/** + * 部门 + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +@TableName("sys_dept") +@AutoTable(value = "sys_dept",comment = "部门") +public class SysDept implements Serializable { + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; + + private String deptNo; + + @NotBlank(message = "机构名称不能为空") + private String name; + + @NotBlank(message = "父级不能为空") + private Long pid; + + @TableField(exist = false) + @Ignore + private String pidName; + + private Integer status; + + private String relationCode; + + private String deptManagerId; + + private String managerName; + + private String phone; + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + @TableField(fill = FieldFill.INSERT) + @ColumnDefault(value = "0") + private Integer deleted; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDeptNo() { + return deptNo; + } + + public void setDeptNo(String deptNo) { + this.deptNo = deptNo; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getPid() { + return pid; + } + + public void setPid(Long pid) { + this.pid = pid; + } + + public String getPidName() { + return pidName; + } + + public void setPidName(String pidName) { + this.pidName = pidName; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getRelationCode() { + return relationCode; + } + + public void setRelationCode(String relationCode) { + this.relationCode = relationCode; + } + + public String getDeptManagerId() { + return deptManagerId; + } + + public void setDeptManagerId(String deptManagerId) { + this.deptManagerId = deptManagerId; + } + + public String getManagerName() { + return managerName; + } + + public void setManagerName(String managerName) { + this.managerName = managerName; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Integer getDeleted() { + return deleted; + } + + public void setDeleted(Integer deleted) { + this.deleted = deleted; + } +} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java similarity index 57% rename from src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java index fe33e71..d1cc7d6 100644 --- a/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java @@ -1,8 +1,7 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; + import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.Ignore; import org.dromara.autotable.annotation.PrimaryKey; @@ -17,8 +16,6 @@ import java.util.Date; * @version V1.0 * @date 2020年3月18日 */ -@EqualsAndHashCode(callSuper = true) -@Data @TableName("sys_dict_detail") @AutoTable(value = "sys_dict_detail",comment = "字典明细") public class SysDictDetailEntity extends BasePageEntity implements Serializable { @@ -68,4 +65,59 @@ public class SysDictDetailEntity extends BasePageEntity implements Serializable @Ignore private String dictName; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Long getDictId() { + return dictId; + } + + public void setDictId(Long dictId) { + this.dictId = dictId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getDictName() { + return dictName; + } + + public void setDictName(String dictName) { + this.dictName = dictName; + } } diff --git a/src/main/java/vip/fuck/sm/entity/SysDictEntity.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysDictEntity.java similarity index 67% rename from src/main/java/vip/fuck/sm/entity/SysDictEntity.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysDictEntity.java index 716be78..bd29a95 100644 --- a/src/main/java/vip/fuck/sm/entity/SysDictEntity.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysDictEntity.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; + import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.PrimaryKey; @@ -19,8 +18,6 @@ import java.util.Date; * @version V1.0 * @date 2020年3月18日 */ -@EqualsAndHashCode(callSuper = true) -@Data @TableName("sys_dict") @AutoTable(value = "sys_dict",comment = "字典管理") public class SysDictEntity extends BasePageEntity implements Serializable { @@ -51,5 +48,35 @@ public class SysDictEntity extends BasePageEntity implements Serializable { @TableField(value = "create_time", fill = FieldFill.INSERT) private Date createTime; + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java similarity index 55% rename from src/main/java/vip/fuck/sm/entity/SysFilesEntity.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java index 21cad47..7898403 100644 --- a/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java @@ -1,8 +1,7 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; + import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.PrimaryKey; @@ -16,8 +15,6 @@ import java.util.Date; * @version V1.0 * @date 2020年3月18日 */ -@EqualsAndHashCode(callSuper = true) -@Data @TableName("sys_files") @AutoTable(value = "sys_files",comment = "文件上传") public class SysFilesEntity extends BasePageEntity implements Serializable { @@ -51,5 +48,51 @@ public class SysFilesEntity extends BasePageEntity implements Serializable { @TableField("file_path") private String filePath; + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public Long getFileSize() { + return fileSize; + } + + public void setFileSize(Long fileSize) { + this.fileSize = fileSize; + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } } diff --git a/src/main/java/vip/fuck/sm/entity/SysGenerator.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysGenerator.java similarity index 55% rename from src/main/java/vip/fuck/sm/entity/SysGenerator.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysGenerator.java index fad0504..afc8d02 100644 --- a/src/main/java/vip/fuck/sm/entity/SysGenerator.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysGenerator.java @@ -1,9 +1,7 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; + import org.dromara.autotable.annotation.AutoTable; import java.io.Serializable; @@ -16,9 +14,6 @@ import java.util.Date; * @version V1.0 * @date 2020年3月18日 */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) @TableName("sys_generator") @AutoTable(value = "sys_generator",comment = "代码生成") public class SysGenerator extends BasePageEntity implements Serializable { @@ -31,4 +26,27 @@ public class SysGenerator extends BasePageEntity implements Serializable { private String tableComment; + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getTableComment() { + return tableComment; + } + + public void setTableComment(String tableComment) { + this.tableComment = tableComment; + } } diff --git a/solon-system/src/main/java/vip/fuck/sm/entity/SysLog.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysLog.java new file mode 100644 index 0000000..43af738 --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysLog.java @@ -0,0 +1,138 @@ +package vip.fuck.sm.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.Ignore; +import org.dromara.autotable.annotation.PrimaryKey; + +import java.io.Serializable; +import java.util.Date; + +/** + * 操作日志 + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +@TableName("sys_log") +@AutoTable(value = "sys_log",comment = "操作日志") +public class SysLog extends BasePageEntity implements Serializable { + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; + + private Long userId; + + private String username; + + private String operation; + + private Integer time; + + private String method; + + private String params; + + private String ip; + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @TableField(exist = false) + @Ignore + private String startTime; + + @TableField(exist = false) + @Ignore + private String endTime; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } + + public Integer getTime() { + return time; + } + + public void setTime(Integer time) { + this.time = time; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getParams() { + return params; + } + + public void setParams(String params) { + this.params = params; + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } +} \ No newline at end of file diff --git a/solon-system/src/main/java/vip/fuck/sm/entity/SysPermission.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysPermission.java new file mode 100644 index 0000000..8ab3100 --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysPermission.java @@ -0,0 +1,180 @@ +package vip.fuck.sm.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.ColumnDefault; +import org.dromara.autotable.annotation.Ignore; +import org.dromara.autotable.annotation.PrimaryKey; +import org.noear.solon.validation.annotation.NotBlank; +import org.noear.solon.validation.annotation.NotNull; + +import java.io.Serializable; +import java.util.Date; + +/** + * 权限菜单 + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +@TableName("sys_permission") +@AutoTable(value = "sys_permission",comment = "权限菜单") +public class SysPermission implements Serializable { + + + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; + + @NotBlank(message = "菜单权限名称不能为空") + private String name; + + private String perms; + + private String url; + + private String icon; + + private String target; + + @NotNull(message = "所属菜单不能为空") + private Long pid; + + private Integer orderNum; + + @NotNull(message = "菜单权限类型不能为空") + private Integer type; + + /** + * 1正常 2禁用 + */ + private Integer status; + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + @TableField(fill = FieldFill.INSERT) + @ColumnDefault(value = "0") + private Integer deleted; + + @TableField(exist = false) + @Ignore + private String pidName; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPerms() { + return perms; + } + + public void setPerms(String perms) { + this.perms = perms; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public Long getPid() { + return pid; + } + + public void setPid(Long pid) { + this.pid = pid; + } + + public Integer getOrderNum() { + return orderNum; + } + + public void setOrderNum(Integer orderNum) { + this.orderNum = orderNum; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Integer getDeleted() { + return deleted; + } + + public void setDeleted(Integer deleted) { + this.deleted = deleted; + } + + public String getPidName() { + return pidName; + } + + public void setPidName(String pidName) { + this.pidName = pidName; + } +} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java similarity index 51% rename from src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java index 58a6f8f..6a2596c 100644 --- a/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java @@ -1,15 +1,14 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; -import lombok.EqualsAndHashCode; + import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.PrimaryKey; -import vip.fuck.sm.entity.BasePageEntity; + import java.util.Date; import java.io.Serializable; -import lombok.Data; /** * 系统插件 @@ -18,8 +17,6 @@ import lombok.Data; * @email xian.zi.ming@qq.com * @date 2025-03-22 20:59:06 */ -@EqualsAndHashCode(callSuper = true) -@Data @TableName("sys_plugs") @AutoTable(value = "sys_plugs",comment = "系统插件") public class SysPlugsEntity extends BasePageEntity implements Serializable { @@ -86,5 +83,83 @@ public class SysPlugsEntity extends BasePageEntity implements Serializable { @TableField("upload_time") private Date uploadTime; + public String getQualifiedVersion() { + return qualifiedVersion; + } + public void setQualifiedVersion(String qualifiedVersion) { + this.qualifiedVersion = qualifiedVersion; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getSiteUrl() { + return siteUrl; + } + + public void setSiteUrl(String siteUrl) { + this.siteUrl = siteUrl; + } + + public String getDocUrl() { + return docUrl; + } + + public void setDocUrl(String docUrl) { + this.docUrl = docUrl; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getJarPath() { + return jarPath; + } + + public void setJarPath(String jarPath) { + this.jarPath = jarPath; + } + + public Long getJarSize() { + return jarSize; + } + + public void setJarSize(Long jarSize) { + this.jarSize = jarSize; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getUploadTime() { + return uploadTime; + } + + public void setUploadTime(Date uploadTime) { + this.uploadTime = uploadTime; + } } diff --git a/solon-system/src/main/java/vip/fuck/sm/entity/SysRole.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysRole.java new file mode 100644 index 0000000..d18bd62 --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysRole.java @@ -0,0 +1,182 @@ +package vip.fuck.sm.entity; + +import com.baomidou.mybatisplus.annotation.*; +import org.dromara.autotable.annotation.*; +import vip.fuck.sm.vo.resp.DeptRespNodeVO; +import vip.fuck.sm.vo.resp.PermissionRespNode; + +import org.noear.solon.validation.annotation.NotBlank; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 角色 + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +@TableName("sys_role") +@AutoTable(value = "sys_role",comment = "角色") +public class SysRole extends BasePageEntity implements Serializable { + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; + + @NotBlank(message = "名称不能为空") + private String name; + + private String description; + + private Integer status; + + private Integer dataScope; + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + @TableField(fill = FieldFill.INSERT) + @ColumnDefault(value = "0") + private Integer deleted; + + @TableField(exist = false) + @Ignore + private List permissionRespNodes; + + @TableField(exist = false) + @Ignore + private List deptRespNodes; + + @TableField(exist = false) + @Ignore + private String startTime; + + @TableField(exist = false) + @Ignore + private String endTime; + + @TableField(exist = false) + @Ignore + private List permissions; + + @TableField(exist = false) + @Ignore + private List depts; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getDataScope() { + return dataScope; + } + + public void setDataScope(Integer dataScope) { + this.dataScope = dataScope; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Integer getDeleted() { + return deleted; + } + + public void setDeleted(Integer deleted) { + this.deleted = deleted; + } + + public List getPermissionRespNodes() { + return permissionRespNodes; + } + + public void setPermissionRespNodes(List permissionRespNodes) { + this.permissionRespNodes = permissionRespNodes; + } + + public List getDeptRespNodes() { + return deptRespNodes; + } + + public void setDeptRespNodes(List deptRespNodes) { + this.deptRespNodes = deptRespNodes; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public List getPermissions() { + return permissions; + } + + public void setPermissions(List permissions) { + this.permissions = permissions; + } + + public List getDepts() { + return depts; + } + + public void setDepts(List depts) { + this.depts = depts; + } +} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java similarity index 64% rename from src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java index 5198655..044080b 100644 --- a/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java @@ -1,8 +1,7 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; + import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.PrimaryKey; @@ -16,8 +15,6 @@ import java.util.Date; * @email *****@mail.com * @date 2020-09-27 17:30:15 */ -@EqualsAndHashCode(callSuper = true) -@Data @TableName("sys_role_dept") @AutoTable(value = "sys_role_dept",comment = "角色部门") public class SysRoleDeptEntity extends BasePageEntity implements Serializable { @@ -48,5 +45,35 @@ public class SysRoleDeptEntity extends BasePageEntity implements Serializable { @TableField(value = "create_time", fill = FieldFill.INSERT) private Date createTime; + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/src/main/java/vip/fuck/sm/entity/SysRolePermission.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysRolePermission.java similarity index 55% rename from src/main/java/vip/fuck/sm/entity/SysRolePermission.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysRolePermission.java index ca9a23d..6fba35f 100644 --- a/src/main/java/vip/fuck/sm/entity/SysRolePermission.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysRolePermission.java @@ -1,7 +1,7 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.PrimaryKey; @@ -15,7 +15,6 @@ import java.util.Date; * @version V1.0 * @date 2020年3月18日 */ -@Data @TableName("sys_role_permission") @AutoTable(value = "sys_role_permission",comment = "角色权限") public class SysRolePermission implements Serializable { @@ -30,4 +29,35 @@ public class SysRolePermission implements Serializable { @TableField(fill = FieldFill.INSERT) private Date createTime; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + public Long getPermissionId() { + return permissionId; + } + + public void setPermissionId(Long permissionId) { + this.permissionId = permissionId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } \ No newline at end of file diff --git a/solon-system/src/main/java/vip/fuck/sm/entity/SysUser.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysUser.java new file mode 100644 index 0000000..67c559e --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysUser.java @@ -0,0 +1,299 @@ +package vip.fuck.sm.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.ColumnDefault; +import org.dromara.autotable.annotation.Ignore; +import org.dromara.autotable.annotation.PrimaryKey; +import org.noear.solon.validation.annotation.NotBlank; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 用户 + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +@TableName("sys_user") +@AutoTable(value = "sys_user",comment = "系统用户") +public class SysUser extends BasePageEntity implements Serializable { + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; + + @NotBlank(message = "账号不能为空") + private String username; + + private String salt; + + @NotBlank(message = "密码不能为空") + private String password; + + @TableField(exist = false) + @Ignore + private String oldPwd; + + @TableField(exist = false) + @Ignore + private String newPwd; + + private String phone; + + private Long deptId; + + @TableField(exist = false) + @Ignore + private String deptName; + + @TableField(exist = false) + @Ignore + private String deptNo; + + + private String realName; + + private String nickName; + + private String email; + + private Integer status; + + private Integer sex; + + @TableField(fill = FieldFill.INSERT) + @ColumnDefault(value = "0") + private Integer deleted; + + private Long createId; + + private Long updateId; + + private Integer createWhere; + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + @TableField(exist = false) + @Ignore + private String startTime; + + @TableField(exist = false) + @Ignore + private String endTime; + + @TableField(exist = false) + @Ignore + private List roleIds; + + @TableField(exist = false) + @Ignore + private String captcha; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getSalt() { + return salt; + } + + public void setSalt(String salt) { + this.salt = salt; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getOldPwd() { + return oldPwd; + } + + public void setOldPwd(String oldPwd) { + this.oldPwd = oldPwd; + } + + public String getNewPwd() { + return newPwd; + } + + public void setNewPwd(String newPwd) { + this.newPwd = newPwd; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getDeptNo() { + return deptNo; + } + + public void setDeptNo(String deptNo) { + this.deptNo = deptNo; + } + + public String getRealName() { + return realName; + } + + public void setRealName(String realName) { + this.realName = realName; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public Integer getDeleted() { + return deleted; + } + + public void setDeleted(Integer deleted) { + this.deleted = deleted; + } + + public Long getCreateId() { + return createId; + } + + public void setCreateId(Long createId) { + this.createId = createId; + } + + public Long getUpdateId() { + return updateId; + } + + public void setUpdateId(Long updateId) { + this.updateId = updateId; + } + + public Integer getCreateWhere() { + return createWhere; + } + + public void setCreateWhere(Integer createWhere) { + this.createWhere = createWhere; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public String getCaptcha() { + return captcha; + } + + public void setCaptcha(String captcha) { + this.captcha = captcha; + } +} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysUserRole.java b/solon-system/src/main/java/vip/fuck/sm/entity/SysUserRole.java similarity index 55% rename from src/main/java/vip/fuck/sm/entity/SysUserRole.java rename to solon-system/src/main/java/vip/fuck/sm/entity/SysUserRole.java index d2a6516..798e3ca 100644 --- a/src/main/java/vip/fuck/sm/entity/SysUserRole.java +++ b/solon-system/src/main/java/vip/fuck/sm/entity/SysUserRole.java @@ -1,7 +1,7 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; + import org.dromara.autotable.annotation.AutoTable; import org.dromara.autotable.annotation.PrimaryKey; @@ -15,7 +15,6 @@ import java.util.Date; * @version V1.0 * @date 2020年3月18日 */ -@Data @TableName("sys_user_role") @AutoTable(value = "sys_user_role",comment = "用户角色") public class SysUserRole implements Serializable { @@ -30,5 +29,35 @@ public class SysUserRole implements Serializable { @TableField(fill = FieldFill.INSERT) private Date createTime; + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } \ No newline at end of file diff --git a/solon-system/src/main/java/vip/fuck/sm/gen/ColumnEntity.java b/solon-system/src/main/java/vip/fuck/sm/gen/ColumnEntity.java new file mode 100644 index 0000000..3f4c774 --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/gen/ColumnEntity.java @@ -0,0 +1,106 @@ +package vip.fuck.sm.gen; + + + +import java.io.Serializable; + +/** + * 代码生成 列属性 + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ + +public class ColumnEntity implements Serializable { + /** + * 列名 + */ + private String columnName; + + /** + * 列名类型 + */ + private String dataType; + + /** + * 列名备注 + */ + private String comments; + + /** + * 属性名称(第一个字母大写)，如：user_name => UserName + */ + private String attrName; + + /** + * 属性名称(第一个字母小写)，如：user_name => userName + */ + private String attrname; + + /** + * 属性类型 + */ + private String attrType; + + /** + * auto_increment + */ + private String extra; + + public String getColumnName() { + return columnName; + } + + public void setColumnName(String columnName) { + this.columnName = columnName; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public String getComments() { + return comments; + } + + public void setComments(String comments) { + this.comments = comments; + } + + public String getAttrName() { + return attrName; + } + + public void setAttrName(String attrName) { + this.attrName = attrName; + } + + public String getAttrname() { + return attrname; + } + + public void setAttrname(String attrname) { + this.attrname = attrname; + } + + public String getAttrType() { + return attrType; + } + + public void setAttrType(String attrType) { + this.attrType = attrType; + } + + public String getExtra() { + return extra; + } + + public void setExtra(String extra) { + this.extra = extra; + } +} diff --git a/solon-system/src/main/java/vip/fuck/sm/gen/TableEntity.java b/solon-system/src/main/java/vip/fuck/sm/gen/TableEntity.java new file mode 100644 index 0000000..bd60cad --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/gen/TableEntity.java @@ -0,0 +1,95 @@ +package vip.fuck.sm.gen; + + +import java.util.List; + +/** + * 代码生成 表数据 + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ + +public class TableEntity { + //表的名称 + private String tableName; + //表的备注 + private String comments; + //表的主键 + private ColumnEntity pk; + //表的列名(不包含主键) + private List columns; + private List htmlColumns; + + //类名(第一个字母大写)，如：sys_user => SysUser + private String className; + //类名(第一个字母小写)，如：sys_user => sysUser + private String classname; + //类名(都小写)，如：sys_user => sysuser + private String classNameLower; + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getComments() { + return comments; + } + + public void setComments(String comments) { + this.comments = comments; + } + + public ColumnEntity getPk() { + return pk; + } + + public void setPk(ColumnEntity pk) { + this.pk = pk; + } + + public List getColumns() { + return columns; + } + + public void setColumns(List columns) { + this.columns = columns; + } + + public List getHtmlColumns() { + return htmlColumns; + } + + public void setHtmlColumns(List htmlColumns) { + this.htmlColumns = htmlColumns; + } + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + public String getClassname() { + return classname; + } + + public void setClassname(String classname) { + this.classname = classname; + } + + public String getClassNameLower() { + return classNameLower; + } + + public void setClassNameLower(String classNameLower) { + this.classNameLower = classNameLower; + } +} diff --git a/src/main/java/vip/fuck/sm/mapper/GeneratorMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/GeneratorMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/GeneratorMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/GeneratorMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysContentMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysContentMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysContentMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysContentMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysDeptMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysDeptMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysDeptMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysDeptMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysDictDetailMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysDictDetailMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysDictDetailMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysDictDetailMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysDictMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysDictMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysDictMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysDictMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysFilesMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysFilesMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysFilesMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysFilesMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysLogMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysLogMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysLogMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysLogMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysPermissionMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysPermissionMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysPermissionMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysPermissionMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysPlugsMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysPlugsMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysPlugsMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysPlugsMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysRoleDeptMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysRoleDeptMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysRoleDeptMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysRoleDeptMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysRoleMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysRoleMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysRoleMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysRoleMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysRolePermissionMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysRolePermissionMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysRolePermissionMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysRolePermissionMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysUserMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysUserMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysUserMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysUserMapper.java diff --git a/src/main/java/vip/fuck/sm/mapper/SysUserRoleMapper.java b/solon-system/src/main/java/vip/fuck/sm/mapper/SysUserRoleMapper.java similarity index 100% rename from src/main/java/vip/fuck/sm/mapper/SysUserRoleMapper.java rename to solon-system/src/main/java/vip/fuck/sm/mapper/SysUserRoleMapper.java diff --git a/src/main/java/vip/fuck/sm/service/DeptService.java b/solon-system/src/main/java/vip/fuck/sm/service/DeptService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/DeptService.java rename to solon-system/src/main/java/vip/fuck/sm/service/DeptService.java diff --git a/src/main/java/vip/fuck/sm/service/HomeService.java b/solon-system/src/main/java/vip/fuck/sm/service/HomeService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/HomeService.java rename to solon-system/src/main/java/vip/fuck/sm/service/HomeService.java diff --git a/src/main/java/vip/fuck/sm/service/ISysGeneratorService.java b/solon-system/src/main/java/vip/fuck/sm/service/ISysGeneratorService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/ISysGeneratorService.java rename to solon-system/src/main/java/vip/fuck/sm/service/ISysGeneratorService.java diff --git a/src/main/java/vip/fuck/sm/service/LogService.java b/solon-system/src/main/java/vip/fuck/sm/service/LogService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/LogService.java rename to solon-system/src/main/java/vip/fuck/sm/service/LogService.java diff --git a/src/main/java/vip/fuck/sm/service/PermissionService.java b/solon-system/src/main/java/vip/fuck/sm/service/PermissionService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/PermissionService.java rename to solon-system/src/main/java/vip/fuck/sm/service/PermissionService.java diff --git a/src/main/java/vip/fuck/sm/service/RolePermissionService.java b/solon-system/src/main/java/vip/fuck/sm/service/RolePermissionService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/RolePermissionService.java rename to solon-system/src/main/java/vip/fuck/sm/service/RolePermissionService.java diff --git a/src/main/java/vip/fuck/sm/service/RoleService.java b/solon-system/src/main/java/vip/fuck/sm/service/RoleService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/RoleService.java rename to solon-system/src/main/java/vip/fuck/sm/service/RoleService.java diff --git a/src/main/java/vip/fuck/sm/service/SysContentService.java b/solon-system/src/main/java/vip/fuck/sm/service/SysContentService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/SysContentService.java rename to solon-system/src/main/java/vip/fuck/sm/service/SysContentService.java diff --git a/src/main/java/vip/fuck/sm/service/SysDictDetailService.java b/solon-system/src/main/java/vip/fuck/sm/service/SysDictDetailService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/SysDictDetailService.java rename to solon-system/src/main/java/vip/fuck/sm/service/SysDictDetailService.java diff --git a/src/main/java/vip/fuck/sm/service/SysDictService.java b/solon-system/src/main/java/vip/fuck/sm/service/SysDictService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/SysDictService.java rename to solon-system/src/main/java/vip/fuck/sm/service/SysDictService.java diff --git a/src/main/java/vip/fuck/sm/service/SysFilesService.java b/solon-system/src/main/java/vip/fuck/sm/service/SysFilesService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/SysFilesService.java rename to solon-system/src/main/java/vip/fuck/sm/service/SysFilesService.java diff --git a/src/main/java/vip/fuck/sm/service/SysPlugsService.java b/solon-system/src/main/java/vip/fuck/sm/service/SysPlugsService.java similarity index 93% rename from src/main/java/vip/fuck/sm/service/SysPlugsService.java rename to solon-system/src/main/java/vip/fuck/sm/service/SysPlugsService.java index 82bc140..4d5166d 100644 --- a/src/main/java/vip/fuck/sm/service/SysPlugsService.java +++ b/solon-system/src/main/java/vip/fuck/sm/service/SysPlugsService.java @@ -17,5 +17,7 @@ public interface SysPlugsService extends IService { SysPlugsEntity uploadJar(UploadedFile file) throws Exception; + void startPlugin(String qn); + } diff --git a/src/main/java/vip/fuck/sm/service/SysRoleDeptService.java b/solon-system/src/main/java/vip/fuck/sm/service/SysRoleDeptService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/SysRoleDeptService.java rename to solon-system/src/main/java/vip/fuck/sm/service/SysRoleDeptService.java diff --git a/src/main/java/vip/fuck/sm/service/UserRoleService.java b/solon-system/src/main/java/vip/fuck/sm/service/UserRoleService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/UserRoleService.java rename to solon-system/src/main/java/vip/fuck/sm/service/UserRoleService.java diff --git a/src/main/java/vip/fuck/sm/service/UserService.java b/solon-system/src/main/java/vip/fuck/sm/service/UserService.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/UserService.java rename to solon-system/src/main/java/vip/fuck/sm/service/UserService.java diff --git a/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java similarity index 99% rename from src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java index 5a431f6..530e2f5 100644 --- a/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java +++ b/solon-system/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java @@ -2,7 +2,6 @@ package vip.fuck.sm.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -14,7 +13,7 @@ import vip.fuck.sm.mapper.SysDeptMapper; import vip.fuck.sm.mapper.SysUserMapper; import vip.fuck.sm.service.DeptService; import vip.fuck.sm.vo.resp.DeptRespNodeVO; -import lombok.extern.slf4j.Slf4j; + import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Component; @@ -34,7 +33,6 @@ import java.util.concurrent.atomic.AtomicReference; * @date 2020年3月18日 */ @Component -@Slf4j public class DeptServiceImpl extends ServiceImpl implements DeptService { @Db diff --git a/src/main/java/vip/fuck/sm/service/impl/HomeServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/HomeServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/HomeServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/HomeServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/LogServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/LogServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/LogServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/LogServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java similarity index 98% rename from src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java index 69567d5..72ca645 100644 --- a/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java +++ b/solon-system/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java @@ -15,7 +15,7 @@ import vip.fuck.sm.service.PermissionService; import vip.fuck.sm.service.RolePermissionService; import vip.fuck.sm.service.UserRoleService; import vip.fuck.sm.vo.resp.PermissionRespNode; -import lombok.extern.slf4j.Slf4j; + import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Component; @@ -36,7 +36,6 @@ import java.util.Set; * @date 2020年3月18日 */ @Component -@Slf4j public class PermissionServiceImpl extends ServiceImpl implements PermissionService { @Inject private UserRoleService userRoleService; @@ -78,7 +77,7 @@ public class PermissionServiceImpl extends ServiceImpl userIds = getUserIdsById(permissionId); SysPermission sysPermission = sysPermissionMapper.selectById(permissionId); if (null == sysPermission) { - log.error("传入 的 id:{}不合法", permissionId); +// log.error("传入 的 id:{}不合法", permissionId); throw new BusinessException(BaseResponseCode.DATA_ERROR); } //获取下一级 diff --git a/src/main/java/vip/fuck/sm/service/impl/RolePermissionServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/RolePermissionServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/RolePermissionServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/RolePermissionServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java similarity index 97% rename from src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java index 6625a69..dac0038 100644 --- a/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java +++ b/solon-system/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java @@ -15,7 +15,7 @@ import vip.fuck.sm.service.*; import vip.fuck.sm.vo.req.RolePermissionOperationReqVO; import vip.fuck.sm.vo.resp.DeptRespNodeVO; import vip.fuck.sm.vo.resp.PermissionRespNode; -import lombok.extern.slf4j.Slf4j; + import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -34,7 +34,6 @@ import java.util.Set; * @date 2020年3月18日 */ @Component -@Slf4j public class RoleServiceImpl extends ServiceImpl implements RoleService { @Db private SysRoleMapper sysRoleMapper; @@ -67,7 +66,7 @@ public class RoleServiceImpl extends ServiceImpl impleme public void updateRole(SysRole vo) { SysRole sysRole = sysRoleMapper.selectById(vo.getId()); if (null == sysRole) { - log.error("传入 的 id:{}不合法", vo.getId()); +// log.error("传入 的 id:{}不合法", vo.getId()); throw new BusinessException(BaseResponseCode.DATA_ERROR); } sysRoleMapper.updateById(vo); @@ -85,7 +84,7 @@ public class RoleServiceImpl extends ServiceImpl impleme public SysRole detailInfo(String id) { SysRole sysRole = sysRoleMapper.selectById(id); if (sysRole == null) { - log.error("传入 的 id:{}不合法", id); +// log.error("传入 的 id:{}不合法", id); throw new BusinessException(BaseResponseCode.DATA_ERROR); } List permissionRespNodes = permissionService.selectAllByTree(1); diff --git a/src/main/java/vip/fuck/sm/service/impl/SysContentServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysContentServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/SysContentServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/SysContentServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/SysDictDetailServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysDictDetailServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/SysDictDetailServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/SysDictDetailServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/SysDictServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysDictServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/SysDictServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/SysDictServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/SysFilesServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysFilesServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/SysFilesServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/SysFilesServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/SysGeneratorServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysGeneratorServiceImpl.java similarity index 97% rename from src/main/java/vip/fuck/sm/service/impl/SysGeneratorServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/SysGeneratorServiceImpl.java index bdadf7c..8d2305e 100644 --- a/src/main/java/vip/fuck/sm/service/impl/SysGeneratorServiceImpl.java +++ b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysGeneratorServiceImpl.java @@ -6,7 +6,7 @@ import vip.fuck.sm.common.utils.GenUtils; import vip.fuck.sm.entity.SysGenerator; import vip.fuck.sm.mapper.GeneratorMapper; import vip.fuck.sm.service.ISysGeneratorService; -import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.IOUtils; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; @@ -24,7 +24,7 @@ import java.util.zip.ZipOutputStream; * @date 2020年3月18日 */ @Component -@Slf4j + public class SysGeneratorServiceImpl implements ISysGeneratorService { @Db private GeneratorMapper generatorMapper; diff --git a/src/main/java/vip/fuck/sm/service/impl/SysPlugsServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysPlugsServiceImpl.java similarity index 83% rename from src/main/java/vip/fuck/sm/service/impl/SysPlugsServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/SysPlugsServiceImpl.java index e741533..6fa7a89 100644 --- a/src/main/java/vip/fuck/sm/service/impl/SysPlugsServiceImpl.java +++ b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysPlugsServiceImpl.java @@ -3,7 +3,7 @@ package vip.fuck.sm.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import lombok.extern.slf4j.Slf4j; + import org.noear.solon.SolonProps; import org.noear.solon.annotation.Component; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -17,6 +17,8 @@ import org.noear.solon.core.handle.UploadedFile; import org.noear.solon.core.util.ResourceUtil; import org.noear.solon.core.util.ScanUtil; import org.noear.solon.data.annotation.Tran; +import org.noear.solon.hotplug.PluginManager; +import org.noear.solon.hotplug.PluginPackage; import org.smartboot.http.server.HttpRequest; import vip.fuck.sm.common.exception.BusinessException; import vip.fuck.sm.common.utils.FileConfig; @@ -37,7 +39,7 @@ import java.util.stream.Collectors; @Component(value = "sysPlugsService",typed = true) -@Slf4j + public class SysPlugsServiceImpl extends ServiceImpl implements SysPlugsService { @Inject @@ -69,7 +71,8 @@ public class SysPlugsServiceImpl extends ServiceImpl solonMetas = nameList.stream().filter( n -> n.startsWith("META-INF/solon") + List solonMetas = nameList.stream().filter( n -> + n.startsWith("BOOT-INF/classes/META-INF/solon/") && n.endsWith(".properties")).collect(Collectors.toList()); Assert.isTrue(ObjectUtil.isNotEmpty(solonMetas), ()-> new BusinessException("jar文件不是solon插件，缺少插件元文件：META-INF/solon/*.properties")); String anyOneMeta = solonMetas.get(0); @@ -94,7 +97,9 @@ public class SysPlugsServiceImpl extends ServiceImpl pluginInfoPropNames = nameList.stream().filter( n -> n.equals(PLUGIN_INFO_PATH)).collect(Collectors.toList()); + List pluginInfoPropNames = nameList.stream().filter( n -> + n.equals("BOOT-INF/classes/"+PLUGIN_INFO_PATH) + ).collect(Collectors.toList()); Assert.isTrue(ObjectUtil.isNotEmpty(pluginInfoPropNames) , ()-> new BusinessException("插件缺少描述文件: "+PLUGIN_INFO_PATH)); String pInfoOne = pluginInfoPropNames.get(0); p = new Props() ; @@ -124,6 +129,8 @@ public class SysPlugsServiceImpl extends ServiceImpl new BusinessException("插件缺少文档链接: "+P_DOC_URL)); + SysPlugsEntity byId = this.getById(p_qualified); + Assert.isTrue(byId==null,()-> new BusinessException("插件已存在，若需要升级，请点击升级")); SysPlugsEntity en = new SysPlugsEntity(); en.setJarSize(jf.getFileSize()); en.setJarPath(jf.getFilePath()); @@ -136,9 +143,28 @@ public class SysPlugsServiceImpl extends ServiceImpl new BusinessException("插件信息保存失败") ); + PluginManager.add(en.getQualifiedVersion(), new File(jf.getFilePath())); return en; }catch (Throwable e){ throw e; } } + + @Override + public void startPlugin(String qn) { + SysPlugsEntity byId = this.getById(qn); + Assert.isTrue(byId!=null,()-> new BusinessException("插件不存在")); + boolean contains = PluginManager.getPlugins().contains(byId.getQualifiedVersion()); + if(!contains){ + PluginManager.add(byId.getQualifiedVersion(),new File(byId.getJarPath())); + } + PluginPackage load = PluginManager.load(byId.getQualifiedVersion()); + if(ObjectUtil.isEmpty(load)){ + PluginManager.remove(byId.getQualifiedVersion()); + Assert.isTrue(true,()-> new BusinessException("插件加载失败")); + return; + } + PluginManager.start(byId.getQualifiedVersion()); + + } } \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/service/impl/SysRoleDeptServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/SysRoleDeptServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/SysRoleDeptServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/SysRoleDeptServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/UserRoleServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/UserRoleServiceImpl.java similarity index 100% rename from src/main/java/vip/fuck/sm/service/impl/UserRoleServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/UserRoleServiceImpl.java diff --git a/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java b/solon-system/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java similarity index 99% rename from src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java rename to solon-system/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java index 867c0dd..515dd3e 100644 --- a/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java +++ b/solon-system/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java @@ -24,7 +24,7 @@ import vip.fuck.sm.service.UserService; import vip.fuck.sm.vo.req.UserRoleOperationReqVO; import vip.fuck.sm.vo.resp.LoginRespVO; import vip.fuck.sm.vo.resp.UserOwnRoleRespVO; -import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang.StringUtils; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Inject; @@ -41,7 +41,7 @@ import java.util.List; * @date 2020年3月18日 */ @Component -@Slf4j + public class UserServiceImpl extends ServiceImpl implements UserService { @Db diff --git a/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java b/solon-system/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java similarity index 66% rename from src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java rename to solon-system/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java index 75bc0ec..68a9404 100644 --- a/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java +++ b/solon-system/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java @@ -1,7 +1,7 @@ package vip.fuck.sm.vo.req; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; + import org.noear.solon.validation.annotation.NotBlank; import org.noear.solon.validation.annotation.NotEmpty; @@ -14,7 +14,7 @@ import java.util.List; * @version V1.0 * @date 2020年3月18日 */ -@Data + public class RolePermissionOperationReqVO { @ApiModelProperty(value = "角色id") @NotBlank(message = "角色id不能为空") @@ -22,4 +22,20 @@ public class RolePermissionOperationReqVO { @ApiModelProperty(value = "菜单权限集合") @NotEmpty(message = "菜单权限集合不能为空") private List permissionIds; + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + public List getPermissionIds() { + return permissionIds; + } + + public void setPermissionIds(List permissionIds) { + this.permissionIds = permissionIds; + } } diff --git a/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java b/solon-system/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java similarity index 67% rename from src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java rename to solon-system/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java index 2b2aa8b..a18b348 100644 --- a/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java +++ b/solon-system/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java @@ -1,7 +1,7 @@ package vip.fuck.sm.vo.req; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; + import org.noear.solon.validation.annotation.NotBlank; import org.noear.solon.validation.annotation.NotEmpty; @@ -14,7 +14,7 @@ import java.util.List; * @version V1.0 * @date 2020年3月18日 */ -@Data + public class UserRoleOperationReqVO { @ApiModelProperty(value = "用户id") @NotBlank(message = "用户id不能为空") @@ -22,4 +22,20 @@ public class UserRoleOperationReqVO { @ApiModelProperty(value = "角色id集合") @NotEmpty(message = "角色id集合不能为空") private List roleIds; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } } diff --git a/solon-system/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java b/solon-system/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java new file mode 100644 index 0000000..05eaaaa --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java @@ -0,0 +1,136 @@ +package vip.fuck.sm.vo.resp; + +import io.swagger.annotations.ApiModelProperty; + + +import java.util.List; + +/** + * DeptRespNodeVO + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +public class DeptRespNodeVO { + @ApiModelProperty(value = "组织id") + private Long id; + + @ApiModelProperty(value = "组织编码") + private String deptNo; + + @ApiModelProperty(value = "组织名称") + private String title; + + @ApiModelProperty(value = "组织名称") + private String label; + + @ApiModelProperty(value = "组织父级id") + private Long pid; + + @ApiModelProperty(value = "组织状态") + private Integer status; + + @ApiModelProperty(value = "组织关系id") + private String relationCode; + + @ApiModelProperty(value = "是否展开 默认不展开(false)") + private boolean spread = true; + + @ApiModelProperty(value = "是否选中") + private boolean checked = false; + + private boolean disabled = false; + + @ApiModelProperty(value = "子集") + private List children; + + public String getLabel() { + return title; + } + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDeptNo() { + return deptNo; + } + + public void setDeptNo(String deptNo) { + this.deptNo = deptNo; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public void setLabel(String label) { + this.label = label; + } + + public Long getPid() { + return pid; + } + + public void setPid(Long pid) { + this.pid = pid; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getRelationCode() { + return relationCode; + } + + public void setRelationCode(String relationCode) { + this.relationCode = relationCode; + } + + public boolean isSpread() { + return spread; + } + + public void setSpread(boolean spread) { + this.spread = spread; + } + + public boolean isChecked() { + return checked; + } + + public void setChecked(boolean checked) { + this.checked = checked; + } + + public boolean isDisabled() { + return disabled; + } + + public void setDisabled(boolean disabled) { + this.disabled = disabled; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } +} diff --git a/src/main/java/vip/fuck/sm/vo/resp/HomeRespVO.java b/solon-system/src/main/java/vip/fuck/sm/vo/resp/HomeRespVO.java similarity index 54% rename from src/main/java/vip/fuck/sm/vo/resp/HomeRespVO.java rename to solon-system/src/main/java/vip/fuck/sm/vo/resp/HomeRespVO.java index fe21f85..f5dfc40 100644 --- a/src/main/java/vip/fuck/sm/vo/resp/HomeRespVO.java +++ b/solon-system/src/main/java/vip/fuck/sm/vo/resp/HomeRespVO.java @@ -1,7 +1,7 @@ package vip.fuck.sm.vo.resp; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; + import java.util.List; @@ -12,11 +12,25 @@ import java.util.List; * @version V1.0 * @date 2020年3月18日 */ -@Data public class HomeRespVO { @ApiModelProperty(value = "用户信息") private UserInfoRespVO userInfo; @ApiModelProperty(value = "目录菜单") private List menus; + public UserInfoRespVO getUserInfo() { + return userInfo; + } + + public void setUserInfo(UserInfoRespVO userInfo) { + this.userInfo = userInfo; + } + + public List getMenus() { + return menus; + } + + public void setMenus(List menus) { + this.menus = menus; + } } \ No newline at end of file diff --git a/solon-system/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java b/solon-system/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java new file mode 100644 index 0000000..916cada --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java @@ -0,0 +1,66 @@ +package vip.fuck.sm.vo.resp; + +import io.swagger.annotations.ApiModelProperty; + + +import java.util.List; + +/** + * LoginRespVO + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +public class LoginRespVO { + @ApiModelProperty(value = "token") + private String accessToken; + @ApiModelProperty(value = "用户名") + private String username; + @ApiModelProperty(value = "用户id") + private Long id; + @ApiModelProperty(value = "电话") + private String phone; + @ApiModelProperty(value = "用户所拥有的菜单权限(前后端分离返回给前端控制菜单和按钮的显示和隐藏)") + private List list; + + public String getAccessToken() { + return accessToken; + } + + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/solon-system/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java b/solon-system/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java new file mode 100644 index 0000000..fc303ea --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java @@ -0,0 +1,155 @@ +package vip.fuck.sm.vo.resp; + +import io.swagger.annotations.ApiModelProperty; + + +import java.util.List; + +/** + * PermissionRespNode + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +public class PermissionRespNode { + @ApiModelProperty(value = "id") + private Long id; + @ApiModelProperty(value = "菜单权限名称") + private String title; + + @ApiModelProperty(value = "菜单权限标识，shiro 适配restful") + private String perms; + + @ApiModelProperty(value = "接口地址") + private String url; + + @ApiModelProperty(value = "icon") + private String icon; + + private String target; + + @ApiModelProperty(value = "父级id") + private Long pid; + + @ApiModelProperty(value = "父级名称") + private String pidName; + + @ApiModelProperty(value = "菜单权限类型(1:目录;2:菜单;3:按钮)") + private Integer type; + + @ApiModelProperty(value = "排序码") + private Integer orderNum; + + @ApiModelProperty(value = "是否展开 默认不展开(false)") + private boolean spread = true; + + @ApiModelProperty(value = "是否选中 默认false") + private boolean checked; + private List children; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getPerms() { + return perms; + } + + public void setPerms(String perms) { + this.perms = perms; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public Long getPid() { + return pid; + } + + public void setPid(Long pid) { + this.pid = pid; + } + + public String getPidName() { + return pidName; + } + + public void setPidName(String pidName) { + this.pidName = pidName; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getOrderNum() { + return orderNum; + } + + public void setOrderNum(Integer orderNum) { + this.orderNum = orderNum; + } + + public boolean isSpread() { + return spread; + } + + public void setSpread(boolean spread) { + this.spread = spread; + } + + public boolean isChecked() { + return checked; + } + + public void setChecked(boolean checked) { + this.checked = checked; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } +} diff --git a/solon-system/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java b/solon-system/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java new file mode 100644 index 0000000..0dc1969 --- /dev/null +++ b/solon-system/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java @@ -0,0 +1,84 @@ +package vip.fuck.sm.vo.resp; + +import io.swagger.annotations.ApiModelProperty; + + +/** + * UserInfoRespVO + * + * @author xian.zi.ming@qq.com fuck.vip + * @version V1.0 + * @date 2020年3月18日 + */ +public class UserInfoRespVO { + @ApiModelProperty(value = "用户id") + private Long id; + @ApiModelProperty(value = "账号") + private String username; + @ApiModelProperty(value = "手机号") + private String phone; + @ApiModelProperty(value = "昵称") + private String nickName; + @ApiModelProperty(value = "真实姓名") + private String realName; + @ApiModelProperty(value = "所属机构id") + private Long deptId; + @ApiModelProperty(value = "所属机构名称") + private String deptName; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getRealName() { + return realName; + } + + public void setRealName(String realName) { + this.realName = realName; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } +} diff --git a/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java b/solon-system/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java similarity index 58% rename from src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java rename to solon-system/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java index a06dfa0..139a3ce 100644 --- a/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java +++ b/solon-system/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java @@ -2,7 +2,7 @@ package vip.fuck.sm.vo.resp; import vip.fuck.sm.entity.SysRole; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; + import java.util.List; @@ -13,10 +13,26 @@ import java.util.List; * @version V1.0 * @date 2020年3月18日 */ -@Data + public class UserOwnRoleRespVO { @ApiModelProperty("所有角色集合") private List allRole; @ApiModelProperty(value = "用户所拥有角色集合") private List ownRoles; + + public List getAllRole() { + return allRole; + } + + public void setAllRole(List allRole) { + this.allRole = allRole; + } + + public List getOwnRoles() { + return ownRoles; + } + + public void setOwnRoles(List ownRoles) { + this.ownRoles = ownRoles; + } } diff --git a/src/main/resources/app.yml b/solon-system/src/main/resources/app.yml similarity index 100% rename from src/main/resources/app.yml rename to solon-system/src/main/resources/app.yml diff --git a/src/main/resources/generator.properties b/solon-system/src/main/resources/generator.properties similarity index 100% rename from src/main/resources/generator.properties rename to solon-system/src/main/resources/generator.properties diff --git a/src/main/resources/mapper/SysPlugsMapper.xml b/solon-system/src/main/resources/mapper/SysPlugsMapper.xml similarity index 100% rename from src/main/resources/mapper/SysPlugsMapper.xml rename to solon-system/src/main/resources/mapper/SysPlugsMapper.xml diff --git a/src/main/resources/mapper/mysql/SysGeneratorMapper.xml b/solon-system/src/main/resources/mapper/mysql/SysGeneratorMapper.xml similarity index 100% rename from src/main/resources/mapper/mysql/SysGeneratorMapper.xml rename to solon-system/src/main/resources/mapper/mysql/SysGeneratorMapper.xml diff --git a/src/main/resources/mapper/oracle/SysGeneratorMapper.xml b/solon-system/src/main/resources/mapper/oracle/SysGeneratorMapper.xml similarity index 100% rename from src/main/resources/mapper/oracle/SysGeneratorMapper.xml rename to solon-system/src/main/resources/mapper/oracle/SysGeneratorMapper.xml diff --git a/src/main/resources/mapper/sqlServer/SysGeneratorMapper.xml b/solon-system/src/main/resources/mapper/sqlServer/SysGeneratorMapper.xml similarity index 100% rename from src/main/resources/mapper/sqlServer/SysGeneratorMapper.xml rename to solon-system/src/main/resources/mapper/sqlServer/SysGeneratorMapper.xml diff --git a/src/main/resources/static/css/403.css b/solon-system/src/main/resources/static/css/403.css similarity index 100% rename from src/main/resources/static/css/403.css rename to solon-system/src/main/resources/static/css/403.css diff --git a/src/main/resources/static/css/404.css b/solon-system/src/main/resources/static/css/404.css similarity index 100% rename from src/main/resources/static/css/404.css rename to solon-system/src/main/resources/static/css/404.css diff --git a/src/main/resources/static/css/500.css b/solon-system/src/main/resources/static/css/500.css similarity index 100% rename from src/main/resources/static/css/500.css rename to solon-system/src/main/resources/static/css/500.css diff --git a/src/main/resources/static/css/build.css b/solon-system/src/main/resources/static/css/build.css similarity index 100% rename from src/main/resources/static/css/build.css rename to solon-system/src/main/resources/static/css/build.css diff --git a/src/main/resources/static/css/custom.form.css b/solon-system/src/main/resources/static/css/custom.form.css similarity index 100% rename from src/main/resources/static/css/custom.form.css rename to solon-system/src/main/resources/static/css/custom.form.css diff --git a/src/main/resources/static/css/home.css b/solon-system/src/main/resources/static/css/home.css similarity index 100% rename from src/main/resources/static/css/home.css rename to solon-system/src/main/resources/static/css/home.css diff --git a/src/main/resources/static/css/images/403.png b/solon-system/src/main/resources/static/css/images/403.png similarity index 100% rename from src/main/resources/static/css/images/403.png rename to solon-system/src/main/resources/static/css/images/403.png diff --git a/src/main/resources/static/css/images/404.png b/solon-system/src/main/resources/static/css/images/404.png similarity index 100% rename from src/main/resources/static/css/images/404.png rename to solon-system/src/main/resources/static/css/images/404.png diff --git a/src/main/resources/static/css/images/500.png b/solon-system/src/main/resources/static/css/images/500.png similarity index 100% rename from src/main/resources/static/css/images/500.png rename to solon-system/src/main/resources/static/css/images/500.png diff --git a/src/main/resources/static/css/images/bg.jpg b/solon-system/src/main/resources/static/css/images/bg.jpg similarity index 100% rename from src/main/resources/static/css/images/bg.jpg rename to solon-system/src/main/resources/static/css/images/bg.jpg diff --git a/src/main/resources/static/css/login.css b/solon-system/src/main/resources/static/css/login.css similarity index 100% rename from src/main/resources/static/css/login.css rename to solon-system/src/main/resources/static/css/login.css diff --git a/src/main/resources/static/css/login2.css b/solon-system/src/main/resources/static/css/login2.css similarity index 100% rename from src/main/resources/static/css/login2.css rename to solon-system/src/main/resources/static/css/login2.css diff --git a/src/main/resources/static/favicon.ico b/solon-system/src/main/resources/static/favicon.ico similarity index 100% rename from src/main/resources/static/favicon.ico rename to solon-system/src/main/resources/static/favicon.ico diff --git a/src/main/resources/static/js/build.js b/solon-system/src/main/resources/static/js/build.js similarity index 100% rename from src/main/resources/static/js/build.js rename to solon-system/src/main/resources/static/js/build.js diff --git a/src/main/resources/static/js/core.util.js b/solon-system/src/main/resources/static/js/core.util.js similarity index 100% rename from src/main/resources/static/js/core.util.js rename to solon-system/src/main/resources/static/js/core.util.js diff --git a/src/main/resources/static/js/home.js b/solon-system/src/main/resources/static/js/home.js similarity index 100% rename from src/main/resources/static/js/home.js rename to solon-system/src/main/resources/static/js/home.js diff --git a/src/main/resources/static/js/jq-module/jquery.particleground.min.js b/solon-system/src/main/resources/static/js/jq-module/jquery.particleground.min.js similarity index 100% rename from src/main/resources/static/js/jq-module/jquery.particleground.min.js rename to solon-system/src/main/resources/static/js/jq-module/jquery.particleground.min.js diff --git a/src/main/resources/static/js/jq-module/paigusu.min.js b/solon-system/src/main/resources/static/js/jq-module/paigusu.min.js similarity index 100% rename from src/main/resources/static/js/jq-module/paigusu.min.js rename to solon-system/src/main/resources/static/js/jq-module/paigusu.min.js diff --git a/src/main/resources/static/js/jq-module/zyupload/zyupload-1.0.0.min.css b/solon-system/src/main/resources/static/js/jq-module/zyupload/zyupload-1.0.0.min.css similarity index 100% rename from src/main/resources/static/js/jq-module/zyupload/zyupload-1.0.0.min.css rename to solon-system/src/main/resources/static/js/jq-module/zyupload/zyupload-1.0.0.min.css diff --git a/src/main/resources/static/js/jq-module/zyupload/zyupload-1.0.0.min.js b/solon-system/src/main/resources/static/js/jq-module/zyupload/zyupload-1.0.0.min.js similarity index 100% rename from src/main/resources/static/js/jq-module/zyupload/zyupload-1.0.0.min.js rename to solon-system/src/main/resources/static/js/jq-module/zyupload/zyupload-1.0.0.min.js diff --git a/src/main/resources/static/js/jquery.js b/solon-system/src/main/resources/static/js/jquery.js similarity index 100% rename from src/main/resources/static/js/jquery.js rename to solon-system/src/main/resources/static/js/jquery.js diff --git a/src/main/resources/static/layui-ext/cron/cron.css b/solon-system/src/main/resources/static/layui-ext/cron/cron.css similarity index 100% rename from src/main/resources/static/layui-ext/cron/cron.css rename to solon-system/src/main/resources/static/layui-ext/cron/cron.css diff --git a/src/main/resources/static/layui-ext/cron/cron.js b/solon-system/src/main/resources/static/layui-ext/cron/cron.js similarity index 100% rename from src/main/resources/static/layui-ext/cron/cron.js rename to solon-system/src/main/resources/static/layui-ext/cron/cron.js diff --git a/src/main/resources/static/layui-ext/eleTree/eleTree.js b/solon-system/src/main/resources/static/layui-ext/eleTree/eleTree.js similarity index 100% rename from src/main/resources/static/layui-ext/eleTree/eleTree.js rename to solon-system/src/main/resources/static/layui-ext/eleTree/eleTree.js diff --git a/src/main/resources/static/layui-ext/icon/iconPicker.js b/solon-system/src/main/resources/static/layui-ext/icon/iconPicker.js similarity index 100% rename from src/main/resources/static/layui-ext/icon/iconPicker.js rename to solon-system/src/main/resources/static/layui-ext/icon/iconPicker.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/icons/default/icons.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/icons/default/icons.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/icons/default/icons.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/icons/default/icons.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/jquery.tinymce.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/jquery.tinymce.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/jquery.tinymce.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/jquery.tinymce.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/langs/readme.md b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/langs/readme.md similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/langs/readme.md rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/langs/readme.md diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/langs/zh_CN.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/langs/zh_CN.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/langs/zh_CN.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/langs/zh_CN.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/license.txt b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/license.txt similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/license.txt rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/license.txt diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/advlist/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/advlist/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/advlist/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/advlist/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/advlist/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/advlist/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/advlist/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/advlist/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/anchor/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/anchor/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/anchor/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/anchor/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/anchor/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/anchor/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/anchor/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/anchor/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autolink/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autolink/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autolink/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autolink/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autolink/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autolink/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autolink/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autolink/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autoresize/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autoresize/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autoresize/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autoresize/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autoresize/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autoresize/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autoresize/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autoresize/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autosave/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autosave/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autosave/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autosave/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autosave/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autosave/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autosave/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/autosave/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/bbcode/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/bbcode/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/bbcode/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/bbcode/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/bbcode/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/bbcode/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/bbcode/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/bbcode/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/charmap/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/charmap/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/charmap/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/charmap/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/charmap/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/charmap/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/charmap/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/charmap/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/code/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/code/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/code/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/code/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/code/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/code/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/code/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/code/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/codesample/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/codesample/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/codesample/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/codesample/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/codesample/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/codesample/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/codesample/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/codesample/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/colorpicker/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/colorpicker/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/colorpicker/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/colorpicker/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/colorpicker/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/colorpicker/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/colorpicker/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/colorpicker/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/contextmenu/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/contextmenu/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/contextmenu/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/contextmenu/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/contextmenu/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/contextmenu/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/contextmenu/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/contextmenu/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/directionality/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/directionality/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/directionality/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/directionality/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/directionality/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/directionality/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/directionality/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/directionality/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/js/emojis.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/js/emojis.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/js/emojis.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/js/emojis.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/js/emojis.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/js/emojis.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/js/emojis.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/js/emojis.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/emoticons/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullpage/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullpage/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullpage/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullpage/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullpage/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullpage/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullpage/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullpage/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullscreen/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullscreen/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullscreen/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullscreen/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullscreen/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullscreen/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullscreen/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/fullscreen/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/help/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/help/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/help/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/help/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/help/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/help/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/help/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/help/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/hr/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/hr/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/hr/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/hr/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/hr/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/hr/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/hr/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/hr/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/image/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/image/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/image/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/image/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/image/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/image/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/image/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/image/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/imagetools/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/imagetools/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/imagetools/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/imagetools/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/imagetools/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/imagetools/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/imagetools/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/imagetools/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/importcss/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/importcss/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/importcss/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/importcss/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/importcss/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/importcss/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/importcss/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/importcss/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/indent2em/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/indent2em/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/indent2em/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/indent2em/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/indent2em/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/indent2em/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/indent2em/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/indent2em/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/insertdatetime/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/insertdatetime/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/insertdatetime/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/insertdatetime/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/insertdatetime/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/insertdatetime/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/insertdatetime/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/insertdatetime/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/legacyoutput/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/legacyoutput/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/legacyoutput/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/legacyoutput/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/legacyoutput/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/legacyoutput/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/legacyoutput/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/legacyoutput/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/link/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/link/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/link/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/link/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/link/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/link/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/link/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/link/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/lists/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/lists/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/lists/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/lists/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/lists/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/lists/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/lists/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/lists/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/media/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/media/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/media/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/media/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/media/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/media/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/media/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/media/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/nonbreaking/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/nonbreaking/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/nonbreaking/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/nonbreaking/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/nonbreaking/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/nonbreaking/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/nonbreaking/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/nonbreaking/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/noneditable/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/noneditable/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/noneditable/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/noneditable/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/noneditable/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/noneditable/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/noneditable/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/noneditable/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/pagebreak/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/pagebreak/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/pagebreak/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/pagebreak/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/pagebreak/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/pagebreak/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/pagebreak/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/pagebreak/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/paste/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/paste/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/paste/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/paste/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/paste/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/paste/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/paste/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/paste/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/preview/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/preview/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/preview/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/preview/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/preview/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/preview/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/preview/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/preview/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/print/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/print/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/print/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/print/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/print/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/print/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/print/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/print/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/quickbars/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/quickbars/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/quickbars/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/quickbars/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/quickbars/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/quickbars/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/quickbars/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/quickbars/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/save/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/save/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/save/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/save/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/save/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/save/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/save/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/save/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/searchreplace/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/searchreplace/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/searchreplace/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/searchreplace/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/searchreplace/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/searchreplace/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/searchreplace/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/searchreplace/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/spellchecker/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/spellchecker/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/spellchecker/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/spellchecker/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/spellchecker/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/spellchecker/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/spellchecker/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/spellchecker/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/tabfocus/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/tabfocus/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/tabfocus/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/tabfocus/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/tabfocus/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/tabfocus/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/tabfocus/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/tabfocus/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/table/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/table/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/table/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/table/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/table/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/table/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/table/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/table/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/template/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/template/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/template/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/template/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/template/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/template/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/template/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/template/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textcolor/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textcolor/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textcolor/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textcolor/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textcolor/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textcolor/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textcolor/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textcolor/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textpattern/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textpattern/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textpattern/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textpattern/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textpattern/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textpattern/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textpattern/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/textpattern/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/toc/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/toc/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/toc/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/toc/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/toc/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/toc/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/toc/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/toc/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualblocks/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualblocks/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualblocks/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualblocks/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualblocks/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualblocks/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualblocks/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualblocks/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualchars/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualchars/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualchars/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualchars/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualchars/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualchars/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualchars/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/visualchars/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/wordcount/plugin.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/wordcount/plugin.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/wordcount/plugin.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/wordcount/plugin.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/wordcount/plugin.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/wordcount/plugin.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/plugins/wordcount/plugin.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/plugins/wordcount/plugin.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/dark/content.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/dark/content.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/dark/content.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/dark/content.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/default/content.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/default/content.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/default/content.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/default/content.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/document/content.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/document/content.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/document/content.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/document/content.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/writer/content.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/writer/content.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/writer/content.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/content/writer/content.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.inline.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.inline.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.inline.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.inline.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.mobile.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.mobile.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.mobile.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/content.mobile.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/skin.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/skin.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/skin.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/skin.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/skin.mobile.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/skin.mobile.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/skin.mobile.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide-dark/skin.mobile.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.inline.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.inline.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.inline.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.inline.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.mobile.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.mobile.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.mobile.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/content.mobile.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/skin.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/skin.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/skin.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/skin.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/skin.mobile.min.css b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/skin.mobile.min.css similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/skin.mobile.min.css rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/skins/ui/oxide/skin.mobile.min.css diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/themes/mobile/theme.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/themes/mobile/theme.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/themes/mobile/theme.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/themes/mobile/theme.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/themes/silver/theme.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/themes/silver/theme.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/themes/silver/theme.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/themes/silver/theme.min.js diff --git a/src/main/resources/static/layui-ext/tinymce/tinymce/tinymce.min.js b/solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/tinymce.min.js similarity index 100% rename from src/main/resources/static/layui-ext/tinymce/tinymce/tinymce.min.js rename to solon-system/src/main/resources/static/layui-ext/tinymce/tinymce/tinymce.min.js diff --git a/src/main/resources/static/layui-ext/treetable-lay/treetable.css b/solon-system/src/main/resources/static/layui-ext/treetable-lay/treetable.css similarity index 100% rename from src/main/resources/static/layui-ext/treetable-lay/treetable.css rename to solon-system/src/main/resources/static/layui-ext/treetable-lay/treetable.css diff --git a/src/main/resources/static/layui-ext/treetable-lay/treetable.js b/solon-system/src/main/resources/static/layui-ext/treetable-lay/treetable.js similarity index 100% rename from src/main/resources/static/layui-ext/treetable-lay/treetable.js rename to solon-system/src/main/resources/static/layui-ext/treetable-lay/treetable.js diff --git a/src/main/resources/static/layui/css/layui.css b/solon-system/src/main/resources/static/layui/css/layui.css similarity index 100% rename from src/main/resources/static/layui/css/layui.css rename to solon-system/src/main/resources/static/layui/css/layui.css diff --git a/src/main/resources/static/layui/css/layui.mobile.css b/solon-system/src/main/resources/static/layui/css/layui.mobile.css similarity index 100% rename from src/main/resources/static/layui/css/layui.mobile.css rename to solon-system/src/main/resources/static/layui/css/layui.mobile.css diff --git a/src/main/resources/static/layui/css/modules/code.css b/solon-system/src/main/resources/static/layui/css/modules/code.css similarity index 100% rename from src/main/resources/static/layui/css/modules/code.css rename to solon-system/src/main/resources/static/layui/css/modules/code.css diff --git a/src/main/resources/static/layui/css/modules/laydate/default/laydate.css b/solon-system/src/main/resources/static/layui/css/modules/laydate/default/laydate.css similarity index 100% rename from src/main/resources/static/layui/css/modules/laydate/default/laydate.css rename to solon-system/src/main/resources/static/layui/css/modules/laydate/default/laydate.css diff --git a/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png b/solon-system/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png similarity index 100% rename from src/main/resources/static/layui/css/modules/layer/default/icon-ext.png rename to solon-system/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png diff --git a/src/main/resources/static/layui/css/modules/layer/default/icon.png b/solon-system/src/main/resources/static/layui/css/modules/layer/default/icon.png similarity index 100% rename from src/main/resources/static/layui/css/modules/layer/default/icon.png rename to solon-system/src/main/resources/static/layui/css/modules/layer/default/icon.png diff --git a/src/main/resources/static/layui/css/modules/layer/default/layer.css b/solon-system/src/main/resources/static/layui/css/modules/layer/default/layer.css similarity index 100% rename from src/main/resources/static/layui/css/modules/layer/default/layer.css rename to solon-system/src/main/resources/static/layui/css/modules/layer/default/layer.css diff --git a/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif b/solon-system/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif similarity index 100% rename from src/main/resources/static/layui/css/modules/layer/default/loading-0.gif rename to solon-system/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif diff --git a/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif b/solon-system/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif similarity index 100% rename from src/main/resources/static/layui/css/modules/layer/default/loading-1.gif rename to solon-system/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif diff --git a/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif b/solon-system/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif similarity index 100% rename from src/main/resources/static/layui/css/modules/layer/default/loading-2.gif rename to solon-system/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif diff --git a/src/main/resources/static/layui/font/iconfont.eot b/solon-system/src/main/resources/static/layui/font/iconfont.eot similarity index 100% rename from src/main/resources/static/layui/font/iconfont.eot rename to solon-system/src/main/resources/static/layui/font/iconfont.eot diff --git a/src/main/resources/static/layui/font/iconfont.svg b/solon-system/src/main/resources/static/layui/font/iconfont.svg similarity index 100% rename from src/main/resources/static/layui/font/iconfont.svg rename to solon-system/src/main/resources/static/layui/font/iconfont.svg diff --git a/src/main/resources/static/layui/font/iconfont.ttf b/solon-system/src/main/resources/static/layui/font/iconfont.ttf similarity index 100% rename from src/main/resources/static/layui/font/iconfont.ttf rename to solon-system/src/main/resources/static/layui/font/iconfont.ttf diff --git a/src/main/resources/static/layui/font/iconfont.woff b/solon-system/src/main/resources/static/layui/font/iconfont.woff similarity index 100% rename from src/main/resources/static/layui/font/iconfont.woff rename to solon-system/src/main/resources/static/layui/font/iconfont.woff diff --git a/src/main/resources/static/layui/font/iconfont.woff2 b/solon-system/src/main/resources/static/layui/font/iconfont.woff2 similarity index 100% rename from src/main/resources/static/layui/font/iconfont.woff2 rename to solon-system/src/main/resources/static/layui/font/iconfont.woff2 diff --git a/src/main/resources/static/layui/images/face/0.gif b/solon-system/src/main/resources/static/layui/images/face/0.gif similarity index 100% rename from src/main/resources/static/layui/images/face/0.gif rename to solon-system/src/main/resources/static/layui/images/face/0.gif diff --git a/src/main/resources/static/layui/images/face/1.gif b/solon-system/src/main/resources/static/layui/images/face/1.gif similarity index 100% rename from src/main/resources/static/layui/images/face/1.gif rename to solon-system/src/main/resources/static/layui/images/face/1.gif diff --git a/src/main/resources/static/layui/images/face/10.gif b/solon-system/src/main/resources/static/layui/images/face/10.gif similarity index 100% rename from src/main/resources/static/layui/images/face/10.gif rename to solon-system/src/main/resources/static/layui/images/face/10.gif diff --git a/src/main/resources/static/layui/images/face/11.gif b/solon-system/src/main/resources/static/layui/images/face/11.gif similarity index 100% rename from src/main/resources/static/layui/images/face/11.gif rename to solon-system/src/main/resources/static/layui/images/face/11.gif diff --git a/src/main/resources/static/layui/images/face/12.gif b/solon-system/src/main/resources/static/layui/images/face/12.gif similarity index 100% rename from src/main/resources/static/layui/images/face/12.gif rename to solon-system/src/main/resources/static/layui/images/face/12.gif diff --git a/src/main/resources/static/layui/images/face/13.gif b/solon-system/src/main/resources/static/layui/images/face/13.gif similarity index 100% rename from src/main/resources/static/layui/images/face/13.gif rename to solon-system/src/main/resources/static/layui/images/face/13.gif diff --git a/src/main/resources/static/layui/images/face/14.gif b/solon-system/src/main/resources/static/layui/images/face/14.gif similarity index 100% rename from src/main/resources/static/layui/images/face/14.gif rename to solon-system/src/main/resources/static/layui/images/face/14.gif diff --git a/src/main/resources/static/layui/images/face/15.gif b/solon-system/src/main/resources/static/layui/images/face/15.gif similarity index 100% rename from src/main/resources/static/layui/images/face/15.gif rename to solon-system/src/main/resources/static/layui/images/face/15.gif diff --git a/src/main/resources/static/layui/images/face/16.gif b/solon-system/src/main/resources/static/layui/images/face/16.gif similarity index 100% rename from src/main/resources/static/layui/images/face/16.gif rename to solon-system/src/main/resources/static/layui/images/face/16.gif diff --git a/src/main/resources/static/layui/images/face/17.gif b/solon-system/src/main/resources/static/layui/images/face/17.gif similarity index 100% rename from src/main/resources/static/layui/images/face/17.gif rename to solon-system/src/main/resources/static/layui/images/face/17.gif diff --git a/src/main/resources/static/layui/images/face/18.gif b/solon-system/src/main/resources/static/layui/images/face/18.gif similarity index 100% rename from src/main/resources/static/layui/images/face/18.gif rename to solon-system/src/main/resources/static/layui/images/face/18.gif diff --git a/src/main/resources/static/layui/images/face/19.gif b/solon-system/src/main/resources/static/layui/images/face/19.gif similarity index 100% rename from src/main/resources/static/layui/images/face/19.gif rename to solon-system/src/main/resources/static/layui/images/face/19.gif diff --git a/src/main/resources/static/layui/images/face/2.gif b/solon-system/src/main/resources/static/layui/images/face/2.gif similarity index 100% rename from src/main/resources/static/layui/images/face/2.gif rename to solon-system/src/main/resources/static/layui/images/face/2.gif diff --git a/src/main/resources/static/layui/images/face/20.gif b/solon-system/src/main/resources/static/layui/images/face/20.gif similarity index 100% rename from src/main/resources/static/layui/images/face/20.gif rename to solon-system/src/main/resources/static/layui/images/face/20.gif diff --git a/src/main/resources/static/layui/images/face/21.gif b/solon-system/src/main/resources/static/layui/images/face/21.gif similarity index 100% rename from src/main/resources/static/layui/images/face/21.gif rename to solon-system/src/main/resources/static/layui/images/face/21.gif diff --git a/src/main/resources/static/layui/images/face/22.gif b/solon-system/src/main/resources/static/layui/images/face/22.gif similarity index 100% rename from src/main/resources/static/layui/images/face/22.gif rename to solon-system/src/main/resources/static/layui/images/face/22.gif diff --git a/src/main/resources/static/layui/images/face/23.gif b/solon-system/src/main/resources/static/layui/images/face/23.gif similarity index 100% rename from src/main/resources/static/layui/images/face/23.gif rename to solon-system/src/main/resources/static/layui/images/face/23.gif diff --git a/src/main/resources/static/layui/images/face/24.gif b/solon-system/src/main/resources/static/layui/images/face/24.gif similarity index 100% rename from src/main/resources/static/layui/images/face/24.gif rename to solon-system/src/main/resources/static/layui/images/face/24.gif diff --git a/src/main/resources/static/layui/images/face/25.gif b/solon-system/src/main/resources/static/layui/images/face/25.gif similarity index 100% rename from src/main/resources/static/layui/images/face/25.gif rename to solon-system/src/main/resources/static/layui/images/face/25.gif diff --git a/src/main/resources/static/layui/images/face/26.gif b/solon-system/src/main/resources/static/layui/images/face/26.gif similarity index 100% rename from src/main/resources/static/layui/images/face/26.gif rename to solon-system/src/main/resources/static/layui/images/face/26.gif diff --git a/src/main/resources/static/layui/images/face/27.gif b/solon-system/src/main/resources/static/layui/images/face/27.gif similarity index 100% rename from src/main/resources/static/layui/images/face/27.gif rename to solon-system/src/main/resources/static/layui/images/face/27.gif diff --git a/src/main/resources/static/layui/images/face/28.gif b/solon-system/src/main/resources/static/layui/images/face/28.gif similarity index 100% rename from src/main/resources/static/layui/images/face/28.gif rename to solon-system/src/main/resources/static/layui/images/face/28.gif diff --git a/src/main/resources/static/layui/images/face/29.gif b/solon-system/src/main/resources/static/layui/images/face/29.gif similarity index 100% rename from src/main/resources/static/layui/images/face/29.gif rename to solon-system/src/main/resources/static/layui/images/face/29.gif diff --git a/src/main/resources/static/layui/images/face/3.gif b/solon-system/src/main/resources/static/layui/images/face/3.gif similarity index 100% rename from src/main/resources/static/layui/images/face/3.gif rename to solon-system/src/main/resources/static/layui/images/face/3.gif diff --git a/src/main/resources/static/layui/images/face/30.gif b/solon-system/src/main/resources/static/layui/images/face/30.gif similarity index 100% rename from src/main/resources/static/layui/images/face/30.gif rename to solon-system/src/main/resources/static/layui/images/face/30.gif diff --git a/src/main/resources/static/layui/images/face/31.gif b/solon-system/src/main/resources/static/layui/images/face/31.gif similarity index 100% rename from src/main/resources/static/layui/images/face/31.gif rename to solon-system/src/main/resources/static/layui/images/face/31.gif diff --git a/src/main/resources/static/layui/images/face/32.gif b/solon-system/src/main/resources/static/layui/images/face/32.gif similarity index 100% rename from src/main/resources/static/layui/images/face/32.gif rename to solon-system/src/main/resources/static/layui/images/face/32.gif diff --git a/src/main/resources/static/layui/images/face/33.gif b/solon-system/src/main/resources/static/layui/images/face/33.gif similarity index 100% rename from src/main/resources/static/layui/images/face/33.gif rename to solon-system/src/main/resources/static/layui/images/face/33.gif diff --git a/src/main/resources/static/layui/images/face/34.gif b/solon-system/src/main/resources/static/layui/images/face/34.gif similarity index 100% rename from src/main/resources/static/layui/images/face/34.gif rename to solon-system/src/main/resources/static/layui/images/face/34.gif diff --git a/src/main/resources/static/layui/images/face/35.gif b/solon-system/src/main/resources/static/layui/images/face/35.gif similarity index 100% rename from src/main/resources/static/layui/images/face/35.gif rename to solon-system/src/main/resources/static/layui/images/face/35.gif diff --git a/src/main/resources/static/layui/images/face/36.gif b/solon-system/src/main/resources/static/layui/images/face/36.gif similarity index 100% rename from src/main/resources/static/layui/images/face/36.gif rename to solon-system/src/main/resources/static/layui/images/face/36.gif diff --git a/src/main/resources/static/layui/images/face/37.gif b/solon-system/src/main/resources/static/layui/images/face/37.gif similarity index 100% rename from src/main/resources/static/layui/images/face/37.gif rename to solon-system/src/main/resources/static/layui/images/face/37.gif diff --git a/src/main/resources/static/layui/images/face/38.gif b/solon-system/src/main/resources/static/layui/images/face/38.gif similarity index 100% rename from src/main/resources/static/layui/images/face/38.gif rename to solon-system/src/main/resources/static/layui/images/face/38.gif diff --git a/src/main/resources/static/layui/images/face/39.gif b/solon-system/src/main/resources/static/layui/images/face/39.gif similarity index 100% rename from src/main/resources/static/layui/images/face/39.gif rename to solon-system/src/main/resources/static/layui/images/face/39.gif diff --git a/src/main/resources/static/layui/images/face/4.gif b/solon-system/src/main/resources/static/layui/images/face/4.gif similarity index 100% rename from src/main/resources/static/layui/images/face/4.gif rename to solon-system/src/main/resources/static/layui/images/face/4.gif diff --git a/src/main/resources/static/layui/images/face/40.gif b/solon-system/src/main/resources/static/layui/images/face/40.gif similarity index 100% rename from src/main/resources/static/layui/images/face/40.gif rename to solon-system/src/main/resources/static/layui/images/face/40.gif diff --git a/src/main/resources/static/layui/images/face/41.gif b/solon-system/src/main/resources/static/layui/images/face/41.gif similarity index 100% rename from src/main/resources/static/layui/images/face/41.gif rename to solon-system/src/main/resources/static/layui/images/face/41.gif diff --git a/src/main/resources/static/layui/images/face/42.gif b/solon-system/src/main/resources/static/layui/images/face/42.gif similarity index 100% rename from src/main/resources/static/layui/images/face/42.gif rename to solon-system/src/main/resources/static/layui/images/face/42.gif diff --git a/src/main/resources/static/layui/images/face/43.gif b/solon-system/src/main/resources/static/layui/images/face/43.gif similarity index 100% rename from src/main/resources/static/layui/images/face/43.gif rename to solon-system/src/main/resources/static/layui/images/face/43.gif diff --git a/src/main/resources/static/layui/images/face/44.gif b/solon-system/src/main/resources/static/layui/images/face/44.gif similarity index 100% rename from src/main/resources/static/layui/images/face/44.gif rename to solon-system/src/main/resources/static/layui/images/face/44.gif diff --git a/src/main/resources/static/layui/images/face/45.gif b/solon-system/src/main/resources/static/layui/images/face/45.gif similarity index 100% rename from src/main/resources/static/layui/images/face/45.gif rename to solon-system/src/main/resources/static/layui/images/face/45.gif diff --git a/src/main/resources/static/layui/images/face/46.gif b/solon-system/src/main/resources/static/layui/images/face/46.gif similarity index 100% rename from src/main/resources/static/layui/images/face/46.gif rename to solon-system/src/main/resources/static/layui/images/face/46.gif diff --git a/src/main/resources/static/layui/images/face/47.gif b/solon-system/src/main/resources/static/layui/images/face/47.gif similarity index 100% rename from src/main/resources/static/layui/images/face/47.gif rename to solon-system/src/main/resources/static/layui/images/face/47.gif diff --git a/src/main/resources/static/layui/images/face/48.gif b/solon-system/src/main/resources/static/layui/images/face/48.gif similarity index 100% rename from src/main/resources/static/layui/images/face/48.gif rename to solon-system/src/main/resources/static/layui/images/face/48.gif diff --git a/src/main/resources/static/layui/images/face/49.gif b/solon-system/src/main/resources/static/layui/images/face/49.gif similarity index 100% rename from src/main/resources/static/layui/images/face/49.gif rename to solon-system/src/main/resources/static/layui/images/face/49.gif diff --git a/src/main/resources/static/layui/images/face/5.gif b/solon-system/src/main/resources/static/layui/images/face/5.gif similarity index 100% rename from src/main/resources/static/layui/images/face/5.gif rename to solon-system/src/main/resources/static/layui/images/face/5.gif diff --git a/src/main/resources/static/layui/images/face/50.gif b/solon-system/src/main/resources/static/layui/images/face/50.gif similarity index 100% rename from src/main/resources/static/layui/images/face/50.gif rename to solon-system/src/main/resources/static/layui/images/face/50.gif diff --git a/src/main/resources/static/layui/images/face/51.gif b/solon-system/src/main/resources/static/layui/images/face/51.gif similarity index 100% rename from src/main/resources/static/layui/images/face/51.gif rename to solon-system/src/main/resources/static/layui/images/face/51.gif diff --git a/src/main/resources/static/layui/images/face/52.gif b/solon-system/src/main/resources/static/layui/images/face/52.gif similarity index 100% rename from src/main/resources/static/layui/images/face/52.gif rename to solon-system/src/main/resources/static/layui/images/face/52.gif diff --git a/src/main/resources/static/layui/images/face/53.gif b/solon-system/src/main/resources/static/layui/images/face/53.gif similarity index 100% rename from src/main/resources/static/layui/images/face/53.gif rename to solon-system/src/main/resources/static/layui/images/face/53.gif diff --git a/src/main/resources/static/layui/images/face/54.gif b/solon-system/src/main/resources/static/layui/images/face/54.gif similarity index 100% rename from src/main/resources/static/layui/images/face/54.gif rename to solon-system/src/main/resources/static/layui/images/face/54.gif diff --git a/src/main/resources/static/layui/images/face/55.gif b/solon-system/src/main/resources/static/layui/images/face/55.gif similarity index 100% rename from src/main/resources/static/layui/images/face/55.gif rename to solon-system/src/main/resources/static/layui/images/face/55.gif diff --git a/src/main/resources/static/layui/images/face/56.gif b/solon-system/src/main/resources/static/layui/images/face/56.gif similarity index 100% rename from src/main/resources/static/layui/images/face/56.gif rename to solon-system/src/main/resources/static/layui/images/face/56.gif diff --git a/src/main/resources/static/layui/images/face/57.gif b/solon-system/src/main/resources/static/layui/images/face/57.gif similarity index 100% rename from src/main/resources/static/layui/images/face/57.gif rename to solon-system/src/main/resources/static/layui/images/face/57.gif diff --git a/src/main/resources/static/layui/images/face/58.gif b/solon-system/src/main/resources/static/layui/images/face/58.gif similarity index 100% rename from src/main/resources/static/layui/images/face/58.gif rename to solon-system/src/main/resources/static/layui/images/face/58.gif diff --git a/src/main/resources/static/layui/images/face/59.gif b/solon-system/src/main/resources/static/layui/images/face/59.gif similarity index 100% rename from src/main/resources/static/layui/images/face/59.gif rename to solon-system/src/main/resources/static/layui/images/face/59.gif diff --git a/src/main/resources/static/layui/images/face/6.gif b/solon-system/src/main/resources/static/layui/images/face/6.gif similarity index 100% rename from src/main/resources/static/layui/images/face/6.gif rename to solon-system/src/main/resources/static/layui/images/face/6.gif diff --git a/src/main/resources/static/layui/images/face/60.gif b/solon-system/src/main/resources/static/layui/images/face/60.gif similarity index 100% rename from src/main/resources/static/layui/images/face/60.gif rename to solon-system/src/main/resources/static/layui/images/face/60.gif diff --git a/src/main/resources/static/layui/images/face/61.gif b/solon-system/src/main/resources/static/layui/images/face/61.gif similarity index 100% rename from src/main/resources/static/layui/images/face/61.gif rename to solon-system/src/main/resources/static/layui/images/face/61.gif diff --git a/src/main/resources/static/layui/images/face/62.gif b/solon-system/src/main/resources/static/layui/images/face/62.gif similarity index 100% rename from src/main/resources/static/layui/images/face/62.gif rename to solon-system/src/main/resources/static/layui/images/face/62.gif diff --git a/src/main/resources/static/layui/images/face/63.gif b/solon-system/src/main/resources/static/layui/images/face/63.gif similarity index 100% rename from src/main/resources/static/layui/images/face/63.gif rename to solon-system/src/main/resources/static/layui/images/face/63.gif diff --git a/src/main/resources/static/layui/images/face/64.gif b/solon-system/src/main/resources/static/layui/images/face/64.gif similarity index 100% rename from src/main/resources/static/layui/images/face/64.gif rename to solon-system/src/main/resources/static/layui/images/face/64.gif diff --git a/src/main/resources/static/layui/images/face/65.gif b/solon-system/src/main/resources/static/layui/images/face/65.gif similarity index 100% rename from src/main/resources/static/layui/images/face/65.gif rename to solon-system/src/main/resources/static/layui/images/face/65.gif diff --git a/src/main/resources/static/layui/images/face/66.gif b/solon-system/src/main/resources/static/layui/images/face/66.gif similarity index 100% rename from src/main/resources/static/layui/images/face/66.gif rename to solon-system/src/main/resources/static/layui/images/face/66.gif diff --git a/src/main/resources/static/layui/images/face/67.gif b/solon-system/src/main/resources/static/layui/images/face/67.gif similarity index 100% rename from src/main/resources/static/layui/images/face/67.gif rename to solon-system/src/main/resources/static/layui/images/face/67.gif diff --git a/src/main/resources/static/layui/images/face/68.gif b/solon-system/src/main/resources/static/layui/images/face/68.gif similarity index 100% rename from src/main/resources/static/layui/images/face/68.gif rename to solon-system/src/main/resources/static/layui/images/face/68.gif diff --git a/src/main/resources/static/layui/images/face/69.gif b/solon-system/src/main/resources/static/layui/images/face/69.gif similarity index 100% rename from src/main/resources/static/layui/images/face/69.gif rename to solon-system/src/main/resources/static/layui/images/face/69.gif diff --git a/src/main/resources/static/layui/images/face/7.gif b/solon-system/src/main/resources/static/layui/images/face/7.gif similarity index 100% rename from src/main/resources/static/layui/images/face/7.gif rename to solon-system/src/main/resources/static/layui/images/face/7.gif diff --git a/src/main/resources/static/layui/images/face/70.gif b/solon-system/src/main/resources/static/layui/images/face/70.gif similarity index 100% rename from src/main/resources/static/layui/images/face/70.gif rename to solon-system/src/main/resources/static/layui/images/face/70.gif diff --git a/src/main/resources/static/layui/images/face/71.gif b/solon-system/src/main/resources/static/layui/images/face/71.gif similarity index 100% rename from src/main/resources/static/layui/images/face/71.gif rename to solon-system/src/main/resources/static/layui/images/face/71.gif diff --git a/src/main/resources/static/layui/images/face/8.gif b/solon-system/src/main/resources/static/layui/images/face/8.gif similarity index 100% rename from src/main/resources/static/layui/images/face/8.gif rename to solon-system/src/main/resources/static/layui/images/face/8.gif diff --git a/src/main/resources/static/layui/images/face/9.gif b/solon-system/src/main/resources/static/layui/images/face/9.gif similarity index 100% rename from src/main/resources/static/layui/images/face/9.gif rename to solon-system/src/main/resources/static/layui/images/face/9.gif diff --git a/src/main/resources/static/layui/lay/modules/carousel.js b/solon-system/src/main/resources/static/layui/lay/modules/carousel.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/carousel.js rename to solon-system/src/main/resources/static/layui/lay/modules/carousel.js diff --git a/src/main/resources/static/layui/lay/modules/code.js b/solon-system/src/main/resources/static/layui/lay/modules/code.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/code.js rename to solon-system/src/main/resources/static/layui/lay/modules/code.js diff --git a/src/main/resources/static/layui/lay/modules/colorpicker.js b/solon-system/src/main/resources/static/layui/lay/modules/colorpicker.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/colorpicker.js rename to solon-system/src/main/resources/static/layui/lay/modules/colorpicker.js diff --git a/src/main/resources/static/layui/lay/modules/element.js b/solon-system/src/main/resources/static/layui/lay/modules/element.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/element.js rename to solon-system/src/main/resources/static/layui/lay/modules/element.js diff --git a/src/main/resources/static/layui/lay/modules/flow.js b/solon-system/src/main/resources/static/layui/lay/modules/flow.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/flow.js rename to solon-system/src/main/resources/static/layui/lay/modules/flow.js diff --git a/src/main/resources/static/layui/lay/modules/form.js b/solon-system/src/main/resources/static/layui/lay/modules/form.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/form.js rename to solon-system/src/main/resources/static/layui/lay/modules/form.js diff --git a/src/main/resources/static/layui/lay/modules/jquery.js b/solon-system/src/main/resources/static/layui/lay/modules/jquery.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/jquery.js rename to solon-system/src/main/resources/static/layui/lay/modules/jquery.js diff --git a/src/main/resources/static/layui/lay/modules/laydate.js b/solon-system/src/main/resources/static/layui/lay/modules/laydate.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/laydate.js rename to solon-system/src/main/resources/static/layui/lay/modules/laydate.js diff --git a/src/main/resources/static/layui/lay/modules/layedit.js b/solon-system/src/main/resources/static/layui/lay/modules/layedit.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/layedit.js rename to solon-system/src/main/resources/static/layui/lay/modules/layedit.js diff --git a/src/main/resources/static/layui/lay/modules/layer.js b/solon-system/src/main/resources/static/layui/lay/modules/layer.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/layer.js rename to solon-system/src/main/resources/static/layui/lay/modules/layer.js diff --git a/src/main/resources/static/layui/lay/modules/laypage.js b/solon-system/src/main/resources/static/layui/lay/modules/laypage.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/laypage.js rename to solon-system/src/main/resources/static/layui/lay/modules/laypage.js diff --git a/src/main/resources/static/layui/lay/modules/laytpl.js b/solon-system/src/main/resources/static/layui/lay/modules/laytpl.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/laytpl.js rename to solon-system/src/main/resources/static/layui/lay/modules/laytpl.js diff --git a/src/main/resources/static/layui/lay/modules/mobile.js b/solon-system/src/main/resources/static/layui/lay/modules/mobile.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/mobile.js rename to solon-system/src/main/resources/static/layui/lay/modules/mobile.js diff --git a/src/main/resources/static/layui/lay/modules/rate.js b/solon-system/src/main/resources/static/layui/lay/modules/rate.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/rate.js rename to solon-system/src/main/resources/static/layui/lay/modules/rate.js diff --git a/src/main/resources/static/layui/lay/modules/slider.js b/solon-system/src/main/resources/static/layui/lay/modules/slider.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/slider.js rename to solon-system/src/main/resources/static/layui/lay/modules/slider.js diff --git a/src/main/resources/static/layui/lay/modules/table.js b/solon-system/src/main/resources/static/layui/lay/modules/table.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/table.js rename to solon-system/src/main/resources/static/layui/lay/modules/table.js diff --git a/src/main/resources/static/layui/lay/modules/transfer.js b/solon-system/src/main/resources/static/layui/lay/modules/transfer.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/transfer.js rename to solon-system/src/main/resources/static/layui/lay/modules/transfer.js diff --git a/src/main/resources/static/layui/lay/modules/tree.js b/solon-system/src/main/resources/static/layui/lay/modules/tree.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/tree.js rename to solon-system/src/main/resources/static/layui/lay/modules/tree.js diff --git a/src/main/resources/static/layui/lay/modules/upload.js b/solon-system/src/main/resources/static/layui/lay/modules/upload.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/upload.js rename to solon-system/src/main/resources/static/layui/lay/modules/upload.js diff --git a/src/main/resources/static/layui/lay/modules/util.js b/solon-system/src/main/resources/static/layui/lay/modules/util.js similarity index 100% rename from src/main/resources/static/layui/lay/modules/util.js rename to solon-system/src/main/resources/static/layui/lay/modules/util.js diff --git a/src/main/resources/static/layui/layui.js b/solon-system/src/main/resources/static/layui/layui.js similarity index 100% rename from src/main/resources/static/layui/layui.js rename to solon-system/src/main/resources/static/layui/layui.js diff --git a/src/main/resources/template/Controller.java.vm b/solon-system/src/main/resources/template/Controller.java.vm similarity index 100% rename from src/main/resources/template/Controller.java.vm rename to solon-system/src/main/resources/template/Controller.java.vm diff --git a/src/main/resources/template/Dao.java.vm b/solon-system/src/main/resources/template/Dao.java.vm similarity index 100% rename from src/main/resources/template/Dao.java.vm rename to solon-system/src/main/resources/template/Dao.java.vm diff --git a/src/main/resources/template/Dao.xml.vm b/solon-system/src/main/resources/template/Dao.xml.vm similarity index 100% rename from src/main/resources/template/Dao.xml.vm rename to solon-system/src/main/resources/template/Dao.xml.vm diff --git a/src/main/resources/template/Entity.java.vm b/solon-system/src/main/resources/template/Entity.java.vm similarity index 98% rename from src/main/resources/template/Entity.java.vm rename to solon-system/src/main/resources/template/Entity.java.vm index 0edb20d..0de306f 100644 --- a/src/main/resources/template/Entity.java.vm +++ b/solon-system/src/main/resources/template/Entity.java.vm @@ -10,7 +10,7 @@ import java.util.Date; #end import java.io.Serializable; -import lombok.Data; + /** * ${comments} diff --git a/src/main/resources/template/Service.java.vm b/solon-system/src/main/resources/template/Service.java.vm similarity index 100% rename from src/main/resources/template/Service.java.vm rename to solon-system/src/main/resources/template/Service.java.vm diff --git a/src/main/resources/template/ServiceImpl.java.vm b/solon-system/src/main/resources/template/ServiceImpl.java.vm similarity index 100% rename from src/main/resources/template/ServiceImpl.java.vm rename to solon-system/src/main/resources/template/ServiceImpl.java.vm diff --git a/src/main/resources/template/list.html.vm b/solon-system/src/main/resources/template/list.html.vm similarity index 100% rename from src/main/resources/template/list.html.vm rename to solon-system/src/main/resources/template/list.html.vm diff --git a/src/main/resources/template/menu.sql.vm b/solon-system/src/main/resources/template/menu.sql.vm similarity index 100% rename from src/main/resources/template/menu.sql.vm rename to solon-system/src/main/resources/template/menu.sql.vm diff --git a/src/main/resources/templates/about.html b/solon-system/src/main/resources/templates/about.html similarity index 100% rename from src/main/resources/templates/about.html rename to solon-system/src/main/resources/templates/about.html diff --git a/src/main/resources/templates/build.html b/solon-system/src/main/resources/templates/build.html similarity index 100% rename from src/main/resources/templates/build.html rename to solon-system/src/main/resources/templates/build.html diff --git a/src/main/resources/templates/depts/dept_list.html b/solon-system/src/main/resources/templates/depts/dept_list.html similarity index 100% rename from src/main/resources/templates/depts/dept_list.html rename to solon-system/src/main/resources/templates/depts/dept_list.html diff --git a/src/main/resources/templates/error/403.html b/solon-system/src/main/resources/templates/error/403.html similarity index 100% rename from src/main/resources/templates/error/403.html rename to solon-system/src/main/resources/templates/error/403.html diff --git a/src/main/resources/templates/error/404.html b/solon-system/src/main/resources/templates/error/404.html similarity index 100% rename from src/main/resources/templates/error/404.html rename to solon-system/src/main/resources/templates/error/404.html diff --git a/src/main/resources/templates/error/500.html b/solon-system/src/main/resources/templates/error/500.html similarity index 100% rename from src/main/resources/templates/error/500.html rename to solon-system/src/main/resources/templates/error/500.html diff --git a/src/main/resources/templates/generator/list.html b/solon-system/src/main/resources/templates/generator/list.html similarity index 100% rename from src/main/resources/templates/generator/list.html rename to solon-system/src/main/resources/templates/generator/list.html diff --git a/src/main/resources/templates/home.html b/solon-system/src/main/resources/templates/home.html similarity index 100% rename from src/main/resources/templates/home.html rename to solon-system/src/main/resources/templates/home.html diff --git a/src/main/resources/templates/layout.html b/solon-system/src/main/resources/templates/layout.html similarity index 100% rename from src/main/resources/templates/layout.html rename to solon-system/src/main/resources/templates/layout.html diff --git a/src/main/resources/templates/login.html b/solon-system/src/main/resources/templates/login.html similarity index 100% rename from src/main/resources/templates/login.html rename to solon-system/src/main/resources/templates/login.html diff --git a/src/main/resources/templates/login2.html b/solon-system/src/main/resources/templates/login2.html similarity index 100% rename from src/main/resources/templates/login2.html rename to solon-system/src/main/resources/templates/login2.html diff --git a/src/main/resources/templates/logs/log_list.html b/solon-system/src/main/resources/templates/logs/log_list.html similarity index 100% rename from src/main/resources/templates/logs/log_list.html rename to solon-system/src/main/resources/templates/logs/log_list.html diff --git a/src/main/resources/templates/main.html b/solon-system/src/main/resources/templates/main.html similarity index 100% rename from src/main/resources/templates/main.html rename to solon-system/src/main/resources/templates/main.html diff --git a/src/main/resources/templates/menus/menu_list.html b/solon-system/src/main/resources/templates/menus/menu_list.html similarity index 100% rename from src/main/resources/templates/menus/menu_list.html rename to solon-system/src/main/resources/templates/menus/menu_list.html diff --git a/src/main/resources/templates/roles/role_list.html b/solon-system/src/main/resources/templates/roles/role_list.html similarity index 100% rename from src/main/resources/templates/roles/role_list.html rename to solon-system/src/main/resources/templates/roles/role_list.html diff --git a/src/main/resources/templates/syscontent/list.html b/solon-system/src/main/resources/templates/syscontent/list.html similarity index 100% rename from src/main/resources/templates/syscontent/list.html rename to solon-system/src/main/resources/templates/syscontent/list.html diff --git a/src/main/resources/templates/sysdict/list.html b/solon-system/src/main/resources/templates/sysdict/list.html similarity index 100% rename from src/main/resources/templates/sysdict/list.html rename to solon-system/src/main/resources/templates/sysdict/list.html diff --git a/src/main/resources/templates/sysfiles/list.html b/solon-system/src/main/resources/templates/sysfiles/list.html similarity index 100% rename from src/main/resources/templates/sysfiles/list.html rename to solon-system/src/main/resources/templates/sysfiles/list.html diff --git a/src/main/resources/templates/sysplugs/list.html b/solon-system/src/main/resources/templates/sysplugs/list.html similarity index 93% rename from src/main/resources/templates/sysplugs/list.html rename to solon-system/src/main/resources/templates/sysplugs/list.html index aada12a..b5b1195 100644 --- a/src/main/resources/templates/sysplugs/list.html +++ b/solon-system/src/main/resources/templates/sysplugs/list.html @@ -111,7 +111,8 @@ @@ -224,10 +225,13 @@ switch (obj.event) { case 'del': var ids=[]; - ids.push(data.id); + ids.push(data.qualifiedVersion); tipDialog(ids); break; - case 'look': + case 'startPlugin': + toStartPlugin(data.qualifiedVersion) + break; + case 'look': backshow(data); toDisabled(); break; @@ -254,6 +258,20 @@ }); }; + let toStartPlugin=function (id) { + layer.open({ + content: "确定要删除么?", + yes: function(index, layero){ + layer.close(index); //如果设定了yes回调，需进行手工关闭 + CoreUtil.sendGet(ctx + "sysPlugs/startPlugin/"+id,{},function (res) { + layer.msg(res.msg, {time:1000},function () { + tableIns1.reload(); + }); + }); + } + }); + }; + //返回 $("#btn_cancel").click(function() { $(".table_div").show(); diff --git a/src/main/resources/templates/users/update_password.html b/solon-system/src/main/resources/templates/users/update_password.html similarity index 100% rename from src/main/resources/templates/users/update_password.html rename to solon-system/src/main/resources/templates/users/update_password.html diff --git a/src/main/resources/templates/users/user_edit.html b/solon-system/src/main/resources/templates/users/user_edit.html similarity index 100% rename from src/main/resources/templates/users/user_edit.html rename to solon-system/src/main/resources/templates/users/user_edit.html diff --git a/src/main/resources/templates/users/user_list.html b/solon-system/src/main/resources/templates/users/user_list.html similarity index 100% rename from src/main/resources/templates/users/user_list.html rename to solon-system/src/main/resources/templates/users/user_list.html diff --git a/src/main/java/vip/fuck/sm/entity/ColumnEntity.java b/src/main/java/vip/fuck/sm/entity/ColumnEntity.java deleted file mode 100644 index dd06fa8..0000000 --- a/src/main/java/vip/fuck/sm/entity/ColumnEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -package vip.fuck.sm.entity; - -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - -/** - * 代码生成 列属性 - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@Data -public class ColumnEntity { - /** - * 列名 - */ - private String columnName; - - /** - * 列名类型 - */ - private String dataType; - - /** - * 列名备注 - */ - private String comments; - - /** - * 属性名称(第一个字母大写)，如：user_name => UserName - */ - private String attrName; - - /** - * 属性名称(第一个字母小写)，如：user_name => userName - */ - private String attrname; - - /** - * 属性类型 - */ - private String attrType; - - /** - * auto_increment - */ - private String extra; - -} diff --git a/src/main/java/vip/fuck/sm/entity/SysDept.java b/src/main/java/vip/fuck/sm/entity/SysDept.java deleted file mode 100644 index 9b7a3f8..0000000 --- a/src/main/java/vip/fuck/sm/entity/SysDept.java +++ /dev/null @@ -1,58 +0,0 @@ -package vip.fuck.sm.entity; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import org.dromara.autotable.annotation.*; -import org.noear.solon.validation.annotation.NotBlank; - -import java.io.Serializable; -import java.util.Date; - -/** - * 部门 - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@Data -@TableName("sys_dept") -@AutoTable(value = "sys_dept",comment = "部门") -public class SysDept implements Serializable { - @TableId(type = IdType.AUTO) - @PrimaryKey(autoIncrement = true) - private Long id; - - private String deptNo; - - @NotBlank(message = "机构名称不能为空") - private String name; - - @NotBlank(message = "父级不能为空") - private Long pid; - - @TableField(exist = false) - @Ignore - private String pidName; - - private Integer status; - - private String relationCode; - - private String deptManagerId; - - private String managerName; - - private String phone; - - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - @TableField(fill = FieldFill.INSERT) - @ColumnDefault(value = "0") - private Integer deleted; - -} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysLog.java b/src/main/java/vip/fuck/sm/entity/SysLog.java deleted file mode 100644 index df056fc..0000000 --- a/src/main/java/vip/fuck/sm/entity/SysLog.java +++ /dev/null @@ -1,54 +0,0 @@ -package vip.fuck.sm.entity; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.autotable.annotation.AutoTable; -import org.dromara.autotable.annotation.Ignore; -import org.dromara.autotable.annotation.PrimaryKey; - -import java.io.Serializable; -import java.util.Date; - -/** - * 操作日志 - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@TableName("sys_log") -@AutoTable(value = "sys_log",comment = "操作日志") -public class SysLog extends BasePageEntity implements Serializable { - @TableId(type = IdType.AUTO) - @PrimaryKey(autoIncrement = true) - private Long id; - - private Long userId; - - private String username; - - private String operation; - - private Integer time; - - private String method; - - private String params; - - private String ip; - - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @TableField(exist = false) - @Ignore - private String startTime; - - @TableField(exist = false) - @Ignore - private String endTime; - -} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysPermission.java b/src/main/java/vip/fuck/sm/entity/SysPermission.java deleted file mode 100644 index f78254f..0000000 --- a/src/main/java/vip/fuck/sm/entity/SysPermission.java +++ /dev/null @@ -1,70 +0,0 @@ -package vip.fuck.sm.entity; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import org.dromara.autotable.annotation.AutoTable; -import org.dromara.autotable.annotation.ColumnDefault; -import org.dromara.autotable.annotation.Ignore; -import org.dromara.autotable.annotation.PrimaryKey; -import org.noear.solon.validation.annotation.NotBlank; -import org.noear.solon.validation.annotation.NotNull; - -import java.io.Serializable; -import java.util.Date; - -/** - * 权限菜单 - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@Data -@TableName("sys_permission") -@AutoTable(value = "sys_permission",comment = "权限菜单") -public class SysPermission implements Serializable { - - - @TableId(type = IdType.AUTO) - @PrimaryKey(autoIncrement = true) - private Long id; - - @NotBlank(message = "菜单权限名称不能为空") - private String name; - - private String perms; - - private String url; - - private String icon; - - private String target; - - @NotNull(message = "所属菜单不能为空") - private Long pid; - - private Integer orderNum; - - @NotNull(message = "菜单权限类型不能为空") - private Integer type; - - /** - * 1正常 2禁用 - */ - private Integer status; - - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - @TableField(fill = FieldFill.INSERT) - @ColumnDefault(value = "0") - private Integer deleted; - - @TableField(exist = false) - @Ignore - private String pidName; - -} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysRole.java b/src/main/java/vip/fuck/sm/entity/SysRole.java deleted file mode 100644 index 0a391a1..0000000 --- a/src/main/java/vip/fuck/sm/entity/SysRole.java +++ /dev/null @@ -1,76 +0,0 @@ -package vip.fuck.sm.entity; - -import com.baomidou.mybatisplus.annotation.*; -import org.dromara.autotable.annotation.*; -import vip.fuck.sm.vo.resp.DeptRespNodeVO; -import vip.fuck.sm.vo.resp.PermissionRespNode; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.noear.solon.validation.annotation.NotBlank; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 角色 - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("sys_role") -@AutoTable(value = "sys_role",comment = "角色") -public class SysRole extends BasePageEntity implements Serializable { - @TableId(type = IdType.AUTO) - @PrimaryKey(autoIncrement = true) - private Long id; - - @NotBlank(message = "名称不能为空") - private String name; - - private String description; - - private Integer status; - - private Integer dataScope; - - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - @TableField(fill = FieldFill.INSERT) - @ColumnDefault(value = "0") - private Integer deleted; - - @TableField(exist = false) - @Ignore - private List permissionRespNodes; - - @TableField(exist = false) - @Ignore - private List deptRespNodes; - - @TableField(exist = false) - @Ignore - private String startTime; - - @TableField(exist = false) - @Ignore - private String endTime; - - @TableField(exist = false) - @Ignore - private List permissions; - - @TableField(exist = false) - @Ignore - private List depts; - -} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysUser.java b/src/main/java/vip/fuck/sm/entity/SysUser.java deleted file mode 100644 index 1b0663d..0000000 --- a/src/main/java/vip/fuck/sm/entity/SysUser.java +++ /dev/null @@ -1,102 +0,0 @@ -package vip.fuck.sm.entity; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.autotable.annotation.AutoTable; -import org.dromara.autotable.annotation.ColumnDefault; -import org.dromara.autotable.annotation.Ignore; -import org.dromara.autotable.annotation.PrimaryKey; -import org.noear.solon.validation.annotation.NotBlank; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 用户 - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@TableName("sys_user") -@AutoTable(value = "sys_user",comment = "系统用户") -public class SysUser extends BasePageEntity implements Serializable { - @TableId(type = IdType.AUTO) - @PrimaryKey(autoIncrement = true) - private Long id; - - @NotBlank(message = "账号不能为空") - private String username; - - private String salt; - - @NotBlank(message = "密码不能为空") - private String password; - - @TableField(exist = false) - @Ignore - private String oldPwd; - - @TableField(exist = false) - @Ignore - private String newPwd; - - private String phone; - - private Long deptId; - - @TableField(exist = false) - @Ignore - private String deptName; - - @TableField(exist = false) - @Ignore - private String deptNo; - - - private String realName; - - private String nickName; - - private String email; - - private Integer status; - - private Integer sex; - - @TableField(fill = FieldFill.INSERT) - @ColumnDefault(value = "0") - private Integer deleted; - - private Long createId; - - private Long updateId; - - private Integer createWhere; - - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - @TableField(exist = false) - @Ignore - private String startTime; - - @TableField(exist = false) - @Ignore - private String endTime; - - @TableField(exist = false) - @Ignore - private List roleIds; - - @TableField(exist = false) - @Ignore - private String captcha; -} \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/TableEntity.java b/src/main/java/vip/fuck/sm/entity/TableEntity.java deleted file mode 100644 index 4b913ca..0000000 --- a/src/main/java/vip/fuck/sm/entity/TableEntity.java +++ /dev/null @@ -1,37 +0,0 @@ -package vip.fuck.sm.entity; - - -import lombok.Getter; -import lombok.Setter; - - -import java.util.List; - -/** - * 代码生成 表数据 - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@Getter -@Setter -public class TableEntity { - //表的名称 - private String tableName; - //表的备注 - private String comments; - //表的主键 - private ColumnEntity pk; - //表的列名(不包含主键) - private List columns; - private List htmlColumns; - - //类名(第一个字母大写)，如：sys_user => SysUser - private String className; - //类名(第一个字母小写)，如：sys_user => sysUser - private String classname; - //类名(都小写)，如：sys_user => sysuser - private String classNameLower; - -} diff --git a/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java b/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java deleted file mode 100644 index 6dead65..0000000 --- a/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java +++ /dev/null @@ -1,53 +0,0 @@ -package vip.fuck.sm.vo.resp; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * DeptRespNodeVO - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@Data -public class DeptRespNodeVO { - @ApiModelProperty(value = "组织id") - private Long id; - - @ApiModelProperty(value = "组织编码") - private String deptNo; - - @ApiModelProperty(value = "组织名称") - private String title; - - @ApiModelProperty(value = "组织名称") - private String label; - - @ApiModelProperty(value = "组织父级id") - private Long pid; - - @ApiModelProperty(value = "组织状态") - private Integer status; - - @ApiModelProperty(value = "组织关系id") - private String relationCode; - - @ApiModelProperty(value = "是否展开 默认不展开(false)") - private boolean spread = true; - - @ApiModelProperty(value = "是否选中") - private boolean checked = false; - - private boolean disabled = false; - - @ApiModelProperty(value = "子集") - private List children; - - public String getLabel() { - return title; - } - -} diff --git a/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java b/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java deleted file mode 100644 index 8e489c2..0000000 --- a/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package vip.fuck.sm.vo.resp; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * LoginRespVO - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@Data -public class LoginRespVO { - @ApiModelProperty(value = "token") - private String accessToken; - @ApiModelProperty(value = "用户名") - private String username; - @ApiModelProperty(value = "用户id") - private Long id; - @ApiModelProperty(value = "电话") - private String phone; - @ApiModelProperty(value = "用户所拥有的菜单权限(前后端分离返回给前端控制菜单和按钮的显示和隐藏)") - private List list; -} diff --git a/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java b/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java deleted file mode 100644 index 184cee5..0000000 --- a/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java +++ /dev/null @@ -1,53 +0,0 @@ -package vip.fuck.sm.vo.resp; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * PermissionRespNode - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@Data -public class PermissionRespNode { - @ApiModelProperty(value = "id") - private Long id; - @ApiModelProperty(value = "菜单权限名称") - private String title; - - @ApiModelProperty(value = "菜单权限标识，shiro 适配restful") - private String perms; - - @ApiModelProperty(value = "接口地址") - private String url; - - @ApiModelProperty(value = "icon") - private String icon; - - private String target; - - @ApiModelProperty(value = "父级id") - private Long pid; - - @ApiModelProperty(value = "父级名称") - private String pidName; - - @ApiModelProperty(value = "菜单权限类型(1:目录;2:菜单;3:按钮)") - private Integer type; - - @ApiModelProperty(value = "排序码") - private Integer orderNum; - - @ApiModelProperty(value = "是否展开 默认不展开(false)") - private boolean spread = true; - - @ApiModelProperty(value = "是否选中 默认false") - private boolean checked; - private List children; - - -} diff --git a/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java b/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java deleted file mode 100644 index a68aeec..0000000 --- a/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package vip.fuck.sm.vo.resp; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * UserInfoRespVO - * - * @author xian.zi.ming@qq.com fuck.vip - * @version V1.0 - * @date 2020年3月18日 - */ -@Data -public class UserInfoRespVO { - @ApiModelProperty(value = "用户id") - private Long id; - @ApiModelProperty(value = "账号") - private String username; - @ApiModelProperty(value = "手机号") - private String phone; - @ApiModelProperty(value = "昵称") - private String nickName; - @ApiModelProperty(value = "真实姓名") - private String realName; - @ApiModelProperty(value = "所属机构id") - private Long deptId; - @ApiModelProperty(value = "所属机构名称") - private String deptName; - -}