From d8e2168b40f37e6d4f08559227dd7698b97c6bea Mon Sep 17 00:00:00 2001
From: zhaoyuhang <1045078399@qq.com>
Date: Sun, 2 Jul 2023 23:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/application-pro.properties | 24 ++++++++++++-------
 .../resources/application-test.properties     | 24 ++++++++++++-------
 .../src/main/resources/application.yml        | 17 ++++++-------
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/mallchat-common/src/main/resources/application-pro.properties b/mallchat-common/src/main/resources/application-pro.properties
index 3b71009..e847f8c 100644
--- a/mallchat-common/src/main/resources/application-pro.properties
+++ b/mallchat-common/src/main/resources/application-pro.properties
@@ -1,28 +1,36 @@
-#todo 记得把这些配置信息补充了
-##################mysql配置##################
+#todo ????????????
+##################mysql??##################
 mallchat.mysql.ip=127.0.0.1
 mallchat.mysql.port=3306
 mallchat.mysql.db=mallchat
 mallchat.mysql.username=root
 mallchat.mysql.password=123456
-##################redis配置##################
+##################redis??##################
 mallchat.redis.host=127.0.0.1
 mallchat.redis.port=6379
 mallchat.redis.password=123456
 ##################jwt##################
 mallchat.jwt.secret=dsfsdfsdfsdfsd
-##################微信公众号信息##################
+##################???????##################
 mallchat.wx.callback=http://127.0.0.1:8080
 mallchat.wx.appId=appid
 mallchat.wx.secret=380bfc1c9147fdsf4sf07
-# 接口配置里的Token值
+# ??????Token?
 mallchat.wx.token=sdfsf
-# 接口配置里的EncodingAESKey值
+# ??????EncodingAESKey?
 mallchat.wx.aesKey=sha1
-##################OSS配置##################
+##################OSS??##################
 oss.enabled=true
 oss.type=minio
 oss.endpoint=http://localhost:9000
 oss.access-key=BEZ213
 oss.secret-key=Ii4vCMIXuFfds1EZ8e7RXI2342342kV
-oss.bucketName=default
\ No newline at end of file
+oss.bucketName=default
+##################gpt??##################
+mallchat.chatgpt.use=false
+mallchat.chatgpt.uid=10001
+mallchat.chatgpt.key=sk-wvWM0xGcxFfsddfsgxixbXK5tHovM
+mallchat.chatgpt.proxyUrl=https://123.cc
+mallchat.chatglm2.use=false
+mallchat.chatglm2.url=http://v32134.cc
+mallchat.chatglm2.uid=10002
\ No newline at end of file
diff --git a/mallchat-common/src/main/resources/application-test.properties b/mallchat-common/src/main/resources/application-test.properties
index 45e7793..fb572d2 100644
--- a/mallchat-common/src/main/resources/application-test.properties
+++ b/mallchat-common/src/main/resources/application-test.properties
@@ -1,28 +1,36 @@
-#todo 记得把这些配置信息补充了
-##################mysql配置##################
+#todo ????????????
+##################mysql??##################
 mallchat.mysql.ip=127.0.0.1
 mallchat.mysql.port=3306
 mallchat.mysql.db=mallchat
 mallchat.mysql.username=root
 mallchat.mysql.password=123456
-##################redis配置##################
+##################redis??##################
 mallchat.redis.host=127.0.0.1
 mallchat.redis.port=6379
 mallchat.redis.password=123456
 ##################jwt##################
 mallchat.jwt.secret=dsfsdfsdfsdfsd
-##################微信公众号信息##################
+##################???????##################
 mallchat.wx.callback=http://127.0.0.1:8080
 mallchat.wx.appId=appid
 mallchat.wx.secret=380bfc1c9147fdsf4sf07
-# 接口配置里的Token值
+# ??????Token?
 mallchat.wx.token=sdfsf
-# 接口配置里的EncodingAESKey值
+# ??????EncodingAESKey?
 mallchat.wx.aesKey=sha1
-##################OSS配置##################
+##################OSS??##################
 oss.enabled=true
 oss.type=minio
 oss.endpoint=http://localhost:9000
 oss.access-key=BEZ213
 oss.secret-key=Ii4vCMIXuFe241dsfEZ8e7RXI2342342kV
-oss.bucketName=default
\ No newline at end of file
+oss.bucketName=default
+##################gpt??##################
+mallchat.chatgpt.use=false
+mallchat.chatgpt.uid=10001
+mallchat.chatgpt.key=sk-wvWM0xGcxFfsddfsgxixbXK5tHovM
+mallchat.chatgpt.proxyUrl=https://123.cc
+mallchat.chatglm2.use=false
+mallchat.chatglm2.url=http://v32134.cc
+mallchat.chatglm2.uid=10002
\ No newline at end of file
diff --git a/mallchat-common/src/main/resources/application.yml b/mallchat-common/src/main/resources/application.yml
index 270d74f..cb9bc48 100644
--- a/mallchat-common/src/main/resources/application.yml
+++ b/mallchat-common/src/main/resources/application.yml
@@ -12,7 +12,7 @@ mybatis-plus:
 spring:
   profiles:
     #运行的环境
-    active: test
+    active: my-prod
   application:
     name: mallchat
   datasource:
@@ -37,7 +37,7 @@ spring:
     database: 0
     # 连接超时时间
     timeout: 1800000
-#    # 设置密码
+    # 设置密码
     password: ${mallchat.redis.password}
     lettuce:
       pool:
@@ -65,11 +65,12 @@ wx:
         aesKey: ${mallchat.wx.aesKey} # 接口配置里的EncodingAESKey值
 chatai:
   chatgpt:
-    use: true
-    AIUserId: 10452
-    key: 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
+    use: ${mallchat.chatgpt.use}
+    AIUserId: ${mallchat.chatgpt.uid}
+    key: ${mallchat.chatgpt.key}
+    proxyUrl: ${mallchat.chatgpt.proxyUrl}
   chatglm2:
-    use: true
-    url: http://vastmiao.natapp1.cc
+    use: ${mallchat.chatglm2.use}
+    url: ${mallchat.chatglm2.url}
     minute: 3 # 每个用户每3分钟可以请求一次
-
+    AIUserId: ${mallchat.chatglm2.uid}
\ No newline at end of file