Merge branch 'wp' into dev

2 weeks ago · dab6870374
parent 4060af4d2a 6d9c56eb02
commit dab6870374
2 changed files with 12 additions and 12 deletions
--- a/conf/prod/config.yaml
+++ b/conf/prod/config.yaml
@ -26,10 +26,10 @@ jwt:
  key: "tP0xXGErz4~"
  expire: 24
 bos:
-  AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe"
+  AccessKeyId: "LTAI5tHfjSmWXHqfWgaL7Uo5"
-  AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306"
+  AccessKeySecret: "kOPctFZ3DHsbdSSym1fLyDK39hkzPI"
-  BucketName: "dci-file-new"
+  BucketName: "erp-k8s-store"
-  Endpoint: ".bj.bcebos.com"
+  Endpoint: "oss-cn-hangzhou-internal.aliyuncs.com"
  BosBaseDir: "exhibition"
-  Host: "https://bj.bcebos.com"
+  Host: "https://oss-cn-hangzhou.aliyuncs.com"
-  CdnHost: "https://cdns.fontree.cn"
+  CdnHost: "https://e-cdn.fontree.cn"
--- a/conf/test/config.yaml
+++ b/conf/test/config.yaml
@ -26,10 +26,10 @@ jwt:
  key: "SxjwBuEcHg42t73"
  expire: 24
 bos:
-  AccessKeyId: "ALTAKxrqOQHnAN525Tb2GX4Bhe"
+  AccessKeyId: "LTAI5tLz1fSK53FQAEC9uNSb"
-  AccessKeySecret: "d2ecaa9d75114d3b9f42b99014198306"
+  AccessKeySecret: "oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
-  BucketName: "dci-file-new"
+  BucketName: "fontree-test"
-  Endpoint: ".bj.bcebos.com"
+  Endpoint: "oss-cn-hangzhou.aliyuncs.com"
  BosBaseDir: "exhibition"
-  Host: "https://bj.bcebos.com"
+  Host: "https://oss-cn-hangzhou.aliyuncs.com"
-  CdnHost: "https://cdns.fontree.cn"
+  CdnHost: "https://cdn-test.szjixun.cn"