diff --git a/dsAiSupport/Doc/5、安装RocketMQ.md b/dsAi/Doc/5、安装RocketMQ.md similarity index 100% rename from dsAiSupport/Doc/5、安装RocketMQ.md rename to dsAi/Doc/5、安装RocketMQ.md diff --git a/dsAiSupport/dsRes.iml b/dsAi/dsRes.iml similarity index 100% rename from dsAiSupport/dsRes.iml rename to dsAi/dsRes.iml diff --git a/dsAiSupport/pom.xml b/dsAi/pom.xml similarity index 96% rename from dsAiSupport/pom.xml rename to dsAi/pom.xml index 4cc188ff..a9c4df7c 100644 --- a/dsAiSupport/pom.xml +++ b/dsAi/pom.xml @@ -8,7 +8,7 @@ dsProject 1.0 - dsAiSupport + dsAi 1.0 diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/AiSupportApplication.java b/dsAi/src/main/java/com/dsideal/aiSupport/AiApplication.java similarity index 88% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/AiSupportApplication.java rename to dsAi/src/main/java/com/dsideal/aiSupport/AiApplication.java index ce313194..afabf666 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/AiSupportApplication.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/AiApplication.java @@ -6,7 +6,6 @@ import com.dsideal.aiSupport.Plugin.RocketMQPlugin; import com.dsideal.aiSupport.Plugin.YamlProp; import com.dsideal.aiSupport.Util.FileUtil; import com.dsideal.aiSupport.Util.LogBackLogFactory; -import com.dsideal.aiSupport.Util.RocketMqKit; import com.jfinal.config.*; import com.jfinal.kit.Prop; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; @@ -20,8 +19,8 @@ import org.slf4j.LoggerFactory; import java.io.File; -public class AiSupportApplication extends JFinalConfig { - private static final Logger logger = LoggerFactory.getLogger(AiSupportApplication.class); +public class AiApplication extends JFinalConfig { + private static final Logger logger = LoggerFactory.getLogger(AiApplication.class); public static String getEnvPrefix() { String myEnvVar = System.getenv("WORKING_ENV"); @@ -33,7 +32,7 @@ public class AiSupportApplication extends JFinalConfig { public static void main(String[] args) { System.out.println("当前环境: " + getEnvPrefix()); - UndertowServer.create(AiSupportApplication.class, "undertow.properties").start(); + UndertowServer.create(AiApplication.class, "undertow.properties").start(); } /** @@ -82,7 +81,7 @@ public class AiSupportApplication extends JFinalConfig { //遍历sql目录下所有的sql文件 File sqlDir; - String basePath = AiSupportApplication.class.getResource("/").getPath(); + String basePath = AiApplication.class.getResource("/").getPath(); sqlDir = new File(basePath + "/Sql"); File[] sqlFiles = sqlDir.listFiles(); for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) { @@ -142,7 +141,7 @@ public class AiSupportApplication extends JFinalConfig { @Override public void onStart() { //打印 启动Logo - String path = AiSupportApplication.class.getClassLoader().getResource("logo.txt").getPath(); + String path = AiApplication.class.getClassLoader().getResource("logo.txt").getPath(); File file = new File(path); System.out.println(FileUtil.txt2String(file)); } diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java b/dsAi/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java similarity index 87% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java index 914036f3..23b15d4d 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java @@ -1,10 +1,10 @@ package com.dsideal.aiSupport.Config; -import com.dsideal.aiSupport.AiSupportApplication; +import com.dsideal.aiSupport.AiApplication; import com.jfinal.kit.Prop; public class GatewayConfig { - private static final Prop prop = AiSupportApplication.PropKit; + private static final Prop prop = AiApplication.PropKit; // 超时配置 public static final int CONNECT_TIMEOUT = prop.getInt("gateway.timeout.connect", 10000); diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Index/IndexController.java b/dsAi/src/main/java/com/dsideal/aiSupport/Index/IndexController.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Index/IndexController.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Index/IndexController.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java b/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java b/dsAi/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java rename to dsAi/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java b/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Plugin/RocketMQPlugin.java b/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/RocketMQPlugin.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Plugin/RocketMQPlugin.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Plugin/RocketMQPlugin.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java b/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo1.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo1.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo1.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo1.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo2.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo2.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo2.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo2.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo3.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo3.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo3.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo3.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo4.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo4.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo4.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo4.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Doc/文档.txt similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Doc/文档.txt diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java similarity index 99% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java index 7a065c30..234a5581 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java @@ -2,7 +2,6 @@ package com.dsideal.aiSupport.Util.AiPpt.Kit; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.AiSupportApplication; import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/HttpUtils.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/HttpUtils.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/HttpUtils.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/HttpUtils.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Doc/文档.txt similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Doc/文档.txt diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/VideoStyleEnum.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/VideoStyleEnum.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/VideoStyleEnum.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/VideoStyleEnum.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Doc/文档.txt similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Doc/文档.txt diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Kit/HuoShanCommon.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Kit/HuoShanCommon.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Kit/HuoShanCommon.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Kit/HuoShanCommon.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Txt2Img.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Txt2Img.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Txt2Img.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Txt2Img.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmImg2Video.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmImg2Video.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmImg2Video.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmImg2Video.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Img.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Img.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Img.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Img.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Video.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Video.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Video.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Video.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java similarity index 95% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java index eb9ef0b5..b541cb16 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java @@ -3,8 +3,6 @@ package com.dsideal.aiSupport.Util.JiMeng.Kit; import cn.hutool.http.Method; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Plugin.YamlProp; -import com.google.common.io.ByteStreams; import com.jfinal.kit.Prop; import org.apache.commons.codec.binary.Hex; import org.slf4j.Logger; @@ -17,10 +15,6 @@ import cn.hutool.http.HttpUtil; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; import java.io.File; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -28,8 +22,6 @@ import java.security.MessageDigest; import java.text.SimpleDateFormat; import java.util.*; -import static com.dsideal.aiSupport.AiSupportApplication.getEnvPrefix; - /** * 即梦API通用工具类 * 用于处理火山引擎API的请求签名和发送 diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmErrorCode.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmErrorCode.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmErrorCode.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmErrorCode.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java similarity index 92% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java index 96e2ef75..8c263386 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java @@ -1,6 +1,6 @@ package com.dsideal.aiSupport.Util; -import com.dsideal.aiSupport.AiSupportApplication; +import com.dsideal.aiSupport.AiApplication; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -16,7 +16,7 @@ import java.util.Map; public class JwtUtil { public static final String AUTHORIZATION_STARTER = "Bearer "; - public static final String SECRET = AiSupportApplication.PropKit.get("jwt.SECRET"); + public static final String SECRET = AiApplication.PropKit.get("jwt.SECRET"); // 生成安全的密钥 private static final SecretKey key = Keys.hmacShaKeyFor(SECRET.getBytes(StandardCharsets.UTF_8)); diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Doc/文档.txt similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Doc/文档.txt diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java similarity index 95% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java index 57503c79..96937656 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java @@ -14,8 +14,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import static com.dsideal.aiSupport.AiSupportApplication.PropKit; - public class KlCommon { private static final Logger log = LoggerFactory.getLogger(KlCommon.class); // 获取项目根目录路径 diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlErrorCode.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlErrorCode.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlErrorCode.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlErrorCode.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlAccount.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlAccount.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlAccount.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlAccount.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlImg2Video.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlImg2Video.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlImg2Video.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlImg2Video.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Img.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Img.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Img.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Img.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Video.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Video.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Video.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Video.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Doc/文档.txt similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Doc/文档.txt diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/SamplingMethod.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/SamplingMethod.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/SamplingMethod.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/SamplingMethod.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/TextToImageUltra.png b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/TextToImageUltra.png similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/TextToImageUltra.png rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/TextToImageUltra.png diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java similarity index 95% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java index 47704023..a3d697f4 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java @@ -11,8 +11,6 @@ import javax.crypto.spec.SecretKeySpec; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Plugin.YamlProp; -import com.jfinal.kit.Prop; import lombok.Getter; import okhttp3.*; import org.apache.commons.codec.binary.Base64; @@ -21,9 +19,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import static com.dsideal.aiSupport.AiSupportApplication.PropKit; - -import static com.dsideal.aiSupport.AiSupportApplication.getEnvPrefix; public class LibLibCommon { // API基础URL diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibImg2Img.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibImg2Img.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibImg2Img.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibImg2Img.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibTxt2Img.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibTxt2Img.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibTxt2Img.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibTxt2Img.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/QueryModelVersion.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/QueryModelVersion.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/QueryModelVersion.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/QueryModelVersion.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraTxt2Img.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraTxt2Img.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraTxt2Img.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraTxt2Img.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Doc/文档.txt similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Doc/文档.txt diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java similarity index 95% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java index 033b75a2..c73f560e 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java @@ -12,7 +12,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; -import static com.dsideal.aiSupport.AiSupportApplication.PropKit; public class MjCommon { private static final Logger log = LoggerFactory.getLogger(MjCommon.class); diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Txt2Img.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Txt2Img.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Txt2Img.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Txt2Img.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java similarity index 95% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java index 77692756..16754754 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java @@ -16,7 +16,7 @@ import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import static com.dsideal.aiSupport.AiSupportApplication.getEnvPrefix; +import static com.dsideal.aiSupport.AiApplication.getEnvPrefix; public class MinioUtils { public static Prop PropKit; diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RetKit.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/RetKit.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RetKit.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/RetKit.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java similarity index 94% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java index 49c80a8e..2f295cd6 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java @@ -1,6 +1,6 @@ package com.dsideal.aiSupport.Util; -import com.dsideal.aiSupport.AiSupportApplication; +import com.dsideal.aiSupport.AiApplication; import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer; import org.apache.rocketmq.client.producer.DefaultMQProducer; import org.apache.rocketmq.client.producer.SendCallback; @@ -24,13 +24,13 @@ public class RocketMqKit { private static final Object consumerLock = new Object(); // RocketMQ服务器地址 - private final static String nameServer = AiSupportApplication.PropKit.get("RocketMq.nameServer"); + private final static String nameServer = AiApplication.PropKit.get("RocketMq.nameServer"); // 生产者组名 private final static String producerGroup = "my_group"; // 消费者组名 private final static String consumerGroup = "my_group"; // 主题名称 - private final static String topic = AiSupportApplication.PropKit.get("RocketMq.topic"); + private final static String topic = AiApplication.PropKit.get("RocketMq.topic"); // 获取Producer实例 public static DefaultMQProducer getProducer() { diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java similarity index 97% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java index 000bd798..d49287da 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java +++ b/dsAi/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static com.dsideal.aiSupport.AiSupportApplication.PropKit; +import static com.dsideal.aiSupport.AiApplication.PropKit; public class SunoMusicGenerator { diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java b/dsAi/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java similarity index 100% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java rename to dsAi/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java diff --git a/dsAiSupport/src/main/resources/Icon/3AFAE457-FDC8-27D3-E2B5-6C10A145A3A6.png b/dsAi/src/main/resources/Icon/3AFAE457-FDC8-27D3-E2B5-6C10A145A3A6.png similarity index 100% rename from dsAiSupport/src/main/resources/Icon/3AFAE457-FDC8-27D3-E2B5-6C10A145A3A6.png rename to dsAi/src/main/resources/Icon/3AFAE457-FDC8-27D3-E2B5-6C10A145A3A6.png diff --git a/dsAiSupport/src/main/resources/Icon/3BB545FE-07E4-4CE8-7E1A-5AAC3255BE7C.png b/dsAi/src/main/resources/Icon/3BB545FE-07E4-4CE8-7E1A-5AAC3255BE7C.png similarity index 100% rename from dsAiSupport/src/main/resources/Icon/3BB545FE-07E4-4CE8-7E1A-5AAC3255BE7C.png rename to dsAi/src/main/resources/Icon/3BB545FE-07E4-4CE8-7E1A-5AAC3255BE7C.png diff --git a/dsAiSupport/src/main/resources/Icon/493A0236-E4E0-20DD-45EF-D1B8D997D510.png b/dsAi/src/main/resources/Icon/493A0236-E4E0-20DD-45EF-D1B8D997D510.png similarity index 100% rename from dsAiSupport/src/main/resources/Icon/493A0236-E4E0-20DD-45EF-D1B8D997D510.png rename to dsAi/src/main/resources/Icon/493A0236-E4E0-20DD-45EF-D1B8D997D510.png diff --git a/dsAiSupport/src/main/resources/Icon/5F57264B-6F37-4615-7FD8-501D2C84D199.png b/dsAi/src/main/resources/Icon/5F57264B-6F37-4615-7FD8-501D2C84D199.png similarity index 100% rename from dsAiSupport/src/main/resources/Icon/5F57264B-6F37-4615-7FD8-501D2C84D199.png rename to dsAi/src/main/resources/Icon/5F57264B-6F37-4615-7FD8-501D2C84D199.png diff --git a/dsAiSupport/src/main/resources/Icon/716531A4-6AC2-4F58-DD7C-AD7C5DBD1FFC.png b/dsAi/src/main/resources/Icon/716531A4-6AC2-4F58-DD7C-AD7C5DBD1FFC.png similarity index 100% rename from dsAiSupport/src/main/resources/Icon/716531A4-6AC2-4F58-DD7C-AD7C5DBD1FFC.png rename to dsAi/src/main/resources/Icon/716531A4-6AC2-4F58-DD7C-AD7C5DBD1FFC.png diff --git a/dsAiSupport/src/main/resources/Icon/76B96464-E6FD-143B-47C3-4B862329C697.png b/dsAi/src/main/resources/Icon/76B96464-E6FD-143B-47C3-4B862329C697.png similarity index 100% rename from dsAiSupport/src/main/resources/Icon/76B96464-E6FD-143B-47C3-4B862329C697.png rename to dsAi/src/main/resources/Icon/76B96464-E6FD-143B-47C3-4B862329C697.png diff --git a/dsAiSupport/src/main/resources/Icon/E6648460-4FFD-E626-1C14-6FBF9F94A23C.png b/dsAi/src/main/resources/Icon/E6648460-4FFD-E626-1C14-6FBF9F94A23C.png similarity index 100% rename from dsAiSupport/src/main/resources/Icon/E6648460-4FFD-E626-1C14-6FBF9F94A23C.png rename to dsAi/src/main/resources/Icon/E6648460-4FFD-E626-1C14-6FBF9F94A23C.png diff --git a/dsAiSupport/src/main/resources/README.md b/dsAi/src/main/resources/README.md similarity index 100% rename from dsAiSupport/src/main/resources/README.md rename to dsAi/src/main/resources/README.md diff --git a/dsAiSupport/src/main/resources/SetMinioDownload.json b/dsAi/src/main/resources/SetMinioDownload.json similarity index 100% rename from dsAiSupport/src/main/resources/SetMinioDownload.json rename to dsAi/src/main/resources/SetMinioDownload.json diff --git a/dsAiSupport/src/main/resources/Sql/Resource.sql b/dsAi/src/main/resources/Sql/Resource.sql similarity index 100% rename from dsAiSupport/src/main/resources/Sql/Resource.sql rename to dsAi/src/main/resources/Sql/Resource.sql diff --git a/dsAiSupport/src/main/resources/Sql/base.sql b/dsAi/src/main/resources/Sql/base.sql similarity index 100% rename from dsAiSupport/src/main/resources/Sql/base.sql rename to dsAi/src/main/resources/Sql/base.sql diff --git a/dsAiSupport/src/main/resources/application_dev.yaml b/dsAi/src/main/resources/application_dev.yaml similarity index 100% rename from dsAiSupport/src/main/resources/application_dev.yaml rename to dsAi/src/main/resources/application_dev.yaml diff --git a/dsAiSupport/src/main/resources/application_pro.yaml b/dsAi/src/main/resources/application_pro.yaml similarity index 100% rename from dsAiSupport/src/main/resources/application_pro.yaml rename to dsAi/src/main/resources/application_pro.yaml diff --git a/dsAiSupport/src/main/resources/logback.xml b/dsAi/src/main/resources/logback.xml similarity index 100% rename from dsAiSupport/src/main/resources/logback.xml rename to dsAi/src/main/resources/logback.xml diff --git a/dsAiSupport/src/main/resources/logo.txt b/dsAi/src/main/resources/logo.txt similarity index 100% rename from dsAiSupport/src/main/resources/logo.txt rename to dsAi/src/main/resources/logo.txt diff --git a/dsAiSupport/src/main/resources/postman-doc.json.ftl b/dsAi/src/main/resources/postman-doc.json.ftl similarity index 100% rename from dsAiSupport/src/main/resources/postman-doc.json.ftl rename to dsAi/src/main/resources/postman-doc.json.ftl diff --git a/dsAiSupport/src/main/resources/undertow.properties b/dsAi/src/main/resources/undertow.properties similarity index 100% rename from dsAiSupport/src/main/resources/undertow.properties rename to dsAi/src/main/resources/undertow.properties diff --git a/dsAiSupport/target/classes/Icon/3AFAE457-FDC8-27D3-E2B5-6C10A145A3A6.png b/dsAi/target/classes/Icon/3AFAE457-FDC8-27D3-E2B5-6C10A145A3A6.png similarity index 100% rename from dsAiSupport/target/classes/Icon/3AFAE457-FDC8-27D3-E2B5-6C10A145A3A6.png rename to dsAi/target/classes/Icon/3AFAE457-FDC8-27D3-E2B5-6C10A145A3A6.png diff --git a/dsAiSupport/target/classes/Icon/3BB545FE-07E4-4CE8-7E1A-5AAC3255BE7C.png b/dsAi/target/classes/Icon/3BB545FE-07E4-4CE8-7E1A-5AAC3255BE7C.png similarity index 100% rename from dsAiSupport/target/classes/Icon/3BB545FE-07E4-4CE8-7E1A-5AAC3255BE7C.png rename to dsAi/target/classes/Icon/3BB545FE-07E4-4CE8-7E1A-5AAC3255BE7C.png diff --git a/dsAiSupport/target/classes/Icon/493A0236-E4E0-20DD-45EF-D1B8D997D510.png b/dsAi/target/classes/Icon/493A0236-E4E0-20DD-45EF-D1B8D997D510.png similarity index 100% rename from dsAiSupport/target/classes/Icon/493A0236-E4E0-20DD-45EF-D1B8D997D510.png rename to dsAi/target/classes/Icon/493A0236-E4E0-20DD-45EF-D1B8D997D510.png diff --git a/dsAiSupport/target/classes/Icon/5F57264B-6F37-4615-7FD8-501D2C84D199.png b/dsAi/target/classes/Icon/5F57264B-6F37-4615-7FD8-501D2C84D199.png similarity index 100% rename from dsAiSupport/target/classes/Icon/5F57264B-6F37-4615-7FD8-501D2C84D199.png rename to dsAi/target/classes/Icon/5F57264B-6F37-4615-7FD8-501D2C84D199.png diff --git a/dsAiSupport/target/classes/Icon/716531A4-6AC2-4F58-DD7C-AD7C5DBD1FFC.png b/dsAi/target/classes/Icon/716531A4-6AC2-4F58-DD7C-AD7C5DBD1FFC.png similarity index 100% rename from dsAiSupport/target/classes/Icon/716531A4-6AC2-4F58-DD7C-AD7C5DBD1FFC.png rename to dsAi/target/classes/Icon/716531A4-6AC2-4F58-DD7C-AD7C5DBD1FFC.png diff --git a/dsAiSupport/target/classes/Icon/76B96464-E6FD-143B-47C3-4B862329C697.png b/dsAi/target/classes/Icon/76B96464-E6FD-143B-47C3-4B862329C697.png similarity index 100% rename from dsAiSupport/target/classes/Icon/76B96464-E6FD-143B-47C3-4B862329C697.png rename to dsAi/target/classes/Icon/76B96464-E6FD-143B-47C3-4B862329C697.png diff --git a/dsAiSupport/target/classes/Icon/E6648460-4FFD-E626-1C14-6FBF9F94A23C.png b/dsAi/target/classes/Icon/E6648460-4FFD-E626-1C14-6FBF9F94A23C.png similarity index 100% rename from dsAiSupport/target/classes/Icon/E6648460-4FFD-E626-1C14-6FBF9F94A23C.png rename to dsAi/target/classes/Icon/E6648460-4FFD-E626-1C14-6FBF9F94A23C.png diff --git a/dsAiSupport/target/classes/README.md b/dsAi/target/classes/README.md similarity index 100% rename from dsAiSupport/target/classes/README.md rename to dsAi/target/classes/README.md diff --git a/dsAiSupport/target/classes/SetMinioDownload.json b/dsAi/target/classes/SetMinioDownload.json similarity index 100% rename from dsAiSupport/target/classes/SetMinioDownload.json rename to dsAi/target/classes/SetMinioDownload.json diff --git a/dsAiSupport/target/classes/Sql/Resource.sql b/dsAi/target/classes/Sql/Resource.sql similarity index 100% rename from dsAiSupport/target/classes/Sql/Resource.sql rename to dsAi/target/classes/Sql/Resource.sql diff --git a/dsAiSupport/target/classes/Sql/base.sql b/dsAi/target/classes/Sql/base.sql similarity index 100% rename from dsAiSupport/target/classes/Sql/base.sql rename to dsAi/target/classes/Sql/base.sql diff --git a/dsAiSupport/target/classes/application_dev.yaml b/dsAi/target/classes/application_dev.yaml similarity index 100% rename from dsAiSupport/target/classes/application_dev.yaml rename to dsAi/target/classes/application_dev.yaml diff --git a/dsAiSupport/target/classes/application_pro.yaml b/dsAi/target/classes/application_pro.yaml similarity index 100% rename from dsAiSupport/target/classes/application_pro.yaml rename to dsAi/target/classes/application_pro.yaml diff --git a/dsAiSupport/target/classes/logback.xml b/dsAi/target/classes/logback.xml similarity index 100% rename from dsAiSupport/target/classes/logback.xml rename to dsAi/target/classes/logback.xml diff --git a/dsAiSupport/target/classes/logo.txt b/dsAi/target/classes/logo.txt similarity index 100% rename from dsAiSupport/target/classes/logo.txt rename to dsAi/target/classes/logo.txt diff --git a/dsAiSupport/target/classes/postman-doc.json.ftl b/dsAi/target/classes/postman-doc.json.ftl similarity index 100% rename from dsAiSupport/target/classes/postman-doc.json.ftl rename to dsAi/target/classes/postman-doc.json.ftl diff --git a/dsAiSupport/target/classes/undertow.properties b/dsAi/target/classes/undertow.properties similarity index 100% rename from dsAiSupport/target/classes/undertow.properties rename to dsAi/target/classes/undertow.properties diff --git a/dsAiSupport/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dsAi/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst similarity index 100% rename from dsAiSupport/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst rename to dsAi/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst diff --git a/dsAiSupport/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dsAi/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst similarity index 100% rename from dsAiSupport/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst rename to dsAi/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/pom.xml b/pom.xml index 01fa9b31..6f4a962f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ dsBase dsUtils dsRes - dsAiSupport + dsAi