Merge remote-tracking branch 'origin/main'

flx-ai/pom.xml

@@ -194,8 +194,18 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <!-- <configuration>
+                    <skip>true</skip>  跳过测试
+                </configuration> -->
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version> <!-- 使用当前或更高版本 -->
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
             </plugin>
         </plugins>
     </build>
-
 </project>

flx-ai/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     druid:
       driver-class-name: org.postgresql.Driver
-      url: jdbc:postgresql://192.168.15.199:5432/lobechat
+      url: jdbc:postgresql://192.168.200.152:5432/lobechat
       username: postgres
       password: uWNZugjBqixf8dxC
       initial-size: 10
@@ -42,7 +42,7 @@ spring:
     #host: 39.174.50.18
     host: 127.0.0.1
     port: 6379
-    password:    # 密码（默认为空）
+    password: 123456   # 密码（默认为空）
     timeout: 6000ms  # 连接超时时长（毫秒）
     lettuce:
       pool:

flx-ai/src/main/resources/application.yml

@@ -66,7 +66,7 @@ file:
     ## windows系统下访问路径
     uploadWindow: d:/ceshi/sysfile
     ## Linux系统下访问路径
-    uploadLinux: /user/img/
+    uploadLinux: /user/uploadfile/
     uploadUrl: /upload/
 tts:
   url: