From a118f29d5d2247cc9ddc37f5222541b99c96236b Mon Sep 17 00:00:00 2001 From: shy Date: Wed, 4 Dec 2024 14:39:53 +0800 Subject: [PATCH] add some --- src/gonganxitong/common.go | 3 + src/gonganxitong/paymentlist.go | 8 ++- src/gonganxitong/portal.js | 10 ++- src/renzhengshouquan/cert.go | 3 + src/renzhengshouquan/common.go | 9 +++ .../external/tencentcloud/ocr/ocr.go | 10 ++- .../external/tencentcloud/ocr/ocr.shy | 1 + .../tencentcloud/realname/realname.go | 11 ++- .../tencentcloud/realname/realname.js | 2 +- .../tencentcloud/realname/realname.shy | 9 --- .../external/tencentcloud/smh/model/model.go | 6 +- .../external/tencentcloud/smh/smh.go | 68 +++++++++---------- .../external/tencentcloud/smh/smh.json | 12 ++-- .../external/tencentcloud/sms/model/model.go | 2 +- .../external/tencentcloud/sms/sms.go | 13 ++-- .../external/tencentcloud/sms/sms.js | 3 +- .../external/tencentcloud/tencentcloud.go | 15 ++-- .../tencentdocument/tencentdocument.go | 15 ++-- .../external/tencentmeeting/model/model.go | 8 +-- .../external/tencentmeeting/tencentmeeting.go | 21 +++--- .../external/tencentmeeting/tencentmeeting.js | 4 +- .../external/weixinpayment/weixinpayment.go | 23 +++---- 22 files changed, 127 insertions(+), 129 deletions(-) diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 83eaf74..0b31fda 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -367,6 +367,9 @@ func (s Table) AuthCreate(m *ice.Message, authType int, fromUID string, arg ...s ) s.Update(m, kit.Dict(m.OptionSimple(model.AUTH_UID)), arg...) } +func (s Table) SpideCreate(m *ice.Message, arg ...string) { + m.Cmd(web.SPIDE, mdb.CREATE, arg) +} func (s Table) PlaceIsAuthed(m *ice.Message, arg ...string) *ice.Message { if msg := m.Cmd(s.Place, s.Select, model.UID, arg[0]); msg.Append(model.AUTH_UID) == "" { m.Echo("本服务暂未申请认证，请到<用户名片>申请认证") diff --git a/src/gonganxitong/paymentlist.go b/src/gonganxitong/paymentlist.go index f3c5cff..c7c7f0b 100644 --- a/src/gonganxitong/paymentlist.go +++ b/src/gonganxitong/paymentlist.go @@ -11,7 +11,7 @@ type paymentlist struct { Table order string `data:"91"` auth_uid string `data:""` - fields string `data:"user_uid,paymentlist_status,amount,title,content"` + fields string `data:"title,content,amount,paymentlist_status,user_uid"` create string `name:"create amount* title* content" role:"leader"` payfor string `name:"payfor" help:"支付" style:"notice" role:"void"` } @@ -22,7 +22,7 @@ func (s paymentlist) Create(m *ice.Message, arg ...string) { arg[i+1] = kit.Format(kit.Int(kit.Float(arg[i+1]) * 100)) } } - m.Option(model.PLACE_UID, m.Option(s.Keys(s.Place, model.UID))) + m.Option(model.PLACE_UID, m.Option(s.PLACE_UID)) s.Insert(m, kit.Simple(arg, m.OptionSimple(model.PLACE_UID, model.USER_UID))...) s.RecordEventWithName(m, "") } @@ -31,7 +31,9 @@ func (s paymentlist) List(m *ice.Message, arg ...string) { s.Select(m, model.PLACE_UID, arg[0]) } else if len(arg) == 2 { s.SelectDetail(m, model.PLACE_UID, arg[0], model.UID, arg[1]) - m.EchoQRCode(s.Link(m, arg[0], m.PrefixKey(), arg[1])).Echo("请用微信扫码支付") + if PaymentStatus(kit.Int(m.Append(model.PAYMENTLIST_STATUS))) == PaymentCreate { + m.EchoQRCode(s.Link(m, arg[0], m.PrefixKey(), arg[1])).Echo("请用微信扫码支付") + } } else { return } diff --git a/src/gonganxitong/portal.js b/src/gonganxitong/portal.js index cd1127a..1b9f907 100644 --- a/src/gonganxitong/portal.js +++ b/src/gonganxitong/portal.js @@ -116,8 +116,7 @@ Volcanos(chat.ONIMPORT, { ]) }) }, - myList: function(can, msg, target) { - var width = (can.ConfWidth()-40)/parseInt((can.ConfWidth()-40)/80); + myList: function(can, msg, target) { var width = (can.ConfWidth()-40)/parseInt((can.ConfWidth()-40)/80); (can.page.tagis(document.body, "body.width1") || can.user.isMobile && !can.user.isLandscape()) && (width = (can.ConfWidth()-40)/5) can.page.Append(can, target, msg.Table(function(value) { if (value.enable == ice.FALSE) { return } if ((value.portal || value.public) && can.page.tagis(can._output, "div.output.public")) { @@ -134,6 +133,7 @@ Volcanos(chat.ONIMPORT, { } return {view: [[html.ITEM, ctx.INDEX].concat( value.type? [mdb.TYPE]: [], can.core.Split(value.type||""), value.role? [aaa.ROLE]: [], can.core.Split(value.role||""), + value.view, )], style: {width: width}, list: [ {img: can.misc.ResourceIcons(can, value.icons)}, {text: can.user.trans(can, value.index.split(".").pop(), value.name)}, ], onclick: function(event) { @@ -233,7 +233,11 @@ Volcanos(chat.ONEXPORT, { can.ui.role && can.onmotion.toggle(can, can.ui.role, value._role == "creator") can.ui.role && can.onmotion.select(can, can.ui.role, html.SPAN, can.page.SelectOne(can, can.ui.role, "span."+role)) can.page.Select(can, can.ui.myindex, html.DIV_ITEM, function(target) { var list = target.className.split(" ") - if (list.indexOf(mdb.TYPE) > -1 && list.indexOf(value._type) == -1) { + if (list.indexOf("tech") > -1 && can.user.info.userrole != "tech") { + can.onmotion.toggle(can, target, false) + } else if (list.indexOf("debug") > -1 && !can.misc.isDebug(can)) { + can.onmotion.toggle(can, target, false) + } else if (list.indexOf(mdb.TYPE) > -1 && list.indexOf(value._type) == -1) { can.onmotion.toggle(can, target, false) } else if (list.indexOf(aaa.ROLE) > -1 && (list.indexOf(role) == -1 && role != "creator")) { can.onmotion.toggle(can, target, false) diff --git a/src/renzhengshouquan/cert.go b/src/renzhengshouquan/cert.go index 67f47e9..cbaf01d 100644 --- a/src/renzhengshouquan/cert.go +++ b/src/renzhengshouquan/cert.go @@ -66,6 +66,9 @@ func (s cert) Verify(m *ice.Message, arg ...string) { s.Update(m, kit.Dict(model.MOBILE, m.Option(model.MOBILE), model.VERIFY, verify), m.OptionSimple(model.AUTH_UID)...) m.Cmd(SmsVendor, SmsVendor.Send, m.Option(model.MOBILE), verify) } else { + if m.Option(model.VERIFY) == "" { + return + } if !m.WarnNotValid(m.Option(model.VERIFY) != msg.Append(model.VERIFY)) { s.Check(m) } diff --git a/src/renzhengshouquan/common.go b/src/renzhengshouquan/common.go index 7a4849c..9158749 100644 --- a/src/renzhengshouquan/common.go +++ b/src/renzhengshouquan/common.go @@ -36,6 +36,15 @@ func (s Table) Inputs(m *ice.Message, arg ...string) { } func (s Table) Config(m *ice.Message, arg ...string) { } +func (s Table) AuthList(m *ice.Message, auth_uid string, cb func(value ice.Maps, auth bool)) { + m.Cmdy(api.RENZHENGSHOUQUAN_AUTH, auth_uid).Table(func(value ice.Maps) { + if AuthStatus(kit.Int(value[model.AUTH_STATUS])) == AuthIssued { + cb(value, true) + } else { + cb(value, false) + } + }) +} func (s Table) RewriteAppend(m *ice.Message, arg ...string) *ice.Message { m.RewriteAppend(func(value, key string, index int) string { if _, e := strconv.ParseInt(value, 10, 64); e != nil { diff --git a/src/renzhengshouquan/external/tencentcloud/ocr/ocr.go b/src/renzhengshouquan/external/tencentcloud/ocr/ocr.go index 5e46e56..c583a6c 100644 --- a/src/renzhengshouquan/external/tencentcloud/ocr/ocr.go +++ b/src/renzhengshouquan/external/tencentcloud/ocr/ocr.go @@ -1,7 +1,10 @@ package ocr import ( + "encoding/base64" + "shylinux.com/x/ice" + "shylinux.com/x/icebergs/base/nfs" "shylinux.com/x/community/src/renzhengshouquan" "shylinux.com/x/community/src/renzhengshouquan/external/tencentcloud" @@ -18,13 +21,13 @@ func (s ocr) List(m *ice.Message, arg ...string) {} func (s ocr) IDCard(m *ice.Message, arg ...string) { request := sdk.NewIDCardOCRRequest() - request.ImageBase64 = common.StringPtr(s.ImageData(m, arg...)) + request.ImageBase64 = common.StringPtr(s.imageData(m, arg...)) response, err := s.newClient(m).IDCardOCR(request) s.ParseResponse(m, response, err) } func (s ocr) BizLicense(m *ice.Message, arg ...string) { request := sdk.NewBizLicenseOCRRequest() - request.ImageBase64 = common.StringPtr(s.ImageData(m, arg...)) + request.ImageBase64 = common.StringPtr(s.imageData(m, arg...)) response, err := s.newClient(m).BizLicenseOCR(request) s.ParseResponse(m, response, err) } @@ -33,6 +36,9 @@ func init() { ice.TeamCtxCmd(ocr{}) } func init() { renzhengshouquan.OcrVendor = ocr{} } +func (s ocr) imageData(m *ice.Message, arg ...string) string { + return base64.StdEncoding.EncodeToString([]byte(m.Cmdx(nfs.CAT, arg[0]))) +} func (s ocr) newClient(m *ice.Message, arg ...string) *sdk.Client { c, _ := sdk.NewClient(s.NewCredential(m), "", s.NewProfile(m)) return c diff --git a/src/renzhengshouquan/external/tencentcloud/ocr/ocr.shy b/src/renzhengshouquan/external/tencentcloud/ocr/ocr.shy index e9d029f..a25a7dc 100644 --- a/src/renzhengshouquan/external/tencentcloud/ocr/ocr.shy +++ b/src/renzhengshouquan/external/tencentcloud/ocr/ocr.shy @@ -1,5 +1,6 @@ section "图文识别" refer ` +后台 https://console.cloud.tencent.com/ocr/overview 文档 https://cloud.tencent.com/document/product/866/45338 调试 https://console.cloud.tencent.com/api/explorer?Product=ocr&Version=2018-11-19&Action=RecognizeEncryptedIDCardOCR ` \ No newline at end of file diff --git a/src/renzhengshouquan/external/tencentcloud/realname/realname.go b/src/renzhengshouquan/external/tencentcloud/realname/realname.go index 93d2620..087f498 100644 --- a/src/renzhengshouquan/external/tencentcloud/realname/realname.go +++ b/src/renzhengshouquan/external/tencentcloud/realname/realname.go @@ -19,14 +19,14 @@ import ( type realname struct { renzhengshouquan.Table order string `data:"18"` - fields string `data:"auth_uid,user_uid,source_id,secret_id,secret_key"` - create string `name:"create source_id* secret_id* secret_key*" role:"leader"` - remove string `name:"remove" role:"leader"` + fields string `data:"source_id,secret_id,secret_key,user_uid"` + create string `name:"create source_id* secret_id* secret_key*" role:"worker"` + remove string `name:"remove" role:"worker"` + list string `name:"list auth_uid uid auto" role:"worker"` } func (s realname) List(m *ice.Message, arg ...string) { - s.ValueList(m, arg).Display("") - kit.If(m.Length() > 0, func() { m.Action() }) + s.ValueList(m, arg).Action().Display("") } func init() { ice.TeamCtxCmd(realname{}) } @@ -37,7 +37,6 @@ func (s realname) Check(m *ice.Message, arg ...string) { source := msg.Append("source_id") secretId := msg.Append("secret_id") secretKey := msg.Append("secret_key") - auth, datetime := calcAuthorization(source, secretId, secretKey) m.Option(web.SPIDE_HEADER, map[string]string{"X-Source": source, "Authorization": auth, "X-Date": datetime}) res := m.Cmdx(web.SPIDE, ice.DEV, web.SPIDE_RAW, http.MethodPost, "https://service-rbgpp2hy-1305308687.gz.apigw.tencentcs.com/release/release/mobile/3-realnameauth", diff --git a/src/renzhengshouquan/external/tencentcloud/realname/realname.js b/src/renzhengshouquan/external/tencentcloud/realname/realname.js index e054947..6a60f76 100644 --- a/src/renzhengshouquan/external/tencentcloud/realname/realname.js +++ b/src/renzhengshouquan/external/tencentcloud/realname/realname.js @@ -1,7 +1,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ - {view: html.TITLE, list: [value.source_id]}, + {view: html.TITLE, list: [value.source_id, can.onimport.titleAction(can, value)]}, {view: html.STATUS, list: [value.secret_id]}, ] }) }, diff --git a/src/renzhengshouquan/external/tencentcloud/realname/realname.shy b/src/renzhengshouquan/external/tencentcloud/realname/realname.shy index 8d5ee8b..0c156b8 100644 --- a/src/renzhengshouquan/external/tencentcloud/realname/realname.shy +++ b/src/renzhengshouquan/external/tencentcloud/realname/realname.shy @@ -2,13 +2,4 @@ section "实名验证" refer ` 后台 https://console.cloud.tencent.com/servicemarket/services/market-2qkoxdj5i 文档 https://market.cloud.tencent.com/products/30034?keyword=%E6%89%8B%E6%9C%BA%E4%B8%89%E8%A6%81%E7%B4%A0%E5%AE%9E%E5%90%8D%E8%AE%A4%E8%AF%81 -` -refer ` -后台 https://console.cloud.tencent.com/servicemarket/services/market-dw3yg5tm8 -文档 https://market.cloud.tencent.com/products/17673 -` -refer ` -实名 https://market.cloud.tencent.com/products/30034 -要素 https://console.cloud.tencent.com/servicemarket/services/market-2qkoxdj5i -要素 https://market.cloud.tencent.com/products/30034?keyword=%E6%89%8B%E6%9C%BA%E4%B8%89%E8%A6%81%E7%B4%A0%E5%AE%9E%E5%90%8D%E8%AE%A4%E8%AF%81 ` \ No newline at end of file diff --git a/src/renzhengshouquan/external/tencentcloud/smh/model/model.go b/src/renzhengshouquan/external/tencentcloud/smh/model/model.go index 5826b91..f99fa35 100644 --- a/src/renzhengshouquan/external/tencentcloud/smh/model/model.go +++ b/src/renzhengshouquan/external/tencentcloud/smh/model/model.go @@ -6,12 +6,12 @@ const ( UID = "uid" NAME = "name" INFO = "info" - PLACE_UID = "place_uid" + VENDOR = "vendor" USER_UID = "user_uid" + PLACE_UID = "place_uid" AUTH_UID = "auth_uid" AUTH_STATUS = "auth_status" PHOTO_UID = "photo_uid" - VENDOR = "vendor" LIBRARY_ID = "library_id" LIBRARY_SECRET = "library_secret" ACCESS_TOKEN = "access_token" @@ -23,7 +23,7 @@ const ( type Smh struct { db.ModelWithUID AuthUID string `gorm:"type:char(32);index"` - UserUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32)"` Name string `gorm:"type:varchar(32)"` Info string `gorm:"type:varchar(64)"` LibraryID string `gorm:"type:varchar(32)"` diff --git a/src/renzhengshouquan/external/tencentcloud/smh/smh.go b/src/renzhengshouquan/external/tencentcloud/smh/smh.go index 2584c29..4aa8000 100644 --- a/src/renzhengshouquan/external/tencentcloud/smh/smh.go +++ b/src/renzhengshouquan/external/tencentcloud/smh/smh.go @@ -6,7 +6,6 @@ import ( "time" "shylinux.com/x/ice" - "shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/nfs" "shylinux.com/x/icebergs/base/web" kit "shylinux.com/x/toolkits" @@ -27,15 +26,44 @@ type smh struct { tencentcloud.Tencentcloud order string `data:"16"` fields string `data:"name,info,library_id,library_secret,access_token,expire_time,user_uid"` - libraryCreate string `name:"libraryCreate" role:"leader"` - libraryRemove string `name:"libraryRemove" role:"leader"` - spaceCreate string `name:"spaceCreate" role:"leader"` - spaceRemove string `name:"spaceRemove" role:"leader"` + list string `name:"list auth_uid uid auto" role:"worker"` + libraryCreate string `name:"libraryCreate" role:"worker"` + libraryRemove string `name:"libraryRemove" role:"worker"` + spaceCreate string `name:"spaceCreate" role:"worker"` + spaceRemove string `name:"spaceRemove" role:"worker"` } func (s smh) Init(m *ice.Message, arg ...string) { + s.SpideCreate(m, "https://api.tencentsmh.cn/api/v1/", "tencentsmh") s.Table.Init(m, arg...) - m.Cmd(web.SPIDE, mdb.CREATE, "https://api.tencentsmh.cn/api/v1/", "tencentsmh") +} +func (s smh) List(m *ice.Message, arg ...string) { + if len(arg) == 1 { + if s.ValueList(m, arg).Display("").Length() == 0 { + s.Button(m.SetResult(), "请创建媒体库", s.LibraryCreate).Action() + } else { + msg := s.token(m) + m.Table(func(value ice.Maps) { + _msg := s.spide(m.Spawn(), kit.MergeURL(kit.Format("usage/%s", msg.Append(model.LIBRARY_ID)), msg.AppendSimple(model.ACCESS_TOKEN))) + m.PushRecord(kit.UnMarshal(_msg.Result()), "totalFileSize") + }).PushAction(s.LibraryRemove).Action() + } + } else if len(arg) == 2 { + s.AuthList(m, arg[0], func(value ice.Maps, auth bool) { + if auth { + msg := s.cmdy(m.Spawn(), s.Select, model.PLACE_UID, value[model.PLACE_UID]) + if msg.Append(model.SPACE_ID) == "" { + m.Push(model.SPACE_ID, "").Push(model.PHOTO_UID, "").PushButton(s.SpaceCreate) + } else { + m.Push(model.SPACE_ID, msg.Append(model.SPACE_ID)) + m.Push(model.PHOTO_UID, msg.Append(model.UID)) + m.PushButton(s.SpaceRemove) + } + } else { + m.Push(model.SPACE_ID, "").Push(model.PHOTO_UID, "").PushButton() + } + }) + } } func (s smh) LibraryCreate(m *ice.Message, arg ...string) { msg := m.Cmd(api.RENZHENGSHOUQUAN_AUTH, s.Select, model.UID, m.Option(model.AUTH_UID)) @@ -74,34 +102,6 @@ func (s smh) LibraryRemove(m *ice.Message, arg ...string) { } s.Table.Remove(m, arg...) } -func (s smh) List(m *ice.Message, arg ...string) { - if len(arg) == 1 { - if s.ValueList(m, arg).Display("").Length() == 0 { - s.Button(m.SetResult(), "请创建媒体库", s.LibraryCreate) - } else { - msg := s.token(m) - m.Table(func(value ice.Maps) { - _msg := s.spide(m.Spawn(), kit.MergeURL(kit.Format("usage/%s", msg.Append(model.LIBRARY_ID)), msg.AppendSimple(model.ACCESS_TOKEN))) - m.PushRecord(kit.UnMarshal(_msg.Result()), "totalFileSize") - }).PushAction(s.LibraryRemove).Action() - } - } else if len(arg) == 2 { - m.Cmdy(api.RENZHENGSHOUQUAN_AUTH, arg[0]).Table(func(value ice.Maps) { - if renzhengshouquan.AuthStatus(kit.Int(value[model.AUTH_STATUS])) == renzhengshouquan.AuthIssued { - msg := s.cmdy(m.Spawn(), s.Select, model.PLACE_UID, value[model.PLACE_UID]) - if space_id := msg.Append(model.SPACE_ID); space_id == "" { - m.Push(model.SPACE_ID, "").Push(model.PHOTO_UID, "").PushButton(s.SpaceCreate) - } else { - m.Push(model.SPACE_ID, msg.Append(model.SPACE_ID)) - m.Push(model.PHOTO_UID, msg.Append(model.UID)) - m.PushButton(s.SpaceRemove) - } - } else { - m.Push(model.SPACE_ID, "").Push(model.PHOTO_UID, "").PushButton() - } - }) - } -} func (s smh) SpaceCreate(m *ice.Message, arg ...string) { msg := s.token(m) if s.spide(m, http.MethodPost, kit.MergeURL(kit.Format("space/%s", msg.Append(model.LIBRARY_ID)), model.USER_ID, m.Option(model.PLACE_UID), msg.AppendSimple(model.ACCESS_TOKEN)), diff --git a/src/renzhengshouquan/external/tencentcloud/smh/smh.json b/src/renzhengshouquan/external/tencentcloud/smh/smh.json index 9a932d4..f2d2ead 100644 --- a/src/renzhengshouquan/external/tencentcloud/smh/smh.json +++ b/src/renzhengshouquan/external/tencentcloud/smh/smh.json @@ -1,14 +1,10 @@ { "smh": "智能媒资托管", - "libraryCreate": "创建", - "libraryRemove": "删除", - "spaceCreate": "分配", - "spaceRemove": "清理", + "libraryCreate": "创建", "libraryRemove": "删除", + "spaceCreate": "分配", "spaceRemove": "清理", "style": { - "libraryCreate": "notice", - "libraryRemove": "danger", - "spaceCreate": "notice", - "spaceRemove": "danger" + "libraryCreate": "notice", "libraryRemove": "danger", + "spaceCreate": "notice", "spaceRemove": "danger" }, "icons": { "smh": "https://img.icons8.com/officel/80/stack-of-photos.png" diff --git a/src/renzhengshouquan/external/tencentcloud/sms/model/model.go b/src/renzhengshouquan/external/tencentcloud/sms/model/model.go index 1c87e04..29b6322 100644 --- a/src/renzhengshouquan/external/tencentcloud/sms/model/model.go +++ b/src/renzhengshouquan/external/tencentcloud/sms/model/model.go @@ -14,7 +14,7 @@ const ( type Sms struct { db.ModelWithUID AuthUID string `gorm:"type:char(32);index"` - UserUID string `gorm:"type:char(32);index"` + UserUID string `gorm:"type:char(32)"` SignName string `gorm:"type:varchar(64)"` TemplateID string `gorm:"type:varchar(64)"` AppID string `gorm:"type:varchar(32)"` diff --git a/src/renzhengshouquan/external/tencentcloud/sms/sms.go b/src/renzhengshouquan/external/tencentcloud/sms/sms.go index 5e605aa..b9b0c2c 100644 --- a/src/renzhengshouquan/external/tencentcloud/sms/sms.go +++ b/src/renzhengshouquan/external/tencentcloud/sms/sms.go @@ -2,7 +2,6 @@ package sms import ( "shylinux.com/x/ice" - kit "shylinux.com/x/toolkits" "shylinux.com/x/community/src/renzhengshouquan" "shylinux.com/x/community/src/renzhengshouquan/external/tencentcloud" @@ -16,15 +15,15 @@ type sms struct { renzhengshouquan.Table tencentcloud.Tencentcloud order string `data:"17"` - fields string `data:"auth_uid,user_uid,sign_name AS sign_name,template_id,app_id"` - create string `name:"create sign_name* template_id* app_id*" role:"leader"` - remove string `name:"remove" role:"leader"` - send string `name:"send mobile verify" role:"leader"` + fields string `data:"sign_name AS sign_name,template_id,app_id,user_uid"` + create string `name:"create sign_name* template_id* app_id*" role:"worker"` + remove string `name:"remove" role:"worker"` + list string `name:"list auth_uid uid auto" role:"worker"` + send string `name:"send mobile* verify*" role:"worker"` } func (s sms) List(m *ice.Message, arg ...string) { - s.ValueList(m, arg).Display("") - kit.If(m.Length() > 0, func() { m.Action() }) + s.ValueList(m, arg).Action().Display("") } func (s sms) Send(m *ice.Message, arg ...string) { msg := s.Select(m.Spawn(), model.AUTH_UID, s.GetAuthUID(m)) diff --git a/src/renzhengshouquan/external/tencentcloud/sms/sms.js b/src/renzhengshouquan/external/tencentcloud/sms/sms.js index 69c9701..5d9d154 100644 --- a/src/renzhengshouquan/external/tencentcloud/sms/sms.js +++ b/src/renzhengshouquan/external/tencentcloud/sms/sms.js @@ -1,7 +1,8 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ - {view: html.TITLE, list: [value.sign_name, value.template_id, value.app_id]}, + {view: html.TITLE, list: [value.sign_name, can.onimport.titleAction(can, value)]}, + {view: html.STATUS, list: [value.template_id, value.app_id]}, ] }) }, }) \ No newline at end of file diff --git a/src/renzhengshouquan/external/tencentcloud/tencentcloud.go b/src/renzhengshouquan/external/tencentcloud/tencentcloud.go index b8a5cd8..09684e8 100644 --- a/src/renzhengshouquan/external/tencentcloud/tencentcloud.go +++ b/src/renzhengshouquan/external/tencentcloud/tencentcloud.go @@ -1,10 +1,8 @@ package tencentcloud import ( - "encoding/base64" - "shylinux.com/x/ice" - "shylinux.com/x/icebergs/base/nfs" + kit "shylinux.com/x/toolkits" "shylinux.com/x/community/src/renzhengshouquan" @@ -18,13 +16,13 @@ type tencentcloud struct { renzhengshouquan.Table order string `data:"15"` fields string `data:"secret_id,secret_key,user_uid"` - create string `name:"create secret_id* secret_key*" role:"leader"` - remove string `name:"remove" role:"leader"` + create string `name:"create secret_id* secret_key*" role:"worker"` + remove string `name:"remove" role:"worker"` + list string `name:"list auth_uid uid auto" role:"worker"` } func (s tencentcloud) List(m *ice.Message, arg ...string) { - s.ValueList(m, arg).Display("") - kit.If(m.Length() > 0, func() { m.Action() }) + s.ValueList(m, arg).Action().Display("") } func init() { ice.TeamCtxCmd(tencentcloud{}) } @@ -40,9 +38,6 @@ func (s Tencentcloud) NewCredential(m *ice.Message, arg ...string) *common.Crede func (s Tencentcloud) NewProfile(m *ice.Message, arg ...string) *profile.ClientProfile { return profile.NewClientProfile() } -func (s Tencentcloud) ImageData(m *ice.Message, arg ...string) string { - return base64.StdEncoding.EncodeToString([]byte(m.Cmdx(nfs.CAT, arg[0]))) -} func (s Tencentcloud) ParseResponse(m *ice.Message, res interface{ ToJsonString() string }, err error, arg ...string) { if !m.Warn(err) { m.PushDetail(kit.Value(kit.UnMarshal(res.ToJsonString()), kit.Select("Response", arg, 0))) diff --git a/src/renzhengshouquan/external/tencentdocument/tencentdocument.go b/src/renzhengshouquan/external/tencentdocument/tencentdocument.go index 8e4b52b..bbc981f 100644 --- a/src/renzhengshouquan/external/tencentdocument/tencentdocument.go +++ b/src/renzhengshouquan/external/tencentdocument/tencentdocument.go @@ -7,7 +7,6 @@ import ( "shylinux.com/x/icebergs/base/web" kit "shylinux.com/x/toolkits" - "shylinux.com/x/community/src/api" "shylinux.com/x/community/src/gonganxitong" "shylinux.com/x/community/src/renzhengshouquan" "shylinux.com/x/community/src/renzhengshouquan/external/tencentdocument/model" @@ -19,9 +18,9 @@ type tencentdocument struct { client_secret string `data:""` order string `data:"13"` fields string `data:"user_id,access_token,expired_time,user_uid"` - auth string `name:"auth" help:"授权" role:"void"` - remove string `name:"remove" role:"leader"` - config string `name:"config folder_id*:select" style:"notice" role:"leader"` + auth string `name:"auth" help:"授权" role:"worker"` + remove string `name:"remove" role:"worker"` + config string `name:"config folder_id*:select" style:"notice" role:"worker"` } func (s tencentdocument) Inputs(m *ice.Message, arg ...string) { @@ -33,13 +32,12 @@ func (s tencentdocument) Inputs(m *ice.Message, arg ...string) { } func (s tencentdocument) List(m *ice.Message, arg ...string) { if len(arg) == 1 { - s.ValueList(m, arg).Action(s.Auth).Display("") - if m.Length() == 0 { + if s.ValueList(m, arg).Action(s.Auth).Display("").Length() == 0 { s.Button(m.SetResult(), "请授权访问腾讯文档", s.Auth) } } else if len(arg) == 2 { - m.Cmdy(api.RENZHENGSHOUQUAN_AUTH, arg[0]).Table(func(value ice.Maps) { - if renzhengshouquan.AuthStatus(kit.Int(value[model.AUTH_STATUS])) == renzhengshouquan.AuthIssued { + s.AuthList(m, arg[0], func(value ice.Maps, auth bool) { + if auth { m.PushButton(s.Config) } else { m.PushButton() @@ -48,7 +46,6 @@ func (s tencentdocument) List(m *ice.Message, arg ...string) { } } func (s tencentdocument) Config(m *ice.Message, arg ...string) { - // m.Cmdy(api.GONGANXITONG_DOCUMENT, s.Config, m.OptionSimple(model.PLACE_UID, model.USER_UID, "folder_id"), model.VENDOR, m.PrefixKey()) m.Cmdy("web.team.gonganxitong.document", s.Config, m.OptionSimple(model.PLACE_UID, model.USER_UID, model.FOLDER_ID), model.VENDOR, m.PrefixKey()) } func (s tencentdocument) Folder(m *ice.Message, arg ...string) *ice.Message { diff --git a/src/renzhengshouquan/external/tencentmeeting/model/model.go b/src/renzhengshouquan/external/tencentmeeting/model/model.go index 8dbf63a..47127cc 100644 --- a/src/renzhengshouquan/external/tencentmeeting/model/model.go +++ b/src/renzhengshouquan/external/tencentmeeting/model/model.go @@ -4,13 +4,13 @@ import "shylinux.com/x/mysql-story/src/db" const ( UID = "uid" + LINK = "link" + AVATAR = "avatar" + VENDOR = "vendor" USER_UID = "user_uid" + PLACE_UID = "place_uid" AUTH_UID = "auth_uid" AUTH_STATUS = "auth_status" - PLACE_UID = "place_uid" - AVATAR = "avatar" - LINK = "link" - VENDOR = "vendor" USER_ID = "user_id" ) diff --git a/src/renzhengshouquan/external/tencentmeeting/tencentmeeting.go b/src/renzhengshouquan/external/tencentmeeting/tencentmeeting.go index 1f97c61..1decd2a 100644 --- a/src/renzhengshouquan/external/tencentmeeting/tencentmeeting.go +++ b/src/renzhengshouquan/external/tencentmeeting/tencentmeeting.go @@ -24,12 +24,11 @@ import ( type tencentmeeting struct { renzhengshouquan.Table order string `data:"12"` - role string `data:"leader"` - fields string `data:"auth_uid,user_uid,app_id,sdk_id,secret_id,secret_key,user_id"` - create string `name:"create app_id* sdk_id* secret_id* secret_key* user_id*" role:"leader"` - remove string `name:"remove" role:"leader"` - list string `name:"list auth_uid uid auto" role:"leader"` - config string `name:"config user_id:select" style:"notice" role:"leader"` + fields string `data:"app_id,sdk_id,secret_id,secret_key,user_id,user_uid"` + create string `name:"create app_id* sdk_id* secret_id* secret_key* user_id*" role:"worker"` + remove string `name:"remove" role:"worker"` + list string `name:"list auth_uid uid auto" role:"worker"` + config string `name:"config user_id:select" style:"notice" role:"worker"` } func (s tencentmeeting) Init(m *ice.Message, arg ...string) { @@ -39,18 +38,16 @@ func (s tencentmeeting) Init(m *ice.Message, arg ...string) { func (s tencentmeeting) Inputs(m *ice.Message, arg ...string) { switch arg[0] { case model.USER_ID: - s.UserList(m, m.Option(model.AUTH_UID)).Cut(arg[0], "username") - m.RenameAppend("username", "name") + s.UserList(m, m.Option(model.AUTH_UID)).Cut(arg[0], "username").RenameAppend("username", "name") m.DisplayInputKeyNameIconTitle() } } func (s tencentmeeting) List(m *ice.Message, arg ...string) { if len(arg) == 1 { - s.ValueList(m, arg).Display("") - kit.If(m.Length() > 0, func() { m.Action() }) + s.ValueList(m, arg).Action().Display("") } else if len(arg) == 2 { - m.Cmdy(api.RENZHENGSHOUQUAN_AUTH, arg[0]).Table(func(value ice.Maps) { - if renzhengshouquan.AuthStatus(kit.Int(value[model.AUTH_STATUS])) == renzhengshouquan.AuthIssued { + s.AuthList(m, arg[0], func(value ice.Maps, auth bool) { + if auth { m.PushButton(s.Config) } else { m.PushButton() diff --git a/src/renzhengshouquan/external/tencentmeeting/tencentmeeting.js b/src/renzhengshouquan/external/tencentmeeting/tencentmeeting.js index 182abf8..fdce2e5 100644 --- a/src/renzhengshouquan/external/tencentmeeting/tencentmeeting.js +++ b/src/renzhengshouquan/external/tencentmeeting/tencentmeeting.js @@ -1,8 +1,8 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.onimport.myView(can, msg, function(value) { return [ - {view: html.TITLE, list: [value.app_id, "/", value.sdk_id, "/", value.user_id]}, - {view: html.TITLE, list: [value.secret_id]}, + {view: html.TITLE, list: [value.app_id, "/", value.sdk_id, "/", value.secret_id]}, + {view: html.TITLE, list: [value.user_id]}, ] }) }, }) diff --git a/src/renzhengshouquan/external/weixinpayment/weixinpayment.go b/src/renzhengshouquan/external/weixinpayment/weixinpayment.go index 1a749dd..b3c43cd 100644 --- a/src/renzhengshouquan/external/weixinpayment/weixinpayment.go +++ b/src/renzhengshouquan/external/weixinpayment/weixinpayment.go @@ -20,11 +20,10 @@ import ( type weixinpayment struct { renzhengshouquan.Table order string `data:"11"` - role string `data:"leader"` - fields string `data:"user_uid,app_id,mch_id,api_key,cert_no,cert_key"` - create string `name:"create app_id* mch_id* api_key* cert_no* cert_key*:textarea" role:"leader"` - remove string `name:"remove" role:"leader"` - list string `name:"list auth_uid uid auto" role:"leader"` + fields string `data:"app_id,mch_id,api_key,cert_no,cert_key,user_uid"` + create string `name:"create app_id* mch_id* api_key* cert_no* cert_key*:textarea" role:"worker"` + remove string `name:"remove" role:"worker"` + list string `name:"list auth_uid uid auto" role:"worker"` response string `name:"response" role:"void"` } @@ -33,18 +32,17 @@ func (s weixinpayment) Init(m *ice.Message, arg ...string) { s.Table.Init(m, arg...) } func (s weixinpayment) List(m *ice.Message, arg ...string) { - s.ValueList(m, arg).Display("") - kit.If(m.Length() > 0, func() { m.Action() }) + s.ValueList(m, arg).Action().Display("") } func (s weixinpayment) Request(m *ice.Message, arg ...string) { msg := s.Select(m.Spawn(), model.AUTH_UID, s.GetAuthUID(m)) svc := jsapi.JsapiApiService{Client: s.newClient(m, msg)} - resp, result, err := svc.PrepayWithRequestPayment(m, jsapi.PrepayRequest{ + resp, _, err := svc.PrepayWithRequestPayment(m, jsapi.PrepayRequest{ Appid: core.String(msg.Append("app_id")), Mchid: core.String(msg.Append("mch_id")), + OutTradeNo: core.String(m.Option(model.UID)), Description: core.String(m.Option(model.TITLE)), Attach: core.String(m.Option(model.CONTENT)), - OutTradeNo: core.String(m.Option(model.UID)), Amount: &jsapi.Amount{Total: core.Int64(kit.Int64(m.Option(model.AMOUNT)))}, Payer: &jsapi.Payer{Openid: core.String(m.Cmd(api.GONGANXITONG_USER, s.Select, model.UID, m.Option(model.USER_UID)).Append(model.OPEN_ID))}, NotifyUrl: core.String(strings.Split(m.MergePodCmd("", m.PrefixKey()), "?")[0] + "/action/response/" + m.Option(model.PLACE_UID) + "/" + m.Option(model.UID)), @@ -52,13 +50,10 @@ func (s weixinpayment) Request(m *ice.Message, arg ...string) { if !m.Warn(err) { kit.For(kit.UnMarshal(kit.Format(resp)), func(k, v string) { m.Push(kit.LowerCapital(k), v) }) } - m.Info("what %v %v %v", resp, result, err) } func (s weixinpayment) Response(m *ice.Message, arg ...string) { - if len(arg) > 1 { - if m.Option("event_type") == "TRANSACTION.SUCCESS" { - m.Cmdy(api.GONGANXITONG_PAYMENTLIST, s.Response, arg) - } + if len(arg) > 1 && m.Option("event_type") == "TRANSACTION.SUCCESS" { + m.Cmdy(api.GONGANXITONG_PAYMENTLIST, s.Response, arg) } }