diff --git a/app.platform/build-common.gradle b/app.platform/build-common.gradle index b1acd61d..f6cfe3d5 100644 --- a/app.platform/build-common.gradle +++ b/app.platform/build-common.gradle @@ -6,7 +6,7 @@ * 2. gradle bootwar -Dtarget=undertow # undertow, target=undertow * 3. gradle bootwar -Dtarget=jetty # jetty, target=jetty */ -def target =System.getProperty("target") ?: "tomcat"; +def target =System.getProperty("target") ?: "undertow"; System.setProperty('target',target); // 根据 targetRuntime 变量的值执行实际的 build.gradle diff --git a/app.platform/src/main/java/app/platform/Application.java b/app.platform/src/main/java/app/platform/Application.java index 83728c3f..e1dbc768 100644 --- a/app.platform/src/main/java/app/platform/Application.java +++ b/app.platform/src/main/java/app/platform/Application.java @@ -10,7 +10,6 @@ import org.springframework.web.WebApplicationInitializer; * 应用程序入口 */ @SpringBootApplication(proxyBeanMethods = false) -@MapperScan("com.xxl.job.admin.dao") public class Application extends PlatformSpringBootServletInitializer implements WebApplicationInitializer { public static void main(String[] args) throws Exception { ApplicationLauncher.run(Application.class,args); diff --git a/app.platform/src/main/resources/public/configure.js b/app.platform/src/main/resources/public/configure.js index b4485e6f..9bc75ad4 100644 --- a/app.platform/src/main/resources/public/configure.js +++ b/app.platform/src/main/resources/public/configure.js @@ -1,7 +1,11 @@ -window.APP = {}; // 在浏览器 window 对象中新建名为 APP 的变量, 用于存放应用对象的容器 -window.APP.configure ={ // 全局配置存储容器 - webContextPath: '[(@{/})]'.startsWith('[')? '/' : '[(@{/})]', // 应用上下文路径 +// 在浏览器 window 对象中新建名为 APP 的容器变量, 用于存放平台的全局变量 +window.APP = {}; +// 全局配置 +window.APP.configure ={ + // 应用上下文路径 + webContextPath: '[(@{/})]'.startsWith('[')? '/' : '[(@{/})]', + // 默认后端 API 请求的服务地址前缀 apiContextPaths: { - DEFAULT: '[(@{/})]'.startsWith('[') ? 'http://localhost:8080/' : '[(@{/})]', // 后端 API 请求的服务地址前缀 + DEFAULT: '[(@{/})]'.startsWith('[') ? 'http://localhost:8080/' : '[(@{/})]' } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/build.gradle b/build.gradle index ebb425e3..04bd9898 100644 --- a/build.gradle +++ b/build.gradle @@ -302,7 +302,7 @@ subprojects { publications{ publication(MavenPublication){ from components.java - artifact sourcesJar + //artifact sourcesJar //artifact javadocJar versionMapping { usage('java-api') { diff --git a/com.xxl.job.admin/build-common.gradle b/com.xxl.job.admin/build-common.gradle new file mode 100644 index 00000000..f6cfe3d5 --- /dev/null +++ b/com.xxl.job.admin/build-common.gradle @@ -0,0 +1,19 @@ +/** + * 设置打包文件的运行时目标环境(target) + * 设置方式: 通过命令行 -D 传入目标环境参数 + * 打包命令如下: + * 1. gradle bootwar # 默认, target=tomcat + * 2. gradle bootwar -Dtarget=undertow # undertow, target=undertow + * 3. gradle bootwar -Dtarget=jetty # jetty, target=jetty + */ +def target =System.getProperty("target") ?: "undertow"; +System.setProperty('target',target); + +// 根据 targetRuntime 变量的值执行实际的 build.gradle +apply from: "build-${target}.gradle" + +// 应用启动项目无需发布到仓库中 +publishPublicationPublicationToMavenRepository.enabled=false + +// 开启 docker 镜像生成任务 +jibBuildTar.enabled =true \ No newline at end of file diff --git a/com.xxl.job.admin/build-jetty.gradle b/com.xxl.job.admin/build-jetty.gradle new file mode 100644 index 00000000..6cf02057 --- /dev/null +++ b/com.xxl.job.admin/build-jetty.gradle @@ -0,0 +1,15 @@ +println "[Jetty] 环境 ......" + +configurations { + all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-jetty") + + providedRuntime( + "org.springframework.boot:spring-boot-starter-jetty", + ) +} diff --git a/com.xxl.job.admin/build-tomcat.gradle b/com.xxl.job.admin/build-tomcat.gradle new file mode 100644 index 00000000..a9d85e43 --- /dev/null +++ b/com.xxl.job.admin/build-tomcat.gradle @@ -0,0 +1,7 @@ +println "[Tomcat] 环境 ......" + +dependencies { + providedRuntime( + "org.springframework.boot:spring-boot-starter-tomcat", + ) +} diff --git a/com.xxl.job.admin/build-undertow.gradle b/com.xxl.job.admin/build-undertow.gradle new file mode 100644 index 00000000..00d3b492 --- /dev/null +++ b/com.xxl.job.admin/build-undertow.gradle @@ -0,0 +1,15 @@ +println "[Undertow] 环境 ......" + +configurations { + all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-undertow") + + providedRuntime( + "org.springframework.boot:spring-boot-starter-undertow", + ) +} diff --git a/com.xxl.job.executor/build-common.gradle b/com.xxl.job.executor/build-common.gradle new file mode 100644 index 00000000..f6cfe3d5 --- /dev/null +++ b/com.xxl.job.executor/build-common.gradle @@ -0,0 +1,19 @@ +/** + * 设置打包文件的运行时目标环境(target) + * 设置方式: 通过命令行 -D 传入目标环境参数 + * 打包命令如下: + * 1. gradle bootwar # 默认, target=tomcat + * 2. gradle bootwar -Dtarget=undertow # undertow, target=undertow + * 3. gradle bootwar -Dtarget=jetty # jetty, target=jetty + */ +def target =System.getProperty("target") ?: "undertow"; +System.setProperty('target',target); + +// 根据 targetRuntime 变量的值执行实际的 build.gradle +apply from: "build-${target}.gradle" + +// 应用启动项目无需发布到仓库中 +publishPublicationPublicationToMavenRepository.enabled=false + +// 开启 docker 镜像生成任务 +jibBuildTar.enabled =true \ No newline at end of file diff --git a/com.xxl.job.executor/build-jetty.gradle b/com.xxl.job.executor/build-jetty.gradle new file mode 100644 index 00000000..6cf02057 --- /dev/null +++ b/com.xxl.job.executor/build-jetty.gradle @@ -0,0 +1,15 @@ +println "[Jetty] 环境 ......" + +configurations { + all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-jetty") + + providedRuntime( + "org.springframework.boot:spring-boot-starter-jetty", + ) +} diff --git a/com.xxl.job.executor/build-tomcat.gradle b/com.xxl.job.executor/build-tomcat.gradle new file mode 100644 index 00000000..a9d85e43 --- /dev/null +++ b/com.xxl.job.executor/build-tomcat.gradle @@ -0,0 +1,7 @@ +println "[Tomcat] 环境 ......" + +dependencies { + providedRuntime( + "org.springframework.boot:spring-boot-starter-tomcat", + ) +} diff --git a/com.xxl.job.executor/build-undertow.gradle b/com.xxl.job.executor/build-undertow.gradle new file mode 100644 index 00000000..00d3b492 --- /dev/null +++ b/com.xxl.job.executor/build-undertow.gradle @@ -0,0 +1,15 @@ +println "[Undertow] 环境 ......" + +configurations { + all*.exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core" + all*.exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-websocket" +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-undertow") + + providedRuntime( + "org.springframework.boot:spring-boot-starter-undertow", + ) +} diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/bean/RestControllerReturnValueAdviceBean.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/bean/RestControllerReturnValueAdviceBean.java index e964163b..71cec30b 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/bean/RestControllerReturnValueAdviceBean.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/bean/RestControllerReturnValueAdviceBean.java @@ -54,7 +54,7 @@ public class RestControllerReturnValueAdviceBean implements ResponseBodyAdvice -
- -
-
- - - -
+
+ + + + + + +
@@ -65,10 +89,25 @@
+ + + + + + + + + + + +
diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Brand.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Brand.java similarity index 97% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Brand.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Brand.java index 6958d2cc..e9f504b2 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Brand.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Brand.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Configure.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Configure.java similarity index 81% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Configure.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Configure.java index f1256a2d..b5fee3ed 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Configure.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Configure.java @@ -1,7 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; - -import java.util.HashMap; -import java.util.Map; +package io.sc.platform.lcdp.configure.api; public class Configure { private Setting setting =new Setting(); diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Footer.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Footer.java similarity index 94% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Footer.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Footer.java index 2cdca624..f6ddf8da 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Footer.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Footer.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Footer { private boolean show =false; // 是否显示 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Grid.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Grid.java similarity index 94% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Grid.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Grid.java index 01b4bab7..01be677b 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Grid.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Grid.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Grid { private String headBgColor ="#f5f7fa"; // 表头背景颜色 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/I18n.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/I18n.java similarity index 97% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/I18n.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/I18n.java index 6c044cad..01a19fad 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/I18n.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/I18n.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class I18n { private String[] availableLocales =new String[]{ "en", "zh_CN", "tw_CN" };// 支持的国际化多语言数组 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/LoadingBar.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/LoadingBar.java similarity index 95% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/LoadingBar.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/LoadingBar.java index d21fe768..956a9bad 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/LoadingBar.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/LoadingBar.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class LoadingBar { private String color ="positive"; // 颜色 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Login.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Login.java similarity index 94% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Login.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Login.java index 8222b01b..7f89a18c 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Login.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Login.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Login { private String bgImage= "login-bg.jpg"; // 背景图片 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Main.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Main.java similarity index 98% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Main.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Main.java index 8bd65674..174cb25c 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Main.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Main.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Main { private String bgColor = "#FFFFFF"; // 背景颜色 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Notifier.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Notifier.java similarity index 92% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Notifier.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Notifier.java index 8a1361b2..f624064a 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Notifier.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Notifier.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Notifier { private String position ="top"; // 位置(可选值:top-left,top-right,bottom-left,bottom-right,top,bottom,left,right,center diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Scroller.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Scroller.java similarity index 97% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Scroller.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Scroller.java index f7c1e8c8..b40871f3 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Scroller.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Scroller.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Scroller { private boolean enable =true; // 是否可用 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Setting.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java similarity index 94% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Setting.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java index aa42222c..7b60644a 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Setting.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Setting { private String routerHistoryMode="hash"; // vue-router 历史模式(hash,web) diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Sider.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Sider.java similarity index 98% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Sider.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Sider.java index cc5a5ebe..f8752632 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Sider.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Sider.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Sider { private String position ="left"; // 位置(可选值:left;right) diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/TagViewBar.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/TagViewBar.java similarity index 98% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/TagViewBar.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/TagViewBar.java index 1248038b..fcd6e358 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/TagViewBar.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/TagViewBar.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class TagViewBar { private int height =50; // 高度(单位:像素) diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Theme.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Theme.java similarity index 98% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Theme.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Theme.java index 4ef830f8..28921f38 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Theme.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Theme.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class Theme { private boolean dark =false; // 是否黑暗模式 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Topper.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Topper.java similarity index 98% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Topper.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Topper.java index aff40c75..1241a284 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/Topper.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Topper.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; import java.util.HashMap; import java.util.Map; diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/TopperAction.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/TopperAction.java similarity index 84% rename from io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/TopperAction.java rename to io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/TopperAction.java index 077c522d..bb8f4af1 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/vo/TopperAction.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/TopperAction.java @@ -1,4 +1,4 @@ -package io.sc.platform.lcdp.configure.vo; +package io.sc.platform.lcdp.configure.api; public class TopperAction { private boolean enable =true; // 是否可用 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/controller/ConfigureController.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/controller/ConfigureController.java index dd24716e..6a76403d 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/controller/ConfigureController.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/controller/ConfigureController.java @@ -1,15 +1,11 @@ package io.sc.platform.lcdp.configure.controller; -import io.sc.platform.lcdp.configure.vo.Configure; +import io.sc.platform.lcdp.configure.api.Configure; import io.sc.platform.lcdp.configure.jpa.entity.ConfigureEntity; import io.sc.platform.lcdp.configure.jpa.repository.ConfigureRepository; import io.sc.platform.lcdp.configure.service.ConfigureService; import io.sc.platform.mvc.controller.support.RestCrudController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/lcdp/configure") @@ -19,8 +15,8 @@ public class ConfigureController extends RestCrudController>>>>"); + return "configure.js"; + } +} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/converter/ConfigureEntityVoConverter.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/converter/ConfigureEntityVoConverter.java index 4bdb8202..007282f8 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/converter/ConfigureEntityVoConverter.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/converter/ConfigureEntityVoConverter.java @@ -1,7 +1,7 @@ package io.sc.platform.lcdp.configure.converter; import io.sc.platform.lcdp.configure.jpa.entity.ConfigureEntity; -import io.sc.platform.lcdp.configure.vo.Configure; +import io.sc.platform.lcdp.configure.api.Configure; import io.sc.platform.orm.EntityVoConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/initializer/ConfigureInitializer.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/initializer/ConfigureInitializer.java new file mode 100644 index 00000000..d1faade5 --- /dev/null +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/initializer/ConfigureInitializer.java @@ -0,0 +1,42 @@ +package io.sc.platform.lcdp.configure.initializer; + +import io.sc.platform.core.initializer.ApplicationInitializer; +import io.sc.platform.core.initializer.ApplicationInitializerExecuteException; +import io.sc.platform.lcdp.configure.api.Setting; +import io.sc.platform.lcdp.configure.api.Theme; +import io.sc.platform.lcdp.configure.jpa.entity.ConfigureEntity; +import io.sc.platform.lcdp.configure.service.ConfigureService; +import org.springframework.context.ApplicationContext; + +public class ConfigureInitializer implements ApplicationInitializer { + private Boolean isInitialized =null; + private ConfigureService configureService; + + @Override + public void init(ApplicationContext applicationContext) { + this.configureService =applicationContext.getBean(ConfigureService.class); + } + + @Override + public synchronized boolean isInitialized() { + if(isInitialized!=null) { + return isInitialized; + } + if(configureService.getRepository().count()<=0){ + isInitialized =false; + }else { + isInitialized = true; + } + return isInitialized; + } + + @Override + public void execute() throws ApplicationInitializerExecuteException { + ConfigureEntity entity =new ConfigureEntity(); + entity.setName("Default"); + entity.setActive(true); + entity.setSetting(new Setting()); + entity.setTheme(new Theme()); + configureService.getRepository().save(entity); + } +} diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/converter/SettingStringConverter.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/converter/SettingStringConverter.java index 7724409f..211f6c8e 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/converter/SettingStringConverter.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/converter/SettingStringConverter.java @@ -3,7 +3,7 @@ package io.sc.platform.lcdp.configure.jpa.converter; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import io.sc.platform.core.util.ObjectMapper4Json; -import io.sc.platform.lcdp.configure.vo.Setting; +import io.sc.platform.lcdp.configure.api.Setting; import javax.persistence.AttributeConverter; diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/converter/ThemeStringConverter.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/converter/ThemeStringConverter.java index a1319c7f..99174335 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/converter/ThemeStringConverter.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/converter/ThemeStringConverter.java @@ -3,7 +3,7 @@ package io.sc.platform.lcdp.configure.jpa.converter; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import io.sc.platform.core.util.ObjectMapper4Json; -import io.sc.platform.lcdp.configure.vo.Theme; +import io.sc.platform.lcdp.configure.api.Theme; import javax.persistence.AttributeConverter; diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/entity/ConfigureEntity.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/entity/ConfigureEntity.java index 1952a8a5..8af01a16 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/entity/ConfigureEntity.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/jpa/entity/ConfigureEntity.java @@ -1,7 +1,7 @@ package io.sc.platform.lcdp.configure.jpa.entity; -import io.sc.platform.lcdp.configure.vo.Setting; -import io.sc.platform.lcdp.configure.vo.Theme; +import io.sc.platform.lcdp.configure.api.Setting; +import io.sc.platform.lcdp.configure.api.Theme; import io.sc.platform.lcdp.configure.jpa.converter.SettingStringConverter; import io.sc.platform.lcdp.configure.jpa.converter.ThemeStringConverter; import io.sc.platform.orm.converter.NumericBooleanConverter; diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/ConfigureService.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/ConfigureService.java index 4b17acde..e99351be 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/ConfigureService.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/ConfigureService.java @@ -1,12 +1,11 @@ package io.sc.platform.lcdp.configure.service; -import io.sc.platform.lcdp.configure.vo.Configure; +import io.sc.platform.lcdp.configure.api.Configure; import io.sc.platform.lcdp.configure.jpa.entity.ConfigureEntity; import io.sc.platform.lcdp.configure.jpa.repository.ConfigureRepository; import io.sc.platform.orm.service.DaoService; public interface ConfigureService extends DaoService { public Configure getActiveConfigure(); - public Configure getConfigure(String name); - public void setActiveConfigure(String name); + public void activeConfigure(String id); } diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java index b86dff6f..313c07fa 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java @@ -1,10 +1,12 @@ package io.sc.platform.lcdp.configure.service.impl; +import io.sc.platform.lcdp.configure.api.Setting; +import io.sc.platform.lcdp.configure.api.Theme; import io.sc.platform.lcdp.configure.converter.ConfigureEntityVoConverter; import io.sc.platform.lcdp.configure.jpa.entity.ConfigureEntity; import io.sc.platform.lcdp.configure.jpa.repository.ConfigureRepository; import io.sc.platform.lcdp.configure.service.ConfigureService; -import io.sc.platform.lcdp.configure.vo.Configure; +import io.sc.platform.lcdp.configure.api.Configure; import io.sc.platform.mvc.service.SystemParameterService; import io.sc.platform.orm.service.impl.DaoServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -16,15 +18,15 @@ import javax.transaction.Transactional; @Service public class ConfigureServiceImpl extends DaoServiceImpl implements ConfigureService { + private ConfigureEntityVoConverter converter =new ConfigureEntityVoConverter(); @Autowired private JdbcTemplate jdbcTemplate; @Autowired private SystemParameterService systemParameterService; @Override public Configure getActiveConfigure() { - ConfigureEntityVoConverter converter =new ConfigureEntityVoConverter(); ConfigureEntity entity =repository.findActiveConfigure(); if(entity!=null) { - return converter.toVo(repository.findActiveConfigure()); + return converter.toVo(entity); }else{ Configure configure = new Configure(); String homePage =systemParameterService.getParameter("parameter.system.homePage"); @@ -35,20 +37,22 @@ public class ConfigureServiceImpl extends DaoServiceImpl result =new HashMap<>(); for (Map.Entry entry : localFrontEndModuleMap.entrySet()) { if(entry.getValue().getComponents().size()>0) { + result.put(entry.getKey(), getRemoteEntry(entry.getValue(), request)); } } diff --git a/settings.gradle b/settings.gradle index 7785428e..824de7d7 100755 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,4 @@ include ':app.platform' -//include ':com.xuxueli.xxl-job-admin' -//include ':com.xuxueli.xxl-job-core' include ':com.xxl.job.admin' include ':com.xxl.job.core' include ':com.xxl.job.executor'