Merge remote-tracking branch 'origin/master'

aa7ffa0d · honghuiliu · 6ba1547f · b68bc5db · aa7ffa0d · aa7ffa0d
Commit aa7ffa0d authored Sep 23, 2022 by honghuiliu 💬
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

config-prod.yaml server/config-prod.yaml +7 -1

config-test.yaml server/config-test.yaml +7 -1

No files found.
--- a/server/config-prod.yaml
+++ b/server/config-prod.yaml
@@ -172,4 +172,10 @@ oss:
 # dtu设备配置
 dtuServer:
  addr: 0.0.0.0:9804
-  enable: false
\ No newline at end of file
+  enable: false
+
+# 莹石云帐号
+yinShiYun:
+  13625717783:
+    appKey: e910fbb3530f4385b8758f1ab268a5f7
+    secret: 11d99e61b7a0998c18a7fcb557bdaa87
\ No newline at end of file
--- a/server/config-test.yaml
+++ b/server/config-test.yaml
@@ -172,4 +172,10 @@ oss:
 # dtu设备配置
 dtuServer:
  addr: 0.0.0.0:9804
-  enable: true
\ No newline at end of file
+  enable: true
+
+# 莹石云帐号
+yinShiYun:
+  13625717783:
+    appKey: e910fbb3530f4385b8758f1ab268a5f7
+    secret: 11d99e61b7a0998c18a7fcb557bdaa87
\ No newline at end of file