Commit bcb363fc authored by vicotor's avatar vicotor

fix bug

parent a38dbc84
...@@ -187,7 +187,7 @@ func AvailableAccountCount() (int64, error) { ...@@ -187,7 +187,7 @@ func AvailableAccountCount() (int64, error) {
func QueryProjectByUserId(userId string) ([]ProjectInDb, bool, error) { func QueryProjectByUserId(userId string) ([]ProjectInDb, bool, error) {
data, count, err := client.From("project").Select("*", "exact", false).Eq("user_id", userId).Execute() data, count, err := client.From("project").Select("*", "exact", false).Eq("user_id", userId).Eq("available", "true").Execute()
if err != nil { if err != nil {
return nil, false, err return nil, false, err
......
...@@ -349,7 +349,7 @@ func TaskStop(c *fiber.Ctx) error { ...@@ -349,7 +349,7 @@ func TaskStop(c *fiber.Ctx) error {
slog.Info("stop job", "user", req.User, "TaskType", req.TaskType, "TaskId", req.TaskId) slog.Info("stop job", "user", req.User, "TaskType", req.TaskType, "TaskId", req.TaskId)
if err := Worker.StopJob(req.User, req.TaskType); err != nil { if err := Worker.StopJob(req); err != nil {
return c.JSON(Res{ return c.JSON(Res{
Code: 500, Code: 500,
Msg: err.Error(), Msg: err.Error(),
...@@ -468,7 +468,7 @@ func VerifyLike(c *fiber.Ctx) error { ...@@ -468,7 +468,7 @@ func VerifyLike(c *fiber.Ctx) error {
slog.Info(c.Route().Path, "tweetId", tweetId, "user_id", retweeterId) slog.Info(c.Route().Path, "tweetId", tweetId, "user_id", retweeterId)
ok, err := VerifyRetweeterInDb(tweetId, retweeterId) ok, err := VerifyLikeInDb(tweetId, retweeterId)
if err != nil { if err != nil {
slog.Error("VerifyRetweeter", "tweetId", tweetId, "user_id", retweeterId, "err", err.Error()) slog.Error("VerifyRetweeter", "tweetId", tweetId, "user_id", retweeterId, "err", err.Error())
......
...@@ -23,16 +23,18 @@ func init() { ...@@ -23,16 +23,18 @@ func init() {
} }
} }
func (w *Work) StopJob(userId, taskType string) error { func (w *Work) StopJob(req AddTaskReq) error {
w.Lock.Lock() w.Lock.Lock()
defer w.Lock.Unlock() defer w.Lock.Unlock()
if v, ok := w.Task[userId+"-"+taskType]; ok { key := req.User + "-" + req.TaskId + "-" + req.TaskType
if v, ok := w.Task[key]; ok {
close(v) close(v)
delete(w.Task, userId+"-"+taskType) delete(w.Task, key)
} else { } else {
return fmt.Errorf("%s do not run", userId+"-"+taskType) return fmt.Errorf("%s do not run", key)
} }
// done := w.RunJob(t) // done := w.RunJob(t)
...@@ -45,13 +47,15 @@ func (w *Work) AddJob(t TaskJob) error { ...@@ -45,13 +47,15 @@ func (w *Work) AddJob(t TaskJob) error {
w.Lock.Lock() w.Lock.Lock()
defer w.Lock.Unlock() defer w.Lock.Unlock()
if _, ok := w.Task[t.UserId+"-"+t.TaskType]; ok { key := t.UserId + "-" + t.TaskId + "-" + t.TaskType
return fmt.Errorf("%s has run", t.UserId+"-"+t.TaskId+"-"+t.TaskType)
if _, ok := w.Task[key]; ok {
return fmt.Errorf("%s has run", key)
} }
done := w.RunJob(t) done := w.RunJob(t)
w.Task[t.UserId+"-"+t.TaskType] = done w.Task[key] = done
return nil return nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment