|
@@ -19,7 +19,7 @@ import (
|
|
|
|
|
|
const (
|
|
const (
|
|
status_rest = 0 //闲时,没有任务
|
|
status_rest = 0 //闲时,没有任务
|
|
- status_working = 1 //闲时,没有任务
|
|
|
|
|
|
+ status_working = 1 //进入工作状态
|
|
status_waitReply = 2 //收到验证码,等待回复
|
|
status_waitReply = 2 //收到验证码,等待回复
|
|
)
|
|
)
|
|
|
|
|
|
@@ -45,7 +45,12 @@ func processevent(p *util.Packet) {
|
|
if ret := make(map[string]interface{}); json.Unmarshal(p.GetBusinessData(), &ret) == nil {
|
|
if ret := make(map[string]interface{}); json.Unmarshal(p.GetBusinessData(), &ret) == nil {
|
|
flag, _ := ret["flag"].(bool)
|
|
flag, _ := ret["flag"].(bool)
|
|
if flag {
|
|
if flag {
|
|
- img, err := json.Marshal(ret["img"])
|
|
|
|
|
|
+ imgTmp, err := json.Marshal(ret["img"])
|
|
|
|
+ if err != nil {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ var img []byte
|
|
|
|
+ err = json.Unmarshal(imgTmp, &img)
|
|
if err != nil {
|
|
if err != nil {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -80,34 +85,6 @@ func (a *DistinguishWork) Start(openId string) {
|
|
toWork(nil)
|
|
toWork(nil)
|
|
}
|
|
}
|
|
|
|
|
|
-func (a *DistinguishWork) Test() {
|
|
|
|
- //发送验证码图片
|
|
|
|
- var itm qrpc.ImgTextMsg
|
|
|
|
- itm.ToUser = "oJULtw8sMXxZX7b-DvqpxIdl47zg"
|
|
|
|
-
|
|
|
|
- var als qrpc.Articles
|
|
|
|
- als.Title = "title"
|
|
|
|
- als.Description = "description"
|
|
|
|
- als.Url = "http://cdn2.qmx.top:9002/images/logo.png"
|
|
|
|
- als.Picurl = "http://cdn2.qmx.top:9002/images/logo.png"
|
|
|
|
-
|
|
|
|
- itm.News.Articles = append(itm.News.Articles, als)
|
|
|
|
-
|
|
|
|
- qfwutil.Try(func() {
|
|
|
|
- client, err := rpc.DialHTTP("tcp", wf.SysConfig.Rpcserver)
|
|
|
|
- defer client.Close()
|
|
|
|
- if err != nil {
|
|
|
|
- log.Println(err.Error())
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- var repl qrpc.RpcResult
|
|
|
|
- err = client.Call("WeiXinRpc.SendImgTextMsg", itm, &repl)
|
|
|
|
- if err != nil {
|
|
|
|
- log.Println(err.Error())
|
|
|
|
- }
|
|
|
|
- }, func(e interface{}) {})
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
//结束工作,删除工作人
|
|
//结束工作,删除工作人
|
|
func (a *DistinguishWork) End(openId string) {
|
|
func (a *DistinguishWork) End(openId string) {
|
|
deleteWorker(openId)
|
|
deleteWorker(openId)
|
|
@@ -292,6 +269,7 @@ func createImg(msgId string, img []byte) (string, error) {
|
|
log.Println("创建验证码图片出错:", err)
|
|
log.Println("创建验证码图片出错:", err)
|
|
return "", err
|
|
return "", err
|
|
}
|
|
}
|
|
|
|
+ log.Println(img)
|
|
_, err = file.Write(img)
|
|
_, err = file.Write(img)
|
|
if err != nil {
|
|
if err != nil {
|
|
log.Println("写入验证码图片出错:", err)
|
|
log.Println("写入验证码图片出错:", err)
|