test
This commit is contained in:
parent
072056a5c0
commit
8935240d68
26
job.go
26
job.go
|
@ -359,6 +359,32 @@ func jobPillage(j Job) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func jobMsgRefresh(j Job) {
|
||||||
|
var p JobPayloadMsgRefresh
|
||||||
|
err := setJobStart(j.ID64)
|
||||||
|
logOnError(err, "jobMsgRefresh : setJobStart")
|
||||||
|
|
||||||
|
err = json.Unmarshal(j.Payload, &p)
|
||||||
|
logOnError(err, "jobMsgRefresh : Unmarshal payload")
|
||||||
|
|
||||||
|
m, err := getObjMsg(p.ObjID64)
|
||||||
|
logOnError(err, "jobMsgRefresh : getObjMsg")
|
||||||
|
|
||||||
|
err = delObj(p.ObjID64)
|
||||||
|
logOnError(err, "jobMsgRefresh : delObj")
|
||||||
|
|
||||||
|
c := TGCommand{
|
||||||
|
Type: commandRefreshMsg,
|
||||||
|
FromChatID64: m.ChatID64,
|
||||||
|
FromMsgID64: m.ID64,
|
||||||
|
}
|
||||||
|
MQTGCmdQueue <- c
|
||||||
|
|
||||||
|
err = setJobDone(j.ID64)
|
||||||
|
logOnError(err, "joMsgClient : setJobDone")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func jobMsgClient(j Job) {
|
func jobMsgClient(j Job) {
|
||||||
var p JobPayloadMsgClient
|
var p JobPayloadMsgClient
|
||||||
err := setJobStart(j.ID64)
|
err := setJobStart(j.ID64)
|
||||||
|
|
33
obj.go
33
obj.go
|
@ -156,6 +156,39 @@ func loadObjMsg() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func delObj(objId int64) error {
|
||||||
|
objSubTypeId, err := getObjSubTypeId(objId)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if objSubTypeId != objSubTypeMessageAuctionAnnounce {
|
||||||
|
return errors.New("Can only delete objSubTypeMessageAuctionAnnounce.")
|
||||||
|
}
|
||||||
|
|
||||||
|
stmt, err := db.Prepare(`DELETE FROM obj o WHERE o.id = ?`)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer stmt.Close()
|
||||||
|
|
||||||
|
res, err := stmt.Exec(objId)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
count, err := res.RowsAffected()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("delObj : %d RowsAffected.\n", count)
|
||||||
|
|
||||||
|
cacheObjMsg.Delete(objId)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func addObjCastle(logo string, name string) (int64, error) {
|
func addObjCastle(logo string, name string) (int64, error) {
|
||||||
tx, err := db.Begin()
|
tx, err := db.Begin()
|
||||||
logOnError(err, "addObjCastle : start transaction")
|
logOnError(err, "addObjCastle : start transaction")
|
||||||
|
|
1
rules.go
1
rules.go
|
@ -124,6 +124,7 @@ func resetMsgParsingRules() {
|
||||||
`.Level: (?P<Level>[0-9]+)\\n` +
|
`.Level: (?P<Level>[0-9]+)\\n` +
|
||||||
`.Atk: (?P<Atk>[0-9]+) .Def: (?P<Def>[0-9]+)\\n` +
|
`.Atk: (?P<Atk>[0-9]+) .Def: (?P<Def>[0-9]+)\\n` +
|
||||||
`.Exp: (?P<ExpNow>[0-9]+)/(?P<ExpLvl>[0-9]+)\\n` +
|
`.Exp: (?P<ExpNow>[0-9]+)/(?P<ExpLvl>[0-9]+)\\n` +
|
||||||
|
`(.Hp: (?P<HPNow>[0-9]+)/(?P<HPMax>[0-9]+).*\\n){0,1}` +
|
||||||
`.Stamina: (?P<StaminaNow>[0-9]+)/(?P<StaminaMax>[0-9]+).*\\n` +
|
`.Stamina: (?P<StaminaNow>[0-9]+)/(?P<StaminaMax>[0-9]+).*\\n` +
|
||||||
`(.(?P<Gold>(-){0,1}[0-9]+)){0,1}( .(?P<Pogs>[0-9]+)){0,1}( .(?P<Gems>[0-9]+)){0,1}\\n\\n` +
|
`(.(?P<Gold>(-){0,1}[0-9]+)){0,1}( .(?P<Pogs>[0-9]+)){0,1}( .(?P<Gems>[0-9]+)){0,1}\\n\\n` +
|
||||||
`(.*?)(🎽Equipment \\+(?P<AtkGear>[0-9]+).\\+(?P<DefGear>[0-9]+).){0,1}\\n` +
|
`(.*?)(🎽Equipment \\+(?P<AtkGear>[0-9]+).\\+(?P<DefGear>[0-9]+).){0,1}\\n` +
|
||||||
|
|
|
@ -233,6 +233,8 @@ func JobWorker(id int, jobs <-chan Job) {
|
||||||
jobPillage(j)
|
jobPillage(j)
|
||||||
case objSubTypeJobMsgClient:
|
case objSubTypeJobMsgClient:
|
||||||
jobMsgClient(j)
|
jobMsgClient(j)
|
||||||
|
case objSubTypeJobMsgRefresh:
|
||||||
|
jobMsgRefresh(j)
|
||||||
default:
|
default:
|
||||||
log.Printf("jobWorker["+strconv.Itoa(id)+"] : No handler for job type #%d.\n", j.JobTypeID)
|
log.Printf("jobWorker["+strconv.Itoa(id)+"] : No handler for job type #%d.\n", j.JobTypeID)
|
||||||
}
|
}
|
||||||
|
@ -305,10 +307,10 @@ func MQTGCmdWorker(id int, cmds <-chan TGCommand) {
|
||||||
logOnError(err, "MQTGCmdWorker["+strconv.Itoa(id)+"] : Marshal(c)")
|
logOnError(err, "MQTGCmdWorker["+strconv.Itoa(id)+"] : Marshal(c)")
|
||||||
log.Printf("MQTGCmdWorker["+strconv.Itoa(id)+"] : new command.\n%s\n", string(j))
|
log.Printf("MQTGCmdWorker["+strconv.Itoa(id)+"] : new command.\n%s\n", string(j))
|
||||||
err = clientsQueue[c.FromUserID64].Channel.Publish(
|
err = clientsQueue[c.FromUserID64].Channel.Publish(
|
||||||
"", // exchange
|
"", // exchange
|
||||||
clientsQueue[c.FromUserID64].Queue.Name, // routing key
|
clientsQueue[c.FromUserID64].Queue.Name, // routing key
|
||||||
false, // mandatory
|
false, // mandatory
|
||||||
false, // immediate
|
false, // immediate
|
||||||
amqp.Publishing{
|
amqp.Publishing{
|
||||||
ContentType: "application/json",
|
ContentType: "application/json",
|
||||||
Body: []byte(j),
|
Body: []byte(j),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user