Merge remote-tracking branch 'origin/master'

api/task/v1/task.go

@@ -51,7 +51,7 @@ type GetLoginTaskListRes struct {
 }
 
 type ListReq struct {
-	g.Meta  `path:"/task/completed/list" method:"get" tags:"Task" summary:"(PC)用户任务已完成列表"`
+	g.Meta  `path:"/task/completed/list" method:"get" tags:"Task" summary:"(商户、门店)用户任务已完成列表"`
 	StoreId int `json:"storeId" dc:"门店 id"`
 	Page    int `json:"page"    dc:"页数"`
 	Size    int `json:"size"    dc:"条数"`

manifest/config/config.yaml

@@ -34,13 +34,23 @@ wechat:
   ticketExpire: 60
   token: "arenax"
 
+#OSS配置
 #OSS配置
 oss:
   aliyun:
-    bucket: "waipretty"
-    key: "LTAI4FhJV8uQvgSzviJ5tgcP"
-    secret: "Zc5E5CO4fqsXTIFsq4SHIaaXO4beJm"
-    endpoint: "oss-us-east-1.aliyuncs.com"
+    bucket: "arenaxx"
+    key: "LTAI5tRc2jeZ8ypdzWA8i24V"
+    secret: "4os1j4NksHPJkQYTZmKgWSqV6EXyjF"
+    endpoint: "oss-cn-chengdu.aliyuncs.com"
+
+#SMS配置
+sms:
+  aliyun:
+    accessKeyId: "LTAI5tRc2jeZ8ypdzWA8i24V"
+    accessKeySecret: "4os1j4NksHPJkQYTZmKgWSqV6EXyjF"
+    endpoint: "dysmsapi.aliyuncs.com"
+    templateId: "SMS_489720224"
+    signName: "竞娱时代"
 
 gamelife:
   platId: "quanyou"