diff --git a/dsAi/pom.xml b/dsAi/pom.xml index a9c4df7c..231ab31f 100644 --- a/dsAi/pom.xml +++ b/dsAi/pom.xml @@ -226,6 +226,12 @@ ${lombok.version} provided + + com.dsideal + dsUtils + 1.0 + compile + dsAiSupport diff --git a/dsAi/src/main/java/com/dsideal/Res/AiApplication.java b/dsAi/src/main/java/com/dsideal/Res/AiApplication.java index 6c63f9fb..f3798511 100644 --- a/dsAi/src/main/java/com/dsideal/Res/AiApplication.java +++ b/dsAi/src/main/java/com/dsideal/Res/AiApplication.java @@ -1,5 +1,6 @@ package com.dsideal.Res; +import com.dsideal.Config.PropKit; import com.dsideal.Res.Index.IndexController; import com.dsideal.Res.Interceptor.*; import com.dsideal.Res.Plugin.RocketMQPlugin; @@ -7,7 +8,6 @@ import com.dsideal.Res.Plugin.YamlProp; import com.dsideal.Res.Util.FileUtil; import com.dsideal.Res.Util.LogBackLogFactory; import com.jfinal.config.*; -import com.jfinal.kit.Prop; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; import com.jfinal.plugin.druid.DruidPlugin; @@ -21,37 +21,19 @@ import java.io.File; public class AiApplication extends JFinalConfig { private static final Logger logger = LoggerFactory.getLogger(AiApplication.class); - - public static String getEnvPrefix() { - String myEnvVar = System.getenv("WORKING_ENV"); - if (myEnvVar == null) { - myEnvVar = "dev"; - } - return myEnvVar; - } + public static void main(String[] args) { - System.out.println("当前环境: " + getEnvPrefix()); + System.out.println("当前环境: " + PropKit.getEnvPrefix()); UndertowServer.create(AiApplication.class, "undertow.properties").start(); } - /** - * 配置常量 - */ - public static Prop PropKit; - static { - //加载配置文件 - String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix()); - PropKit = new YamlProp(configFile); - } @Override public void configConstant(Constants me) { //使用LogBack me.setLogFactory(new LogBackLogFactory()); - // 设置静态根目录为上传根目录 - me.setBaseUploadPath(PropKit.get("uploadTempPath")); } /** diff --git a/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java b/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java index 36b6f2b8..c9dfea69 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java +++ b/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java @@ -1,10 +1,11 @@ package com.dsideal.Res.Config; -import com.dsideal.Res.AiApplication; import com.jfinal.kit.Prop; +import static com.dsideal.Res.Util.JiMeng.Kit.JmCommon.PropKit; + public class GatewayConfig { - private static final Prop prop = AiApplication.PropKit; + private static final Prop prop = PropKit; // 超时配置 public static final int CONNECT_TIMEOUT = prop.getInt("gateway.timeout.connect", 10000); diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java index 81b6fe6a..f91e4a0b 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java @@ -1,5 +1,6 @@ package com.dsideal.Res.Util; +import com.dsideal.Config.PropKit; import com.dsideal.Res.AiApplication; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -16,7 +17,7 @@ import java.util.Map; public class JwtUtil { public static final String AUTHORIZATION_STARTER = "Bearer "; - public static final String SECRET = AiApplication.PropKit.get("jwt.SECRET"); + public static final String SECRET = PropKit.get("jwt.SECRET"); // 生成安全的密钥 private static final SecretKey key = Keys.hmacShaKeyFor(SECRET.getBytes(StandardCharsets.UTF_8)); diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/MinioUtils.java b/dsAi/src/main/java/com/dsideal/Res/Util/MinioUtils.java deleted file mode 100644 index 462a5e76..00000000 --- a/dsAi/src/main/java/com/dsideal/Res/Util/MinioUtils.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.dsideal.Res.Util; - -import cn.hutool.core.io.FileUtil; -import com.dsideal.Res.Plugin.YamlProp; -import com.jfinal.kit.PathKit; -import com.jfinal.kit.Prop; -import io.minio.GetPresignedObjectUrlArgs; -import io.minio.MinioClient; -import io.minio.SetBucketPolicyArgs; -import io.minio.UploadObjectArgs; -import io.minio.errors.*; -import io.minio.http.Method; - -import java.io.File; -import java.io.IOException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; - -import static com.dsideal.Res.AiApplication.getEnvPrefix; - -public class MinioUtils { - public static Prop PropKit; - public static String minio_endpoint; - public static String minio_accesskey; - public static String minio_secretkey; - public static String bucketName; - - static { - //加载配置文件 - String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix()); - PropKit = new YamlProp(configFile); - minio_endpoint = PropKit.get("minio.endpoint"); - minio_accesskey = PropKit.get("minio.accessKey"); - minio_secretkey = PropKit.get("minio.secretKey"); - bucketName = PropKit.get("minio.bucketName"); - } - - /** - * 功能：获取Minio操作实例 - * - * @return - */ - - public static MinioClient getMinioClient() { - return MinioClient.builder() - .endpoint(minio_endpoint) - .credentials(minio_accesskey, minio_secretkey) - .build(); - } - - /** - * 功能：获取文件上传签名 - * - * @param objectName - * @return - * @throws ServerException - * @throws InsufficientDataException - * @throws ErrorResponseException - * @throws IOException - * @throws NoSuchAlgorithmException - * @throws InvalidKeyException - * @throws InvalidResponseException - * @throws XmlParserException - * @throws InternalException - */ - public static String getSignature(String objectName) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { - // 生成带有签名的URL - return getMinioClient().getPresignedObjectUrl( - GetPresignedObjectUrlArgs.builder() - .method(Method.PUT) - .bucket(bucketName) - .object(objectName) - .build()); - } - - - /** - * 功能：上传文件 - * - * @param minioClient - * @param key - * @param source - * @throws IOException - * @throws ServerException - * @throws InsufficientDataException - * @throws ErrorResponseException - * @throws NoSuchAlgorithmException - * @throws InvalidKeyException - * @throws InvalidResponseException - * @throws XmlParserException - * @throws InternalException - */ - public static void uploadFile(MinioClient minioClient, String key, String source) throws IOException, ServerException, InsufficientDataException, ErrorResponseException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { - minioClient.uploadObject( - UploadObjectArgs.builder() - .bucket(bucketName) - .object(key) - .filename(source) - .build()); - } - - /** - * 初始化Minio 服务端 - * - * @throws Exception - */ - public static void initMinio() throws Exception { - MinioClient client = getMinioClient(); - String policy = FileUtil.readUtf8String(PathKit.getRootClassPath() + "/SetMinioDownload.json"); - SetBucketPolicyArgs setBucketPolicyArgs = SetBucketPolicyArgs.builder() - .bucket(bucketName) - .config(policy) - .build(); - client.setBucketPolicy(setBucketPolicyArgs); - System.out.println("完成全局权限设置！"); - client.close(); - } - - public static void main(String[] args) throws Exception { - //加载配置文件 - String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix()); - PropKit = new YamlProp(configFile); - - MinioClient client = getMinioClient(); - //测试样例 - //http://10.10.14.212:9000/dsideal/%E5%AE%89%E5%90%89%E4%B8%BD%E5%A8%9C%E6%9C%B1%E8%8E%89.jpg - - //将指定目录下的所有以png为扩展名的文件找出来，并且将图标文件上传上去 - String path = PathKit.getRootClassPath() + "/Icon"; - File[] files = FileUtil.ls(path); - for (File file : files) { - //上传到minio - String objectName = "Thumbs/" + file.getName(); - uploadFile(client, objectName, file.getAbsolutePath()); - System.out.println("上传成功！文件名：" + objectName); - } - client.close(); - } -} \ No newline at end of file diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java b/dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java index f74352ab..2cbb3ec4 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java @@ -1,5 +1,6 @@ package com.dsideal.Res.Util; +import com.dsideal.Config.PropKit; import com.dsideal.Res.AiApplication; import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer; import org.apache.rocketmq.client.producer.DefaultMQProducer; @@ -27,13 +28,13 @@ public class RocketMqKit { private static final Object consumerLock = new Object(); // RocketMQ服务器地址 - private final static String nameServer = AiApplication.PropKit.get("RocketMq.nameServer"); + private final static String nameServer = PropKit.get("RocketMq.nameServer"); // 生产者组名 private final static String producerGroup = "my_group"; // 消费者组名 private final static String consumerGroup = "my_group"; // 主题名称 - private final static String topic = AiApplication.PropKit.get("RocketMq.topic"); + private final static String topic = PropKit.get("RocketMq.topic"); // 获取Producer实例 public static DefaultMQProducer getProducer() { diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java b/dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java index 13985a33..35d3f04b 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java @@ -3,6 +3,7 @@ package com.dsideal.Res.Util.Suno; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.dsideal.Config.PropKit; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +12,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static com.dsideal.Res.AiApplication.PropKit; public class SunoMusicGenerator { diff --git a/dsBase/pom.xml b/dsBase/pom.xml index 31dcdb41..d42e65f5 100644 --- a/dsBase/pom.xml +++ b/dsBase/pom.xml @@ -10,21 +10,6 @@ dsBase dsBase - - - - ali-maven - http://maven.aliyun.com/nexus/content/groups/public - - true - - - true - always - fail - - - @@ -226,8 +211,8 @@ maven-compiler-plugin 3.11.0 - 8 - 8 + 21 + 21 UTF-8 -parameters -Xlint:unchecked