Merge remote-tracking branch 'origin/master'

src/main/resources/application.yml

@@ -79,8 +79,10 @@ wx:
   mchId: xxxx
   # 商户证书序列号
   mchSerialNo: xxxxx
-  # 回调接口地址
-  notifyUrl: https://xxxx/a/biz/wxpay/payNotify
+  # 支付回调接口地址
+  payNotifyUrl: https://xxxx/a/biz/wxpay/payNotify
+  # 退款回调接口地址
+  refundNotifyUrl: https://xxxx/a/biz/wxpay/payNotify
   # 商户API私钥路径
   keyPath: module-app/src/main/resources/cert/apiclient_key.pem
   # 商户APIV3密钥
@@ -88,10 +90,15 @@ wx:
 
 #阿里云OSS
 aliYunOss:
-  endpoint: "https://oss-cn-chengdu.aliyuncs.com"
-  accessKeyId: "LTAI5t5cydpGpHfYqf31mEJA"
-  accessKeySecret: "xdFzlwzmE8QPPstbcZY82tU3xj7G0R"
-  bucketName: "scwzzn-file"
-  objectName: "image/"
-  url: "https://scwzzn-file.oss-cn-chengdu.aliyuncs.com/"
-  region: "cn-hangzhou"
+  endpoint: "https://oss-cn-shanghai.aliyuncs.com"
+  accessKeyId: "LTAI5tCa641QdNHH9Ybg9u7V"
+  accessKeySecret: "RRVIgekoqx96Fgm2Gs7eQshMShcEpk"
+  bucketName: "frametour-assets"
+  objectName: "user-faces/"
+  url: "https://frametour-assets.oss-cn-shanghai.aliyuncs.com/"
+  region: "cn-shanghai"
+#阿里云人脸检测
+aliYunFace:
+  accessKeyId: "LTAI5tMwrmxVcUEKoH5QzLHx"
+  accessKeySecret: "ZCIP8aKx1jwX1wkeYIPQEDZ8fPtN1c"
+  region: "cn-shanghai"