diff --git a/controllers/client/sign.go b/controllers/client/sign.go index 2a6c3b3..86c2d13 100644 --- a/controllers/client/sign.go +++ b/controllers/client/sign.go @@ -195,10 +195,17 @@ func (t *SignCtl) RealSign() { } else if sign.RealSignJsonForm != nil && len(sign.RealSignJsonForm) != 0 { var params = make(map[string]string, 0) var extSql string - for _, name := range sign.RealSignJsonForm { + for _, v := range sign.RealSignJsonForm { + m, ok := v.(map[string]interface{}) + if !ok { + continue + } + name, _ := m["name"].(string) if value, ok := t.Get(name); ok { - params[value] = name + params[name] = value extSql += "and json_list like \"%" + value + "%\" " + } else { + t.ERROR(fmt.Sprintf("%v不能为空", m["val"]), code.MSG_ERR_Param) } } if len(extSql) == 0 || len(params) == 0 { @@ -212,6 +219,8 @@ func (t *SignCtl) RealSign() { body, err = json.Marshal(params) t.CheckErr(err) + history.SignRuleId = sign.Id + history.SignMethod = 2 history.ActivityId = activityId history.UserId = userId history.Nickname = user.Nickname @@ -236,7 +245,7 @@ func (t *SignCtl) RealSign() { t.SUCCESS("实名签到成功") return } else { - t.ERROR("实名签到活动不存在", code.MSG_SIGN_REAL_NOT_EXIST) + t.ERROR("实名签到活动未上传名单", code.MSG_SIGN_REAL_NOT_EXIST) return } } diff --git a/log/hdzj.log b/log/hdzj.log index 4dcca27..7e69cef 100644 --- a/log/hdzj.log +++ b/log/hdzj.log @@ -440,3 +440,35 @@ 2020-06-02 11:17:47.365 ERROR logger/logger.go:87 客户订单异常 2020-06-02 11:17:47.410 ERROR logger/logger.go:87 客户订单异常 2020-06-02 11:17:47.413 ERROR logger/logger.go:87 客户订单异常 +2020-06-03 11:25:50.403 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 11:55:50.487 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 12:25:50.492 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 12:55:51.045 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 13:25:51.139 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 13:55:50.397 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 14:25:50.600 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 14:55:50.588 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 15:25:51.147 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 15:55:50.439 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 16:25:50.689 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 16:55:50.967 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 17:25:50.753 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 17:55:50.515 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-03 18:25:50.682 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILERROR订单已全额退款, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 13:52:28.959 ERROR controllers/base.go:209 check err{error 25 0 sql: converting argument $8 type: unsupported type map[string]string, a map} +2020-06-04 13:52:30.042 ERROR controllers/base.go:209 check err{error 25 0 sql: converting argument $8 type: unsupported type map[string]string, a map} +2020-06-04 14:31:12.125 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 15:01:11.765 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 15:31:11.803 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 16:01:11.724 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 16:31:11.735 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 16:54:33.883 ERROR controllers/base.go:209 check err{error 25 0 sql: converting argument $8 type: unsupported type map[string]string, a map} +2020-06-04 16:55:35.003 ERROR controllers/base.go:209 check err{error 25 0 sql: converting argument $8 type: unsupported type map[string]string, a map} +2020-06-04 17:26:24.788 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 17:56:25.004 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 18:26:24.956 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 18:56:24.850 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 19:26:24.938 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 19:56:25.166 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-04 20:26:26.117 ERROR utils/utils.go:155 定时任务错误原因欧轩互动打赏过期退款错误: FAILORDERNOTEXIST订单不存在, out_trade_no: FWH6rL0SZcDY5ensh9ge5iFXGlA7bsOw +2020-06-05 09:27:30.973 ERROR utils/utils.go:155 定时任务错误原因获取过期打赏错误原因: dial tcp: lookup gz-cdb-onvbcfqn.sql.tencentcdb.com: no such host diff --git a/models/sign_history.go b/models/sign_history.go index 67dbe89..9b1001d 100644 --- a/models/sign_history.go +++ b/models/sign_history.go @@ -17,7 +17,7 @@ type SignHistory struct { Type int `json:"type" xorm:"not null default 0 comment('普通签到') TINYINT(1)"` UserId int64 `json:"user_id" xorm:"not null default 0 comment('用户表id') TINYINT(11)"` SignMethod int `json:"sign_method" xorm:"not null default 0 comment('1扫码签到2实名签到3人脸签到') TINYINT(1)"` - Content string `json:"content" xorm:"not null comment('提交审核的内容') TEXT"` + Content string `json:"content" xorm:"json comment('提交审核的内容') TEXT"` Nickname string `json:"nickname" xorm:"not null default('') comment('微信昵称') VARCHAR(128)"` Status int64 `json:"status" xorm:"not null default 0 comment('是否通过审核[0未通过审核1申请审核2通过审核]') TINYINT(1)"` IsDelete bool `json:"is_delete" xorm:"not null default(0) comment('删除') TINYINT(1)"` diff --git a/models/sign_up.go b/models/sign_up.go index a091346..3a288aa 100644 --- a/models/sign_up.go +++ b/models/sign_up.go @@ -8,19 +8,19 @@ import ( const SignUpTN = TableNamePrefix + "sign_up" type SignUp struct { - Id int64 `json:"id" xorm:"not null pk autoincr INT(11)"` - ActivityId int64 `json:"activity_id" xorm:"not null default(0) comment('主活动id') INT(11)"` - Title string `json:"title"` - MaxModel string `json:"max_model"` - OnlyInvitation int `json:"only_invitation"` - LogoUrl string `json:"logo_url"` - RealSignJsonForm []string `json:"real_sign_json_form"` - RealSignJsonTitle string `json:"real_sign_json_title"` - SignMethod int `json:"sign_method"` - RealSignListPath string `json:"real_sign_list_path"` - IsDelete bool `json:"is_delete" xorm:"default(0)" description:"是否删除"` - CreatedAt time.Time `json:"created_at" xorm:"created" description:"创建时间"` - UpdatedAt time.Time `json:"updated_at" xorm:"updated" description:"更新时间"` + Id int64 `json:"id" xorm:"not null pk autoincr INT(11)"` + ActivityId int64 `json:"activity_id" xorm:"not null default(0) comment('主活动id') INT(11)"` + Title string `json:"title"` + MaxModel string `json:"max_model"` + OnlyInvitation int `json:"only_invitation"` + LogoUrl string `json:"logo_url"` + RealSignJsonForm []interface{} `json:"real_sign_json_form"` + RealSignJsonTitle string `json:"real_sign_json_title"` + SignMethod int `json:"sign_method"` + RealSignListPath string `json:"real_sign_list_path"` + IsDelete bool `json:"is_delete" xorm:"default(0)" description:"是否删除"` + CreatedAt time.Time `json:"created_at" xorm:"created" description:"创建时间"` + UpdatedAt time.Time `json:"updated_at" xorm:"updated" description:"更新时间"` } func (t *SignUp) TableName() string { diff --git a/services/pay/bindata.go b/services/pay/bindata.go index 60b2e77..ba46170 100644 --- a/services/pay/bindata.go +++ b/services/pay/bindata.go @@ -1,9 +1,9 @@ // Code generated for package main by go-bindata DO NOT EDIT. (@generated) // sources: -// apiclient_cert.p12 -// apiclient_cert.pem -// apiclient_key.pem -// 证书使用说明.txt +// cacert/apiclient_cert.p12 +// cacert/apiclient_cert.pem +// cacert/apiclient_key.pem +// cacert/rootca.pem package pay_service import ( @@ -80,82 +80,82 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _apiclient_certP12 = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\xd4\x79\x3c\xd3\x8f\xe3\x07\xf0\xf7\x34\x33\x67\x6e\x5d\x73\x34\x21\xe7\x94\xe3\x63\x84\x88\x50\xcc\x90\x23\x22\x77\xc8\x2d\x85\x72\x0c\xcb\xd9\x8f\x16\x63\xc2\xcc\xb1\x72\xc5\x46\xcc\x7d\x44\x43\x37\x9a\x23\x2d\x47\x2a\x45\xc6\x8c\x9c\xbf\xc7\xe7\xf1\xf8\xfd\xbe\x9f\xef\xe7\xcf\xd7\xe3\xf5\x7a\xfd\xfb\x44\x60\xf8\x08\x5c\xa0\x43\x08\x0c\x9f\x0f\x84\x57\x19\x6b\x81\xdd\x14\x04\xf1\x80\x88\x18\xbe\x2b\x60\x0c\x1f\x1a\x81\xe1\xb3\x46\x60\xc0\x6f\xff\xa9\x20\x44\x0c\xb8\x07\x81\x01\x77\x70\x81\x00\x04\x06\xdc\xfc\x5f\x27\xc4\x09\x08\xdf\xff\x05\x01\x10\x04\x21\x04\x86\x66\xe4\xb3\xf4\xbe\xce\x9b\x71\xb8\xb8\xa0\x40\x22\x06\x9c\x56\x5f\xf3\xcc\xb9\x67\x23\xfe\x7c\x1f\x23\xc4\x96\x37\xfa\xfb\xbc\x67\xb5\x87\x7a\x4e\xde\x2d\x52\xeb\x63\xd1\x83\x8f\xc9\xc1\xf9\x2a\xfc\xee\xdc\x54\x4c\x31\xc1\xc1\x91\xd9\x79\xa2\x4c\x59\x40\x89\x0c\xbf\xa8\xf8\x4d\xa6\xd4\xe7\xf5\x13\x93\xe0\x27\x17\x71\xd8\xa7\xdb\x59\xad\xb3\x92\xcd\xea\xdd\xc7\x9f\x17\x68\xd6\xec\x9a\xc7\xff\x24\xe3\x29\x49\x2b\x5e\xf1\xf2\xb8\xcc\xc6\xb2\x0b\x3c\x5f\x02\x91\x91\xd4\x85\x36\xdb\x8b\x7a\x59\x00\x05\xfa\xc3\x04\x76\x5d\x5f\xe6\xee\xdd\xcc\xb3\x31\x16\x24\x4c\xfa\xec\x4b\xf2\x68\xb5\x0a\xa7\xa2\x9c\x49\x18\xc5\x29\xc3\x1c\xe1\xfa\x52\x0b\x9e\x0a\xf4\x24\x5a\xd7\xd6\x9d\x2f\xf6\xed\x32\x20\x60\xe9\x8f\x34\x67\x32\x57\x32\x59\xdc\x3b\x36\x24\xdd\x94\xa7\x41\x51\x37\x7e\x5f\xde\xd8\xe4\x11\x59\xa5\x55\x8e\x64\x92\xf9\x4b\x37\xcb\x65\xc3\x96\xe2\x4b\x93\x34\x5f\x85\xf2\x3a\xe1\x3b\x24\xe2\x0e\x0e\x35\x4c\xa5\xad\xdd\x78\x1c\x76\xe6\xa1\xa1\x4e\xea\x9c\x57\xad\x4a\xaf\x54\xc0\x38\x9e\x91\xb8\x9f\xd0\x44\xb0\x09\x1b\xbd\xf1\x8b\x40\x38\xed\x2c\x5e\x73\xfd\x7c\x00\xbb\xfe\x6a\x9d\x25\x59\x48\x7f\xc9\xac\x79\x81\xe0\x73\xbc\x2e\xad\xb7\x4c\xdd\x20\xcf\x35\xa5\x47\xf6\x03\x73\x5f\x7d\xa1\x9e\x6c\x51\xf1\x8c\xbc\x11\x38\x73\xa7\xf3\xe4\x52\x8d\x38\x3a\xaa\xb7\x47\x28\xc4\x1e\x65\x35\xb7\xbc\x50\xa9\xa4\xf3\x5a\xd1\xba\x26\x26\x05\x91\x61\x2f\x55\xda\xad\x28\x1b\xd1\xf0\xc3\xfc\xeb\xd4\xad\x07\x4b\x85\xb7\xad\xc9\x41\x75\x6d\x3d\x4d\x7a\xc2\xd3\x4e\x52\xc1\x5d\x3a\xab\x74\xf5\x22\x1a\xb6\xd6\x17\x1b\xf2\x33\x77\x57\xca\x54\x8c\xc2\x6f\xe1\x78\xd3\xc4\x69\x79\xe7\xb2\xa9\xb7\xd0\xec\xa9\xfe\x2d\xea\xcf\x57\x55\x81\xe7\xa2\x4e\xb6\x5a\x39\x27\xa8\x1b\x2b\x0f\xd7\x81\x42\xff\x00\x3a\x37\x15\x76\x7d\xa9\xac\x75\x25\x56\x98\xa4\x73\xd6\xcf\x33\x61\xa2\xba\x41\x68\xd9\x4e\xe0\xd7\x8e\x28\xbb\xd9\x68\x83\x10\xdc\xf8\xbc\xf8\x82\xe2\x61\x2d\xa4\xe5\x15\xc5\x12\x75\x21\xe9\xae\x3f\xc9\x79\x3b\xbb\x8d\xb1\xcc\x69\x4f\x5e\xe5\x12\xbb\x0c\x0e\x4d\x16\xa1\xfd\x89\xc3\x91\x43\xc1\x75\x86\x51\x0e\x4b\xf5\x4e\xca\x7e\xa2\x0c\x4e\xa2\x80\xba\x1d\x24\xbf\xad\xe8\xae\x3b\xf9\xf4\x06\xca\xd6\xa6\x2e\xa8\x24\x32\x5f\x60\x4e\xa3\xe8\x20\x6b\x51\x91\xd2\xc4\xae\xa2\x3d\xf2\x10\x98\xd6\xd2\xed\x22\xc1\x68\x2e\xef\xdf\x81\xb9\x39\xc8\x84\x8c\x0d\x3a\x32\x25\xb8\xde\x8a\x06\x88\x58\x8b\x5c\xbe\x74\xcf\xe8\x0e\xda\x93\xdc\xf0\x9c\xbe\x0e\x4f\x7a\x76\x4c\x5b\xdc\x2c\xfa\x07\xb5\xa1\x4f\x2b\xb4\x32\x1c\x1c\x53\x71\x4d\x2f\xaf\x53\x2c\x99\x25\xe6\x62\x6a\x58\x74\x6c\x75\xed\xb1\xef\x78\x11\xea\x92\x5d\x66\xfd\x88\x3b\x51\x72\xb6\xb4\x18\xda\xed\x1d\xf1\x95\x60\xd7\xf4\xb9\x21\xf6\x88\x79\xaf\x16\xe5\x35\x71\xfa\x82\xe3\xf5\x79\x6b\x7f\xdb\x89\x94\xb8\xfd\xfe\x5e\x39\xd6\x10\x41\xe4\x52\x9f\xf1\x77\x1e\x35\xfc\xc0\x19\x65\xa2\xc6\x60\xda\xd7\x3c\x9e\x5b\x89\xb6\x23\x39\xe7\x46\x50\xed\x9d\xfe\x36\xc3\x1a\x43\xb3\xfd\x83\xe0\x62\xbb\x58\xba\x2a\x76\xa9\xed\xe6\xa4\xfd\x9d\x6a\xdf\x27\x6a\xa1\xa4\xdb\x8e\x56\x53\x21\x21\x02\x26\xa2\xcc\xb7\xfa\xf6\x6f\xb8\x1c\x79\x25\x59\xd8\x84\x8b\x03\xcc\xc1\xc2\x17\xa1\xbf\x21\x7a\xbf\xd5\x1a\x8f\xf6\xf6\x49\x7f\x5b\x93\x35\xcc\xd6\xc4\xa5\x24\xc2\xb1\xba\xca\x2b\x1d\xb4\xe8\x63\xbb\xde\x5b\x9e\xf2\x76\xd4\x93\x2f\x9c\x82\x47\x0c\xe2\x5e\x30\xb5\x7e\x40\x75\x83\x62\x78\x20\xdd\xb9\x64\xf7\xde\xd3\x27\xf0\x4d\x67\xd7\xcf\xc2\x08\x2d\x66\x6d\xae\xdc\xa9\xd6\x4b\x4f\xb4\x3d\x0f\x17\x10\xae\x6d\x8e\x39\xb2\x39\x0a\x44\x7a\xf3\xff\xbc\x9e\x8a\xcc\x34\xc0\x3f\xc6\x74\x27\xd1\xe3\xe6\x54\x4d\xdd\xd2\x70\x69\xad\x43\x66\x09\xa1\x3a\xab\xbe\xe2\x34\xd9\xd2\x34\x89\xb6\x42\xe7\x4a\xcc\x30\xe1\x9a\xf5\xcc\xa2\xe9\xf2\x5b\xc4\x03\xa1\xb1\x52\x56\x17\x5e\x4c\xe5\x75\x66\xd4\xaf\xda\x9b\xc1\x72\x76\xe2\xbc\xc1\xc2\x5a\x5d\xc0\xab\x96\xc0\xf0\xc0\xc4\x58\x4f\x68\x47\x72\xd9\xd0\x8a\x1f\xf6\x68\x62\xd3\xf3\x35\x6e\xd5\xf1\xa5\x91\x11\x93\x2f\x6e\xcd\x79\x71\x53\x29\xde\xa8\x67\xd3\x23\xce\x49\x96\x0f\x04\x52\x41\x95\xe5\x82\xae\x5b\xa7\xf2\xbb\x7b\x6c\x07\x04\xa5\x80\xa4\x4a\x05\xe3\xfc\xd9\x30\xdb\xa8\xdb\xbf\xb1\xd9\x1a\xf7\xfb\xa0\x66\x86\xb4\x76\x4e\x1f\xde\xdb\xae\xeb\x41\x18\xea\x2e\x45\x75\x32\xd7\x35\x25\x95\x07\xda\xdc\xeb\xec\xa1\xb6\xb5\xbe\xfb\x85\x35\x2e\x37\xd1\x5e\xba\x3b\xe1\x6a\x3e\xb2\x65\xbb\xe1\xf1\x05\x33\x50\x73\x5f\x8a\x8f\x57\xfa\xa1\x8a\x13\xb4\xa4\xae\x1a\x62\x35\x87\xbd\xb4\x5a\xdb\x71\x5e\x15\xa5\x9f\x57\x1e\x82\xfc\x79\xad\x49\xbe\x9c\xa5\x36\xec\xc2\x64\xb4\x14\x74\x23\x76\x96\x95\x36\xad\xe8\xef\x0c\xd8\x23\xd8\xb9\x16\x79\xfb\xa3\xf9\xba\x25\x86\x23\x87\x0d\x39\xdb\x65\xc7\x14\x96\x27\xb4\x0c\x45\xcd\x9c\x38\x2e\xd3\xda\x7f\x6e\xbe\x1b\xe7\x41\x97\xbc\x52\x4a\x39\x55\x05\x52\x8a\xff\x0d\xbd\xd1\x15\x9b\x36\x60\xbf\x14\xd0\x39\x28\xf5\x5c\xbf\x24\xb7\x5a\x7e\x24\x82\x1f\x7d\xbc\x85\x67\xee\x2d\x0d\x81\xe1\x8e\xfe\x97\x76\xdc\xfe\x60\x0c\xb7\x37\x02\xc3\xed\x81\xc0\x70\xbb\x42\xf8\xff\x9f\x31\x3e\x10\x17\x11\x03\x5e\x41\x60\xc0\x4b\xff\xd2\xed\xd0\xdf\xba\x81\xfc\x37\x67\x8c\x22\x5e\xe1\xfe\xd6\x0d\x8c\x01\xd3\xd3\xde\x2f\x8c\x17\x74\xa7\xb7\x3d\xba\x19\xca\xdd\xa4\x16\x20\x03\x0d\xb7\x9e\x19\xac\x8e\x7c\x27\x77\xde\x6d\xff\xf4\xee\x5a\x81\x7d\x24\x94\xf1\xd7\xfe\x22\xc5\x86\x54\xa4\x75\x44\xf9\xeb\x42\x71\xf8\xa1\xd4\xcf\x04\xb8\xe0\xbc\x3c\x32\xdf\xe8\x9b\x21\xf5\x5e\x74\x7d\x02\x49\xb6\x4f\x7d\x3a\x4b\x95\xd1\x7a\x7e\x5e\xc4\xf8\x0f\xa3\xd7\x7f\xb9\x82\xad\x4d\xc7\xdf\x66\xa8\xba\xa5\x0b\x87\xd7\x7a\x56\xab\x7f\x48\x3d\xda\x78\xb8\x36\xaa\x77\x86\xe3\x8c\xe5\x1f\xf3\xaa\x12\x1c\x22\x4a\xa7\xe9\x25\xf9\x27\x76\x1b\xdd\x5a\x64\x0d\x8e\x45\x56\x68\xda\xb7\xee\x35\x93\x20\x3e\x65\xfb\x94\x23\x2d\x3c\x29\x04\x7a\x02\xc8\x5d\x81\xe1\x19\x3c\x05\xd7\x7f\x3a\xce\x3f\xe0\x7d\x1e\x8c\xcc\x3f\xe7\x97\x41\x7d\xaf\x43\x11\x46\xaf\x5a\x2f\x7b\xe5\x4c\xa2\x37\x17\x54\x13\x66\xa2\x1e\xfc\x2a\x7f\x79\xfb\x5a\x2e\x32\xf1\xea\x01\x3c\xf2\x1b\x4c\xa9\x66\xfd\x63\x96\x30\xe8\x20\xa0\xff\x23\xe3\x70\xa7\xf3\x5f\xb5\xdb\xe1\x71\x72\x68\x9b\x69\x92\x04\xa9\xa0\x95\xeb\x0d\x46\x90\x61\x45\x16\xeb\xb8\x22\x86\x7b\x5f\x10\xb9\x7c\x04\x22\xd9\x80\x51\x54\x7d\xb2\x6d\x79\x45\x9a\xf8\x5d\xc1\x79\xb1\xe9\xb4\xdc\x5d\xe9\x09\x8b\x95\x15\x9c\x47\x25\x61\x3d\xe7\xf0\x98\x6e\x4d\xa9\x2c\x55\x19\xb3\xbe\xe0\x38\xea\x93\xc7\xa5\x56\x0b\x51\xb3\x76\x11\x6a\x7d\xfc\x41\x58\xdb\x46\x96\x2e\xfd\xd4\xe1\x8d\x90\xbf\xb4\x8c\x6a\xa3\x53\xca\x7e\x61\x6f\x09\x21\x12\xf4\xa8\x90\x4f\xd0\xcf\x82\x55\xce\xce\x71\x09\x63\x5a\xc5\xbd\x73\xe5\xc9\xd6\x2b\xe2\x81\xcf\x64\x79\x71\x5c\x7a\xa2\x8b\xdf\x4d\x5e\xc1\x4c\xce\xfe\xa1\xe4\x54\xbf\x69\xf5\xcd\xcf\x8c\xbc\x13\xde\x22\xe9\xc7\x34\x7a\x54\xd6\x9a\xfd\xd7\xb9\xb2\x35\x67\x7e\xbe\x7b\xd4\xc4\x53\xac\x32\xca\x0e\xda\x6d\xdf\x58\x43\x2f\xd3\x56\x31\xc6\x07\xfe\xea\x9b\x00\x01\xa7\xe5\x8f\xbd\x94\x9c\x7b\x2b\xda\x90\xed\x03\xed\x64\x0a\xa3\x97\xe4\x1d\x72\x82\xbf\x1f\xbb\x76\x23\x94\x7b\x3b\xe2\x08\x23\x2f\xdd\xb5\xe9\x35\xdc\x4d\xb1\xfc\xe7\x04\x80\x9f\xc1\x6b\x13\xb4\xe6\x35\x66\x5f\x65\x3f\xaa\x9e\xc0\xf7\xc1\xef\xc2\x06\x5d\xcd\x92\x61\x62\x16\xf7\x05\xbe\xd8\x89\x07\x1d\x70\x44\xaa\x4d\x75\x1c\x34\xe6\xa6\x93\x72\xdd\x07\xd0\x35\x29\x27\x18\x3f\x02\x48\xe6\xc9\x82\xe6\x21\xb3\x2d\xec\x5f\x8d\x2c\x21\xef\xc0\x36\xf5\x15\x82\x1e\x97\xf0\xfd\x22\xfd\xbc\x45\xa5\xf4\x98\x2a\xa3\x02\x7b\x15\xb6\x83\x25\x09\x17\x35\xb7\x8c\x0d\x96\x76\x05\x4b\x46\x3c\x67\xd4\xae\xf7\x60\x77\x47\x47\xfb\x5f\x94\x2c\x9e\x9a\x12\x80\x19\xce\x8a\x15\xbc\x88\x3e\x8d\x45\x5d\x02\xf2\x91\x67\xa4\x1e\x23\x4b\x9b\xaf\x19\x14\x94\x74\xc7\x57\x07\x61\x8a\x6f\x70\x69\x66\x67\xbf\x47\xc2\xa8\xb1\xbf\xc3\x04\x36\xfb\x23\x88\x5e\xe3\xa3\x19\xca\x6d\x24\x40\xfb\x13\x2d\x81\x39\xd5\x83\x06\xa3\x36\x36\x3f\x7b\x45\x18\x8b\xa5\xee\xa9\xf2\xda\x7d\xa2\x60\xdf\x14\xf2\xed\x5d\x67\x34\x9c\x9a\x64\x67\x6a\x68\x5e\xfe\xa8\x7f\x01\xab\xb8\x87\x27\x99\xb5\x11\xbd\xb6\x35\xb6\x65\x6a\x04\xcc\xe7\x1b\xd8\x6e\xb0\x1f\xf7\x70\x57\x38\x32\x09\x64\xe4\x2a\xd7\x3d\x4f\x94\xdd\x83\xac\x5e\x43\xe4\x54\x4b\x91\xee\xa5\x3d\xe3\x09\xda\x0b\x75\xf3\x49\x33\x9f\xa9\x7c\xf7\x2b\x09\xae\x8d\x36\x91\x6c\x2b\xda\x6f\x85\xbe\xed\xcc\x38\x48\xea\x4e\x55\x6d\xef\x26\x21\x57\x35\x70\x7b\xd4\x63\x69\x3d\xdc\x8c\x17\x1d\x32\xa6\x5d\x96\xdf\xec\x4d\x9a\x97\x39\x8b\x05\xe6\x0d\x0a\x02\x3c\x3e\x76\x50\x0a\x9d\x6a\x49\x3c\xd2\xb2\xfc\x82\x84\xea\xf2\x15\xa9\xd2\xf4\xf3\xef\x34\xf6\xa2\x44\xca\x82\xdf\xa4\x87\xb0\x4e\xb4\x9f\xd4\x3e\x1a\x61\xd3\xbf\xf8\xf9\xa1\x80\x47\xd2\x56\x76\x91\xa1\xef\x99\x70\xfb\xe1\x9a\xe1\xa3\x2b\x38\x64\xa5\x88\xbc\xeb\x40\x91\x54\x68\x4e\xac\x81\xc2\x58\x10\x28\x31\x4e\xd9\xe4\xe0\xe2\x01\xbc\xf2\xb4\x9d\xcd\xc7\xcd\xe7\x85\x1c\xd4\xe4\x98\xce\xcb\x39\xc5\xeb\x27\x13\x43\xfd\x3e\xc7\x6e\xed\xd7\x35\xdc\x11\xed\xab\xa0\x65\x78\x74\x14\xe4\x2e\xbe\x7d\x58\xa2\x17\xda\xaa\x25\x5d\x3d\x71\x63\x17\x7a\x14\x07\xfa\x63\xb8\x01\xe3\xbb\x3c\x44\xd7\xcc\x90\x18\x79\x2a\x2c\x71\xab\xc4\xc0\xa2\xa6\x4e\x18\xc5\xc9\x9a\x90\x85\xdb\xbd\x5f\x3b\xfe\xba\xb2\xea\xcc\xce\xec\xfb\x7e\x18\x7f\xe5\xdc\xa8\x6f\x85\x8e\x68\xa8\x48\x44\x61\xa9\x44\x34\xdb\x25\xf0\xc6\x17\xa3\x67\x24\x3e\xf5\x11\xe7\xc7\x4a\xba\x1f\x34\x1c\x70\x6e\xcc\x93\xf4\x87\xe9\x4f\x38\x5e\xed\x4d\x85\x43\x60\xfa\xd3\x97\x70\x0f\x0a\xf5\x10\x15\x99\x23\xd1\x1a\x33\xff\x46\xab\x50\xcc\xaf\x71\x1b\x97\x95\xb9\x16\x6d\xce\xa9\x33\xa5\xe7\xc0\xa7\x25\xdc\x7c\x37\x98\x63\xd7\xa7\xb9\x3b\xad\x8a\xcd\x87\x2d\x69\x35\x9d\xe8\x17\xe6\x61\xdd\xe3\x17\x27\x4e\xf8\xe4\xe8\xa4\x16\x0f\x51\x6f\xc5\x75\x3d\x21\xa2\x80\xd0\x4f\xa8\xdb\x59\x0a\x92\xba\x08\x2d\x45\xb2\x84\x87\x93\xed\x45\xd8\xd7\xce\x86\x21\xc5\x20\x44\x30\x9d\x1e\x69\xa9\x67\xab\xdd\x17\xc6\x3b\xe9\xd8\x6e\xca\x4e\x15\xe1\xe5\x1d\xfe\xa0\xe7\x6e\x2a\xb4\xa0\xfe\x35\xe2\xaa\x98\x8b\xae\x82\x50\x93\xed\xb3\x88\x43\xbf\x3e\x11\xef\xe9\xac\xd6\xcd\x88\x1c\xdf\xf2\x7d\x49\x9d\x7b\x6b\x2b\xda\x84\xda\xfc\xa4\x63\xf9\x76\x8a\x2b\xd2\xa7\x28\x74\x0d\x96\x5a\x77\x39\x2e\x5f\x2c\x85\x3f\x4f\x6e\x6f\x76\x4d\xe4\x66\x11\x58\x4e\xfe\x53\x69\xbf\x69\x0f\xd1\x54\xf3\x2a\x02\xfe\x1f\x1d\x79\x25\x34\x25\xc1\xe2\xda\x8e\x5c\x07\x15\x99\x4e\xc2\xa9\xf6\xf8\xa1\xe3\x3e\x88\xf8\xeb\x27\x5b\xea\x11\x67\xff\x19\x89\x6b\x2a\x48\xcb\x03\x0e\x80\x2f\x10\x02\x84\x01\x9e\x40\x0c\x20\x0b\x98\x02\xbe\x40\x04\x10\x05\x04\x00\x7e\x40\x00\xe0\x0d\x78\x02\x51\x80\x2f\x42\x0d\x21\x87\xe0\x85\x70\xab\x08\x1d\xe2\x3a\xc6\x0d\x80\xc5\x8d\x06\xb1\xde\xed\xb7\x89\xf1\xa0\x9d\x49\xc3\xfa\xfe\x88\xd2\x5d\x18\x23\x01\x0c\xd5\x38\x02\xa9\xf2\x89\x8b\xd5\xfe\xdf\x00\x00\x00\xff\xff\xd3\x6c\x0d\x93\x9e\x0a\x00\x00") +var _cacertApiclient_certP12 = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\xd4\x69\x38\xd4\x0b\xc3\x06\xf0\xff\x8c\x99\x49\x33\xf6\xad\x2c\x89\x8e\xec\xc3\x20\xc6\x5a\x09\x43\x85\xd2\xb1\x93\x31\xf6\x75\xec\x53\xb6\x89\x69\x2c\x73\x22\x83\x49\xb2\x3c\xf6\x35\x33\xf6\xad\xc2\x20\x43\x54\x0a\x21\x5b\x59\x4a\x96\xb1\x53\xea\xc8\x7b\x3d\xd7\xf5\xbe\xef\xf3\x9c\x8f\xf7\x75\xdf\xf7\xd7\x1f\x8a\x04\xcf\x01\x83\x38\x50\x24\xb8\x07\xec\xa4\x62\xa2\x59\xe2\x77\x6e\xd0\x09\x50\x21\x09\x6e\x03\x21\xc1\xad\x50\x24\xb8\x05\x8a\x04\x19\xfe\x4f\x05\x2b\x24\x41\x98\x28\x12\xe4\x05\x18\x04\xa0\x48\x90\xe6\xff\x3a\xa1\x24\x60\xf0\xff\x0d\x5c\x20\x18\x8a\x07\xc2\xd9\xa7\xfc\xb3\xe3\x7d\xe0\x34\x1a\x0c\xe6\x04\xe2\x48\x90\x64\xad\x28\xee\x95\xd1\x34\xf9\x7d\x21\x17\xe1\xf3\x84\x42\x05\x0d\x83\x0d\xed\x8b\x46\xba\x0f\x18\xb1\xa7\xaf\x73\x2f\xaf\x11\x45\xc7\x3e\xde\xcd\xec\x76\xc0\xaa\xc7\x09\x53\x4d\x29\x54\xe6\xa5\xc8\xc9\xc6\x12\xff\xb5\x3b\xb1\x36\x3f\x26\x75\xfb\x9c\xd4\xc1\xb2\xf7\xbb\xfd\x71\x9f\x05\x5c\x4a\xde\x3d\xa9\x47\xe3\x4f\x0f\x73\xa3\x4f\xb6\x57\x0c\xc5\x4f\x5e\x51\x9d\xbc\xb5\x8f\xbf\x02\x50\x1a\x8c\x25\xd4\x84\xb1\x1c\x75\x56\x76\x5b\x9d\x53\xea\x86\x6e\xdc\x50\x4a\x66\x13\x2c\x3a\xbf\xa7\xec\x50\x2d\xf5\x16\xef\x11\x3d\xff\x80\x26\xc2\x6c\xd9\x4f\x34\x2f\xb5\xc6\x08\x77\x9b\x1f\xf0\xf3\xef\xa1\xbc\x3b\xaa\x89\xa3\x8a\x18\xa0\x77\x35\x88\x27\xe8\x7b\x61\xb3\x36\xd5\x24\xc5\xf1\x31\x52\x81\xdd\x7d\x61\x86\x4a\x39\xa5\x9d\xfc\xbd\xec\x35\xdb\xf3\xe5\x24\x5d\x3a\xa3\x6e\xd8\x33\x3f\xa0\x53\xe7\xcb\xbf\x26\xea\x69\x72\x6d\x55\x40\x6c\x8b\x61\x8a\x9b\xa5\x6e\xf1\x43\x93\x19\xfd\x41\xce\x78\x9d\x4b\x6b\xbb\x9a\xf4\x9f\x61\xad\xad\xe2\x01\x9a\x9f\xd7\xbe\xde\xb9\x4a\xdf\x6d\x6a\xc2\x19\x5d\xb7\x38\x63\x70\x69\x77\x29\x80\x5d\xb0\x33\x65\x10\x25\x0e\x34\x4f\x89\xd8\xa4\x0d\xbf\xcd\xde\x0e\x4f\xc6\x4e\xc8\xb8\x82\xcf\x24\xe7\xc0\xaf\xad\xb8\xca\x6b\xcb\x1e\xb2\xa2\x55\x86\x28\x2a\x1e\x4e\x11\x0f\x05\x7c\xb0\xc4\x6c\x57\xea\x9b\xe4\x1c\x7b\xa3\xee\x4b\x95\x24\x30\x24\xfe\x8a\x7b\x85\x4f\xd5\xaa\xdf\x08\x35\x5f\xe0\x19\x6e\xa3\x64\xd8\xd2\xd4\x62\x0f\x59\xb8\xb3\x3a\xf5\x3c\xcc\xcc\x1c\xfb\xa0\x72\xbb\x6f\x45\x5c\xf2\x8c\x34\xf3\x33\xbc\x50\xef\xbb\xf8\x2f\x65\xa8\xcd\x73\x89\xf3\x27\xac\x45\x91\x78\xdb\xa2\x87\xca\x67\x46\x62\x40\x2f\xaf\xbb\x19\xa5\x1c\x5a\x6b\x70\xa5\x62\xc8\x73\x94\xa6\xa5\x16\x6d\x59\xeb\x21\x0e\x62\x79\xcc\xe5\x8b\xd4\xfb\x75\xf9\xab\x5e\xf3\x05\x13\xb5\xfc\xc1\x58\x0d\xbe\x84\xdf\x9a\xf6\xc4\xe4\xe8\x7d\x16\xcd\x9d\xa4\x76\x8a\x73\x7a\xe2\x5d\xa6\x53\x18\x93\xbe\x73\x99\xc0\x75\xfb\xc2\xeb\x68\xb5\xf5\xf2\xb4\x60\x59\x68\xd7\xb4\x26\x79\x4f\x43\x63\xf4\x8b\x89\x05\xbd\x78\x81\xe8\xf7\x04\xb3\x57\x88\x68\xa2\x59\x3e\x30\x39\x48\xe7\x2d\x56\xee\x20\xd7\x71\xd1\x22\x05\xaf\xbd\x7a\xf4\x41\x55\xca\x3b\x08\x51\xb1\x65\xb9\x90\x7b\xec\x46\x57\xbd\x69\x7d\xe3\x56\xbb\x55\xa8\xd2\xde\x33\xc1\xc7\xc4\xef\x65\x8f\x3f\xcf\x74\x56\xa7\xd2\x4a\x66\xcc\x05\x6b\xdf\x6c\x4b\xce\xc9\x98\x31\x9a\xb3\xa3\xd6\x8b\x37\x84\xd2\xd6\x3c\x7d\xe9\x0a\xc2\x9f\xee\x09\xbb\x30\x28\x09\x9d\x25\x52\xd1\x4a\x19\x91\x17\xac\x8f\xe8\x8e\x66\x62\xae\x1f\xac\x06\xfb\x6a\xab\xfc\x0c\x6b\x54\x9a\xcd\x47\x03\x5f\xe4\x2b\x7c\xa4\x24\x94\x0d\x7e\xe5\x44\xb6\x94\x45\x8f\xf3\x19\x05\x23\xe7\xdf\x54\x58\x0c\xd7\xef\x66\x17\xdd\x4f\x90\xb8\x4b\x3a\xb1\xa0\x03\x51\x41\xb6\x5e\xa8\x49\xc9\xe2\x79\xa3\x6f\xba\xe5\xfa\x3a\x4a\xcd\x48\xaf\x45\x01\x18\xb1\x5c\xc8\xb2\xed\xb8\xb6\x29\x27\xad\xd5\x5c\x4c\x8c\x32\x47\x80\x8f\x9b\x46\x78\x78\x6e\x6f\xbb\xf5\x1f\xa4\x9a\x3b\xaa\x72\x6d\x50\xa8\x95\x89\x23\x42\xe1\x25\xe1\xb8\xbc\x72\xd1\xf2\x89\x81\x8a\x4d\x38\x55\xb7\x1f\x6a\x9c\xb4\x8b\x99\x30\xfd\x2b\xa6\x6a\x60\x5c\x15\xdc\x2a\x53\x67\x86\x15\x06\xa3\xdc\x4d\xf7\x53\xfd\x76\x31\x4e\x7f\xb7\x65\xc6\xb6\x17\xa9\xab\x32\x6c\xe4\x33\x31\xc0\x17\xd6\xa3\xd9\xf9\xc3\x9e\x81\xc0\x7f\x8d\x8a\xd1\x44\x17\x3c\x55\xd8\x5e\x15\xe9\xe5\x55\x63\x2b\x06\x37\x1a\x7e\xff\xfd\x21\xcf\x47\xf4\xe1\xf0\x72\x4d\x48\x8f\xdb\xe6\x4c\x6b\x42\xf9\x4a\x63\xdf\xe2\x90\xa1\x3f\x26\xa4\xd7\xbc\x0b\xcf\x58\x45\x7c\x9b\xff\x80\x9c\xa9\x14\xe8\xca\xe9\xec\x9f\x57\xfa\x01\xb5\x34\x26\x5f\x5d\xa0\x99\xb4\x1b\x4f\xd7\x4b\x16\x4f\x5e\x4f\x03\x55\xa0\x9b\x2d\xa5\x63\x92\xd2\xc6\x9c\x46\xcf\x24\x09\x4d\xd0\xe7\x92\x48\xa3\xca\x9a\x5e\x05\x8b\x0a\x18\x2f\x03\x5b\xa2\x07\x62\x7c\x8d\x1d\x19\x7f\x35\x83\x50\x5d\x70\xcf\xd3\xca\xef\xd7\x43\x6c\x5e\x86\xde\xe2\x31\x65\x5d\x86\x6c\xeb\x4f\x6d\x82\x58\x4b\x74\x5a\x8f\x6f\xf1\xc9\xc0\x66\x18\x83\x01\xdd\x8b\xbe\xce\x84\x3c\x95\x4f\x6c\x04\x13\x3f\xe9\x51\xca\x0c\x4f\x3e\xdb\x6b\xae\xea\xdd\x36\xb1\xa3\xcf\x16\x1f\x17\x4f\xbc\xb5\xf7\x51\xe3\x2b\xde\xdf\xbe\xac\x23\xa0\xc9\xcc\x0b\x29\xed\x63\x2a\xb4\xae\x8d\xf0\x98\xc0\xeb\x46\xb9\x03\x9f\xc0\xb3\x93\x54\x67\x07\x21\x41\x5e\xf9\x69\xcc\x4f\xee\xb0\x66\x9d\x2f\x86\x6d\xf4\x16\x82\xe4\x9f\x9f\x5b\x54\x47\xbd\x58\x43\xf6\xab\x0e\x2c\x5e\x23\x1e\x0f\x7e\xae\x02\xb7\xa9\x41\x21\x98\x3b\x7b\x73\x62\xdb\x03\x6d\xb5\x74\x2a\xf4\x15\x3c\x83\x95\x42\xad\x1a\x9e\x8b\x26\xb3\x60\xa1\xcd\x41\x2e\x24\x7b\x6a\xae\xd1\x4e\xcf\xb2\xb1\xd4\x85\x2a\xbc\x9a\x22\x97\xfc\x91\xac\xef\xa7\xeb\xb1\x71\x51\xd3\x2c\x94\xdd\x28\xac\xa5\x41\xd6\x4d\x34\xb8\xfa\xd0\x4c\xf9\x1c\x72\x2b\xbf\x0b\xea\x0f\x56\x87\x55\x71\xb0\xc4\x3e\x11\x4f\xf4\xae\x0d\xf7\x8a\x9e\xd5\xd3\xe9\x5c\x6e\x1c\x41\x60\x30\xf2\x99\xf7\xc4\x76\x57\xb4\x4f\xff\x35\xf4\x92\xe3\x38\x0d\x45\x82\x12\xfe\xa1\x1d\xd4\x1b\x42\x82\xba\xa3\x48\x50\x2c\x8a\x04\x75\x82\x21\xfe\x8f\x31\x38\x08\x5c\x48\x82\x6c\xa0\x48\x90\xd5\x7f\xe8\xc6\xf1\x6f\xdd\x54\xe2\xb2\x30\xb3\x21\x79\x06\xff\xd6\x0d\x42\x82\x0c\x80\x1a\x68\xca\xb6\x3a\xe8\xed\x0d\x8d\x07\xd9\xe9\x64\xe4\x02\xfe\xa9\xd0\x49\xcd\xf2\x0e\x77\x7d\x40\x95\x56\x5c\xd2\x3f\x8d\xce\x65\xa5\x5f\x9e\x8f\x39\x57\xec\x3c\x14\x32\xe0\x57\xfb\x4d\xaf\xce\x71\x86\x64\xd8\xbd\x46\x65\xfd\x8a\xe7\xb7\xd1\x5d\x9e\x6d\x8e\x55\xf9\xa9\x9f\xeb\x7d\x53\x4a\xd7\x5a\x46\xca\x91\xfb\x8f\x7c\xeb\x32\xc9\x25\x52\x3a\x5e\x52\xe8\x69\x89\xe3\xb2\xc9\x7a\x9e\xb8\xc8\xd0\xea\x64\xa6\xbd\xb3\xe8\x58\x57\xd9\xdd\xa9\x71\x06\x79\xbf\x1d\xff\xb4\x9d\x47\xe5\x8c\xaf\xb2\x35\x7f\x7a\x51\x06\x51\xeb\x91\x7b\x7f\xf9\xf8\xd8\x66\x35\xd0\x25\xd5\xf5\x35\xe3\x8a\x16\xf5\x2d\x44\x7f\x54\xd1\xa2\x0c\x5c\xa9\xe4\x9d\x41\x7f\xb6\x1d\x80\xb7\x83\x1e\xbc\x1a\x1c\xdb\xca\xeb\x4b\x0d\x69\xf6\xd7\x38\x5b\x4b\xb8\x73\x64\xa5\xae\x3a\x7b\x9e\xe8\x34\x99\x9e\xf0\x10\x91\x14\xcf\x33\xb9\xbc\xf0\x54\x77\xce\xd6\x54\x3d\x3c\xf9\x21\x62\x6e\x04\x34\x2b\x46\x7c\x65\x95\x79\xb5\xc5\xd9\xfb\x16\x2e\x1c\x46\x4c\xf9\xf0\x6b\x79\x92\xc1\xe3\x31\xff\x0e\xe7\xf9\x4b\xbe\xc4\x36\xc6\x6e\x4b\xe9\x6e\x74\xc0\xf8\x86\x62\xd2\x4b\x7d\x09\xad\x73\x35\x93\xde\x2a\xa5\x94\x47\xb4\x3b\xe4\x0d\x4e\x16\xfe\xe5\x3c\xa3\xc7\x86\x28\xa6\x42\xa8\xca\xaa\xd0\xa9\xa6\x49\x5d\xd1\xd4\x35\x9f\x8b\xc5\x29\xd8\xd9\xd4\x59\x8a\xa9\xe6\x83\x7e\xaf\xfd\x71\x13\x9f\xbc\xee\x6d\x82\x7e\x7c\x85\x55\x8c\x35\x78\xde\x90\x7d\xee\x15\x8f\x97\x33\x52\x51\xe5\xed\xa5\xbc\x65\xfa\xb4\x73\x06\xa2\x1f\x2d\xa9\xfa\x2e\xc7\x3e\xe7\xc4\x9f\xe6\xab\xeb\xc1\xc8\xec\x27\x2e\x72\xa1\xb7\xaa\x6b\xe7\xcb\x8e\x7b\xcb\x64\xa3\xf2\xa7\xce\x3b\x1d\x4f\xe9\xce\xca\x8c\x3e\xf1\xc5\xba\xbc\x8f\x3f\x64\x04\x75\x40\xf3\xe4\x14\x6e\x8e\x33\x83\x5c\x9d\xb5\x4a\xc9\x7b\x63\x3b\x25\x17\xbd\xba\xaf\x37\xad\x3c\x2e\x81\x12\x82\x10\x09\x11\x69\x91\x59\x56\xd2\xe4\x55\x93\x4b\x49\xbd\x1a\x6a\xf3\x6d\x67\xc7\x66\xec\xfa\x82\xd4\xd9\x4c\xd7\xf3\x4a\x94\xac\x77\x6e\xef\xbc\xe6\x0a\x57\xb2\x47\xf2\x38\xb5\x71\xf2\xfa\xc1\x84\xc1\x3e\x9e\x0b\x44\xd4\xc1\x41\xb4\xfd\xc0\xf2\xf3\xd5\xc8\x17\x91\xe5\x22\x55\xc7\x8b\x58\x59\x1d\x2b\xed\x53\x8c\x9b\x88\xa7\x31\x91\x33\x63\xa1\x6a\x73\xfc\xdb\x4c\x97\x4a\x9d\x5c\xdf\x1c\x0e\xd1\xc7\xe7\xbe\x48\xc0\xf5\xb9\x57\x5a\xf4\x96\x96\xa2\x6f\x77\xff\xb0\x75\x7b\xf9\x13\x57\xe4\x57\x7e\x34\x74\x8c\x16\x70\x89\x67\x78\x47\x7a\xb4\xd3\xba\x7c\xbe\xe1\x3e\x95\xef\x96\x25\x9e\x6c\xb4\xaf\x41\x89\x7e\xc3\x5b\x68\x61\xb1\x82\x1e\xad\x7a\x12\xdc\x7b\xc1\x9d\x3a\xf0\x6f\x65\x77\xb9\x0d\xa9\x5a\xa9\xe4\x94\x30\x41\xa3\xe8\xc1\x37\xdf\xb9\x4e\xd8\x2b\x74\x3b\xcc\x2a\x07\x27\x26\x57\x45\x22\xec\xc8\x45\x6a\x75\x27\x44\x0f\x7a\x1b\x13\x79\x85\x3d\x58\xc2\xeb\x45\xe8\x81\xae\x8a\xd6\xe7\x9d\x43\x98\xbc\xed\xb6\xe9\xc5\xdf\xa1\x82\xeb\xcb\x94\xfc\x53\xf5\x16\x9f\x93\xd6\x41\xea\xd1\xdf\x0f\x3b\xbd\x6c\x08\xe9\x70\x85\xbf\x8e\x6a\x77\x2e\xd3\xe7\x17\xff\x9e\x0b\x34\x6b\xaa\x43\x8a\x77\x3d\xb3\x4a\x16\x6e\xac\x37\x82\x97\x68\x0a\xf0\xc9\x1e\x75\xe4\xb3\xbb\xcd\x1d\x78\xb1\x72\xcf\x33\x2a\x22\x7e\xe1\x61\xc5\xf9\xa4\xf1\x5f\x2f\x2e\x4e\x88\x19\xb0\x38\x3a\x0c\x36\xfb\x8c\x63\x4f\xc7\x6d\x2b\x7f\x18\xfd\x5c\xb8\x1f\x40\x29\x51\x0a\xdf\x4e\x1b\x09\x19\xff\x43\x77\xcf\x78\x3d\x99\x46\xd3\xee\x4c\xf0\x0d\x57\xaf\x9e\xcb\x43\x9f\x3f\x86\x6f\xbe\xe2\x80\x4e\x2a\x50\xc4\xae\x72\xe1\x1a\x92\x2d\xb8\x46\xc6\xee\x36\xfa\x44\x57\x39\xc9\x7e\x62\x17\x8c\xc0\x0c\x3a\x64\xb8\x5b\xe4\x2e\xc7\xe3\x9a\xf8\xc8\xec\x93\xaf\xc7\xfa\x2b\x65\xe3\x0f\x87\x12\xd8\xdd\x9b\xed\xdf\xfc\xf5\x59\xca\x4b\x77\xb2\x40\x5c\xe2\x8e\xa2\xd2\x58\xe5\xad\x72\xf5\xb3\xa7\xd2\x5c\x1b\x5e\x5b\xcd\x4b\xd4\x38\x30\x78\x25\xb9\xc9\x12\xdd\x94\x1f\x2d\xf3\x9e\x59\x71\x2b\x8b\x1b\xbb\xd7\xea\x5d\x64\x8c\x53\xd0\x6a\x98\x1f\x77\x14\x8d\xd0\x8f\x02\xdf\x86\xa0\x8b\x7c\x56\x78\x8d\x4a\x4f\xff\xfe\xa1\xe2\xc3\xff\xe4\xb5\x4b\x50\x4d\x57\x8d\x06\x5f\x44\x58\xc8\x6b\xe6\xf5\x33\xe7\xda\xed\xf4\x98\x77\x1d\xde\x77\x54\xbd\x70\xf9\x53\x46\xf6\xc1\xc6\xed\xdf\x18\xb3\x08\x5d\xf4\xfd\x59\xf2\xbc\x10\xd2\x90\xe9\xd1\x2f\xd0\xe9\xc2\x97\xc3\x1b\x2d\x72\x8f\x97\xde\x51\xe5\x5e\xcb\xbe\xdd\x66\x6a\x32\xe3\x92\xd0\xc6\x43\x49\xb5\xbc\x61\xb7\x2f\xd2\xd4\x1a\xd1\x58\xdd\xfb\xa4\x7c\xf9\xa2\xc1\x57\x9f\x90\x5e\xb3\x7b\x03\x66\xac\x01\xeb\xd3\x4b\x72\x9c\x4c\x6d\xdc\xb0\x2f\x81\x94\x68\x66\x5e\x1f\x96\x13\xe7\x33\x22\x49\x55\x5d\x91\x83\xf9\xae\x17\x42\x8f\xd9\x9d\xb9\x8e\x1f\x09\x73\x4b\x37\xed\x6e\x11\x0e\x69\xeb\x22\x8f\x78\x95\x4b\x7b\xc3\xb7\x6a\xe1\x7d\x17\x22\xa6\xe7\x30\x5f\x7e\xf6\x93\x5c\x03\xdf\x07\x2c\x6d\xf1\x49\xd0\x22\x34\x4f\x7f\xd1\x41\x36\x3e\xbe\x56\x9a\x0b\x4a\x5d\x7c\x97\x82\x40\xb7\xf3\xfd\x2e\x3f\xde\xad\x64\x45\x74\xbb\x39\x6c\xb8\x85\x4c\xa5\xd0\x18\x14\xe3\x9e\x1b\xeb\xb1\xcc\xab\x50\xf6\xc1\x66\x6d\xe0\x01\xff\xb6\xb6\x56\x40\x5d\x40\x2d\x97\x70\x3b\x1a\xe4\xe0\x6e\xe0\x15\xc4\xbd\xfc\x31\xca\xe8\xa0\xa2\xc8\x2f\xe3\xe5\xb9\x3d\xae\x86\x02\xed\x53\x07\xc3\x1c\x0d\x51\xbd\xef\x13\xcc\x04\x31\xcf\x3a\xa9\x3d\x63\xea\x3d\x22\x86\x52\x60\x37\xc6\xd1\xa6\xe3\xe1\xd8\x53\x09\xc2\x35\x65\xe6\xf1\x9b\x51\x35\x47\xd4\x1f\xff\xaf\xe3\x49\x61\x35\x11\x88\x90\xa0\xc0\xc1\x8d\x3c\xa5\x40\xf9\xde\x9d\xbe\x8c\x94\x67\x6d\x12\xb9\x20\xbe\x38\x94\xc6\x7f\x46\x42\x6a\xb2\x92\x32\x80\x35\xe0\x09\xe0\x81\x60\x00\x07\x44\x02\x52\x80\x11\xe0\x09\x84\x02\xe1\x80\x2f\xe0\x05\xf8\x02\xee\x00\x0e\x08\x07\x3c\x51\x48\x94\x34\xea\x24\x0c\xaa\xc4\xc3\x01\x16\x83\x02\x10\xa1\x6c\xdb\x1d\xf7\xd0\xa7\xe2\x0f\x28\x7d\x61\x85\x6f\x72\x5c\x44\xd4\x03\x62\x30\x10\xce\x82\x52\xbc\xe2\x74\xee\x13\xec\xff\x04\x00\x00\xff\xff\x96\xd7\xd8\x93\x9e\x0a\x00\x00") -func apiclient_certP12Bytes() ([]byte, error) { +func cacertApiclient_certP12Bytes() ([]byte, error) { return bindataRead( - _apiclient_certP12, - "apiclient_cert.p12", + _cacertApiclient_certP12, + "cacert/apiclient_cert.p12", ) } -func apiclient_certP12() (*asset, error) { - bytes, err := apiclient_certP12Bytes() +func cacertApiclient_certP12() (*asset, error) { + bytes, err := cacertApiclient_certP12Bytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "apiclient_cert.p12", size: 2718, mode: os.FileMode(438), modTime: time.Unix(1584340128, 0)} + info := bindataFileInfo{name: "cacert/apiclient_cert.p12", size: 2718, mode: os.FileMode(438), modTime: time.Unix(1565839462, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _apiclient_certPem = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x94\xc9\xae\xab\x38\x18\x84\xf7\x3c\x45\xef\xa3\x56\x48\x0e\x64\x58\xdc\x85\x27\xa6\x60\x88\x99\x02\xec\x20\x09\xb3\x21\x13\x38\xe1\xe9\x5b\xf7\x9c\x56\x4b\xad\xeb\xe5\x57\x96\x55\x2e\xfd\x7f\xfd\xfd\xfb\x40\xa2\x9b\xce\x5f\x88\x78\x81\xa9\x99\x08\x04\xe4\x9b\x4a\xd4\x34\xf1\x0e\x23\x04\x5e\x75\x09\x84\x09\x41\x69\x86\xc5\x1e\xd6\x29\x30\x79\xd5\xbe\x90\x76\x02\x33\xdf\x34\xa7\xab\x92\x7c\x8a\xc8\x14\x98\x25\xd6\x61\x48\xcd\x6a\x3a\x3b\x80\x11\x5b\x82\x0c\x88\xb8\x21\x36\x05\xad\x0e\x56\x21\x81\x15\x45\x4c\x56\xde\x64\x06\x1e\x2c\x9d\x08\x82\x21\x40\x9d\xd7\xe5\x3d\xac\xae\xbe\xda\xe4\x6b\xf9\x6d\x04\x20\xff\xd1\x9e\x81\xa4\x69\xff\x13\x4b\x26\x93\x92\xad\xa3\xf1\xa2\x47\x1f\xea\x3d\x85\xce\x12\x1c\x31\x86\xc9\xdb\x0a\xd3\x93\x2a\x92\xb8\x1d\x93\xf5\xfe\x65\x6a\xd6\x94\x7f\xb1\x52\x62\x32\x11\x46\x75\x76\x68\x03\x04\x9d\xc9\x9a\xe2\xe4\xe3\x04\x6c\x3e\x7d\xb3\xf0\x37\x5b\xfd\xc7\x1a\x04\xcb\x80\x04\x14\x92\x6f\xb7\x40\x88\x83\x44\x03\x26\xd3\xc0\x5c\x3b\xcd\x59\xd0\x86\xe4\x14\xfe\x7c\x05\x95\xc2\x57\xf3\xcd\xa8\xda\x8b\x4a\x4d\x4f\xba\x3a\xd4\x5f\xea\xd6\xdd\xaa\xdb\xb1\xa0\xbe\x2c\x0e\xe2\xdb\x99\x2d\x61\x14\x74\x63\xbe\xec\x5e\xea\x96\x3f\x0e\xc5\x30\x65\x7d\x3f\xa5\x46\x3f\xaa\x73\x7f\x53\x0d\x5e\x0f\x98\xf7\x66\x7f\xe3\x29\xee\xaa\x6c\xee\x9a\x6d\xf9\x46\x33\xb0\x7e\x32\x48\xa8\x04\x5a\xc7\xa5\x1e\x11\xf8\xe7\x45\x03\x83\x2a\xc8\xf4\x68\x3c\xf1\xaa\xcb\x1b\x84\x80\xff\x47\xf2\x10\x32\x80\xcb\x92\x1c\x01\x46\x48\x02\x6c\x40\x65\x49\x20\x70\x53\xe5\x1a\xee\x5b\x9e\xe4\xa5\xea\x28\xda\x08\x2e\x67\x57\x7e\xd2\xeb\x0e\x42\x2a\x4e\x9b\xa7\xfb\xda\x86\xbd\xb2\x1d\x0f\x4e\xde\xbd\xef\xdd\xc9\xaf\x87\x54\xac\x33\xc9\x6f\xbb\xd8\x85\x0b\x51\xc4\x73\x38\xc5\xf1\x2e\xcd\x83\xcd\x7e\x4c\x94\x93\xcf\x1d\xd0\xad\x05\xd3\x2e\xab\xa0\xcd\x4b\x2e\xac\xbb\xce\xa9\x2f\x6e\xfa\x26\x57\x76\x71\x91\x7a\xd3\x87\x1f\x3c\xa9\x36\xfd\x48\x69\xf4\x4f\x5c\x2b\x8f\x83\x6b\x94\xbd\xcd\x9b\x5d\x37\x66\xb7\xe3\xfc\xb9\x1d\xcc\xc6\x16\x0b\x9b\x66\x3b\xf7\x6d\xeb\xdb\x62\x48\x88\xb2\x4f\x53\xc5\xbf\xac\x3c\x67\xfb\x7a\x5a\x38\x94\x8c\x21\xcc\x91\xde\x42\xe7\x7d\x7c\xd1\xfc\x03\xc0\x4e\x55\xe0\xfd\x72\x6e\xfc\x89\x07\x83\x7e\xcb\xb8\xde\x5a\xfd\x49\xac\xab\x98\x61\xba\xbb\x10\x33\x89\x1e\x49\x3d\x91\x57\x45\xc2\xdd\xf4\x94\xc0\xda\x5d\x6a\xaf\x63\x61\x3a\x62\x25\x57\xf1\xd2\x9d\xe2\x03\xb2\x35\x7a\xcd\xa2\x16\xb9\xeb\xd3\x6a\x3f\xf3\x2b\x3f\x1e\xbf\x96\xd1\xa3\x1d\xad\xe0\x3e\xe2\x7d\xfe\x78\x0c\x57\x10\x88\x4e\x8d\xaf\x12\xab\xd7\xc3\x54\x6c\xb6\xfe\xbc\xd8\x7c\xdd\x83\xaf\xe7\x6e\xaf\xeb\x41\x93\xd6\xeb\xc3\xf9\xd8\xb4\x08\x08\x02\x40\xe6\xc2\x32\x80\xcb\x7f\xc7\xfd\x42\x04\x43\x14\x00\x81\x44\x82\xa5\xc8\x93\x8f\x10\x30\x0c\xca\x40\x50\x3d\xfc\xbe\x60\x08\xef\x4a\x35\x21\x4e\x77\x98\x0c\x5a\xa6\x47\x7a\x25\x5f\x0c\xb0\xb1\x3f\xfb\xee\xc2\x9d\xca\xe6\x9d\x7c\xee\xa3\xd9\xe6\xce\x24\xe5\xbf\x77\xa0\xde\x8b\xcb\xc9\x7a\x66\x27\x3a\x65\xb1\xf7\xb9\xc4\x4e\x73\xe6\x62\xc9\x64\xb2\xa7\xa1\x45\x1c\x6c\x7e\x28\x09\x57\x94\x78\x88\xcd\x40\x66\x0d\x58\xb3\x90\xcd\x6e\x70\x5e\x49\x0e\x6e\x15\x07\xa7\x98\x62\x0d\x53\x39\x54\xbc\xd0\x22\xb4\x01\x0e\x2c\xdb\x7b\xd5\xd6\xfa\x5e\xc8\x10\xb0\xa7\x06\x80\x8b\x00\x23\x80\x20\x72\xa6\xd9\x0b\xac\xb5\x5d\xa9\x71\x5a\x4a\x0d\xb6\xdb\xca\xf5\x8e\x56\xb7\x6d\xcd\x47\x15\xe4\xfc\xd2\x60\x68\xcd\x15\xdc\xb5\x85\xbd\x8a\xbd\x78\xe9\xe8\x1e\xe8\xdc\x00\xf3\xf9\x11\x1a\x0a\x29\x61\x7f\x2e\x16\x28\x35\x98\xfc\x68\x4d\xa9\x19\xfc\x23\xbf\x47\xaf\xf7\x99\x27\x33\xcd\x0f\x4b\x78\x55\x2e\xf8\x5c\x7f\xc2\x52\xc8\xc5\xc2\x8f\xc7\x44\x33\x8a\xc3\x2a\x96\x0d\x7b\x24\x7b\xa0\x27\x5d\x12\x10\xb4\xc8\x7d\xed\x2e\xf2\x54\x97\x72\xb2\xe5\x71\x8c\x36\xc1\xac\x2c\xee\xd7\x43\x6f\xbf\xe4\x9d\xc9\x95\x79\xe5\x0e\x6c\x6b\xcd\xe8\xd5\xbf\x16\x64\xb8\x7f\xf6\x2b\xde\x5c\xbd\x72\xd2\xe0\x2d\x7f\xe4\xfb\x30\x2c\xac\xe3\x2d\xf6\x4d\xa9\xa5\x7d\x52\x1e\xfd\xc7\x34\x4d\xf5\x2e\xe7\xaa\xb5\x8b\x27\x7b\x29\xc3\x42\xbe\x6e\x8b\xde\x98\x60\xd0\x56\x6f\x9c\x4d\x35\x04\xeb\x7e\xd3\x45\x06\xc7\x46\x67\xa2\xfc\xf6\x85\xe4\x09\x65\x85\xa4\xbd\x0f\x83\xc1\x92\xf7\xf5\x63\x37\xb7\xf7\xb5\x71\x54\x6d\x9e\x3e\x95\x27\x93\xe3\x6d\x72\x02\x9a\x20\x30\x8c\x81\xd0\xfa\xe8\xcb\xdf\x24\x59\x6c\xda\xd4\xb0\x55\x77\x5f\x0f\xcc\xba\x85\x46\x28\xbd\x0b\xd4\xa0\xf2\xd7\x2f\xe9\xbb\x63\x89\x83\xff\xec\xdd\x7f\x02\x00\x00\xff\xff\x3d\x3b\x5b\x0c\x94\x05\x00\x00") +var _cacertApiclient_certPem = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x94\x4b\xcf\xb2\x30\x1e\xc5\xf7\x7c\x8a\xd9\x9b\x89\x28\xa2\xb8\x78\x17\x85\x16\xe4\xd2\x6a\xb9\xaa\x3b\x40\x28\x72\x57\x90\x22\x9f\x7e\xf2\x3e\xcf\x64\x92\x99\xe9\xf2\x77\x9a\xe6\xf4\xe4\xff\x3f\xff\xfc\x7b\x54\x64\x98\xe4\x1f\x1a\x72\x7d\x53\x37\x35\xe0\xa3\x1f\x2a\x60\xd3\x84\x0a\xd4\x34\x30\x3e\x19\xe0\xa6\x0a\x98\x19\x5c\xb9\x74\x27\x12\x43\x45\xf5\xca\xb5\xa2\x7a\xd9\xf6\x98\x8d\x18\xcd\x63\x09\x38\xa4\x37\xcb\xee\xee\x66\x31\xa5\x04\x50\xe4\x08\x2a\x05\xfc\x5a\x22\x07\x83\xca\x00\x9b\x00\xa9\x05\xd6\xa8\xb8\x9b\xd1\x02\x5c\x95\x91\x50\x05\x9d\xaf\xd5\x6e\x9d\xb4\x6a\x91\x79\x72\x99\x6c\xc5\xf9\xe4\x83\xe4\x57\x1b\x7c\x41\xd7\xff\x4b\x64\x54\x44\x8c\x6e\xc3\xcf\xc3\x08\xbf\xd8\x1d\xb8\x41\x6f\x30\xa4\x14\xa2\xd9\x0a\xee\x91\xcc\x6f\xd7\xea\x73\xdb\x1e\x47\x53\xb7\xa6\x44\xa2\x4c\xa0\x22\xe2\xa7\x22\x25\xd8\xaf\xf8\x19\xa2\x0d\x86\xf8\x8b\x97\x80\x47\x7f\x59\x49\xff\xb2\xe5\x3f\xac\xd4\x54\xe6\x23\x1f\xab\xe8\xc7\x2d\xe0\xdc\x16\xb0\x8f\x65\x02\x29\x27\x30\xe0\xb8\x44\x09\x56\x7f\xbf\xa2\x31\xee\xc9\xc9\xfe\x23\x3b\xab\x42\xbe\x47\x86\xdc\x3d\x25\xf9\x70\x3e\xc8\x87\x4f\x8e\x3d\x91\xdb\xfc\xc7\x99\x23\x40\xcd\xaf\x3f\xc9\xba\x1e\xe5\x43\xf3\xb6\xf3\x6e\x8a\xdb\x76\xba\x9f\xda\x8f\xbc\xb4\xbd\x7c\x6a\x9e\x1d\x6c\x5a\xb3\xed\x9b\x3b\xac\x8b\x78\xa9\xcb\x03\x9b\xb5\x05\x58\xbf\x19\xdc\xb0\x00\x2a\x72\xc6\x2e\xe2\xf0\xf7\xc5\x13\x04\x85\x1f\x1b\xe1\x27\x6a\x8a\x3a\x29\x35\x0d\x78\xe6\xff\x26\xaf\xaa\x14\x40\xc6\xd0\x05\x40\x4d\x13\x00\xed\x34\xc6\x90\x0a\x70\xb1\x3e\x50\x29\x48\x0e\x46\x9a\x31\xd4\xed\x83\x9e\x76\x7d\xa3\x98\xce\x1e\xdc\x4c\x2b\xee\xfc\xc1\x51\x5d\xc5\xf0\xd2\xce\x8f\xa2\x09\x48\x79\x67\xef\xc2\x3c\x10\x9a\x4d\xe0\xc2\xac\xec\x06\x2e\x46\xe4\x25\xee\x58\x54\x2d\x46\xc5\x27\xd2\xe6\xfe\x70\x1a\x4f\xae\xb9\x2e\x49\xb7\xd4\x5d\x85\x7a\x73\xe4\xa3\x4b\xdd\xcf\xd6\xcf\x5a\x10\xd9\x9f\xfd\xcb\xae\x84\x4b\xd9\xbc\x2f\xd9\xbc\x3f\x6e\x72\xc2\xd4\x58\x1e\x8d\x38\xda\x99\xd5\x56\xe1\x7b\x82\x3e\x45\x2c\xd7\x91\x0a\xcb\xd4\xa9\xc1\xc6\xcc\x36\x62\x91\x0f\xb5\xb9\x53\x26\xf4\xe8\x69\xeb\xa7\x4f\x2a\x64\x2b\x7d\x7f\xb0\x24\x5d\xae\x5f\x73\x3d\x4b\xed\x21\x73\x90\x5c\x46\x73\x93\xbc\x8e\xab\xb3\xe9\x9e\x62\x16\x25\x6b\x2b\xfd\xca\xe8\xac\x7a\x73\x51\xf4\x53\x72\x6c\x43\x67\x6a\xcd\x3b\x73\xc0\x43\xd8\x8e\x30\xcb\x65\x35\x9e\xfc\x54\x7c\xad\xa5\x24\x75\xe2\x4b\xd7\xe4\xf2\x00\xed\xf5\xc5\xeb\x1f\xa6\x16\x6f\xc7\xcc\x4a\xdf\xef\xd7\x79\x1a\x96\x1b\x23\xf5\x72\xed\x77\x1e\x4b\xbd\x2f\x66\xbd\x25\xc8\x22\x34\x32\xb4\x5d\x94\xfa\xb3\xba\xe3\xb4\x5a\x97\xd7\x7d\x9b\xf8\xde\xdd\xea\x67\xb0\x15\x35\xc0\x11\x00\xf1\x59\x65\xbe\xba\xfe\xf7\xb8\x3f\x10\xa7\x1a\x06\x80\x6b\xfc\x06\x85\xd0\x15\x2f\x2a\xa0\x10\x30\x9f\x63\x23\xf8\xb9\x70\xe2\x6e\x86\x75\xce\xa3\x97\x7a\xeb\xf4\xd8\x08\x8d\x42\x7c\x9c\xc0\xde\xf9\x1e\xeb\x47\x43\x0a\xa7\xa9\xc5\xb4\x0d\x17\xa7\x21\x93\x90\xfc\xdd\x81\xe7\x91\x3f\x22\x6b\x88\x23\x3c\xc5\x57\xf7\xfb\xb8\x92\x32\x6d\xf8\x9a\x8a\xe8\x88\x03\x0b\x11\x68\x7e\x31\x0a\x36\x18\xb9\x1a\x5d\x80\x48\x4b\xb0\xa5\x01\x5d\xce\x7e\xba\x11\x08\xac\x76\x04\xde\x21\x86\x3a\xc4\x62\xb0\x73\x03\x0b\xe1\x12\x10\x95\x55\xaf\xa2\x7a\x1a\x47\x2e\xaa\x80\x0e\x3a\x00\x67\x0d\x50\x04\x9e\x8d\xa4\xf4\xac\x32\xd3\x7a\x9c\xcb\xcc\x91\x84\x92\x2c\xf3\x36\x6c\x9a\x53\x9d\x5b\xa7\x74\x8b\x53\x6d\xc5\x5e\x5b\x59\xb9\x44\x98\xaf\x55\x53\xfe\x9a\xca\xb5\x39\xf9\x8a\xbd\x73\xbc\x55\x8f\xd9\x75\x7f\x64\x5d\xdd\x50\x23\x25\xf3\x73\x87\xde\xc2\xb0\x5f\x5b\x27\x10\xf6\x2e\x86\xb2\xb6\xdf\x34\x21\xe6\xdb\xf0\x5a\x0e\x9b\xe7\xcd\xe6\x8c\x29\x56\x60\xa9\x7e\x5f\x29\xcb\x2e\x38\x0e\xf6\x81\x2d\x7a\x63\x28\xa3\xb7\xfb\x94\x84\x46\xb9\x7e\x17\xde\x34\xd9\xf8\xf7\x1b\xaf\x96\xf7\x30\x3a\xc6\xa6\xc7\x9b\xb7\x2f\xfa\x96\x89\xf1\xe0\xed\xf4\x34\x0d\xe3\x5b\x9e\xbb\x46\x0e\xc5\x5a\xab\xe9\xad\xbc\x59\x1d\x29\x3b\x57\x42\x92\xee\x7d\x26\x49\x88\x0b\x31\x5f\x42\xf3\xa8\x76\x07\x55\x57\x56\xae\x24\x61\x78\x3c\x96\x20\xeb\x8b\x33\xff\x4e\x75\xe3\xc9\x75\xae\x73\x4c\xdc\x37\xa8\x6b\xb1\x4c\xaa\x74\xf2\xc8\x62\x5c\x72\x3a\xda\x2b\x53\x11\xba\x6b\x55\x7e\xcc\xf4\x99\x1c\xec\x39\x24\x9f\xe9\xc0\xd8\x26\xfe\x5a\x9b\xa1\x5f\xaf\x8a\xa4\xff\x42\x7d\xeb\x66\xc3\xf1\x8c\x82\xc6\x88\x9f\xa4\x48\xde\x68\x3d\x24\x3c\x95\x32\xb8\x52\x80\x0d\x84\xd5\xf5\xbd\x6f\xd9\x9f\x3f\xc2\x4f\xc7\x22\x02\xff\xbf\x77\xff\x15\x00\x00\xff\xff\xef\x33\x6f\x42\x94\x05\x00\x00") -func apiclient_certPemBytes() ([]byte, error) { +func cacertApiclient_certPemBytes() ([]byte, error) { return bindataRead( - _apiclient_certPem, - "apiclient_cert.pem", + _cacertApiclient_certPem, + "cacert/apiclient_cert.pem", ) } -func apiclient_certPem() (*asset, error) { - bytes, err := apiclient_certPemBytes() +func cacertApiclient_certPem() (*asset, error) { + bytes, err := cacertApiclient_certPemBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "apiclient_cert.pem", size: 1428, mode: os.FileMode(438), modTime: time.Unix(1584340128, 0)} + info := bindataFileInfo{name: "cacert/apiclient_cert.pem", size: 1428, mode: os.FileMode(438), modTime: time.Unix(1565839462, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _apiclient_keyPem = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\xd5\xb7\x0e\xab\x5a\x16\xc6\xf1\x9e\xa7\xb8\xbd\x35\x22\xa7\xe2\x16\x7b\x03\x26\x9a\x9c\x4c\x47\x32\x19\x93\xc1\x3c\xfd\xe8\x9c\x29\x67\x95\xab\xfa\x15\x9f\xf4\xff\xcf\x9f\x83\x92\xac\x9a\xff\xd8\xae\x1a\x02\x5f\xfa\x47\x97\xde\x7f\xbf\xc8\x4b\x55\xa5\xe3\x54\x21\x10\x81\x09\xab\x6e\xae\xbb\x46\xe6\x4f\x0c\x02\x47\x7a\x02\xe0\x09\x50\xef\xce\xaa\xf2\x7a\x50\x49\x00\x7c\x55\x08\x1c\x71\x28\x95\xde\x4e\xb4\x41\xa6\x2c\xbf\x44\x60\x56\x29\xb1\xb8\x19\xa2\x72\x00\xc7\x7f\x3d\xf7\x45\x5c\x4a\x5c\x7b\x58\x6c\xd3\x46\x74\x9e\x4e\x61\xf7\x9d\xe5\xdc\x1c\xba\x49\x0b\xef\xea\xb3\x2a\x38\x87\x1b\x38\x8e\xca\x11\xf6\x38\xb2\x01\xb1\x9e\xdd\xd4\x3a\x5a\xb1\x4a\x30\x2e\x02\x5a\xa6\xb4\x55\x48\xeb\xa9\x95\x56\xdd\xdd\x87\x87\xfd\x24\x89\x20\xe3\xa6\xa6\x7b\x37\x52\x5f\xaa\xd7\xda\x53\xbb\xfe\x6b\x6b\x4a\xfb\xd1\x5f\x54\xcb\x90\x61\xf6\x39\x6e\xf6\x1a\xf5\xc7\xd9\xcd\x2d\x1f\xe2\xea\x5d\x3b\xc9\xc8\xd0\xb2\xa3\xa8\x94\xc6\x22\xf0\x4b\x36\x13\x1c\x1c\x32\x4f\xf9\xac\x27\xe0\xe7\x3e\xeb\xcb\x5c\x05\x6c\xab\x04\xe9\x88\xc4\x2a\xb6\xd0\x1d\x03\xe7\x68\xaa\x27\x21\xc1\x57\xf3\x1b\x62\xe0\xb6\x15\x57\x90\x9f\x29\xa1\x2e\x97\xf1\x76\x9f\xb6\xc1\x02\xb3\x3d\xae\xcc\x27\x7f\x62\x6e\x16\x6a\x88\xde\x0b\xfe\xab\x9a\x0b\xf1\x95\xa1\x4f\x40\xbb\xf5\xdb\x27\xa7\xc7\xa9\xbd\x79\x14\x4f\x69\xa3\x09\x98\xa5\x42\x23\x86\x61\x94\x4a\xe2\xb4\x32\x24\x3b\x75\x9b\x0d\xf2\xb1\x63\x2b\xba\x6f\x4c\xc7\xb3\xb6\xed\xd6\x1d\x85\x10\xef\xad\x19\x45\x8a\x06\xd5\x0b\x02\x20\x09\x55\x25\x41\x60\xb8\x0a\x7b\xf9\xdd\x4c\x97\x47\xd4\x56\xc4\x78\x1a\x29\x53\x1a\x4f\x16\x5a\xbf\xc5\xf8\xc0\x7e\xc3\x4d\x37\x0e\x0d\x07\xd2\x00\x61\x2a\x5c\xa2\x9f\x8c\x50\xbf\x34\xd9\x7a\xa0\x2b\x76\x49\x3b\xa9\xcf\xb2\x45\xa9\xaf\xef\xc8\x04\x75\x55\xc9\xf9\x47\x18\xaf\x0f\xf7\xfc\xd8\xdc\x4a\xac\x66\xb7\x19\x3f\xed\x72\xdc\xe0\x47\x42\x1c\x31\xcf\x76\x98\x9a\xf3\x26\xba\x5d\xcf\x6a\xd1\x59\x3f\x9e\x03\x30\x92\x52\x77\x02\xa7\x57\x63\x2d\x9c\xbd\x87\x94\xcb\xb8\x39\xf8\xd1\x14\x38\x5f\x76\x75\x42\x71\x51\xde\xfa\x75\x1b\xaf\x6f\x8d\xc4\xdd\x93\x67\xcc\x63\x7e\x13\x0b\xd1\x0e\x26\xcb\xf4\x52\x98\xc2\x66\xed\x5c\x4a\x61\xa3\x54\xa1\x67\x12\x0b\xbc\x14\xf3\x29\x00\x5b\x2d\x78\x60\xf7\xe6\x3d\xf3\xc2\x8e\x3f\xc6\x77\x4a\x29\x15\xd9\x6a\x11\x78\x7c\xa2\x77\x19\x23\x2e\xf2\x2b\x22\xda\x2f\x9b\x88\x12\x36\xfb\x41\xf6\x3a\x67\xf7\x14\xaf\x06\xec\xb9\x53\xbb\x54\x9f\x8c\x39\x1f\xa0\x42\x4e\x91\x71\x37\x35\xd2\x90\x43\x6c\x42\x96\xf0\x72\x85\x6b\xb4\x95\x38\x55\xc2\xd9\x78\x6b\x54\x58\x99\x6b\x65\x71\x6f\xda\x49\x9b\xc1\x85\xbe\xc1\x2e\x68\xa9\x06\x93\x24\x54\x6f\x09\xa0\x1e\xac\xd9\xe1\xbb\x89\x51\x33\xac\x95\xb9\x23\x12\x7f\xf1\xd8\x5c\x09\x8e\x72\x06\x8a\xba\x71\xbb\x5b\x14\xb8\x96\x93\xd8\xc9\xa9\x26\xa6\xd9\xb2\xa2\xce\x60\xc7\xb4\x26\x9a\x75\x2f\x7b\xa0\x02\xc4\x07\xdb\x64\x18\x54\x87\x9a\xe9\xb5\x12\xd2\x8d\xd9\x6b\x88\x9e\x14\xcc\xa2\x46\x2c\x47\x6b\xc5\xa8\x46\x78\x9a\x49\x3e\x0e\xd9\xc3\xc0\x37\x5d\x90\x9e\x3c\xcb\xc9\xbc\x3a\xe6\x37\xf9\x0b\x39\xbe\x20\x6e\x98\xf1\x91\xc3\xff\x4a\x87\x19\x90\x15\x70\xd1\x2d\x00\x74\x8b\x32\xec\x8c\x04\xde\x75\xb5\xd3\xf5\xdf\xac\x46\x05\x7f\xc9\x8c\x9b\x00\xc5\xcf\xce\xae\xe0\x45\x92\xb1\x9b\xbd\xa7\xba\x43\x25\x3b\x03\x8c\x7c\x13\x5c\x37\x82\x32\x8b\x3c\x47\xba\xd9\x9c\xc6\xa6\x6c\xf0\x28\x04\xf6\x88\xab\x70\xf0\x8b\x9e\x70\x38\x4f\x96\x65\x5a\x56\x2e\xd8\x72\x8f\x19\x2e\xc9\x54\x5c\xf6\x3a\x51\xba\xf8\x06\xaf\xb0\xbb\x78\xcb\x47\xc4\x60\xd4\xd2\x3a\x4b\x77\x7b\xf4\x31\x14\x1b\x7d\x03\xfc\x9e\xfb\x9b\x52\xbf\x4d\xcb\x14\xa3\xc3\x6d\x2a\x4b\x36\x7d\x98\xa5\x82\x92\x38\xcc\xf8\xfd\xfd\xf4\xe9\x65\xe9\x82\x41\x41\xc9\xcb\x1b\x24\x16\x72\xd8\x70\xe3\xcd\x08\xff\x23\x3f\x3e\xbb\x2a\xf3\xe8\x84\xca\x6b\xc0\xbe\xd7\x65\x82\x87\x5c\x62\xbb\x92\xe4\x64\xe7\xac\x8d\xc7\x47\xbf\xe4\x75\x2a\x55\x6f\x05\x6b\x6f\x53\x1c\x52\x3b\x81\x90\x8d\xbc\xe3\x6c\x62\xa5\xb0\xe6\xf4\x3e\x73\x1e\x47\x65\x7f\xbd\xeb\x17\xff\x24\xf9\x43\xb4\x37\x25\x93\xd0\x5f\xb7\xe3\xec\x97\x38\xbf\x02\xe5\xed\xc2\x79\x76\x77\xcd\x35\x8f\xe3\x40\x66\xb5\x5d\xdb\x8d\xd9\xb3\x97\x1f\x59\x72\xb1\xd3\xa2\x74\x84\xb3\x0c\x37\x7b\x1c\x73\xed\x16\x9a\x07\x3f\x73\x01\x67\xa0\xe0\x53\x9d\x6d\x9c\xe2\xcd\xeb\xd1\x11\x47\x5a\xe5\xd8\x5f\x31\x42\x36\xde\x6f\x6c\x42\xdd\xfb\x9c\xac\xc9\xe3\xfc\xa2\x75\x1d\xf7\xe1\x13\xe7\x7c\x78\x19\xee\xea\x42\xe2\xf1\x72\xf2\x3d\x2e\xd8\x26\xa4\x09\x3d\x5d\xbf\x85\xc3\xbd\x4f\x9f\x19\xf8\xd9\x11\x62\xe4\xd0\x5a\xae\xa2\xd2\xcf\x47\x3a\xc9\xef\xdd\x2a\xc7\x5b\xf0\x3e\x26\x6f\x7d\x2a\xa2\x61\xee\x47\x31\xac\x82\x24\xc5\x8e\x35\x9b\x9e\xab\x37\xb7\x1d\x30\xdb\x14\xa4\x0a\x70\xbb\x7e\xb9\xf7\xaa\x43\x08\x50\xf2\xc7\xa5\x6e\x9b\x3d\x84\x9d\xc6\x7a\x6c\xed\xd3\x71\x99\xec\x03\x4b\xa7\xfe\x67\x66\x74\x4d\x0e\x3c\x46\x85\x0b\xf9\x67\xca\xa0\x60\xe6\x79\x91\x4e\x89\x1b\x19\xc3\x5f\x34\x57\x40\xac\x25\x26\xf8\x0c\xe7\x6d\x0b\x5f\x7f\xbb\x43\x14\xdc\x2c\x60\x78\x9b\x24\xc1\x37\x5e\x4f\xd1\xfb\x2a\xaa\x04\x6f\xd6\xa4\xae\xc6\x07\x85\x46\xab\x58\x6f\x27\x92\x4f\xe3\x81\xe6\x55\x66\xcc\x21\xe2\xe6\x27\x19\xff\x66\x5c\xb1\x2f\xa5\x58\x36\x0d\xcb\x34\x0f\xe0\xe8\xe7\xf0\x2a\x65\x3d\x25\xb1\xf0\x65\x9c\xc3\x55\xce\xc1\x09\x77\x91\xb9\xea\xeb\x45\xb1\x77\xd5\x4f\xc1\x2e\x87\x1e\xb1\x21\x57\xb3\xb4\x0e\x55\xb9\x7a\xcc\x10\xd2\x53\x64\x68\xb6\x5c\x87\x10\x7e\x2b\xf0\xef\xbf\xc8\xdf\xf6\x48\xa6\xf8\xff\x3d\xfa\x6f\x00\x00\x00\xff\xff\x0a\xf7\xaf\xab\xac\x06\x00\x00") +var _cacertApiclient_keyPem = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\xd5\x37\xb2\x83\x4a\x02\x85\xe1\x9c\x55\xbc\x9c\x9a\x12\x56\x48\xc1\x0b\x1a\x6f\x44\xe3\x6d\x06\x08\x27\x40\x98\x16\x76\xf5\x53\x73\xd3\x39\xe1\x89\xfe\xec\xfb\xcf\xff\xc6\x4b\x8a\x06\xff\xb1\x5d\x2d\x04\xbe\xf4\x8f\x21\x25\x7f\x2f\x66\x6a\x9a\xb4\xed\x1a\x0f\x44\x00\xf9\xba\x9b\x9b\xae\x55\x9e\x3b\xc1\x03\x47\x92\x01\xf0\x04\xde\xe8\xf6\xba\xf6\x7a\x50\x4b\x00\x8c\x1a\x0f\x1c\x51\xab\x70\x02\x92\x0a\x7e\x7c\xd5\x91\xc7\x0c\xab\x37\x02\xc3\x48\x37\x41\xc0\x6b\x45\x10\xa2\x59\xe2\x84\x3d\xa8\xf8\xee\x6b\x48\x64\xbf\xec\x90\xbe\x0b\xab\x1c\x93\xfa\x2f\x94\x1c\x7a\xbc\xbf\x4c\x28\x7f\xb2\x9f\xa5\xc9\x93\x79\x4c\x26\xf6\xba\x52\x9a\xe0\x78\xce\x25\x3c\x9b\xb9\x32\x93\xcd\x74\xde\xf0\x5e\xc5\x2b\x08\xa4\xfc\xd7\xd1\xd3\x2e\xb7\xcb\x3a\xb7\x93\xc8\xb0\xf3\x45\xa3\x72\x7b\xc7\x57\x02\xa2\x35\x77\x87\x7e\x15\x74\x0c\x6e\xa6\xf5\x71\x5f\x63\xb4\xa6\x61\xed\x30\xb4\xc0\x3a\xd0\x53\x7f\x6f\x2d\xe6\x74\xcf\xb2\x5f\x87\x9a\x05\x3a\x41\x6b\x9d\xba\x35\xe5\x7a\xbe\x8f\x32\xcd\x50\x5a\xbc\x59\x9c\x6e\x0f\x2b\x21\x31\x94\x0e\xf7\xad\xfa\xb4\x92\x4b\x8d\xf2\x70\x3b\x63\x73\x75\xc5\x3a\x40\x49\x92\xe5\xd4\x2d\x25\x3d\x8e\x3d\x95\x44\xd8\xd5\xf7\xe2\xd0\x5f\xdc\x89\x16\x82\x86\xc6\xf6\xa4\x68\x81\xfa\xdc\xf5\x2f\x86\xe7\xe0\xdc\x2e\x62\x8e\x3d\x30\xfc\x96\xb8\x8d\x8d\xfb\xfd\xb3\x70\x26\xa5\x89\x69\x41\xde\x4b\x69\x54\x25\xf4\xd1\x0c\xaf\x7c\x83\xe3\xdb\x40\x74\xd3\xf3\x6d\xf0\x55\xdd\x66\x48\x7c\xa2\x08\x8c\x18\xbc\xac\x70\xe0\x0f\xd4\x26\x0f\x80\x24\xd4\xb5\xc4\x03\x5d\x80\x2b\xea\xbf\x67\x5d\xba\x2b\x79\xae\x3f\xd9\x16\xc0\xd1\xd1\x27\xbb\x41\x1f\xbd\xd1\x4f\x88\xb6\xa2\xab\x64\xee\xd7\x77\x98\x5f\x8e\x9d\x11\x25\x5f\xbe\xf6\x4a\xa6\xcb\x93\x6a\x15\x63\xa8\xf3\x0e\x9d\xe5\xee\xae\xac\xb3\x3f\xc8\x17\x30\xc0\x46\x47\xb0\xd3\xb5\xa6\x26\x87\xc1\xb8\xd5\x53\x8d\x04\x78\x3c\x6f\x73\x80\x59\xa6\x35\x81\xc9\x23\x33\x4e\x7e\xa9\xee\xd7\xa3\xfb\x66\x66\x69\x52\xf2\xaa\x47\x52\xa8\xe3\x5a\x06\x80\xa8\x9e\x9e\x4f\xc7\x15\x4a\xe2\x66\x17\x23\xa5\x0c\xa3\x68\x70\x7b\x24\x91\x7e\xd2\x61\xa8\x77\xb6\x36\xc1\xe9\x26\x10\xeb\xe7\xa4\xe8\x9f\x22\x3d\x10\x93\xbf\xdf\x3f\xb6\x1c\xd3\x78\x64\x78\x40\xb7\x74\xb8\x9d\xe9\x6d\x9a\x9b\xa1\x1a\x9a\x22\xe7\x5c\xcd\x00\xb7\x36\xee\xce\xb6\xc1\xac\xd0\x85\x7d\xe4\xc4\xfe\x67\x74\x6a\x6f\x61\x24\xb7\x93\x1f\xd5\xd2\x32\x4b\xf0\xbc\x93\x31\x65\xb3\x95\x22\x4c\x45\xb6\x44\xe3\x83\x8b\x78\x19\xaf\x98\x88\x63\xa8\x47\x3e\xd5\x3a\x81\x42\x19\x4b\x99\x1f\x37\x4d\x72\xcc\xd5\xdd\x30\x2d\xe1\x4d\xd0\x53\xc9\xdf\x42\x0a\x90\xe9\xbd\x4c\x6c\x83\x63\x93\x55\xf6\x3d\x35\x7c\x75\x42\x9d\x48\xe0\x1e\x1a\x5c\x69\xdd\x99\x4b\x6a\xce\xb0\x2f\x4f\xac\xbb\xc9\x11\xed\x0f\x8c\xec\xb1\x8d\x7f\x9e\x6d\xbf\xe9\x52\x4c\xc9\x45\x11\xc4\x25\x93\x46\x82\xb4\xcd\x4a\x6c\xd3\x3c\x1b\x6e\x19\x85\xf8\xb2\xe2\x63\x35\x64\x64\x18\xb6\x81\xd3\x9d\xe9\x0f\x4b\x9b\x50\x70\xef\x76\x68\x2d\x23\x3c\x21\x35\x83\xc9\x3b\x71\xcb\x0d\xa1\xfd\x20\xee\x4c\xbb\xed\xd4\xe7\x36\xd6\x8a\x50\x87\xce\xaf\x73\xf2\x4d\xf9\x46\x9e\x33\x6c\x64\xf4\xf0\x0d\x70\x76\x3f\x0c\xf5\x2e\xd4\xd3\xf8\x70\xcf\x42\xa3\x0e\xb4\x75\x79\x57\x7d\xee\xd5\x76\x2f\xd1\x5f\x32\x75\x3b\x65\x3e\xd4\xe9\x57\x6b\xa6\x5b\xd0\x84\xfa\xc1\xb5\xb4\x2e\x93\xda\x46\xd7\xca\x48\x41\x0c\x88\x11\x6f\x6c\x13\xcb\x8b\xf2\x14\x19\xfb\x9a\x28\xc2\x6c\x82\x59\x25\xf5\x5e\xf9\xee\xb9\xaa\x4e\xc8\xa7\x09\xbb\xd8\xf1\xd7\x25\x34\xd6\xa9\x89\x5f\x83\x38\xf7\xaa\xe4\x15\xa2\xb5\x2c\x0a\x9b\x4b\x45\x15\xf9\x91\xcb\xb2\x72\x52\xcd\xc6\x11\xcc\x3b\xcf\xdd\xcc\xf2\x85\x52\x02\x5f\x73\x7b\x43\xed\x2d\x1f\x6b\xb4\xe3\x50\xf5\x87\x82\x3c\x83\x68\x21\x92\xe0\x63\x9f\xc2\xe2\x7c\xb8\x1f\xb6\x5d\xdf\xf0\xcd\x0c\x5b\x54\x17\x7f\xc9\x63\xa5\xde\x3f\x49\xd4\xc5\x73\x32\xc3\xd6\xd6\xbe\x44\x7e\x21\xae\x37\x2d\xfc\xdd\x3b\xd7\x43\xa5\x0e\x12\xfd\x98\x02\x05\xcb\xab\x28\xe4\x42\xc6\x92\x24\x6f\x86\xc7\x57\x5e\x8f\x83\x8a\xae\x87\x11\xe6\x89\x26\x8f\x2e\x43\x05\x1a\x58\x4e\xcd\xe4\x5e\x34\x81\x4e\xdf\xbf\x93\x8f\x44\xea\xa0\xb6\x44\xea\xd8\x5f\x4d\x37\x3f\x1d\x1a\xee\x0e\x83\x95\x4b\x4f\xc1\x60\xa7\x70\x8b\xe8\x0a\x3a\x30\x47\x43\xcc\x02\xf6\xc6\xd9\x5e\x3e\x11\x42\x15\x6c\xb8\xf6\xc9\x4a\x33\xe5\xed\x6f\x8b\x73\xf2\xc9\xec\xfa\x4b\xce\x17\x63\x58\x25\xa1\x4e\x40\x81\x95\xd7\x3e\x2d\xfe\x99\x71\x6c\x4a\xb4\xe2\x77\x50\xb9\x33\xac\xc0\xfa\x49\xbd\x60\x9b\xd7\x98\xae\xab\xb8\xb6\x59\x1c\x66\xca\xe1\x58\x9c\xd1\xe4\x85\xce\xf1\x4f\x0d\x40\x7a\x37\x2c\x28\x23\x8c\xbd\x11\xee\x5c\x19\x19\xac\xf2\xe5\xdd\xc0\x84\x40\x06\x3a\xc6\x76\xac\xaa\x29\xda\xd1\x79\x56\x38\xc5\xeb\x33\x6f\xf6\x7a\x78\x75\x49\x79\xbd\x44\x19\x35\x7a\x2b\x9c\x4f\x9f\xce\xf6\x93\xc1\xba\x1c\x55\x2f\xaa\x91\x02\xb9\xbc\x4b\xe5\x47\xbd\x88\x69\xfc\x38\xdd\xc3\x6c\x86\xcc\x74\x23\x93\x4b\x96\x73\xe5\x6d\x8d\xde\x0d\xbe\x76\x04\x26\x88\xd8\x79\xa6\x45\x3f\xf5\x1e\x87\x18\xa7\x0e\xb6\xcd\x0b\xef\x95\xcf\x7e\x7c\x57\xaa\x80\xbb\x3b\x63\xf7\xd9\x93\x7c\x22\xee\x89\xa4\x9b\x54\xab\xf0\x34\x0f\xf9\x4d\xd2\xe0\x3a\x8f\xa9\xba\x64\x46\xe8\x28\x8d\xb7\x5e\xf0\x4d\x91\x9c\xd6\x21\x0c\x7c\xb6\x6e\x5a\x69\xeb\xb7\x9a\x8c\xfb\x34\x07\x36\xbe\x89\xdf\x99\x8b\x95\x36\xe1\xa5\xa0\xae\x96\x40\x5e\x9f\xa4\xb4\x59\xd5\xcf\x87\x6c\xa4\xed\xf8\xf8\x64\x3b\x3a\x90\x89\xdb\x7b\x29\x93\x12\x6b\x5e\x1d\xa8\xba\x82\x7b\xf0\x48\xff\x5a\x4b\x9c\xf7\xfc\xf4\x86\x90\xd1\x9c\x7f\xff\xc5\xfe\xec\x91\xa0\xf8\xff\x1e\xfd\x37\x00\x00\xff\xff\x8f\x2c\x57\x2c\xac\x06\x00\x00") -func apiclient_keyPemBytes() ([]byte, error) { +func cacertApiclient_keyPemBytes() ([]byte, error) { return bindataRead( - _apiclient_keyPem, - "apiclient_key.pem", + _cacertApiclient_keyPem, + "cacert/apiclient_key.pem", ) } -func apiclient_keyPem() (*asset, error) { - bytes, err := apiclient_keyPemBytes() +func cacertApiclient_keyPem() (*asset, error) { + bytes, err := cacertApiclient_keyPemBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "apiclient_key.pem", size: 1708, mode: os.FileMode(438), modTime: time.Unix(1584340128, 0)} + info := bindataFileInfo{name: "cacert/apiclient_key.pem", size: 1708, mode: os.FileMode(438), modTime: time.Unix(1565839462, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _Txt = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x95\x4f\x6f\xe2\x46\x18\xc6\xef\x91\xf2\x1d\x7c\x6c\xa5\xa4\x02\x56\x5a\xb5\xc7\x55\x4f\xbd\xf5\x1b\x54\x2b\x4a\xa5\x28\x09\xa0\x25\xd5\x76\x6f\x06\x1c\x03\x1b\x83\x49\x96\x64\x13\x2f\x34\x7f\x8a\x89\xd5\x14\x5c\x92\x28\x18\x7b\x0c\x1f\x66\xdf\x77\x66\x7c\xf2\x57\xa8\xcc\x38\x81\x85\xb6\x6a\xaf\xcb\x6d\x5e\x8f\x9f\xf7\x9d\xe7\xf7\x78\xa0\x7f\x5c\xf1\x69\x03\xfc\x29\x6b\x59\x38\x19\xc0\xf4\x92\xb6\x6c\xf0\x4e\x43\x52\x5c\x5f\x0b\xce\x14\xf0\x1e\xc0\xe9\x33\x43\x01\xa7\x06\x9e\x4f\x4f\x2a\xe0\x3d\x84\xa4\xca\xed\x22\x8c\x7b\xf9\xed\x74\x21\x99\xa2\x17\x04\x89\xfe\x51\x2e\xc6\xc5\xcc\xee\x52\x05\x6d\x35\x38\x32\x9f\xea\x21\xa9\x6d\x80\xe3\xd2\x86\x89\xfa\x6f\xe0\xf4\x91\xb8\x58\x7d\xe0\xbd\x22\x1d\x96\xe8\xfb\x87\xa0\x2d\xd3\xa6\x8b\x4e\x8f\x19\x8a\x78\x5f\x74\xfd\x28\x97\xd6\xd7\x62\xc1\xe1\xaf\xe0\x36\xe8\xb1\x4e\x95\xf3\x68\xe4\xa2\x1d\x12\x8d\xdb\x23\xec\x99\x78\xa2\xc0\xb4\xc3\x06\x97\xe0\xd4\x23\xc9\x3b\x25\x68\xdf\xe2\x91\xc6\xaf\x6e\xc0\x3b\x01\xd7\xc5\x6e\x1d\xab\x42\x0c\x9c\x3a\x36\x35\x24\x32\xea\x87\xdc\xee\x73\x4b\x06\xe7\x60\xde\x75\x36\xac\xd8\x13\x12\x0d\x3c\x13\x9c\x03\x70\x5c\x6e\xdf\xd3\xd3\x06\xd5\x2a\x48\x8e\x43\x62\xac\xaf\x49\x92\x24\xad\xfa\x11\x92\xea\xcb\xfc\x56\x7a\x67\x2b\x93\xdd\xfb\x21\x9d\x79\xb5\xf7\x55\x3e\x99\x0a\x49\x4d\xec\x8f\x7e\xa8\xed\x63\xf3\x06\x5c\x95\x5d\x17\x83\x23\x53\x1c\x64\xe9\xd0\x51\x63\xc7\xcd\x27\x53\x5f\xe4\x7f\xfa\xe5\xcb\x47\x65\x8d\xb5\x86\x8b\xb4\x58\x7f\x82\xfa\x21\xf3\xce\x68\xc9\x62\x2d\x8b\x76\x4c\x7a\x51\xe1\xb6\x8a\x47\x1a\x3b\xd6\x70\x60\x44\x75\x43\xe1\xee\x0d\x78\xfe\x7c\x80\xa0\x6c\x61\x55\xc5\x41\x0d\xf7\x2d\x2a\x5f\x0b\x02\x7c\x52\x0e\x6e\x4e\x99\xa1\xbc\xf8\xfe\xbb\xa0\x2d\xf3\x5e\x51\xa4\x83\xdb\x66\x3c\x58\xc7\x64\x97\x03\x3e\xe8\xc6\xa2\x7f\x96\xa3\xa7\x4b\xd2\xaf\xb7\xb2\x3f\xe6\x5e\x17\xc0\x79\x8b\xba\x0d\x9e\xc9\x3e\xdc\xcf\x78\x6b\x58\xf1\xd0\x26\xb8\x6f\xb2\x3b\x8f\x79\xe7\x21\xd1\xc4\x92\x4f\x2b\xcc\x3a\x00\xa7\x0f\xc4\xa0\x7a\x93\x75\x5d\x3e\x79\x17\xd5\x1f\x13\xc4\x2e\x8a\x33\xc8\xf3\x65\xe0\x9d\xf2\x41\x37\x4a\xd2\x6c\x10\x3c\x56\x69\x75\x84\xfa\x28\x24\x55\xec\x95\x42\x62\x24\xbf\x49\x24\x12\x89\xe7\x89\x67\xc9\x27\xdf\x97\x22\xfa\x37\x90\x32\xbb\x9f\x40\x02\xaf\xb1\x8a\x31\x0a\xad\x4d\xb0\xe2\x0a\x39\xe1\x23\x33\x94\x4f\x98\xcd\x7b\xfc\x63\x34\x29\xd1\x57\xa3\xb9\xc2\x67\x21\x9f\x11\xd0\x86\x8d\x57\xe5\x59\x8f\x3a\x2f\xfb\xc2\x58\x81\x28\x9f\x4c\x3d\x4d\xc0\x65\x6d\x91\xde\xec\x58\x1a\xad\xc9\xb3\x18\xbb\xe0\xaa\xf4\x64\x0c\x93\x29\x2d\x59\x62\x43\x04\x62\x74\x1b\x9b\x39\xd3\xa4\x7a\x13\x26\x1f\xe6\xd3\x44\x5b\xc7\xe7\x02\xa7\x78\x27\x97\xcf\x64\x0b\x85\x1d\x3c\xf4\xc1\xeb\xd2\x8e\xc9\x2b\xbf\xe3\x68\x28\x9c\x09\x89\x11\x3f\x96\xc4\x57\x21\x6d\xa6\x77\x22\xff\x0a\xd2\x66\x36\xb7\x9d\x79\x53\x90\x36\xb7\xb2\xd2\xaa\xb7\xd2\x66\xee\xe7\xbd\x95\x7a\x66\x77\x91\xdf\xca\x85\xb2\x40\x71\x3b\xf3\xe6\x7f\x42\x14\x6a\xff\x0e\xf1\xb3\x85\x92\xcd\xc5\x50\xfe\x13\x8c\xd8\xdc\xf5\x35\xec\x56\xe8\x9d\x25\xae\xc2\x90\x18\x92\x34\x1f\x89\xb5\x86\xe0\x36\x98\xd7\xc1\xee\xb5\x30\x8b\xbe\xab\x83\xdf\x16\x1f\x3c\x8e\x6e\x51\xdd\x67\xfe\x00\x5c\x75\xf1\x0a\xa3\xed\x3a\xbe\xbd\xc4\x33\x4b\x10\x8e\x38\x5c\x8c\xbf\x7d\x21\x56\x1b\x92\x94\x4a\x24\xbf\xc6\xf1\xfd\x33\xda\xae\x3e\xa7\xef\x4d\x6c\x36\x36\xa4\xe8\x6e\x56\xeb\xc2\x92\xc7\xad\x4f\xff\x50\xaf\x72\xb9\xbd\xf4\xcb\x38\x0a\xe0\x1c\x70\xdf\x97\xfe\x0a\x00\x00\xff\xff\xf8\x92\x64\x6e\xee\x06\x00\x00") +var _cacertRootcaPem = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x94\x4d\xcf\xb2\x38\x17\xc7\xf7\x24\x7c\x87\x67\x6f\x9e\x08\x5e\xbe\x2e\x4f\x4b\xc1\xaa\x05\x8b\xbc\xef\x90\x97\x22\x88\x5c\xea\xad\x45\x3e\xfd\x44\xaf\xc9\x24\x73\xcf\xec\xa6\xcb\x5f\x9b\x9e\x93\xff\xf9\xe5\xfc\xff\x7d\x10\xb1\xa8\xfd\x3f\x4c\x5c\x8f\x9a\x14\x83\x47\x3e\x54\x55\x18\xa5\x06\x35\x30\x86\xae\x15\x20\x29\x02\x41\x89\x9d\x2f\xb4\x61\x00\x1b\x89\xe6\x5a\x35\x27\x6b\x25\x35\x04\xdc\x37\xc1\x40\x0e\xe3\x77\x89\x79\x6c\x04\x9c\x5b\x44\x6e\x02\x55\xf1\x07\xc2\x19\x4c\x2d\xd0\x7d\x82\x2b\xb6\x76\x23\x53\x4f\xc3\xa4\x2a\x0c\xf2\x8b\xe1\xfb\x0f\xef\x59\xf3\x17\xc7\xc8\x4b\x42\x5b\xcf\x5a\x5f\xf0\x49\xf0\x52\x95\xdc\x3a\xb7\x69\x68\x57\xb9\xe5\x0b\x1e\x05\x5a\x6a\xad\x5e\x69\xe4\xce\x18\x9a\x46\x86\xd7\x4c\x99\x21\x5e\xac\x26\x13\xdb\x20\x3a\x0b\xba\xc8\xf0\xc8\xdf\x98\xaa\xb0\xa0\x93\x5e\x4d\x76\x0c\x9a\x4f\x3d\x54\x31\x1c\x04\xac\x27\x06\x38\x48\xd8\x01\x82\xce\x43\x5a\xd0\xe7\xe1\xb9\x8d\x23\xd1\xef\x3c\xb8\xfd\xf0\xbb\xb7\x21\x41\xaf\x2a\x7f\xde\x08\x7f\x12\xd4\x79\xb4\x39\x53\x62\x9f\xb3\x8b\xfb\x9d\xb4\xe7\x3a\x8e\xdc\x33\x25\xa6\x9e\x5b\xd5\x33\x6b\xcf\x5a\xe1\x61\x74\xf9\x2d\x1f\x55\x01\x4e\x4c\x00\x07\xd5\x1c\xa4\x88\x1b\x2c\x62\x02\x32\x98\xf4\xa1\x95\xd1\xf8\x31\x17\xed\x49\x2b\xb1\x35\x71\x4d\xeb\x14\xe3\x6a\x31\x9a\x08\xf7\x49\xa6\xee\x89\x66\x7b\xb7\x64\xf3\x52\x55\x50\x81\xa7\x50\x22\xc7\x76\x86\xd3\xe9\xdb\x27\xc9\x76\xe8\x53\xdd\x2e\xd1\x71\xbf\x4b\xa6\x78\xcc\xc5\xd6\x19\xff\xd2\x10\x2e\x86\x0a\x90\xbb\x1f\xef\x9f\xd2\xb0\x75\xe3\x71\xbe\xdf\xa6\xee\x08\x54\x25\xdb\x34\x41\x30\x63\xe1\x92\x8f\xa2\xf4\x56\xe2\x14\xb3\x6c\x20\x7a\xc2\xb6\xbd\xbb\xae\x1f\xcf\xed\xea\xf8\x88\xb5\x60\xd1\xe7\xe7\xd2\xb7\x77\xb5\x0f\xcb\xf9\xc9\x29\xc6\xe6\xfe\x4b\xf4\x8b\x06\xab\x0a\x48\x02\x90\x3a\x18\x78\x23\x85\x20\x26\x5b\xc3\x3b\xd1\x7c\x2d\xdd\x6f\x66\x65\x32\x49\x51\xdd\x59\x56\x13\x0d\x28\xff\xdd\x85\xb7\x09\xaa\xf2\x5f\x5c\x78\x9b\xa0\x2a\xff\xea\x02\xd7\x24\x96\x9f\x5a\x06\x91\xae\xe1\x37\xb2\x67\xa8\xfb\xf4\x46\x80\x7b\x0c\x59\xc8\x18\xa8\x64\x9e\x90\xaa\xe2\x18\xf4\xc5\xbc\x58\x63\x9e\xdf\x87\x35\xec\xde\xb3\x5e\xf3\x25\x41\xc0\x30\xf0\x58\xae\xdf\x3f\xb9\x5a\x8d\x90\x90\x66\x07\xfe\xc1\x49\xba\xd1\xe1\x79\xb8\x7f\x47\x91\xbb\x12\xb5\xaa\x50\x84\xf6\x6c\x76\xe2\x97\x15\x97\x6b\xfe\x79\xed\x20\x14\x13\x93\xd4\x6d\xba\x6f\x6e\xda\x6d\x1b\xe8\x5a\x19\xd3\x17\x70\x6f\x70\xe2\x66\x33\xf6\x19\xc8\x9f\x7e\x24\x37\xdf\x39\x30\x04\xe5\x52\x5a\x22\xde\x6c\xbb\x84\x56\xcf\x64\x85\x34\x02\x08\x34\x89\xfb\xbb\x19\xd4\xec\xc1\x2c\x66\x80\x38\x02\x03\xcd\xc2\x87\xab\x75\xa0\xc7\x2f\x83\x13\x84\xb8\x0f\xaa\x02\x53\x0b\x81\x59\x3b\xdb\xe2\xb6\x5c\xad\xe6\xfa\x20\xb6\x33\x73\x11\x9a\xda\xf1\x52\x4f\x37\x11\xdb\x78\xc4\x86\x6d\x7a\x38\x5e\x46\x93\xa6\x75\x0a\x7f\x13\xb9\x6d\x3b\x6e\x48\x3e\xab\xab\x70\x1e\xab\xca\xe2\x5a\x8f\xc3\x7b\xed\x05\xc7\x4d\x9b\x05\x65\x21\xf1\xfa\xb6\x3f\x5c\x2f\x54\x6b\x10\xa2\x09\x2e\xc6\xc3\xa3\x9c\xd3\xd0\xbf\x05\x97\x64\x65\xc3\x64\xb8\xb7\xe1\x8e\x76\xf9\x30\x79\x98\xeb\xbc\x52\x15\xfd\xd9\x5d\x93\x53\x21\x8c\xf2\x7a\xc9\xf4\xe1\x9a\xed\x2d\x9f\x86\x01\x89\xc6\xb7\xe5\xe2\x75\xee\xae\xe9\x76\x5d\x14\xab\xd9\x42\x1b\xdd\xd1\x57\x36\x55\x95\xcf\x62\x21\xb6\xf1\x8f\x65\xf3\x47\x00\x00\x00\xff\xff\x94\xef\x0a\xc2\x88\x04\x00\x00") -func TxtBytes() ([]byte, error) { +func cacertRootcaPemBytes() ([]byte, error) { return bindataRead( - _Txt, - "证书使用说明.txt", + _cacertRootcaPem, + "cacert/rootca.pem", ) } -func Txt() (*asset, error) { - bytes, err := TxtBytes() +func cacertRootcaPem() (*asset, error) { + bytes, err := cacertRootcaPemBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "证书使用说明.txt", size: 1774, mode: os.FileMode(438), modTime: time.Unix(1553857574, 0)} + info := bindataFileInfo{name: "cacert/rootca.pem", size: 1160, mode: os.FileMode(438), modTime: time.Unix(1523923200, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -212,10 +212,10 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "apiclient_cert.p12": apiclient_certP12, - "apiclient_cert.pem": apiclient_certPem, - "apiclient_key.pem": apiclient_keyPem, - "证书使用说明.txt": Txt, + "cacert/apiclient_cert.p12": cacertApiclient_certP12, + "cacert/apiclient_cert.pem": cacertApiclient_certPem, + "cacert/apiclient_key.pem": cacertApiclient_keyPem, + "cacert/rootca.pem": cacertRootcaPem, } // AssetDir returns the file names below a certain @@ -259,10 +259,12 @@ type bintree struct { } var _bintree = &bintree{nil, map[string]*bintree{ - "apiclient_cert.p12": &bintree{apiclient_certP12, map[string]*bintree{}}, - "apiclient_cert.pem": &bintree{apiclient_certPem, map[string]*bintree{}}, - "apiclient_key.pem": &bintree{apiclient_keyPem, map[string]*bintree{}}, - "证书使用说明.txt": &bintree{Txt, map[string]*bintree{}}, + "cacert": &bintree{nil, map[string]*bintree{ + "apiclient_cert.p12": &bintree{cacertApiclient_certP12, map[string]*bintree{}}, + "apiclient_cert.pem": &bintree{cacertApiclient_certPem, map[string]*bintree{}}, + "apiclient_key.pem": &bintree{cacertApiclient_keyPem, map[string]*bintree{}}, + "rootca.pem": &bintree{cacertRootcaPem, map[string]*bintree{}}, + }}, }} // RestoreAsset restores an asset under the given directory diff --git a/services/pay/client.go b/services/pay/client.go index 986e70f..cf433c3 100644 --- a/services/pay/client.go +++ b/services/pay/client.go @@ -12,15 +12,15 @@ import ( // 配置 client func Client() (*core.Client, error) { - certP12, err := Asset("apiclient_cert.p12") + certP12, err := Asset("cacert/apiclient_cert.p12") if err != nil { return nil, err } - certPem, err := Asset("apiclient_cert.pem") + certPem, err := Asset("cacert/apiclient_cert.pem") if err != nil { return nil, err } - keyPem, err := Asset("apiclient_key.pem") + keyPem, err := Asset("cacert/apiclient_key.pem") if err != nil { return nil, err } diff --git a/services/pay/loop.go b/services/pay/loop.go index 043cdc0..b098241 100644 --- a/services/pay/loop.go +++ b/services/pay/loop.go @@ -1,6 +1,7 @@ package pay_service import ( + "go.uber.org/zap" "hudongzhuanjia/logger" "hudongzhuanjia/models" "hudongzhuanjia/utils/define" @@ -92,3 +93,116 @@ func HandleTimeout(order *models.UserOrder) error { } return nil } + +func init() { + //go loopTransfer() +} + +var transferDelayQueue = make(chan *transferDelayQueueParam, math.MaxInt8) + +type transferDelayQueueParam struct { + first bool // 首次跳过 + Retries int `json:"retries"` // 尝试次数 + Delay int `json:"delay"` // 延迟时间, 单位second + Amount int `json:"amount"` // 转账金额 + Desc string `json:"desc"` // 转账描述 + OpenId string `json:"open_id"` // 被转账人 + PartnerTradeNo string `json:"partner_trade_no"` // 转账账单单号 +} + +func loopTransfer() { + //初始化 + transfers, err := models.GetUserTransferByStatus(0, 1, 3) + if err != nil { + panic(err) + } + + transferDelayQueue = make(chan *transferDelayQueueParam, math.MaxInt8) + for _, transfer := range transfers { + transferDelayQueue <- &transferDelayQueueParam{ + first: true, + Retries: 5, + Delay: 2 * 60, + Amount: transfer.PaymentAmount, + Desc: transfer.Desc, + OpenId: transfer.OpenId, + PartnerTradeNo: transfer.PartnerTradeNo, + } + } + + defer func() { + if errRec := recover(); errRec != nil { + logger.Error("转账轮询 loop transfer panic", zap.Any("错误原因", errRec)) + } + loopTransfer() + }() + for { + select { + case param, ok := <-transferDelayQueue: + if !ok { + panic("转账延迟通道异常关闭") + } + + // 尝试次数 + if param.Retries <= 0 { + logger.Info("微信转账尝试3次失败", zap.String("转账账单单号", param.PartnerTradeNo)) + userTransfer := new(models.UserTransfer) + userTransfer.Status = 4 + _, err = userTransfer.UpdateByPartnerTradeNo(param.PartnerTradeNo) + if err != nil { + logger.Info("微信转账更新状态失败", zap.String("失败原因", err.Error()), + zap.String("转账账单单号", param.PartnerTradeNo)) + } + continue + } else { + param.Retries-- + } + + if !param.first { + time.Sleep(time.Duration(param.Delay) * time.Second) + } + param.first = false + res, err := TransferInfo(param.PartnerTradeNo) + if err != nil { + logger.Error("微信转账查询出现的错误", zap.String("错误原因", err.Error()), + zap.String("转账账单", param.PartnerTradeNo)) + transferDelayQueue <- param + continue + } + + if res.Status == define.CODE_SUCCESS { + continue + } else if res.Status == define.CODE_TRANSFER_PROCESSING { + transferDelayQueue <- param + continue + } else { + //失败 --> 重新转账 + _, err = Transfer(param.Desc, param.OpenId, param.PartnerTradeNo, param.Amount) + if err != nil { + logger.Error("微信转账出现的错误", zap.String("错误原因", err.Error()), + zap.String("转账账单", param.PartnerTradeNo)) + } + transferDelayQueue <- param // 重新确认 + continue + } + } + } +} + +func PutTransferDelayQueue(desc, openId, partnerTradeNo string, amount, retries, delay int) { + if retries <= 0 { + retries = 3 + } + if delay == 0 { + delay = 30 + } + transferDelayQueue <- &transferDelayQueueParam{ + first: true, + Retries: retries, + Delay: delay, + Amount: amount, + Desc: desc, + OpenId: openId, + PartnerTradeNo: partnerTradeNo, + } +} diff --git a/services/pay/transfer.go b/services/pay/transfer.go index fca16d7..f817236 100644 --- a/services/pay/transfer.go +++ b/services/pay/transfer.go @@ -4,111 +4,13 @@ import ( "fmt" "github.com/chanxuehong/wechat/mch/mmpaymkttransfers" "github.com/chanxuehong/wechat/mch/mmpaymkttransfers/promotion" - "go.uber.org/zap" "hudongzhuanjia/logger" "hudongzhuanjia/models" "hudongzhuanjia/utils" "hudongzhuanjia/utils/define" - "math" "strconv" - "time" ) -func init() { - //go loopTransfer() -} - -var transferDelayQueue = make(chan *transferDelayQueueParam, math.MaxInt8) - -type transferDelayQueueParam struct { - first bool // 首次跳过 - Retries int `json:"retries"` // 尝试次数 - Delay int `json:"delay"` // 延迟时间, 单位second - Amount int `json:"amount"` // 转账金额 - Desc string `json:"desc"` // 转账描述 - OpenId string `json:"open_id"` // 被转账人 - PartnerTradeNo string `json:"partner_trade_no"` // 转账账单单号 -} - -func loopTransfer() { - //初始化 - transfers, err := models.GetUserTransferByStatus(0, 1, 3) - if err != nil { - panic(err) - } - - transferDelayQueue = make(chan *transferDelayQueueParam, math.MaxInt8) - for _, transfer := range transfers { - transferDelayQueue <- &transferDelayQueueParam{ - first: true, - Retries: 5, - Delay: 2 * 60, - Amount: transfer.PaymentAmount, - Desc: transfer.Desc, - OpenId: transfer.OpenId, - PartnerTradeNo: transfer.PartnerTradeNo, - } - } - - defer func() { - if errRec := recover(); errRec != nil { - logger.Error("转账轮询 loop transfer panic", zap.Any("错误原因", errRec)) - } - loopTransfer() - }() - for { - select { - case param, ok := <-transferDelayQueue: - if !ok { - panic("转账延迟通道异常关闭") - } - - // 尝试次数 - if param.Retries <= 0 { - logger.Info("微信转账尝试3次失败", zap.String("转账账单单号", param.PartnerTradeNo)) - userTransfer := new(models.UserTransfer) - userTransfer.Status = 4 - _, err = userTransfer.UpdateByPartnerTradeNo(param.PartnerTradeNo) - if err != nil { - logger.Info("微信转账更新状态失败", zap.String("失败原因", err.Error()), - zap.String("转账账单单号", param.PartnerTradeNo)) - } - continue - } else { - param.Retries-- - } - - if !param.first { - time.Sleep(time.Duration(param.Delay) * time.Second) - } - param.first = false - res, err := TransferInfo(param.PartnerTradeNo) - if err != nil { - logger.Error("微信转账查询出现的错误", zap.String("错误原因", err.Error()), - zap.String("转账账单", param.PartnerTradeNo)) - transferDelayQueue <- param - continue - } - - if res.Status == define.CODE_SUCCESS { - continue - } else if res.Status == define.CODE_TRANSFER_PROCESSING { - transferDelayQueue <- param - continue - } else { - //失败 --> 重新转账 - _, err = Transfer(param.Desc, param.OpenId, param.PartnerTradeNo, param.Amount) - if err != nil { - logger.Error("微信转账出现的错误", zap.String("错误原因", err.Error()), - zap.String("转账账单", param.PartnerTradeNo)) - } - transferDelayQueue <- param // 重新确认 - continue - } - } - } -} - // 企业向微信用户个人付款（不支持沙箱环境） type TransferResponse struct { DeviceInfo string `xml:"device_info,omitempty" json:"device_info,omitempty"` @@ -118,24 +20,6 @@ type TransferResponse struct { PaymentTime string `xml:"payment_time,omitempty" json:"payment_time,omitempty"` } -func PutTransferDelayQueue(desc, openId, partnerTradeNo string, amount, retries, delay int) { - if retries <= 0 { - retries = 3 - } - if delay == 0 { - delay = 30 - } - transferDelayQueue <- &transferDelayQueueParam{ - first: true, - Retries: retries, - Delay: delay, - Amount: amount, - Desc: desc, - OpenId: openId, - PartnerTradeNo: partnerTradeNo, - } -} - func Transfer(desc, openId, partnerTradeNo string, amount int) (*TransferResponse, error) { client, err := Client() if err != nil { @@ -280,9 +164,9 @@ func SendRedPack(sendName, openId, wishing, actName, remark string, totalAmount, body := make(map[string]string, 0) body["mch_id"] = client.MchId() - body["sub_mch_id"] = client.SubMchId() + //body["sub_mch_id"] = client.SubMchId() body["wxappid"] = client.AppId() - body["msgappid"] = define.WxAppId + //body["msgappid"] = define.WxAppId body["nonce_str"] = nonceStr body["mch_billno"] = mchBillNo body["send_name"] = sendName @@ -293,7 +177,7 @@ func SendRedPack(sendName, openId, wishing, actName, remark string, totalAmount, body["client_ip"] = define.ClientIp body["act_name"] = actName body["remark"] = remark - //body["scene_id"] = fmt.Sprintf("PRODUCT_%d", scene) + body["scene_id"] = fmt.Sprintf("PRODUCT_%d", scene) m, err := mmpaymkttransfers.SendRedPack(client, body) if err != nil { diff --git a/utils/define/define.go b/utils/define/define.go index f9ea525..7843724 100644 --- a/utils/define/define.go +++ b/utils/define/define.go @@ -90,21 +90,21 @@ var DefaultOrderNo = 10000000000 // 微信常量 const ( // 欧轩互动 -> 普通商户 - //ApiKey = `2c82c64ceec6ba89ffc9f593c671a12f` - WxAppId = `wx7b0bcf476552c5e9` - Secret = `f6aabdd40ea25272f4442603a7dc8028` - //AppId = `wx7b0bcf476552c5e9` - //MchId = `1394404502` - //SubMchId = `` + ApiKey = `2c82c64ceec6ba89ffc9f593c671a12f` + WxAppId = `wx7b0bcf476552c5e9` + Secret = `f6aabdd40ea25272f4442603a7dc8028` + AppId = `wx7b0bcf476552c5e9` + MchId = `1394404502` + SubMchId = `` // 欧轩 -> 服务商 - ApiKey = `6e281c8b5430c674034594cab789334F` - AppId = `wx662a1633304bfd42` + //ApiKey = `6e281c8b5430c674034594cab789334F` + //AppId = `wx662a1633304bfd42` //WxAppId = `wx662a1633304bfd42` //Secret = `7e4ecfe06ad1e075c210059d5b0162a3` - MchId = `1441266702` + //MchId = `1441266702` //SubMchId = `1394404502` - SubMchId = `1594049151` + //SubMchId = `1594049151` // 认证服务号：欧轩（用于申请微信服务商） // AppID：wx662a1633304bfd42 // 密钥：7e4ecfe06ad1e075c210059d5b0162a3