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

# Conflicts:
#	script/sql/update/2025-10-10-实时交互数字人集成.sql

pom.xml

@@ -20,7 +20,7 @@
         <java.version>17</java.version>
         <mysql.version>8.0.33</mysql.version>
         <mybatis.version>3.5.16</mybatis.version>
-        <springdoc.version>2.8.13</springdoc.version>
+        <springdoc.version>2.8.5</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <poi.version>5.2.3</poi.version>
         <easyexcel.version>3.2.1</easyexcel.version>
@@ -341,6 +341,13 @@
                 <artifactId>ruoyi-generator</artifactId>
                 <version>${revision}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.ruoyi</groupId>
+                <artifactId>ruoyi-aihuman</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

ruoyi-admin/pom.xml

@@ -57,6 +57,11 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.ruoyi</groupId>
+            <artifactId>ruoyi-aihuman</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-modules/pom.xml

@@ -21,7 +21,11 @@
         <module>ruoyi-chat</module>
         <module>ruoyi-system</module>
         <module>ruoyi-generator</module>
-		 <module>ruoyi-wechat</module>
+        <module>ruoyi-wechat</module>
+
+        <!-- 新添加的数字人模块-->
+        <module>ruoyi-aihuman</module>
+
     </modules>
 
     <properties>

script/sql/update/2025-10-10-实时交互数字人集成.sql

@@ -390,3 +390,6 @@ INSERT INTO `sys_menu` VALUES (1971582278942666757, '交互数字人配置导出
 INSERT INTO `sys_menu` VALUES (1972543718952386561, 'Live2D数字人体验', 1971550631887237121, 10, 'aihumanPublish', 'aihuman/aihumanPublish/index', NULL, 1, 0, 'C', '0', '0', NULL, '#', NULL, NULL, '2025-09-29 14:07:25', 1, '2025-09-29 14:36:28', '');
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+
+