Merge remote-tracking branch 'origin/develop' into develop

src/main/resources/application.yml

@@ -33,22 +33,29 @@ spring:
       resourceserver:
         jwt:
           issuer-uri: https://login.partner.microsoftonline.cn/4807e9cf-87b8-4174-aa5b-e76497d7392b/v2.0
-          audiences: 72643704-b2e7-4b26-b881-bd5865e7a7a5
+          audiences: 72643704-b2e7-4b26-b881-bd5865e7a7a
-
+#企业账户秘钥
 spark:
   gpt:
-    endpoint: https://spark-api.xf-yun.com/v3.1/chat
+    endpoint: https://spark-api.xf-yun.com/v3.5/chat
-    appId: c49d1e24
+    appId: 7971f265
-    apiKey: 6c586e7dd1721ed1bb19bdb573b4ad34
+    apiKey: 866cd866de47fd55d3bac79ecbfcdae3
-    apiSecret: MDU1MTU1Nzg4MDg2ZTJjZWU3MmI4ZGU1
+    apiSecret: MDQ3YzFlNzI0MDEzMjgwYmJkNGFhOTkz
     cache_timeout: 1800000 # 30min
     cache_context: 3
 
-
+#个人账户秘钥
+  #spark:
+    #gpt:
+    #endpoint: https://spark-api.xf-yun.com/v3.1/chat
+    #appId: c49d1e24
+    #apiKey: 6c586e7dd1721ed1bb19bdb573b4ad34
+    #apiSecret: MDU1MTU1Nzg4MDg2ZTJjZWU3MmI4ZGU1
+    #cache_timeout: 1800000 # 30min
+    #cache_context: 3
 jwt:
   secret: fXO6ko/qyXeYrkecPeKdgXnuLXf9vMEtnBC9OB3s+aA=
 
-
 # 钉钉 webhook
 ding:
   server-url: https://oapi.dingtalk.com/robot/send?access_token=32d9b24f69c2c4fd7c2dab43268b6258a7214d2620e0805d7b6d1429003b64b6