Merge branch 'refs/heads/master' into dev-zenas-20241018

# Conflicts:
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -297,9 +297,9 @@ jeecg:
     # 是否开启；必须。
     enabled: true
     # openAi接口秘钥，填写自己的apiKey；必须。
-    apiKey: "sk-qiRbJ62llvdWtFPF74B4C398B0D049A4A5B001E9B1C18e4f"
+    apiKey: sk-qiRbJ62llvdWtFPF74B4C398B0D049A4A5B001E9B1C18e4f
     # openAi域名，有代理就填代理的域名。默认：openAI官方apiHost
-    apiHost: "https://api.cinfohubs.buzz/"
+    apiHost: https://api.cinfohubs.buzz/
     # 超时时间单位:s。默认 60s
     timeout: 60
 

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -294,6 +294,17 @@ jeecg:
     password:
     type: STANDALONE
     enabled: true
+  # ai-chat
+  ai-chat:
+    # 是否开启；必须。
+    enabled: true
+    # openAi接口秘钥，填写自己的apiKey；必须。
+    apiKey: sk-qiRbJ62llvdWtFPF74B4C398B0D049A4A5B001E9B1C18e4f
+    # openAi域名，有代理就填代理的域名。默认：openAI官方apiHost
+    apiHost: https://api.cinfohubs.buzz/
+    # 超时时间单位:s。默认 60s
+    timeout: 60
+
 #cas单点登录
 cas:
   prefixUrl: http://cas.example.org:8443/cas