🐛 销假

config.toml

@@ -29,10 +29,10 @@ url = "redis://:jhkdjhkjdhsIUTYURTU_pEGmFP@database.out:56379"
 smtpHost = "smtp-mail.outlook.com"
 smtpPort = 587
 # 发件人邮箱和密码（需要使用授权码，不是登录密码）
-smtpUsername = "demo@likedream.xyz"
+smtpUsername = "reply@likedream.xyz"
 smtpPassword = "baca122..."
 # 发件人邮箱和显示名称
-fromEmail = "demo@likedream.xyz"
+fromEmail = "reply@likedream.xyz"
 fromName = "若梦系统"
 
 

internal/application/cpdaily/cryptoutil/aes_decrypt_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestAesDecrypt(t *testing.T) {
-	str := "457xXTd3ZBTY0017ueFiMR0gFff7W2NuXH39lkT/kvTTCKqhXA1vjJwgtmzRgZOC+qEpA3O9GmAroR+A1lORFVqe+q7o3alKOKj4rxPUUSwcyqGUF2LMNbxFXrmWUEPzeedbdUtlI+ufR8SLXNHbZSs0ECPy864bwUAuSDhFcD235c/3AbiTNacXIZZ+paK0T6GWxS291XbffgNCpGFa+5jCaP7/t9erCUjId9Zm4hmoaHkhqGRKAgZrLwuICa4lTFNOQqLA1N/Dljd/ZPVbZGVZaJQ0oV3zEaQQDCWuSTcWF4JVVeaCw9s/8mqkarg+RIz3/OA8dCvc8Wo6auMGzXT6IlisCX+S5TuPlhKKo1ttAW1KrWNg2nkZMxyD+kTKtNijvZRsdQnA8znVp0q2p0byyvzevaB6qSYUM9NBcaxyxkes5Bd1lKCTUHPaG93Jz4SQ+B8MQ1rLm13eWY8uME/WBTOraG7Rgmba32zBccC6BWwV3ncNGhu7hLL0dIhdgIpuxnrFmXDw4HX/IM+cnCxAFo7+EfzKb4l3yDMyr2d+0tDlVl4UbUR2uRTGz5r/7vVI1WtLgM0fiRTk56JU5BwRrutS7KonsLzugbEp/E8="
+	str := "gTIjjNBTwN0Vdv2o5ZlTZ6gHbFcIA0MV0caRqvv/50tptfoSO+VASLxpQZWy Xa86lY21QtmXhwlvTsfd3XR819O0IUi2FynPOM6s0pDsSndM2JhhqoRNXBTK 4WqfMgt0RCQJ38KP8XtM5O+Ktkj1YHHM/OVEGqOxRcUh2M++JJCheJbSs+aQ 2T3va13/GWJH7PEd8JVEJgBiO3wXLOb9+CvvWuU/Frc9nNNxQL7LrgZTdQAv C9Yt+5/a2n41reOeOs7Bu5C4FFlHQSs71Rom/HtIhL67x1ecIre1rbgK9xxz 1AhTEHY6nhdZmktPGJD5CfxvLVWIeLv09CjKqdSaNodkP4e9YTScNEZ2s8TK y8Xhv8L0r6gllC9B3nla4GRe+lqMvhDPDZx7PFu7kxFspf9yoM4eOpgWfCr9 xbDwxO9cXphiktfWsQiX28W4g2jCFFEazh01WBtpjM9LsLfbBgZA+z3jgfYa AXZuOvFQMJuUnLyOIGPtsaSTwXFDlJwNRgEw+Ctl22JSJbbu1yOoM9S6Ge27 rUVMhbAS5snVbNbLhgAymQLQQVLRwfsMLbtUfLTZuCC8zO8d16eOYw56+DqR QWNG1EXQz3CLeFDs2hFqcNWrAt773qANQ3zLPA65"
 	str = strings.ReplaceAll(str, " ", "")
 	decodeString, _ := base64.StdEncoding.DecodeString(str)
 	decrypt := AesDecryptForCat(decodeString)

internal/application/cpdaily/leave/report.go

@@ -10,6 +10,7 @@ import (
 	"likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/utils"
 
+	"github.com/bytedance/sonic"
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/google/uuid"
 	"github.com/samber/oops"
@@ -104,6 +105,11 @@ func (c *CpdailyReportApp) LeaveDetail(leaveId string) gjson.Result {
 	return datas
 }
 
+type Attach struct {
+	Type string `json:"type"`
+	Url  string `json:"url"`
+}
+
 func (c *CpdailyReportApp) FillReportForm(detail gjson.Result) map[string]*gvar.Var {
 	resultForm := make(map[string]*gvar.Var)
 	resultForm["id"] = gvar.New(detail.Get("detail.id").String())
@@ -112,9 +118,17 @@ func (c *CpdailyReportApp) FillReportForm(detail gjson.Result) map[string]*gvar.
 	resultForm["reportLocation"] = gvar.New(detail.Get("detail.applyLocation.address").String())
 	resultForm["approverWid"] = gvar.New("")
 	resultForm["reportApplyExplain"] = gvar.New(nil)
-	//resultForm["reportAttach"] = gvar.New(detail.Get("detail.applyAttach").Array())
+	//resultForm["reportAttach"] = gvar.New(.Array())
 	resultForm["reportAttach"] = gvar.New([]string{})
 	resultForm["uaIsCpadaily"] = gvar.New(true)
+	attachStr := detail.Get("detail.applyAttach").String()
+	if attachStr != "" {
+		var attach []Attach
+		_ = sonic.Unmarshal([]byte(attachStr), &attach)
+		resultForm["reportAttach"] = gvar.New(attach)
+	} else {
+		resultForm["reportAttach"] = gvar.New([]string{})
+	}
 	return resultForm
 }
 

internal/framework/schedule/email_handler.go

@@ -44,7 +44,7 @@ func (h *EmailTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task) (e
 
 	message.SetBodyString(mail.TypeTextHTML, payload.Body)
 
-	client, e := mail.NewClient(payload.SMTPHost, mail.WithPort(payload.SMTPPort), mail.WithSMTPAuth(mail.SMTPAuthAutoDiscover),
+	client, e := mail.NewClient(payload.SMTPHost, mail.WithPort(payload.SMTPPort), mail.WithSSL(),
 		mail.WithUsername(payload.SMTPUsername), mail.WithPassword(payload.SMTPPassword))
 	utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
 

internal/framework/schedule/scanner.go

@@ -8,6 +8,7 @@ import (
 	cst2 "likedream-goframe/internal/common/cst"
 	"likedream-goframe/internal/common/db"
 	"likedream-goframe/internal/ent"
+	"likedream-goframe/internal/ent/courseentity"
 	"likedream-goframe/internal/ent/cptask"
 	"likedream-goframe/internal/framework/queue"
 	"likedream-goframe/internal/utils"
@@ -65,6 +66,7 @@ func (ts *TaskScanner) StartScan() {
 		}
 
 		ts.scanCpdailyTask()
+		ts.scanXuexitongTask()
 	}
 }
 
@@ -186,3 +188,76 @@ func (ts *TaskScanner) scanCpdailyTask() {
 		utils.LogError(ts.ctx, "重置过期任务下次执行时间失败", oops.With("task_id", task.ID, "next_execute_at", nextExecuteAt).Wrap(e))
 	}
 }
+
+// scanXuexitongTask 扫描学习通刷课任务
+func (ts *TaskScanner) scanXuexitongTask() {
+	// 查询所有状态为not_start或waiting的课程
+	allCourses := db.Global.CourseEntity.Query().
+		Where(
+			courseentity.Or(
+				courseentity.StatusEQ(courseentity.StatusNotStart),
+				courseentity.StatusEQ(courseentity.StatusWaiting),
+			),
+		).
+		AllX(ts.ctx)
+
+	if len(allCourses) == 0 {
+		return
+	}
+
+	// 按暴力模式区分任务
+	for _, course := range allCourses {
+		// 检查是否暂停
+		if course.Status == courseentity.StatusPause {
+			continue
+		}
+
+		payload := &XuexitongTaskPayload{
+			CourseID: course.ID,
+		}
+
+		payloadWriter := bytes.NewBuffer(nil)
+
+		e := gob.NewEncoder(payloadWriter).Encode(payload)
+		utils.OkOrPanic(e, oops.WithContext(ts.ctx).With("payload", payload).In("XuexitongTaskScanner.scanXuexitongTask").Wrap)
+
+		// 根据violence字段选择队列和任务类型
+		var queueName string
+		var taskType string
+
+		if course.Violence == courseentity.ViolenceYes {
+			queueName = cst2.TaskQueueXuexitongVio
+			taskType = cst2.TaskXuexitongVio
+		} else {
+			queueName = cst2.TaskQueueXuexitong
+			taskType = cst2.TaskXuexitong
+		}
+
+		e = utils.Catch(func() {
+			queue.AddTask(ts.ctx, asynq.NewTask(taskType, payloadWriter.Bytes()),
+				//asynq.Unique(30*time.Minute), // 30分钟内去重
+				asynq.MaxRetry(3),
+				asynq.Timeout(2*time.Hour), // 刷课可能需要较长时间
+				asynq.Queue(queueName),
+			)
+			// 更新状态为等待中
+			db.Global.CourseEntity.Update().
+				Where(courseentity.ID(course.ID), courseentity.StatusEQ(courseentity.StatusNotStart)).
+				SetStatus(courseentity.StatusWaiting).
+				Exec(ts.ctx)
+		})
+		if e != nil {
+			if errors.Is(e, asynq.ErrDuplicateTask) {
+				// 任务已在队列中，跳过
+				g.Log().Debugf(ts.ctx, "学习通课程ID %d 已在队列中，跳过本次扫描", course.ID)
+				continue
+			} else if errors.Is(e, context.Canceled) {
+				return
+			} else {
+				utils.LogError(ts.ctx, "扫描学习通任务时，入列失败", oops.With("course_id", course.ID).Wrap(e))
+			}
+		} else {
+			g.Log().Debugf(ts.ctx, "学习通课程 %s (ID: %d) 已加入队列: %s", course.CourseName, course.ID, queueName)
+		}
+	}
+}