Merge remote-tracking branch 'origin/main'

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

@@ -2,7 +2,9 @@ spring:
   datasource:
     druid:
       driver-class-name: org.postgresql.Driver
-      url: jdbc:postgresql://192.168.200.152:5432/lobechat
+      #url: jdbc:postgresql://192.168.200.152:5432/lobechat
+      #url: jdbc:postgresql://36.103.177.31:50005/lobechat
+      url: jdbc:postgresql://10.97.11.3:5432/lobechat
       username: postgres
       password: uWNZugjBqixf8dxC
       initial-size: 10

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

@@ -5,7 +5,7 @@ server:
     threads:
       max: 1000
       min-spare: 30
-  port: 18080
+  port: 50006
   servlet:
     context-path: /flxai
     session:

flx-ai/src/test/java/test/com/pjilisense/flxai/TestUtils.java

@@ -21,7 +21,7 @@ public class TestUtils {
     public static final String GBK = "gbk";
     public static final String GB2312 = "gb2312";
     public static final String ISO88591 = "ISO-8859-1";
-    public static String WebconnectURL = "http://localhost:18080/flxai";
+    public static String WebconnectURL = "http://localhost:50006/flxai";
     public static String EXPIRESIN = null;
     public static String TOKEN=null;
     public static int READ_TIMEOUT = 30000;