diff --git a/jeecg-boot/jeecg-module-demo/pom.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/pom.xml
similarity index 91%
rename from jeecg-boot/jeecg-module-demo/pom.xml
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/pom.xml
index 62d3b59e7..af28e7d5e 100644
--- a/jeecg-boot/jeecg-module-demo/pom.xml
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- jeecg-boot-parent
+ jeecg-boot-module
org.jeecgframework.boot
3.7.4
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/controller/AiController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/controller/AiController.java
new file mode 100644
index 000000000..ec35dd13a
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/controller/AiController.java
@@ -0,0 +1,95 @@
+package org.jeecg.modules.demo.gpt.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.chatgpt.service.AiChatService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+//update-begin---author:chenrui ---date:20240110 for:[QQYUN-5509]AI生成表结构和软文------------
+
+/**
+ * @Description: chatGpt接口
+ * @Author: chenrui
+ * @Date: 2024/1/9 16:30
+ */
+@Tag(name = "AI接口")
+@RestController
+@RequestMapping("/test/ai")
+@Slf4j
+public class AiController {
+
+ private static final String CACHE_PREFIX = "ai:resp:";
+
+ @Autowired
+ AiChatService aiChatService;
+
+
+ /**
+ * 通过AI生成模块表设计
+ * @param descr 描述
+ * @return
+ * @author chenrui
+ * @date 2024/1/9 20:12
+ */
+ @AutoLog(value = "通过AI生成模块表设计")
+ @PostMapping(value = "/gen/schema/modules")
+ @Operation(summary = "通过AI生成模块表设计")
+ public Result genSchemaModules(@RequestParam(name = "prompt", required = true) String prompt) {
+ String result = aiChatService.genSchemaModules(prompt);
+ return Result.ok(result);
+ }
+
+ /**
+ * 通过AI生成软文
+ * @param descr 描述
+ * @return
+ * @author chenrui
+ * @date 2024/1/9 20:12
+ */
+ @AutoLog(value = "通过AI生成软文")
+ @PostMapping(value = "/gen/article")
+ @Operation(summary = "通过AI生成软文")
+ public Result genArticle(@RequestParam(name = "prompt", required = true) String prompt) {
+ String result = aiChatService.genArticleWithMd(prompt);
+ return Result.ok(result);
+ }
+
+ /**
+ * 向AI提问
+ * @param message
+ * @return
+ * @author chenrui
+ * @date 2024/1/15 19:11
+ */
+ @AutoLog(value = "向AI提问")
+ @PostMapping(value = "/completions")
+ @Operation(summary = "向AI提问")
+ public Result> completions(@RequestParam(name = "message", required = true) String message) {
+ String result = aiChatService.completions(message);
+ return Result.ok(result);
+ }
+
+ /**
+ * 让AI生成图片
+ * @param prompt
+ * @return
+ * @author chenrui
+ * @date 2024/1/15 19:11
+ */
+ @AutoLog(value = "让AI生成图片")
+ @PostMapping(value = "/gen/image")
+ @Operation(summary = "让AI生成图片")
+ public Result> genImage(@RequestParam(name = "prompt", required = true) String prompt) {
+ String result = aiChatService.imageGenerate(prompt);
+ return Result.ok(result);
+ }
+
+}
+//update-end---author:chenrui ---date:20240110 for://update-begin---author:chenrui ---date:20240110 for:[QQYUN-5509]AI生成表结构和软文------------------------
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDynamicDataServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDynamicDataServiceImpl.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDynamicDataServiceImpl.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDynamicDataServiceImpl.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxljob/TestJobHandler.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxljob/TestJobHandler.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxljob/TestJobHandler.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxljob/TestJobHandler.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/easyui.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/easyui.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/easyui.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/easyui.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/jquery-ui.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/jquery-ui.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/jquery-ui.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/jquery-ui.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/main_design1.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/main_design1.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/main_design1.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/main_design1.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/room.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/room.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/room.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/css/room.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm1.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm1.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm1.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm1.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down1.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down1.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down1.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/content_down1.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index1.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index1.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index1.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/index1.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/screenbg_design1.jpg b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/screenbg_design1.jpg
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/screenbg_design1.jpg
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/screenbg_design1.jpg
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/war_room_main.jpg b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/war_room_main.jpg
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/war_room_main.jpg
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/images/war_room_main.jpg
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/big_design1.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/big_design1.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/big_design1.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/big_design1.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/china.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/china.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/china.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/china.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts-wordcloud.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts-wordcloud.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts-wordcloud.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts-wordcloud.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts.min.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts.min.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts.min.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/echarts.min.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/geoCoord.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/geoCoord.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/geoCoord.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/geoCoord.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.easyui.min.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.easyui.min.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.easyui.min.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.easyui.min.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.min.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.min.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.min.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/jquery.min.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/resize.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/resize.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/resize.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/resize.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/room.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/room.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/room.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template1/js/room.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/css/style.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/css/style.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/css/style.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/css/style.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/arrow.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/arrow.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/arrow.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/arrow.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img03.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img03.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img03.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img03.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img04.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img04.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img04.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/bg_img04.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/border_bg01.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/border_bg01.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/border_bg01.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/border_bg01.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/box_title.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/box_title.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/box_title.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/box_title.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon_on.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon_on.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon_on.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/chart_icon_on.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close_icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close_icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close_icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/close_icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon_on.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon_on.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon_on.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/data_icon_on.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/fangda.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/fangda.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/fangda.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/fangda.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/index_bg.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/index_bg.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/index_bg.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/index_bg.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/jian.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/jian.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/jian.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/jian.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line-blue.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line-blue.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line-blue.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line-blue.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_bg.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_bg.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_bg.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_bg.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_img.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_img.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_img.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/line_img.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_btn.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_btn.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_btn.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_btn.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_on.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_on.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_on.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/menu_on.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/next.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/next.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/next.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/next.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/people_iocn.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/people_iocn.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/people_iocn.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/people_iocn.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/plus.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/plus.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/plus.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/plus.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/popUP_bg.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/popUP_bg.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/popUP_bg.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/popUP_bg.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/prev.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/prev.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/prev.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/prev.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon_on.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon_on.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon_on.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/select_icon_on.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/selsct_time.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/selsct_time.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/selsct_time.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/selsct_time.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon_on.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon_on.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon_on.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/settings_icon_on.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/teacher_icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/teacher_icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/teacher_icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/teacher_icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_bg01.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_bg01.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_bg01.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_bg01.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_border.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_border.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_border.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_border.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_line.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_line.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_line.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/title_line.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/weather_img01.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/weather_img01.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/weather_img01.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/weather_img01.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雨转大雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雨转大雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雨转大雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雨转大雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雪转大雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雪转大雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雪转大雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/中雪转大雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/冻雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/冻雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/冻雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/冻雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/多云.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/多云.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/多云.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/多云.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大暴雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大暴雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大暴雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大暴雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大暴雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大暴雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大暴雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大暴雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雨转暴雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雨转暴雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雨转暴雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雨转暴雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雪转暴雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雪转暴雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雪转暴雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/大雪转暴雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雨转中雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雨转中雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雨转中雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雨转中雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雪转中雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雪转中雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雪转中雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/小雪转中雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/强沙尘暴.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/强沙尘暴.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/强沙尘暴.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/强沙尘暴.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/扬沙.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/扬沙.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/扬沙.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/扬沙.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/晴.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/晴.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/晴.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/晴.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雨转大暴雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雨转大暴雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雨转大暴雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雨转大暴雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/暴雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/沙尘暴.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/沙尘暴.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/沙尘暴.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/沙尘暴.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/浮尘.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/浮尘.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/浮尘.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/浮尘.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/特大暴雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/特大暴雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/特大暴雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/特大暴雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阴.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阴.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阴.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阴.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阵雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阵雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阵雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阵雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阵雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阵雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阵雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/阵雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雨加雪.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雨加雪.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雨加雪.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雨加雪.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雷阵雨.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雷阵雨.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雷阵雨.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雷阵雨.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雷阵雨加冰雹.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雷阵雨加冰雹.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雷阵雨加冰雹.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雷阵雨加冰雹.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雾.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雾.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雾.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/雾.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/霾.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/霾.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/霾.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/images/weather/霾.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/base.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/base.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/base.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/base.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/china.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/china.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/china.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/china.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/city.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/city.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/city.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/city.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/guangdong.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/guangdong.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/guangdong.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/data/guangdong.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/echarts.min.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/echarts.min.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/echarts.min.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/echarts.min.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/jquery-3.3.1.min.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/jquery-3.3.1.min.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/jquery-3.3.1.min.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/jquery-3.3.1.min.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/extend/layer.ext.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/extend/layer.ext.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/extend/layer.ext.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/extend/layer.ext.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/laydate.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/laydate.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/laydate.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/laydate.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/need/laydate.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/need/laydate.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/need/laydate.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/need/laydate.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/laydate.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/laydate.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/laydate.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/danlan/laydate.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/laydate.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/laydate.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/laydate.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/laydate/skins/default/laydate.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layer.min.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layer.min.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layer.min.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layer.min.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/chatlog.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/chatlog.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/chatlog.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/chatlog.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/friend.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/friend.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/friend.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/friend.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/group.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/group.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/group.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/group.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/groups.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/groups.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/groups.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/data/groups.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/layim.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/loading.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/loading.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/loading.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/layim/loading.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon-ext.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon-ext.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon-ext.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon-ext.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon_ext.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon_ext.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon_ext.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/icon_ext.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-0.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-0.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-0.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-0.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-1.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-1.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-1.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-1.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-2.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-2.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-2.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/loading-2.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/textbg.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/textbg.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/textbg.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/textbg.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_ico0.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_ico0.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_ico0.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_ico0.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading0.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading0.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading0.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading0.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading1.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading1.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading1.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading1.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading2.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading2.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading2.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading2.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading3.gif b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading3.gif
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading3.gif
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_loading3.gif
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_title0.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_title0.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_title0.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/default/xubox_title0.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.ext.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.ext.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.ext.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/layer.ext.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/default.png b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/default.png
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/default.png
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/default.png
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/style.css b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/style.css
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/style.css
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/layer/skin/moon/style.css
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/pop_base.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/pop_base.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/pop_base.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/pop_base.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/rem.js b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/rem.js
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/rem.js
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/bigscreen/template2/js/rem.js
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_main.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_main.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_main.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_main.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub_one.json b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub_one.json
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub_one.json
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/static/desform/aitest/json/ai_control_sub_one.json
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/templates/bigscreen/template1/index.ftl b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/templates/bigscreen/template1/index.ftl
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/templates/bigscreen/template1/index.ftl
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/templates/bigscreen/template1/index.ftl
diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/templates/bigscreen/template2/index.ftl b/jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/templates/bigscreen/template2/index.ftl
similarity index 100%
rename from jeecg-boot/jeecg-module-demo/src/main/resources/templates/bigscreen/template2/index.ftl
rename to jeecg-boot/jeecg-boot-module/jeecg-module-demo/src/main/resources/templates/bigscreen/template2/index.ftl
diff --git a/jeecg-boot/jeecg-boot-module/pom.xml b/jeecg-boot/jeecg-boot-module/pom.xml
new file mode 100644
index 000000000..318a73d53
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module/pom.xml
@@ -0,0 +1,21 @@
+
+
+
+ jeecg-boot-parent
+ org.jeecgframework.boot
+ 3.7.4
+
+ 4.0.0
+
+ jeecg-boot-module
+ pom
+
+
+ jeecg-module-demo
+ jeecg-boot-module-airag
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/cache/LocalCache.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/cache/LocalCache.java
deleted file mode 100644
index 554b42dc3..000000000
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/cache/LocalCache.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.jeecg.modules.demo.gpt.cache;
-
-import cn.hutool.cache.CacheUtil;
-import cn.hutool.cache.impl.TimedCache;
-import cn.hutool.core.date.DateUnit;
-
-//update-begin---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
-
-/**
- * 聊天记录本地缓存
- * @author chenrui
- * @date 2024/1/26 20:06
- */
-public class LocalCache {
- /**
- * 缓存时长
- */
- public static final long TIMEOUT = 5 * DateUnit.MINUTE.getMillis();
- /**
- * 清理间隔
- */
- private static final long CLEAN_TIMEOUT = 5 * DateUnit.MINUTE.getMillis();
- /**
- * 缓存对象
- */
- public static final TimedCache CACHE = CacheUtil.newTimedCache(TIMEOUT);
-
- static {
- //启动定时任务
- CACHE.schedulePrune(CLEAN_TIMEOUT);
- }
-}
-
-//update-end---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/controller/ChatController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/controller/ChatController.java
deleted file mode 100644
index fe808c202..000000000
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/controller/ChatController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.jeecg.modules.demo.gpt.controller;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.demo.gpt.service.ChatService;
-import org.jeecg.modules.demo.gpt.vo.ChatHistoryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-//update-begin---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
-
-/**
- * @Description: chatGpt-聊天接口
- * @Author: chenrui
- * @Date: 2024/1/9 16:30
- */
-@Controller
-@RequestMapping("/test/ai/chat")
-public class ChatController {
-
- @Autowired
- ChatService chatService;
-
- /**
- * 创建sse连接
- *
- * @return
- */
- @GetMapping(value = "/send")
- public SseEmitter createConnect(@RequestParam(name = "topicId", required = false) String topicId, @RequestParam(name = "message", required = true) String message) {
- SseEmitter sse = chatService.createChat();
- chatService.sendMessage(topicId, message);
- return sse;
- }
-
- //update-begin---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
- /**
- * 保存聊天记录
- * @param chatHistoryVO
- * @return
- * @author chenrui
- * @date 2024/2/22 13:54
- */
- @PostMapping(value = "/history/save")
- @ResponseBody
- public Result> saveHistory(@RequestBody ChatHistoryVO chatHistoryVO) {
- return chatService.saveHistory(chatHistoryVO);
- }
-
- /**
- * 查询聊天记录
- * @return
- * @author chenrui
- * @date 2024/2/22 14:03
- */
- @GetMapping(value = "/history/get")
- @ResponseBody
- public Result getHistoryByTopic() {
- return chatService.getHistoryByTopic();
- }
- //update-end---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
-
- /**
- * 关闭连接
- */
- @GetMapping(value = "/close")
- public void closeConnect() {
- chatService.closeChat();
- }
-
-
-}
-//update-end---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/listeners/OpenAISSEEventSourceListener.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/listeners/OpenAISSEEventSourceListener.java
deleted file mode 100644
index c2d0c1e11..000000000
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/listeners/OpenAISSEEventSourceListener.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.jeecg.modules.demo.gpt.listeners;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.unfbx.chatgpt.entity.chat.ChatCompletionResponse;
-import com.unfbx.chatgpt.entity.chat.Message;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okhttp3.sse.EventSource;
-import okhttp3.sse.EventSourceListener;
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.util.Objects;
-import java.util.function.Consumer;
-
-//update-begin---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
-
-/**
- * OpenAI的SSE监听
- * @author chenrui
- * @date 2024/1/26 20:06
- */
-@Slf4j
-public class OpenAISSEEventSourceListener extends EventSourceListener {
-
- private long tokens;
-
- private SseEmitter sseEmitter;
-
- private String topicId;
- /**
- * 回复消息内容
- */
- private String messageContent = "";
-
- /**
- * 完成回复回调
- */
- private Consumer doneCallback;
-
- /**
- * 是否正在思考
- */
- private boolean isThinking = false;
-
- public OpenAISSEEventSourceListener(SseEmitter sseEmitter) {
- this.sseEmitter = sseEmitter;
- }
-
- public OpenAISSEEventSourceListener(String topicId, SseEmitter sseEmitter){
- this.topicId = topicId;
- this.sseEmitter = sseEmitter;
- }
-
- /**
- * 设置消息完成响应时的回调
- * for [QQYUN-11102/QQYUN-11109]兼容deepseek模型,支持tink标签
- * @param doneCallback
- * @author chenrui
- * @date 2025/2/7 18:14
- */
- public void onDone(Consumer doneCallback){
- this.doneCallback = doneCallback;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void onOpen(@NotNull EventSource eventSource, @NotNull Response response) {
- log.info("ai-chat建立sse连接...");
- }
-
- /**
- * {@inheritDoc}
- */
- @SneakyThrows
- @Override
- public void onEvent(@NotNull EventSource eventSource, String id, String type, @NotNull String data) {
- log.debug("ai-chat返回数据:{}", data);
- tokens += 1;
- if (data.equals("[DONE]")) {
- log.info("ai-chat返回数据结束了");
- this.doneCallback.accept(messageContent);
- messageContent = "";
- sseEmitter.send(SseEmitter.event()
- .id("[TOKENS]")
- .data("
tokens:" + tokens())
- .reconnectTime(3000));
- sseEmitter.send(SseEmitter.event()
- .id("[DONE]")
- .data("[DONE]")
- .reconnectTime(3000));
- // 传输完成后自动关闭sse
- sseEmitter.complete();
- return;
- }
- ObjectMapper mapper = new ObjectMapper();
- ChatCompletionResponse completionResponse = mapper.readValue(data, ChatCompletionResponse.class); // 读取Json
- try {
- //update-begin---author:chenrui ---date:20250207 for:[QQYUN-11102/QQYUN-11109]兼容deepseek模型,支持think标签------------
- // 兼容think标签
- //update-begin---author:chenrui ---date:20250210 for:判断空,防止反悔的内容为空报错.------------
- if(null != completionResponse.getChoices()
- && !completionResponse.getChoices().isEmpty()
- && null != completionResponse.getChoices().get(0)) {
- //update-end---author:chenrui ---date:20250210 for:判断空,防止反悔的内容为空报错.------------
- Message delta = completionResponse.getChoices().get(0).getDelta();
- if (null != delta) {
- String content = delta.getContent();
- if ("".equals(content)) {
- isThinking = true;
- content = "> ";
- delta.setContent(content);
- }
- if ("".equals(content)) {
- isThinking = false;
- content = "\n\n";
- delta.setContent(content);
- }
- if (isThinking) {
- if (null != content && content.contains("\n")) {
- content = "\n> ";
- delta.setContent(content);
- }
- } else {
- // 响应消息体不记录思考过程
- messageContent += null == content ? "" : content;
- }
- log.info("ai-chat返回数据,发送给前端:" + content);
- sseEmitter.send(SseEmitter.event()
- .id(this.topicId)
- .data(delta)
- .reconnectTime(3000));
- }
- }
- //update-end---author:chenrui ---date:20250207 for:[QQYUN-11102/QQYUN-11109]兼容deepseek模型,支持think标签------------
- } catch (Exception e) {
- log.error("ai-chat返回数据,发生异常"+e.getMessage(),e);
- sseEmitter.completeWithError(e);
- eventSource.cancel();
- }
- }
-
-
- @Override
- public void onClosed(@NotNull EventSource eventSource) {
- log.info("流式输出返回值总共{}tokens", tokens() - 2);
- log.info("ai-chat关闭sse连接...");
- }
-
-
- @SneakyThrows
- @Override
- public void onFailure(@NotNull EventSource eventSource, Throwable t, Response response) {
- String errMsg = "";
- ResponseBody body = null == response ? null:response.body();
- if (Objects.nonNull(body)) {
- log.error("ai-chat sse连接异常data:{},异常:{}", body.string(), t.getMessage());
- errMsg = body.string();
- } else {
- log.error("ai-chat sse连接异常data:{},异常:{}", response, t.getMessage());
- errMsg = t.getMessage();
- }
- eventSource.cancel();
- sseEmitter.send(SseEmitter.event()
- .id("[ERR]")
- .data(Message.builder().content(explainErr(errMsg)).build())
- .reconnectTime(3000));
- sseEmitter.send(SseEmitter.event()
- .id("[DONE]")
- .data("[DONE]")
- .reconnectTime(3000));
- sseEmitter.complete();
- }
-
- private String explainErr(String errMsg){
- if(StringUtils.isEmpty(errMsg)){
- return "";
- }
- if(errMsg.contains("Rate limit")){
- return "请求频率太快了,请等待20秒再试.";
- }
- return errMsg;
- }
-
- /**
- * tokens
- * @return
- */
- public long tokens() {
- return tokens;
- }
-}
-
-//update-end---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/ChatService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/ChatService.java
deleted file mode 100644
index 57013a2e1..000000000
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/ChatService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.jeecg.modules.demo.gpt.service;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.demo.gpt.vo.ChatHistoryVO;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-//update-begin---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
-
-/**
- * AI助手聊天Service
- * @author chenrui
- * @date 2024/1/26 20:08
- */
-public interface ChatService {
- /**
- * 创建SSE
- * @return
- */
- SseEmitter createChat();
-
- /**
- * 关闭SSE
- */
- void closeChat();
-
- /**
- * 客户端发送消息到服务端
- *
- * @param topicId
- * @param message
- * @author chenrui
- * @date 2024/1/26 20:01
- */
- void sendMessage(String topicId, String message);
-
- //update-begin---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
- /**
- * 保存聊天记录
- * @param chatHistoryVO
- * @return
- * @author chenrui
- * @date 2024/2/22 13:37
- */
- Result> saveHistory(ChatHistoryVO chatHistoryVO);
-
- /**
- * 查询聊天记录
- * @return
- * @author chenrui
- * @date 2024/2/22 13:59
- */
- Result getHistoryByTopic();
- //update-end---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
-}
-
-//update-end---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/impl/ChatServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/impl/ChatServiceImpl.java
deleted file mode 100644
index c22ace481..000000000
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/impl/ChatServiceImpl.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.jeecg.modules.demo.gpt.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.unfbx.chatgpt.OpenAiStreamClient;
-import com.unfbx.chatgpt.entity.chat.ChatCompletion;
-import com.unfbx.chatgpt.entity.chat.Message;
-import com.unfbx.chatgpt.exception.BaseException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.chatgpt.prop.AiChatProperties;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.common.util.UUIDGenerator;
-import org.jeecg.modules.demo.gpt.cache.LocalCache;
-import org.jeecg.modules.demo.gpt.listeners.OpenAISSEEventSourceListener;
-import org.jeecg.modules.demo.gpt.service.ChatService;
-import org.jeecg.modules.demo.gpt.vo.ChatHistoryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-//update-begin---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
-
-/**
- * AI助手聊天Service
- * @author chenrui
- * @date 2024/1/26 20:07
- */
-@Service
-@Slf4j
-public class ChatServiceImpl implements ChatService {
-
- //update-begin---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
- private static final String CACHE_KEY_PREFIX = "ai:chart:";
-
- /**
- *
- */
- private static final String CACHE_KEY_MSG_CONTEXT = "msg_content";
-
-
- /**
- *
- */
- private static final String CACHE_KEY_MSG_HISTORY = "msg_history";
-
- @Autowired
- RedisTemplate redisTemplate;
- //update-end---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
-
- private OpenAiStreamClient openAiStreamClient = null;
-
- /**
- * ai聊天配置
- * for [QQYUN-10943]【AI 重要】jeecg-boot-starter-chatgpt 支持deepseek等国产模型
- */
- private AiChatProperties aiChatProperties;
- //update-begin---author:chenrui ---date:20240131 for:[QQYUN-8212]fix 没有配置启动报错------------
-
- /**
- * 防止client不能成功注入
- * @return
- * @author chenrui
- * @date 2024/2/3 23:08
- */
- private void ensureClient(){
- if (null == this.openAiStreamClient){
- //update-begin---author:chenrui ---date:20240625 for:[TV360X-1570]给于更友好的提示,提示未配置ai------------
- try {
- this.openAiStreamClient = SpringContextUtils.getBean(OpenAiStreamClient.class);
- this.aiChatProperties = SpringContextUtils.getBean(AiChatProperties.class);
- } catch (Exception ignored) {
- sendErrorMsg("如果您想使用AI助手,请先设置相应配置!");
- }
- //update-end---author:chenrui ---date:20240625 for:[TV360X-1570]给于更友好的提示,提示未配置ai------------
- }
- }
- //update-end---author:chenrui ---date:20240131 for:[QQYUN-8212]fix 没有配置启动报错------------
-
- private String getUserId() {
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- return sysUser.getId();
- }
-
- @Override
- public SseEmitter createChat() {
- String uid = getUserId();
- //默认30秒超时,设置为0L则永不超时
- SseEmitter sseEmitter = new SseEmitter(-0L);
- //完成后回调
- sseEmitter.onCompletion(() -> {
- log.info("[{}]结束连接...................",uid);
- LocalCache.CACHE.remove(uid);
- });
- //超时回调
- sseEmitter.onTimeout(() -> {
- log.info("[{}]连接超时...................", uid);
- LocalCache.CACHE.remove(uid);
- });
- //异常回调
- sseEmitter.onError(
- throwable -> {
- try {
- log.info("[{}]连接异常,{}", uid, throwable.toString());
- sseEmitter.send(SseEmitter.event()
- .id(uid)
- .name("发生异常!")
- .data(Message.builder().content("发生异常请重试!").build())
- .reconnectTime(3000));
- LocalCache.CACHE.remove(uid);
- } catch (IOException e) {
- log.error(e.getMessage(),e);
- }
- }
- );
- try {
- sseEmitter.send(SseEmitter.event().reconnectTime(5000));
- } catch (IOException e) {
- log.error(e.getMessage(),e);
- }
- LocalCache.CACHE.put(uid, sseEmitter);
- log.info("[{}]创建sse连接成功!", uid);
- return sseEmitter;
- }
-
- @Override
- public void closeChat() {
- String uid = getUserId();
- SseEmitter sse = (SseEmitter) LocalCache.CACHE.get(uid);
- if (sse != null) {
- sse.complete();
- //移除
- LocalCache.CACHE.remove(uid);
- }
- }
-
- @Override
- public void sendMessage(String topicId, String message) {
- ensureClient();
- String uid = getUserId();
- if (StrUtil.isBlank(message)) {
- log.info("参数异常,message为null");
- throw new BaseException("参数异常,message不能为空~");
- }
- if (StrUtil.isBlank(topicId)) {
- topicId = UUIDGenerator.generate();
- }
- //update-begin---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
- log.info("话题id:{}", topicId);
- String cacheKey = CACHE_KEY_PREFIX + uid + "_" + topicId;
- String messageContext = (String) redisTemplate.opsForHash().get(cacheKey, CACHE_KEY_MSG_CONTEXT);
- List msgHistory = new ArrayList<>();
- if (StrUtil.isNotBlank(messageContext)) {
- List messages = JSONArray.parseArray(messageContext, Message.class);
- msgHistory = messages == null ? new ArrayList<>() : messages;
- }
- Message currentMessage = Message.builder().content(message).role(Message.Role.USER).build();
- msgHistory.add(currentMessage);
-
- SseEmitter sseEmitter = (SseEmitter) LocalCache.CACHE.get(uid);
- if (sseEmitter == null) {
- log.info("聊天消息推送失败uid:[{}],没有创建连接,请重试。", uid);
- throw new JeecgBootException("聊天消息推送失败uid:[{}],没有创建连接,请重试。~");
- }
- //update-begin---author:chenrui ---date:20240625 for:[TV360X-1570]给于更友好的提示,提示未配置ai------------
- if (null != openAiStreamClient) {
- OpenAISSEEventSourceListener openAIEventSourceListener = new OpenAISSEEventSourceListener(topicId, sseEmitter);
- List finalMsgHistory = msgHistory;
- openAIEventSourceListener.onDone(respMessage -> {
- Message tempMessage = Message.builder().content(respMessage).role(Message.Role.ASSISTANT).build();
- finalMsgHistory.add(tempMessage);
- redisTemplate.opsForHash().put(cacheKey, CACHE_KEY_MSG_CONTEXT, JSONUtil.toJsonStr(finalMsgHistory));
- });
- log.info("话题:{},开始发送消息~~~", topicId);
- ChatCompletion completion = ChatCompletion
- .builder()
- .messages(msgHistory)
- .model(aiChatProperties.getModel())
- .build();
- openAiStreamClient.streamChatCompletion(completion, openAIEventSourceListener);
- //update-end---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
- }
- //update-end---author:chenrui ---date:20240625 for:[TV360X-1570]给于更友好的提示,提示未配置ai------------
- }
-
- //update-begin---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
- @Override
- public Result> saveHistory(ChatHistoryVO chatHistoryVO) {
- String uid = getUserId();
- String cacheKey = CACHE_KEY_PREFIX + CACHE_KEY_MSG_HISTORY + ":" + uid;
- redisTemplate.opsForValue().set(cacheKey, chatHistoryVO.getContent());
- return Result.OK("保存成功");
- }
-
- @Override
- public Result getHistoryByTopic() {
- String uid = getUserId();
- String cacheKey = CACHE_KEY_PREFIX + CACHE_KEY_MSG_HISTORY + ":" + uid;
- String historyContent = (String) redisTemplate.opsForValue().get(cacheKey);
- ChatHistoryVO chatHistoryVO = new ChatHistoryVO();
- chatHistoryVO.setContent(historyContent);
- return Result.OK(chatHistoryVO);
- }
- //update-end---author:chenrui ---date:20240223 for:[QQYUN-8225]聊天记录保存------------
-
- /**
- * 发送异常消息给前端
- * [TV360X-1570]给于更友好的提示,提示未配置ai
- *
- * @param msg
- * @author chenrui
- * @date 2024/6/25 10:38
- */
- private void sendErrorMsg(String msg) {
- String uid = getUserId();
- SseEmitter sseEmitter = (SseEmitter) LocalCache.CACHE.get(uid);
- if (sseEmitter == null) {
- return;
- }
- try {
- sseEmitter.send(SseEmitter.event()
- .id("[ERR]")
- .data(Message.builder().content(msg).build())
- .reconnectTime(3000));
- sseEmitter.send(SseEmitter.event()
- .id("[DONE]")
- .data("[DONE]")
- .reconnectTime(3000));
- sseEmitter.complete();
- } catch (IOException e) {
- log.error(e.getMessage(), e);
- }
- }
-}
-
-//update-end---author:chenrui ---date:20240126 for:【QQYUN-7932】AI助手------------
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/vo/ChatHistoryVO.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/vo/ChatHistoryVO.java
deleted file mode 100644
index db8f942a0..000000000
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/vo/ChatHistoryVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.jeecg.modules.demo.gpt.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Description: 聊天记录
- * @Author: chenrui
- * @Date: 2024/2/22 13:36
- */
-@Data
-public class ChatHistoryVO implements Serializable {
- private static final long serialVersionUID = 3238429500037511283L;
-
- /**
- * 话题id
- */
- String topicId;
-
- /**
- * 聊天记录内容
- */
- String content;
-}
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index e7a3144ef..bc89dc251 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -84,8 +84,8 @@
jeecg-boot-base-core
- jeecg-module-demo
jeecg-module-system
+ jeecg-boot-module
@@ -436,7 +436,7 @@
org.jeecgframework.boot
jeecg-boot-starter-chatgpt
- 3.7.3
+ 3.7.4