Merge remote-tracking branch 'origin/feature/aihuman' into feature/aihuman

ruoyi-admin/src/main/resources/application-dev.yml

@@ -0,0 +1,106 @@
+
+--- # 数据源配置
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
+    dynamic:
+      # 性能分析插件(有性能损耗 不建议生产环境使用)
+      p6spy: true
+      # 设置默认的数据源或者数据源组,默认值即为 master
+      primary: master
+      # 严格模式 匹配不到数据源则报错
+      strict: true
+      datasource:
+        # 主库数据源
+        master:
+          type: ${spring.datasource.type}
+          driverClassName: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: root
+          password: root
+
+      hikari:
+        # 最大连接池数量
+        maxPoolSize: 20
+        # 最小空闲线程数量
+        minIdle: 10
+        # 配置获取连接等待超时的时间
+        connectionTimeout: 30000
+        # 校验超时时间
+        validationTimeout: 5000
+        # 空闲连接存活最大时间，默认10分钟
+        idleTimeout: 600000
+        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
+        maxLifetime: 1800000
+        # 连接测试query（配置检测连接是否有效）
+        connectionTestQuery: SELECT 1
+        # 多久检查一次连接的活性
+        keepaliveTime: 30000
+
+--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+spring.data:
+  redis:
+    # 地址
+    host: 127.0.0.1
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # 密码(如没有密码请注释掉)
+    # password: 123456
+    # 连接超时时间
+    timeout: 10S
+redisson:
+  # redis key前缀
+  keyPrefix:
+  # 线程池数量
+  threads: 4
+  # Netty线程池数量
+  nettyThreads: 8
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称
+    clientName: ${ruoyi.name}
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 8
+    # 连接池大小
+    connectionPoolSize: 32
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+
+--- # sms 短信
+sms:
+  enabled: false
+  # 阿里云 dysmsapi.aliyuncs.com
+  # 腾讯云 sms.tencentcloudapi.com
+  endpoint: "dysmsapi.aliyuncs.com"
+  accessKeyId: xxxxxxx
+  accessKeySecret: xxxxxx
+  signName: 测试
+  # 腾讯专用
+  sdkAppId:
+
+pdf:
+  extract:
+    service:
+      url: http://localhost:8080
+    ai-api:
+      url: https://api.pandarobot.chat/v1/chat/completions
+      key: sk-xxxx
+  transition:
+    # 是否开启mineru
+    enable-minerU: true
+    # mineru conda环境路径
+    conda-env-path: "F:\\ProgramData\\Computer\\Anaconda\\envs\\mineru"
+    # 是否开启图片OCR
+    enable-ocr: true
+#百炼模型配置
+dashscope:
+  key: sk-xxxx
+  model: qvq-max
+

ruoyi-modules/ruoyi-aihuman/pom.xml

@@ -19,6 +19,7 @@
     <properties>
         <easyexcel.version>3.2.1</easyexcel.version>
         <jna.version>5.13.0</jna.version>
+        <java-websocket.version>1.5.5</java-websocket.version>
     </properties>
 
     <!-- 按照用户要求，不添加任何依赖 -->
@@ -84,5 +85,11 @@
             <version>${jna.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.java-websocket</groupId>
+            <artifactId>Java-WebSocket</artifactId>
+            <version>${java-websocket.version}</version>
+        </dependency>
+
     </dependencies>
 </project>

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/config/WebConfig.java

@@ -1,4 +1,16 @@
 package org.ruoyi.aihuman.config;
 
-public class WebConfig {
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // 映射/voice/**路径到classpath:/voice/目录
+        registry.addResourceHandler("/voice/**")
+                .addResourceLocations("classpath:/voice/")
+                .setCachePeriod(3600);
+    }
 }

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/domain/VoiceRequest.java

@@ -1,4 +1,21 @@
 package org.ruoyi.aihuman.domain;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
 
+
+/**
+ * 语音请求参数实体类
+ */
+@Data
 public class VoiceRequest {
+
+    @JsonProperty("ENDPOINT")
+    private String endpoint;
+    private String appId;
+    private String accessToken;
+    private String resourceId;
+    private String voice;
+    private String text;
+    private String encoding;
+
 }

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/CompressionBits.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.Getter;
 

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/EventType.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.Getter;
 

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/HeaderSizeBits.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.Getter;
 

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/Message.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/MsgType.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.Getter;
 

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/MsgTypeFlagBits.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.Getter;
 

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/SerializationBits.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.Getter;
 

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/SpeechWebSocketClient.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/protocol/VersionBits.java

@@ -1,4 +1,4 @@
-package com.speech.protocol;
+package org.ruoyi.aihuman.protocol;
 
 import lombok.Getter;
 

ruoyi-modules/ruoyi-aihuman/src/main/java/org/ruoyi/aihuman/volcengine/Bidirection.java

@@ -1,10 +1,10 @@
-package com.speech.volcengine;
+package org.ruoyi.aihuman.volcengine;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.speech.protocol.EventType;
+import org.ruoyi.aihuman.protocol.EventType;
-import com.speech.protocol.Message;
+import org.ruoyi.aihuman.protocol.Message;
-import com.speech.protocol.MsgType;
+import org.ruoyi.aihuman.protocol.MsgType;
-import com.speech.protocol.SpeechWebSocketClient;
+import org.ruoyi.aihuman.protocol.SpeechWebSocketClient;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.ByteArrayOutputStream;
@@ -40,7 +40,7 @@ public class Bidirection {
         String accessToken = System.getProperty("accessToken", "fOHuq4R4dirMYiOruCU3Ek9q75zV0KVW");
         String resourceId = System.getProperty("resourceId", "seed-tts-2.0");
         String voice = System.getProperty("voice", "zh_female_vv_uranus_bigtts");
-        String text = System.getProperty("text", "你好呀！如果你有关于老婆相关的问题，比如怎么让她开心、怎么照顾她等，都可以跟我说哦，我会根据【马斯克·陈】提供的关爱老婆百事通里的信息给你分析和建议哒。");
+        String text = System.getProperty("text", "你好呀！我是AI合成的语音，很高兴认识你。");
         String encoding = System.getProperty("encoding", "mp3");
 
         if (appId.isEmpty() || accessToken.isEmpty()) {

ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml

@@ -0,0 +1,10 @@
+# 代码生成
+gen:
+  # 作者
+  author: ageerle
+  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
+  packageName: org.ruoyi.aihuman
+  # 自动去除表前缀，默认是false
+  autoRemovePre: false
+  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
+  tablePrefix: aihuman_