'commit'

dsAi/pom.xml

@@ -8,7 +8,7 @@
         <artifactId>dsProject</artifactId>
         <version>1.0</version>
     </parent>
-    <artifactId>dsAiSupport</artifactId>
+    <artifactId>dsAi</artifactId>
     <version>1.0</version>
 
     <dependencies>

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));
     }

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);

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;
 

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的请求签名和发送

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));

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);
     // 获取项目根目录路径

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

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);

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;

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() {

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 {