diff --git a/modules/cms-ai/bin/deploy.bat b/modules/ai/ai-cms/bin/deploy.bat similarity index 100% rename from modules/cms-ai/bin/deploy.bat rename to modules/ai/ai-cms/bin/deploy.bat diff --git a/modules/cms-ai/bin/deploy.sh b/modules/ai/ai-cms/bin/deploy.sh similarity index 100% rename from modules/cms-ai/bin/deploy.sh rename to modules/ai/ai-cms/bin/deploy.sh diff --git a/modules/cms-ai/bin/package.bat b/modules/ai/ai-cms/bin/package.bat similarity index 100% rename from modules/cms-ai/bin/package.bat rename to modules/ai/ai-cms/bin/package.bat diff --git a/modules/cms-ai/bin/package.sh b/modules/ai/ai-cms/bin/package.sh similarity index 100% rename from modules/cms-ai/bin/package.sh rename to modules/ai/ai-cms/bin/package.sh diff --git a/modules/cms-ai/db/cms-ai.erm b/modules/ai/ai-cms/db/ai-cms.erm similarity index 99% rename from modules/cms-ai/db/cms-ai.erm rename to modules/ai/ai-cms/db/ai-cms.erm index cab48ffb..a9295543 100644 --- a/modules/cms-ai/db/cms-ai.erm +++ b/modules/ai/ai-cms/db/ai-cms.erm @@ -41,7 +41,7 @@ false - db/cms-ai.sql + db/ai-cms.sql UTF-8 CR+LF false @@ -73,7 +73,7 @@ null - db/cms-ai.xls + db/ai-cms.xls en @@ -89,7 +89,7 @@ true - db/cms-ai.png + db/ai-cms.png true true diff --git a/modules/cms-ai/pom.xml b/modules/ai/ai-cms/pom.xml similarity index 86% rename from modules/cms-ai/pom.xml rename to modules/ai/ai-cms/pom.xml index 7327090c..25951139 100644 --- a/modules/cms-ai/pom.xml +++ b/modules/ai/ai-cms/pom.xml @@ -5,24 +5,22 @@ com.jeesite - jeesite-parent + jeesite-parent-ai 5.14.0.springboot3-SNAPSHOT - ../../parent/pom.xml + ../../../parent/ai/pom.xml - jeesite-module-cms-ai + jeesite-module-ai-cms jar - JeeSite Module CMS+RAG+AI + JeeSite Module AI + CMS + RAG http://jeesite.com 2013-Now - 1.0.3 - - + @@ -39,7 +37,7 @@ ${project.parent.version} - + org.springframework.ai spring-ai-starter-model-openai @@ -119,20 +117,21 @@ commons-compress 1.27.1 - - - - - - org.springframework.ai - spring-ai-bom - ${spring-ai.version} - pom - import - - - + + + com.jeesite + jeesite-module-ai-tools + ${project.parent.version} + + + + + org.springframework.ai + spring-ai-starter-mcp-client + + + diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java b/modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/config/AiCmsWebMvcConfig.java similarity index 92% rename from modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java rename to modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/config/AiCmsWebMvcConfig.java index 44e5ef1b..8f409e85 100644 --- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/config/CmsAiWebMvcConfig.java +++ b/modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/config/AiCmsWebMvcConfig.java @@ -2,7 +2,7 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. * No deletion without permission, or be held responsible to law. */ -package com.jeesite.modules.cms.ai.config; +package com.jeesite.modules.ai.cms.config; import com.jeesite.common.config.Global; import org.springframework.context.annotation.Bean; @@ -16,7 +16,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author ThinkGem */ @Configuration -public class CmsAiWebMvcConfig implements WebMvcConfigurer { +public class AiCmsWebMvcConfig implements WebMvcConfigurer { @Override public void configureAsyncSupport(AsyncSupportConfigurer configurer) { diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java b/modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/service/ArticleVectorStoreImpl.java similarity index 99% rename from modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java rename to modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/service/ArticleVectorStoreImpl.java index 9d379959..dc0fd1ca 100644 --- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/ArticleVectorStoreImpl.java +++ b/modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/service/ArticleVectorStoreImpl.java @@ -2,7 +2,7 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. * No deletion without permission, or be held responsible to law. */ -package com.jeesite.modules.cms.ai.service; +package com.jeesite.modules.ai.cms.service; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemoryRepository.java b/modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/service/CacheChatMemoryRepository.java similarity index 96% rename from modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemoryRepository.java rename to modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/service/CacheChatMemoryRepository.java index b9540218..4eecf3cb 100644 --- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/service/CacheChatMemoryRepository.java +++ b/modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/service/CacheChatMemoryRepository.java @@ -2,7 +2,7 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. * No deletion without permission, or be held responsible to law. */ -package com.jeesite.modules.cms.ai.service; +package com.jeesite.modules.ai.cms.service; import com.jeesite.common.cache.CacheUtils; import org.jetbrains.annotations.NotNull; diff --git a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java b/modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/web/CmsAiChatController.java similarity index 81% rename from modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java rename to modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/web/CmsAiChatController.java index 13e596b4..72defa31 100644 --- a/modules/cms-ai/src/main/java/com/jeesite/modules/cms/ai/web/CmsAiChatController.java +++ b/modules/ai/ai-cms/src/main/java/com/jeesite/modules/ai/cms/web/CmsAiChatController.java @@ -2,11 +2,11 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. * No deletion without permission, or be held responsible to law. */ -package com.jeesite.modules.cms.ai.web; +package com.jeesite.modules.ai.cms.web; import com.jeesite.common.config.Global; import com.jeesite.common.web.BaseController; -import com.jeesite.modules.cms.ai.service.CmsAiChatService; +import com.jeesite.modules.ai.cms.service.AiCmsChatService; import com.jeesite.modules.sys.entity.Area; import jakarta.servlet.http.HttpServletRequest; import org.springframework.ai.chat.messages.Message; @@ -31,10 +31,10 @@ import java.util.stream.Collectors; @RequestMapping("${adminPath}/cms/chat") public class CmsAiChatController extends BaseController { - private final CmsAiChatService cmsAiChatService; + private final AiCmsChatService aiCmsChatService; - public CmsAiChatController(CmsAiChatService cmsAiChatService) { - this.cmsAiChatService = cmsAiChatService; + public CmsAiChatController(AiCmsChatService aiCmsChatService) { + this.aiCmsChatService = aiCmsChatService; } /** @@ -43,7 +43,7 @@ public class CmsAiChatController extends BaseController { */ @RequestMapping("/message") public List message(String id) { - return cmsAiChatService.getChatMessage(id); + return aiCmsChatService.getChatMessage(id); } /** @@ -52,7 +52,7 @@ public class CmsAiChatController extends BaseController { */ @RequestMapping("/list") public Collection> list() { - return cmsAiChatService.getChatCacheMap().values().stream() + return aiCmsChatService.getChatCacheMap().values().stream() .sorted(Comparator.comparing(map -> (String) map.get("id"), Comparator.reverseOrder())).collect(Collectors.toList()); } @@ -63,7 +63,7 @@ public class CmsAiChatController extends BaseController { */ @RequestMapping("/save") public String save(String id, String title) { - Map map = cmsAiChatService.saveChatConversation(id, title); + Map map = aiCmsChatService.saveChatConversation(id, title); return renderResult(Global.TRUE, "保存成功", map); } @@ -73,7 +73,7 @@ public class CmsAiChatController extends BaseController { */ @RequestMapping("/delete") public String delete(@RequestParam String id) { - cmsAiChatService.deleteChatConversation(id); + aiCmsChatService.deleteChatConversation(id); return renderResult(Global.TRUE, "删除成功", id); } @@ -84,7 +84,7 @@ public class CmsAiChatController extends BaseController { */ @RequestMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE) public Flux stream(@RequestParam String id, @RequestParam String message, HttpServletRequest request) { - return cmsAiChatService.chatStream(id, message, request); + return aiCmsChatService.chatStream(id, message, request); } /** @@ -94,7 +94,7 @@ public class CmsAiChatController extends BaseController { */ @RequestMapping(value = "/text") public String text(@RequestParam String message) { - return cmsAiChatService.chatText(message); + return aiCmsChatService.chatText(message); } /** @@ -105,7 +105,7 @@ public class CmsAiChatController extends BaseController { */ @RequestMapping(value = "/json") public Map json(@RequestParam String message) { - return cmsAiChatService.chatJson(message); + return aiCmsChatService.chatJson(message); } /** @@ -115,7 +115,7 @@ public class CmsAiChatController extends BaseController { */ @RequestMapping(value = "/entity") public List entity(@RequestParam String message) { - return cmsAiChatService.chatArea(message); + return aiCmsChatService.chatArea(message); } } diff --git a/modules/cms-ai/src/main/resources/application-assistant.yml b/modules/ai/ai-cms/src/main/resources/application-assistant.yml similarity index 57% rename from modules/cms-ai/src/main/resources/application-assistant.yml rename to modules/ai/ai-cms/src/main/resources/application-assistant.yml index 83dbcfce..552fd86e 100644 --- a/modules/cms-ai/src/main/resources/application-assistant.yml +++ b/modules/ai/ai-cms/src/main/resources/application-assistant.yml @@ -2,11 +2,11 @@ ## 重要提示（Tip）： ## 请勿在该配置文件中添加其它任何配置（添加也不会生效）。 -## 该文件，仅仅是为了让 jeesite-cms-ai.yml 文件， +## 该文件，仅仅是为了让 jeesite-ai-cms.yml 文件， ## 在 IDEA 中有一个自动完成及帮助提示，并无其它用意。 -## 参数配置请在 jeesite-cms-ai.yml 文件中添加。 +## 参数配置请在 jeesite-ai-cms.yml 文件中添加。 spring: config: import: - - classpath:config/jeesite-cms-ai.yml + - classpath:config/jeesite-ai-cms.yml diff --git a/modules/ai/ai-cms/src/main/resources/db/upgrade/cms-ai/versions b/modules/ai/ai-cms/src/main/resources/db/upgrade/cms-ai/versions new file mode 100644 index 00000000..6319d91f --- /dev/null +++ b/modules/ai/ai-cms/src/main/resources/db/upgrade/cms-ai/versions @@ -0,0 +1,5 @@ +5.11.1 +5.12.0 +5.12.1 +5.13.0 +5.13.1 \ No newline at end of file diff --git a/modules/cms-ai/src/test/resources/application.yml b/modules/ai/ai-cms/src/test/resources/application.yml similarity index 100% rename from modules/cms-ai/src/test/resources/application.yml rename to modules/ai/ai-cms/src/test/resources/application.yml diff --git a/modules/cms-ai/src/test/resources/logback-test.xml b/modules/ai/ai-cms/src/test/resources/logback-test.xml similarity index 100% rename from modules/cms-ai/src/test/resources/logback-test.xml rename to modules/ai/ai-cms/src/test/resources/logback-test.xml diff --git a/modules/ai/pom.xml b/modules/ai/pom.xml new file mode 100644 index 00000000..18e404db --- /dev/null +++ b/modules/ai/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + + com.jeesite + jeesite-parent-ai + 5.14.0.springboot3-SNAPSHOT + ../../parent/ai/pom.xml + + + jeesite-module-ai + pom + + JeeSite Module AI + http://jeesite.com + 2013-Now + + + ai-cms + ai-tools + + + + + thinkgem + WangZhen + thinkgem at 163.com + Project lead + +8 + + + + + JeeSite + http://jeesite.com + + + \ No newline at end of file diff --git a/modules/cms-ai/src/main/resources/db/upgrade/cms-ai/versions b/modules/cms-ai/src/main/resources/db/upgrade/cms-ai/versions deleted file mode 100644 index 57f82f72..00000000 --- a/modules/cms-ai/src/main/resources/db/upgrade/cms-ai/versions +++ /dev/null @@ -1 +0,0 @@ -5.11.0 \ No newline at end of file diff --git a/parent/ai/bin/deploy.bat b/parent/ai/bin/deploy.bat new file mode 100644 index 00000000..f4258bf5 --- /dev/null +++ b/parent/ai/bin/deploy.bat @@ -0,0 +1,22 @@ +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * No deletion without permission, or be held responsible to law. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [Ϣ] 𹤳̵Maven +echo. + +%~d0 +cd %~dp0 + +call mvn -v +echo. + +cd .. +call mvn clean deploy -Dmaven.test.skip=true -Pdeploy + +cd bin +pause \ No newline at end of file diff --git a/parent/ai/bin/deploy.sh b/parent/ai/bin/deploy.sh new file mode 100644 index 00000000..f8696c71 --- /dev/null +++ b/parent/ai/bin/deploy.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +# * No deletion without permission, or be held responsible to law. +# * +# * Author: ThinkGem@163.com +# */ +echo "" +echo "[信息] 部署工程到Maven服务器。" +echo "" + +mvn -v +echo "" + +cd .. +mvn clean deploy -Dmaven.test.skip=true -Pdeploy + +cd bin \ No newline at end of file diff --git a/parent/ai/bin/package.bat b/parent/ai/bin/package.bat new file mode 100644 index 00000000..a6b29c2c --- /dev/null +++ b/parent/ai/bin/package.bat @@ -0,0 +1,22 @@ +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * No deletion without permission, or be held responsible to law. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [Ϣ] װ̣jarļ +echo. + +%~d0 +cd %~dp0 + +call mvn -v +echo. + +cd .. +call mvn clean install -Dmaven.test.skip=true -Ppackage + +cd bin +pause \ No newline at end of file diff --git a/parent/ai/bin/package.sh b/parent/ai/bin/package.sh new file mode 100644 index 00000000..8deff508 --- /dev/null +++ b/parent/ai/bin/package.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# /** +# * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +# * No deletion without permission, or be held responsible to law. +# * +# * Author: ThinkGem@163.com +# */ +echo "" +echo "[信息] 打包安装工程，生成jar包文件。" +echo "" + +mvn -v +echo "" + +cd .. +mvn clean install -Dmaven.test.skip=true -Ppackage + +cd bin \ No newline at end of file diff --git a/parent/ai/pom.xml b/parent/ai/pom.xml new file mode 100644 index 00000000..a96deb3f --- /dev/null +++ b/parent/ai/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + + com.jeesite + jeesite-parent + 5.14.0.springboot3-SNAPSHOT + ../pom.xml + + + jeesite-parent-ai + pom + + JeeSite Module AI Parent + http://jeesite.com + 2013-Now + + + + 1.0.3 + + + + + + + org.springframework.ai + spring-ai-bom + ${spring-ai.version} + pom + import + + + + + + + thinkgem + WangZhen + thinkgem at 163.com + Project lead + +8 + + + + + JeeSite + http://jeesite.com + + + \ No newline at end of file diff --git a/web-ai/pom.xml b/web-ai/pom.xml index 643f6a5b..b9c66395 100644 --- a/web-ai/pom.xml +++ b/web-ai/pom.xml @@ -2,114 +2,21 @@ 4.0.0 - - - com.jeesite - jeesite-parent - 5.14.0.springboot3-SNAPSHOT - ../parent/pom.xml - - - jeesite-web-ai - war - - Web AI 服务 - - JeeSite Web AI + + com.jeesite + jeesite-module-web-ai + 5.14.0.springboot3-SNAPSHOT + pom + + JeeSite Module Web AI http://jeesite.com 2013-Now - - - - web - com.jeesite.modules.AiApplication - - 8980:8980 - - + + web-ai-cms + web-ai-mcp + - - - - - com.jeesite - jeesite-module-core - ${project.parent.version} - - - - - com.jeesite - jeesite-module-test - ${project.parent.version} - - - - - com.jeesite - jeesite-module-cms - ${project.parent.version} - - - - - com.jeesite - jeesite-module-cms-ai - ${project.parent.version} - - - - - com.jeesite - jeesite-vue-dist - 5.14.0-SNAPSHOT - - - - - - - - ${finalName} - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - org.apache.maven.plugins - maven-war-plugin - - ${finalName} - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - - ${finalName} - - - - - - thinkgem @@ -119,35 +26,10 @@ +8 - + JeeSite http://jeesite.com - - - - aliyun-repos - https://maven.aliyun.com/repository/public - true - false - - - jeesite-repos - https://maven.jeesite.net/repository/maven-public - - - - - aliyun-repos - https://maven.aliyun.com/repository/public - true - false - - - jeesite-repos - https://maven.jeesite.net/repository/maven-public - - - - + + \ No newline at end of file diff --git a/web-ai/README.md b/web-ai/web-ai-cms/README.md similarity index 50% rename from web-ai/README.md rename to web-ai/web-ai-cms/README.md index 280759eb..8be5776f 100644 --- a/web-ai/README.md +++ b/web-ai/web-ai-cms/README.md @@ -1,14 +1,15 @@ ## 介绍 -jeesite-web-ai 拷贝自 jeesite-web 只保留了 AI 模块的引用， +jeesite-web-ai-cms 拷贝自 jeesite-web 只保留了 CMS 和 AI 模块的引用， -可直接运行 AiApplication.java 文件，启动一个 Web 服务。 +可直接运行 AiCmsApplication.java 文件，启动一个 Web 服务。 启动 Web 服务后，可通过网页浏览器访问 JeeSite 系统。 ## 更多介绍 -1. +1. +2. ## 文档 diff --git a/web-ai/bin/docker-build.bat b/web-ai/web-ai-cms/bin/docker-build.bat similarity index 100% rename from web-ai/bin/docker-build.bat rename to web-ai/web-ai-cms/bin/docker-build.bat diff --git a/web-ai/bin/docker-build.sh b/web-ai/web-ai-cms/bin/docker-build.sh similarity index 100% rename from web-ai/bin/docker-build.sh rename to web-ai/web-ai-cms/bin/docker-build.sh diff --git a/web-ai/bin/docker/Dockerfile b/web-ai/web-ai-cms/bin/docker/Dockerfile similarity index 100% rename from web-ai/bin/docker/Dockerfile rename to web-ai/web-ai-cms/bin/docker/Dockerfile diff --git a/web-ai/bin/init-data.bat b/web-ai/web-ai-cms/bin/init-data.bat similarity index 100% rename from web-ai/bin/init-data.bat rename to web-ai/web-ai-cms/bin/init-data.bat diff --git a/web-ai/bin/init-data.sh b/web-ai/web-ai-cms/bin/init-data.sh similarity index 100% rename from web-ai/bin/init-data.sh rename to web-ai/web-ai-cms/bin/init-data.sh diff --git a/web-ai/bin/package.bat b/web-ai/web-ai-cms/bin/package.bat similarity index 100% rename from web-ai/bin/package.bat rename to web-ai/web-ai-cms/bin/package.bat diff --git a/web-ai/bin/package.sh b/web-ai/web-ai-cms/bin/package.sh similarity index 100% rename from web-ai/bin/package.sh rename to web-ai/web-ai-cms/bin/package.sh diff --git a/web-ai/bin/run-tomcat.bat b/web-ai/web-ai-cms/bin/run-tomcat.bat similarity index 100% rename from web-ai/bin/run-tomcat.bat rename to web-ai/web-ai-cms/bin/run-tomcat.bat diff --git a/web-ai/bin/run-tomcat.sh b/web-ai/web-ai-cms/bin/run-tomcat.sh similarity index 100% rename from web-ai/bin/run-tomcat.sh rename to web-ai/web-ai-cms/bin/run-tomcat.sh diff --git a/web-ai/bin/run-web.bat b/web-ai/web-ai-cms/bin/run-web.bat similarity index 100% rename from web-ai/bin/run-web.bat rename to web-ai/web-ai-cms/bin/run-web.bat diff --git a/web-ai/bin/run-web.sh b/web-ai/web-ai-cms/bin/run-web.sh similarity index 100% rename from web-ai/bin/run-web.sh rename to web-ai/web-ai-cms/bin/run-web.sh diff --git a/web-ai/web-ai-cms/pom.xml b/web-ai/web-ai-cms/pom.xml new file mode 100644 index 00000000..74dee49f --- /dev/null +++ b/web-ai/web-ai-cms/pom.xml @@ -0,0 +1,153 @@ + + + 4.0.0 + + + com.jeesite + jeesite-parent + 5.14.0.springboot3-SNAPSHOT + ../../parent/pom.xml + + + jeesite-web-ai-cms + war + + Web AI CMS 服务 + + JeeSite Web AI + http://jeesite.com + 2013-Now + + + + web + com.jeesite.modules.AiCmsApplication + + + 8980:8980 + + + + + + + + com.jeesite + jeesite-module-core + ${project.parent.version} + + + + + com.jeesite + jeesite-module-test + ${project.parent.version} + + + + + com.jeesite + jeesite-module-cms + ${project.parent.version} + + + + + com.jeesite + jeesite-module-ai-cms + ${project.parent.version} + + + + + com.jeesite + jeesite-vue-dist + 5.14.0-SNAPSHOT + + + + + + + + ${finalName} + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + org.apache.maven.plugins + maven-war-plugin + + ${finalName} + + + + + + org.apache.maven.plugins + maven-eclipse-plugin + + ${finalName} + + + + + + + + + thinkgem + WangZhen + thinkgem at 163.com + Project lead + +8 + + + + + JeeSite + http://jeesite.com + + + + + aliyun-repos + https://maven.aliyun.com/repository/public + true + false + + + jeesite-repos + https://maven.jeesite.net/repository/maven-public + + + + + aliyun-repos + https://maven.aliyun.com/repository/public + true + false + + + jeesite-repos + https://maven.jeesite.net/repository/maven-public + + + + diff --git a/web-ai/src/main/java/com/jeesite/modules/AiApplication.java b/web-ai/web-ai-cms/src/main/java/com/jeesite/modules/AiCmsApplication.java similarity index 53% rename from web-ai/src/main/java/com/jeesite/modules/AiApplication.java rename to web-ai/web-ai-cms/src/main/java/com/jeesite/modules/AiCmsApplication.java index bda551a5..b372378e 100644 --- a/web-ai/src/main/java/com/jeesite/modules/AiApplication.java +++ b/web-ai/web-ai-cms/src/main/java/com/jeesite/modules/AiCmsApplication.java @@ -19,35 +19,36 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer * @author ThinkGem */ @SpringBootApplication -public class AiApplication extends SpringBootServletInitializer { +public class AiCmsApplication extends SpringBootServletInitializer { - private static final Logger logger = LoggerFactory.getLogger(AiApplication.class); + private static final Logger logger = LoggerFactory.getLogger(AiCmsApplication.class); public static void main(String[] args) { - SpringApplication.run(AiApplication.class, args); + SpringApplication.run(AiCmsApplication.class, args); String vuePath = Global.getProperty("vuePath"); String ctxPath = Global.getProperty("server.servlet.context-path"); if (StringUtils.isNoneBlank(vuePath) && !StringUtils.equals(ctxPath, "/js")) { logger.info( - "\r\n\r\n==============================================================\r\n" - + "\r\n 提示：您修改了 server.servlet.context-path 参数，需要您" - + "\r\n 同步修改 _app.config.js 中的 VITE_GLOB_API_URL_PREFIX 参数 " - + "\r\n 请修改为 VITE_GLOB_API_URL_PREFIX=\"" + ctxPath + "\"" - + "\r\n\r\n==============================================================\r\n"); + "\n\n==============================================================\n" + + "\n 提示：您修改了 server.servlet.context-path 参数，需要您" + + "\n 同步修改 _app.config.js 中的 VITE_GLOB_API_URL_PREFIX 参数 " + + "\n 请修改为 VITE_GLOB_API_URL_PREFIX=\"{}\" 并重新打包 Vue\n" + + "\n==============================================================\n", + ctxPath); } logger.info( - "\r\n\r\n==============================================================\r\n" - + "\r\n 启动完成，访问地址：http://127.0.0.1:" - + Global.getProperty("server.port") + FileUtils.path("/" - + Global.getProperty("server.servlet.context-path")) - + "\r\n\r\n 默认管理账号： system 密码： admin" - + "\r\n\r\n==============================================================\r\n"); + "\n\n==============================================================\n" + + "\n 启动完成，访问地址：http://127.0.0.1:{}\n" + + "\n 默认管理账号： system 密码： admin\n" + + "\n==============================================================\n", + Global.getProperty("server.port") + FileUtils.path("/" + + Global.getProperty("server.servlet.context-path"))); } @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { this.setRegisterErrorPageFilter(false); // 错误页面有容器来处理，而不是SpringBoot - return builder.sources(AiApplication.class); + return builder.sources(AiCmsApplication.class); } } \ No newline at end of file diff --git a/web-ai/src/main/resources/config/application-prod.yml b/web-ai/web-ai-cms/src/main/resources/config/application-prod.yml similarity index 100% rename from web-ai/src/main/resources/config/application-prod.yml rename to web-ai/web-ai-cms/src/main/resources/config/application-prod.yml diff --git a/web-ai/src/main/resources/config/application.yml b/web-ai/web-ai-cms/src/main/resources/config/application.yml similarity index 95% rename from web-ai/src/main/resources/config/application.yml rename to web-ai/web-ai-cms/src/main/resources/config/application.yml index 1af3b05a..6e070738 100644 --- a/web-ai/src/main/resources/config/application.yml +++ b/web-ai/web-ai-cms/src/main/resources/config/application.yml @@ -4,7 +4,7 @@ #======================================# # 产品或项目名称、软件开发公司名称 -productName: JeeSite Demo +productName: JeeSite AI CMS companyName: ThinkGem # 产品版本、版权年份 @@ -98,7 +98,7 @@ spring: # 打印横幅 main: banner-mode: "off" - lazy-initialization: true + lazy-initialization: false # # MVC 映射匹配策略 # mvc: diff --git a/web-ai/src/main/resources/config/logback-spring-prod.xml b/web-ai/web-ai-cms/src/main/resources/config/logback-spring-prod.xml similarity index 100% rename from web-ai/src/main/resources/config/logback-spring-prod.xml rename to web-ai/web-ai-cms/src/main/resources/config/logback-spring-prod.xml diff --git a/web-ai/src/main/resources/config/logback-spring.xml b/web-ai/web-ai-cms/src/main/resources/config/logback-spring.xml similarity index 90% rename from web-ai/src/main/resources/config/logback-spring.xml rename to web-ai/web-ai-cms/src/main/resources/config/logback-spring.xml index dd2650f0..440f94d5 100644 --- a/web-ai/src/main/resources/config/logback-spring.xml +++ b/web-ai/web-ai-cms/src/main/resources/config/logback-spring.xml @@ -9,6 +9,8 @@ + + diff --git a/web-ai/src/main/resources/static/common/common.css b/web-ai/web-ai-cms/src/main/resources/static/common/common.css similarity index 100% rename from web-ai/src/main/resources/static/common/common.css rename to web-ai/web-ai-cms/src/main/resources/static/common/common.css diff --git a/web-ai/src/main/resources/static/common/common.js b/web-ai/web-ai-cms/src/main/resources/static/common/common.js similarity index 100% rename from web-ai/src/main/resources/static/common/common.js rename to web-ai/web-ai-cms/src/main/resources/static/common/common.js diff --git a/web-ai/src/main/resources/static/favicon.png b/web-ai/web-ai-cms/src/main/resources/static/favicon.png similarity index 100% rename from web-ai/src/main/resources/static/favicon.png rename to web-ai/web-ai-cms/src/main/resources/static/favicon.png diff --git a/web-ai/src/main/resources/vue/_app.config.js b/web-ai/web-ai-cms/src/main/resources/vue/_app.config.js similarity index 100% rename from web-ai/src/main/resources/vue/_app.config.js rename to web-ai/web-ai-cms/src/main/resources/vue/_app.config.js diff --git a/web-ai/src/main/webapp/WEB-INF/startup.bat b/web-ai/web-ai-cms/src/main/webapp/WEB-INF/startup.bat similarity index 100% rename from web-ai/src/main/webapp/WEB-INF/startup.bat rename to web-ai/web-ai-cms/src/main/webapp/WEB-INF/startup.bat diff --git a/web-ai/src/main/webapp/WEB-INF/startup.sh b/web-ai/web-ai-cms/src/main/webapp/WEB-INF/startup.sh similarity index 100% rename from web-ai/src/main/webapp/WEB-INF/startup.sh rename to web-ai/web-ai-cms/src/main/webapp/WEB-INF/startup.sh diff --git a/web-ai/src/test/java/com/jeesite/test/InitData.java b/web-ai/web-ai-cms/src/test/java/com/jeesite/test/InitData.java similarity index 84% rename from web-ai/src/test/java/com/jeesite/test/InitData.java rename to web-ai/web-ai-cms/src/test/java/com/jeesite/test/InitData.java index fd4999a5..a89a5216 100644 --- a/web-ai/src/test/java/com/jeesite/test/InitData.java +++ b/web-ai/web-ai-cms/src/test/java/com/jeesite/test/InitData.java @@ -9,14 +9,14 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import com.jeesite.common.tests.BaseInitDataTests; -import com.jeesite.modules.AiApplication; +import com.jeesite.modules.AiCmsApplication; /** * 初始化数据表 * @author ThinkGem */ @ActiveProfiles("test") -@SpringBootTest(classes = AiApplication.class) +@SpringBootTest(classes = AiCmsApplication.class) public class InitData extends BaseInitDataTests { @Test diff --git a/web-ai/src/test/java/com/jeesite/test/RememberMeKeyGen.java b/web-ai/web-ai-cms/src/test/java/com/jeesite/test/RememberMeKeyGen.java similarity index 100% rename from web-ai/src/test/java/com/jeesite/test/RememberMeKeyGen.java rename to web-ai/web-ai-cms/src/test/java/com/jeesite/test/RememberMeKeyGen.java