fix: 无历史时保底使用管理员配置的签到范围信息

- 有历史签到数据 → 优先使用历史中的真实地址和经纬度 - 无历史签到数据 → 保底从 signPlaceSelected 提取管理员配置的范围信息
fix: 未签到任务表单中地址和经纬度仍错误使用管理员配置数据
2026-07-04 01:04:10 +08:00 · 2026-07-04 00:59:33 +08:00 · 2026-07-04 00:51:27 +08:00 · 2026-07-04 00:48:58 +08:00 · 2026-07-02 00:36:42 +08:00 · 2026-07-01 20:22:03 +08:00
101 changed files with 4505 additions and 594 deletions
@@ -4,7 +4,7 @@ permissions:
 on: [release]
 env:
  IMAGE: RecordingTheSmile/likedream-go
-  REGISTRY: git.likedream.xyz
+  REGISTRY: mycoder.cc.cd
 jobs:
  Build-And-Upload:
    runs-on: ubuntu-latest
@@ -4,4 +4,6 @@
 node_modules
 .claude
 *.exe
-.serena
+.serena
+
+device_code_cfworker
@@ -0,0 +1,128 @@
+when:
+  - event: tag
+    branch: [v*]
+
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      remote: http://10.10.10.128:3000/becomer/likedream.git
+
+steps:
+  build-image:
+    image: docker
+    commands:
+      - docker build -t likedream-go:latest .
+      - docker tag likedream-go:latest likedream-go:${CI_COMMIT_TAG:-${CI_COMMIT_SHA:0:8}}
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+
+  deploy:
+    image: docker
+    commands: |
+      # ============================================================
+      # 蓝绿部署：零宕机切换 likedream-go 容器
+      # 判断当前代理使用的端口，另一个作为备用
+      # ============================================================
+
+      set -e
+
+      IMAGE_TAG="$CI_COMMIT_TAG"
+      if [ -z "$IMAGE_TAG" ]; then IMAGE_TAG="latest"; fi
+
+      # 确保网络存在
+      docker network create likedream-net 2>/dev/null || true
+
+      # 读取 1Panel 当前代理端口
+      CURRENT_PORT=$(docker exec 1Panel-openresty-ESmn \
+        grep -o 'proxy_pass http://10.10.10.128:[0-9]\+' \
+        /www/sites/tianshen/proxy/api.conf | grep -o '[0-9]\+$')
+      echo "=== 当前 1Panel 反代端口: $CURRENT_PORT ==="
+
+      if [ "$CURRENT_PORT" = "8091" ]; then
+        PORT_ACTIVE=8091
+        PORT_STANDBY=8092
+      elif [ "$CURRENT_PORT" = "8092" ]; then
+        PORT_ACTIVE=8092
+        PORT_STANDBY=8091
+      else
+        echo "未知当前端口 $CURRENT_PORT，默认使用 8091/8092"
+        PORT_ACTIVE=8091
+        PORT_STANDBY=8092
+      fi
+      echo "   活跃: $PORT_ACTIVE | 备用: $PORT_STANDBY"
+
+      # 清理之前可能残留的临时容器
+      docker rm -f likedream-go-new 2>/dev/null || true
+
+      echo "=== 蓝绿部署: 启动新容器 on :$PORT_STANDBY (image: $IMAGE_TAG) ==="
+
+      docker run -d --name likedream-go-new \
+        --restart unless-stopped \
+        --network likedream-net \
+        -p $PORT_STANDBY:8091 \
+        -v /opt/likedream-go/config.toml:/app/config.toml:ro \
+        likedream-go:$IMAGE_TAG
+
+      # 健康检查：等待新容器就绪
+      HEALTHY=false
+      for i in $(seq 1 15); do
+        if wget -q --timeout=3 -O /dev/null http://10.10.10.128:$PORT_STANDBY/health 2>/dev/null; then
+          HEALTHY=true
+          break
+        fi
+        echo "  等待新容器就绪... ($i/15)"
+        sleep 2
+      done
+
+      if [ "$HEALTHY" = false ]; then
+        echo "ERROR: 新容器未通过健康检查，回滚"
+        docker stop likedream-go-new
+        docker rm likedream-go-new
+        exit 1
+      fi
+      echo "   新容器已就绪 ✓"
+
+      # 切换 1Panel 代理到备用端口
+      echo "=== 切换 1Panel 反代 :$PORT_ACTIVE → :$PORT_STANDBY ==="
+      docker exec 1Panel-openresty-ESmn \
+        sed -i "s|:$PORT_ACTIVE|:$PORT_STANDBY|g" \
+        /www/sites/tianshen/proxy/api.conf
+      docker exec 1Panel-openresty-ESmn nginx -s reload
+      echo "   Nginx 热加载完成（零中断）✓"
+
+      # 停止旧容器
+      echo "=== 清理旧容器 ==="
+      docker stop likedream-go 2>/dev/null || true
+      docker rm likedream-go 2>/dev/null || true
+
+      # 在活跃端口启动正式容器
+      echo "=== 启动正式容器 on :$PORT_ACTIVE ==="
+      docker run -d --name likedream-go \
+        --restart unless-stopped \
+        --network likedream-net \
+        -p $PORT_ACTIVE:8091 \
+        -v /opt/likedream-go/config.toml:/app/config.toml:ro \
+        likedream-go:$IMAGE_TAG
+
+      # 连接到验证码服务网络
+      docker network connect ocr-go_default likedream-go 2>/dev/null || true
+
+      # 切回 1Panel 代理到活跃端口
+      echo "=== 切回 1Panel 反代 :$PORT_STANDBY → :$PORT_ACTIVE ==="
+      docker exec 1Panel-openresty-ESmn \
+        sed -i "s|:$PORT_STANDBY|:$PORT_ACTIVE|g" \
+        /www/sites/tianshen/proxy/api.conf
+      docker exec 1Panel-openresty-ESmn nginx -s reload
+      echo "   Nginx 热加载完成（零中断）✓"
+
+      # 清理临时容器和旧镜像
+      echo "=== 清理 ==="
+      docker rm -f likedream-go-new 2>/dev/null || true
+      # 保留 latest 和最近 3 个 tag 镜像
+      docker images likedream-go --format '{{.Tag}}' | grep -v latest | head -n -3 | while read tag; do
+        docker rmi likedream-go:$tag 2>/dev/null || true
+      done
+      echo "=== 部署完成 ✓ ==="
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
@@ -1,5 +1,6 @@
-FROM golang:alpine AS backend-builder
+FROM golang:1.25-alpine AS backend-builder
 WORKDIR /build
+ENV GOPROXY=https://goproxy.cn,direct
 COPY . .

 RUN go build -ldflags="-s -w" -o bin/server
@@ -1,13 +1,30 @@
 [ocr]
 url = "https://devocr.likedream.xyz"

+# ===== 应用品牌配置 =====
+# brand: "default"(老系统/若梦系统/MD3风格邮件) 或 "new"(新系统/天神系统/shadcn风格邮件)
+# 未设置时默认使用 "default"
+[app]
+brand = "default"
+name = "若梦系统"
+copyright = "© 2025 若梦系统. 保留所有权利."
+# 邮件中的链接地址（会覆盖 server 段中的同名配置）
+# emailConfirmBaseUrl = "https://ujob.us.ci/confirm/"
+# emailResetPasswordUrl = "https://ujob.us.ci/reset-password/"
+# balanceMigrateUrl = "https://ujob.us.ci/balance-migrate/"
+
+[quesbank]
+url = "http://tk.swk.tw/api/search.php"
+key = "sk-acacac439b346036df45e90c85c177c375568ef72c469e49"
+
 [database]
 type = "mysql"
 dsn = "test_likedream_go:EpXckXmxawDEQGxJ@tcp(database.out:3306)/test_likedream_go?parseTime=true&loc=Asia%2FShanghai"
-dsn2 = "host=database.out user=dev password=JPmKjmpcaG3EYAJZ dbname=dev port=5432 sslmode=disable TimeZone=Asia/Shanghai"
-# host=localhost user=gorm password=gorm dbname=gorm port=9920 sslmode=disable TimeZone=Asia/Shanghai
+dsn2 = "host=pg.out user=dev password=JPmKjmpcaG3EYAJZ dbname=dev port=5432 sslmode=disable TimeZone=Asia/Shanghai"
+#type = "postgres"
+#dsn = "host=pg.out user=dev password=JPmKjmpcaG3EYAJZ dbname=dev port=5432 sslmode=disable TimeZone=Asia/Shanghai"
 [server]
-port = 8090
+port = 8091
 url = "https://devocr.likedream.xyz"
 openapiPath= "/api.json"
 swaggerPath= "/swagger"
@@ -19,8 +36,9 @@ balanceMigrateUrl = "http://localhost:3200/balance-migrate/"
 mode = "dev"

 [captcha]
-baseUrl = "http://captcha-resolver.out"
-#baseUrl = "http://localhost:8890"
+#baseUrl = "http://captcha-resolver.out"
+baseUrl = "http://likedream-go-captcha:8890"
+apiKey = "baca122..."
 [redis]
 url = "redis://:jhkdjhkjdhsIUTYURTU_pEGmFP@database.out:56379"

@@ -0,0 +1,18 @@
+services:
+  likedream-go:
+    image: likedream-go:latest
+    container_name: likedream-go
+    restart: unless-stopped
+    ports:
+      - "8091:8091"
+    volumes:
+      - /opt/likedream-go/config.toml:/app/config.toml:ro
+    networks:
+      - likedream-net
+      - ocr-go_default
+
+networks:
+  likedream-net:
+    external: true
+  ocr-go_default:
+    external: true
@@ -1,6 +1,6 @@
 module likedream-goframe

-go 1.24.0
+go 1.25.0

 require (
 	entgo.io/ent v0.14.5
@@ -28,10 +28,12 @@ require (
 	github.com/wenlng/go-captcha-assets v1.0.7
 	github.com/wenlng/go-captcha/v2 v2.0.4
 	github.com/wneessen/go-mail v0.6.2
+	github.com/xuri/excelize/v2 v2.10.0
 	go.uber.org/automaxprocs v1.6.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/crypto v0.43.0
-	golang.org/x/net v0.45.0
+	golang.org/x/net v0.46.0
+	golang.org/x/oauth2 v0.36.0
 	gorm.io/driver/postgres v1.6.0
 	gorm.io/gorm v1.31.1
 	resty.dev/v3 v3.0.0-beta.3
@@ -87,15 +89,20 @@ require (
 	github.com/oklog/ulid/v2 v2.1.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/richardlehane/mscfb v1.0.4 // indirect
+	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/samber/lo v1.51.0 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/spf13/cast v1.9.2 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tiendc/go-deepcopy v1.7.1 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/xuri/efp v0.0.1 // indirect
+	github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	github.com/zclconf/go-cty v1.14.4 // indirect
 	github.com/zclconf/go-cty-yaml v1.1.0 // indirect
@@ -163,6 +163,11 @@ github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4
 github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/redis/go-redis/v9 v9.11.0 h1:E3S08Gl/nJNn5vkxd2i78wZxWAPNZgUNTp8WIJUAiIs=
 github.com/redis/go-redis/v9 v9.11.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
+github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
+github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
+github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
+github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00=
+github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -195,14 +200,16 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
 github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tiendc/go-deepcopy v1.7.1 h1:LnubftI6nYaaMOcaz0LphzwraqN8jiWTwm416sitff4=
+github.com/tiendc/go-deepcopy v1.7.1/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
 github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
@@ -215,6 +222,12 @@ github.com/wenlng/go-captcha/v2 v2.0.4 h1:5cSUF36ZyA03qeDMjKmeXGpbYJMXEexZIYK3Vg
 github.com/wenlng/go-captcha/v2 v2.0.4/go.mod h1:5hac1em3uXoyC5ipZ0xFv9umNM/waQvYAQdr0cx/h34=
 github.com/wneessen/go-mail v0.6.2 h1:c6V7c8D2mz868z9WJ+8zDKtUyLfZ1++uAZmo2GRFji8=
 github.com/wneessen/go-mail v0.6.2/go.mod h1:L/PYjPK3/2ZlNb2/FjEBIn9n1rUWjW+Toy531oVmeb4=
+github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
+github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.10.0 h1:8aKsP7JD39iKLc6dH5Tw3dgV3sPRh8uRVXu/fMstfW4=
+github.com/xuri/excelize/v2 v2.10.0/go.mod h1:SC5TzhQkaOsTWpANfm+7bJCldzcnU/jrhqkTi/iBHBU=
+github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE=
+github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -268,8 +281,10 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
-golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
+golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2,6 +2,7 @@ package api

 import (
 	"context"
+
 	"likedream-goframe/internal/common/cst"
 	"likedream-goframe/internal/controller/agent"
 	"likedream-goframe/internal/controller/balance"
@@ -26,56 +27,53 @@ import (

 func StartServer(ctx context.Context) {
 	s := g.Server()
-	// 设置端口
+
 	port, err := g.Cfg().Get(ctx, cst.ConfigServerPort)
 	utils.OkOrPanic(err)
+
 	s.SetNameToUriType(3)
-	// 设置中间件
-	s.Use(
-		middleware.ExceptionHandler,
-	)
+	s.Use(middleware.ExceptionHandler)
 	s.BindStatusHandler(404, common.NewBaseV1().NotFound)
-	// 业务路由
+
 	s.Group("/v1", func(group *ghttp.RouterGroup) {
 		group.Bind(user_login.NewUserLoginV1())
-		// 系统设置路由
+		group.Bind(config.NewMailOAuthCtrlV1())
+
 		systemGroup := group.Group("/system").Middleware(middleware.AuthHandler, middleware.PermissionHandler)
 		systemGroup.Bind(role.NewV1())
 		systemGroup.Bind(menu.NewV1())
 		systemGroup.Bind(user.NewUserCtrlV1())
 		systemGroup.Bind(config.NewConfigCtrlV1())
 		systemGroup.Bind(config.NewAIConfigCtrlV1())
-		//systemGroup.Bind(agent.NewV1())
-		// 用户信息路由
+
 		userGroup := group.Group("/user").Middleware(middleware.AuthHandler, middleware.PermissionHandler)
 		userGroup.Bind(user_login.NewUserInfoV1())
 		userGroup.Bind(balance.NewBalanceCtrlV1())
-		// 代理信息路由
+
 		agentGroup := group.Group("/agent").Middleware(middleware.AuthHandler, middleware.PermissionHandler)
 		agentGroup.Bind(agent.NewV1())
 		agentGroup.Bind(card.NewCardCtrlV1())
-		// 今日校园
+
 		cpdailyGroup := group.Group("/cpdaily").Middleware(middleware.AuthHandler, middleware.PermissionHandler)
 		cpdailyGroup.Bind(cpdaily.NewCpUserCtrlV1())
 		cpdailyGroup.Bind(cpdaily.NewCpTaskCtrlV1())
 		cpdailyGroup.Bind(cpdaily.NewCpImageCtrlV1())
 		cpdailyGroup.Bind(cpdaily.NewCpTaskLogCtrlV1())
 		cpdailyGroup.Bind(cpdaily.NewCpLeaveCtrlV1())
-		// 娱乐
+
 		musicGroup := group.Group("/music").Middleware(middleware.AuthHandler, middleware.PermissionHandler)
 		musicGroup.Bind(music.NewMusicCtrlV1())
-		// 网课
+
 		courseGroup := group.Group("/course").Middleware(middleware.AuthHandler, middleware.PermissionHandler)
 		courseGroup.Bind(course.NewXxtCtrlV1())
 		courseGroup.Bind(course.NewSmartEduSCCtrlV1())
 	})

 	s.SetPort(port.Int())
-
 	s.GetOpenApi().Config.IgnorePkgPath = true
-	// 设置全局异常捕获
-	e := s.Start()
-	utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
+
+	err = s.Start()
+	utils.OkOrPanic(err, oops.WithContext(ctx).Wrap)
 }

 func StopServer() {
@@ -24,6 +24,62 @@ type ConfigListReq struct {
 }

 type ConfigPublicGetReq struct {
-	g.Meta `path:"/config/public/{key}" method:"get" tags:"Config" summary:"获取公开配置（无需认证）" auth:"false"`
+	g.Meta `path:"/config/public/{key}" method:"get" tags:"Config" summary:"获取公开配置" auth:"false"`
 	Key    string `json:"key" v:"required#配置键不能为空"`
 }
+
+type SmtpConfigGetReq struct {
+	g.Meta `path:"/config/smtp" method:"get" tags:"Config" summary:"获取邮件配置" permission:"sys:config:edit"`
+}
+
+type SmtpConfigUpdateReq struct {
+	g.Meta `path:"/config/smtp" method:"put" tags:"Config" summary:"更新邮件配置" permission:"sys:config:edit"`
+
+	AuthMode string `json:"authMode" v:"required#请选择邮件认证模式"`
+
+	SmtpHost     string `json:"smtpHost"`
+	SmtpPort     int    `json:"smtpPort"`
+	SmtpUsername string `json:"smtpUsername"`
+	SmtpPassword string `json:"smtpPassword"`
+
+	FromEmail string `json:"fromEmail" v:"required|email#发件人邮箱不能为空|请输入正确的发件人邮箱"`
+	FromName  string `json:"fromName" v:"required#发件人名称不能为空"`
+
+	OAuthTenant       string `json:"oauthTenant"`
+	OAuthClientID     string `json:"oauthClientId"`
+	OAuthClientSecret string `json:"oauthClientSecret"`
+	OAuthRedirectURL  string `json:"oauthRedirectUrl"`
+	OAuthRefreshToken string `json:"oauthRefreshToken"`
+	OAuthScope        string `json:"oauthScope"`
+}
+
+type SmtpTestReq struct {
+	g.Meta  `path:"/config/smtp/test" method:"post" tags:"Config" summary:"发送测试邮件" permission:"sys:config:edit"`
+	ToEmail string `json:"toEmail" v:"required|email#收件人邮箱不能为空|请输入正确的收件人邮箱"`
+}
+
+type OutlookOAuthAuthorizeURLReq struct {
+	g.Meta `path:"/config/smtp/oauth/outlook/authorize-url" method:"post" tags:"Config" summary:"获取 Outlook OAuth2 授权地址" permission:"sys:config:edit"`
+
+	OAuthTenant       string `json:"oauthTenant"`
+	OAuthClientID     string `json:"oauthClientId" v:"required#Client ID 不能为空"`
+	OAuthClientSecret string `json:"oauthClientSecret" v:"required#Client Secret 不能为空"`
+	OAuthScope        string `json:"oauthScope"`
+	FromEmail         string `json:"fromEmail" v:"required|email#发件人邮箱不能为空|请输入正确的发件人邮箱"`
+	FrontendOrigin    string `json:"frontendOrigin" v:"required#前端来源地址不能为空"`
+	CallbackBaseURL   string `json:"callbackBaseUrl" v:"required#API 基础地址不能为空"`
+}
+
+type OutlookOAuthAuthorizeURLResp struct {
+	AuthURL     string `json:"authUrl"`
+	CallbackURL string `json:"callbackUrl"`
+	State       string `json:"state"`
+}
+
+type OutlookOAuthCallbackReq struct {
+	g.Meta           `path:"/mail/oauth/outlook/callback" method:"get" tags:"MailOAuth" summary:"Outlook OAuth2 回调" auth:"false"`
+	Code             string `json:"code"`
+	State            string `json:"state"`
+	Error            string `json:"error"`
+	ErrorDescription string `json:"error_description"`
+}
@@ -1,8 +1,30 @@
 package v1

-// TaskStatisticsItem 每日任务统计项
+// TaskStatisticsItem 每日任务统计项（旧版）
 type TaskStatisticsItem struct {
 	Date        string `json:"date"`        // 日期 格式：2006-01-02
 	PendingTask int    `json:"pendingTask"` // 需要完成的任务数
 	SuccessTask int    `json:"successTask"` // 成功执行的任务数
 }
+
+// TaskStatisticsV2Item 每日任务统计项（新版：从日志表按任务id去重）
+type TaskStatisticsV2Item struct {
+	Date           string  `json:"date"`                     // 日期 格式：2006-01-02
+	SuccessTask    int     `json:"successTask"`              // 成功任务数（任务id去重）
+	FailTask       int     `json:"failTask"`                 // 失败任务数（任务id去重）
+	PendingTask    int     `json:"pendingTask"`              // 待执行任务数（仅当天）
+	SuccessTaskIds []int64 `json:"successTaskIds,omitempty"` // 成功任务ID列表
+	FailTaskIds    []int64 `json:"failTaskIds,omitempty"`    // 失败任务ID列表
+	PendingTaskIds []int64 `json:"pendingTaskIds,omitempty"` // 待执行任务ID列表（仅当天）
+}
+
+// DashboardSummary 首页概览数据（新版）
+type DashboardSummary struct {
+	Balance        string `json:"balance"`        // 当前余额
+	TodayCost      string `json:"todayCost"`      // 今日消费
+	YesterdayCost  string `json:"yesterdayCost"`  // 昨日消费
+	Week1Cost      string `json:"week1Cost"`      // 近7日消费
+	Week2Cost      string `json:"week2Cost"`      // 上7日消费
+	TodayTaskCount int    `json:"todayTaskCount"` // 今日任务数（成功+失败，任务id去重）
+	YdayTaskCount  int    `json:"ydayTaskCount"`  // 昨日任务数（成功+失败，任务id去重）
+}
@@ -1,16 +1,33 @@
 package v1

 import (
+	"likedream-goframe/internal/ent/cptask"
+
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 )

 type UploadImageReq struct {
-	g.Meta `path:"/image/upload" method:"post" tags:"Image" summary:"上传图片"`
-	File   *ghttp.UploadFile `json:"file" v:"required#请上传图片"`
+	g.Meta   `path:"/image/upload" method:"post" tags:"Image" summary:"上传图片"`
+	File     *ghttp.UploadFile `json:"file" v:"required#请上传图片"`
+	CpUserId int64             `json:"cpUserId" v:"required#请指定今日校园用户"`
+	TaskType cptask.TaskType   `json:"taskType" v:"required#请指定任务类型"`
+}
+
+type GetUploadPolicyReq struct {
+	g.Meta   `path:"/image/policy" method:"post" tags:"Image" summary:"获取图片上传策略"`
+	CpUserId int64           `json:"cpUserId" v:"required#请指定今日校园用户"`
+	TaskType cptask.TaskType `json:"taskType" v:"required#请指定任务类型"`
+}
+
+type GetPreviewUrlReq struct {
+	g.Meta   `path:"/image/previewUrl" method:"post" tags:"Image" summary:"获取图片预览地址"`
+	CpUserId int64           `json:"cpUserId" v:"required#请指定今日校园用户"`
+	TaskType cptask.TaskType `json:"taskType" v:"required#请指定任务类型"`
+	FileKey  string          `json:"fileKey" v:"required#请指定文件key"`
 }

 type PreviewImageReq struct {
 	g.Meta `path:"/image/preview" method:"get" tags:"Image" summary:"预览图片"`
-	Key    string `json:"key" v:"required#请输入图片key"`
+	Key    string `json:"key" v:"required#请指定图片key" in:"query"`
 }
@@ -1,6 +1,17 @@
 package v1

 type UploadImageRes struct {
-	FileKey  string `json:"key"`
-	FileSize *int64 `json:"size"`
+	PreviewUrl string `json:"previewUrl"`
+}
+
+type UploadPolicyRes struct {
+	Host      string `json:"host"`
+	AccessId  string `json:"accessId"`
+	FileName  string `json:"fileName"`
+	Policy    string `json:"policy"`
+	Signature string `json:"signature"`
+}
+
+type PreviewUrlRes struct {
+	PreviewUrl string `json:"previewUrl"`
 }
@@ -6,7 +6,7 @@ import (
 )

 type CpLeaveListReq struct {
-	g.Meta   `path:"/leave" method:"get" tags:"CpLeave" summary:"获取销假记录列表"`
+	g.Meta   `path:"/leave" method:"get" tags:"CpLeave" summary:"Get leave records"`
 	CpUserId int64  `json:"cpUserId"`
 	Username string `json:"username"`
 	Status   string `json:"status"`
@@ -15,23 +15,67 @@ type CpLeaveListReq struct {
 }

 type GetLeaveListFromSystemReq struct {
-	g.Meta   `path:"/leave/system/{cpUserId}" method:"get" tags:"CpLeave" summary:"获取今日校园系统中的请假列表"`
+	g.Meta   `path:"/leave/system/{cpUserId}" method:"get" tags:"CpLeave" summary:"Get system leave list"`
 	CpUserId int64 `json:"cpUserId" v:"required#今日校园账号ID不能为空"`
 }

 type CpLeaveReportReq struct {
-	g.Meta    `path:"/leave/report" method:"post" tags:"CpLeave" summary:"执行销假"`
+	g.Meta    `path:"/leave/report" method:"post" tags:"CpLeave" summary:"Submit leave report"`
 	CpUserId  int64  `json:"cpUserId" v:"required#今日校园账号ID不能为空"`
 	LeaveId   string `json:"leaveId" v:"required#请假记录ID不能为空"`
 	Title     string `json:"title" v:"required#请假记录标题不能为空"`
-	Longitude string `json:"longitude"` // 经度（可选，不传则使用系统默认）
-	Latitude  string `json:"latitude"`  // 纬度（可选，不传则使用系统默认）
-	Address   string `json:"address"`   // 地址（可选，不传则使用系统默认）
+	Longitude string `json:"longitude"`
+	Latitude  string `json:"latitude"`
+	Address   string `json:"address"`
 	ImageUrl  string `json:"imageUrl"`
 }

 type CpLeaveUploadReq struct {
-	g.Meta   `path:"/leave/upload" method:"post" tags:"CpLeave" summary:"上传销假图片"`
+	g.Meta   `path:"/leave/upload" method:"post" tags:"CpLeave" summary:"Upload leave image"`
 	File     *ghttp.UploadFile `json:"file"`
 	CpUserId int64             `json:"cpUserId"`
 }
+
+type CpLeaveCheckReq struct {
+	g.Meta   `path:"/leave/check/{cpUserId}" method:"get" tags:"CpLeave" summary:"Check leave permission"`
+	CpUserId int64 `json:"cpUserId" v:"required#今日校园账号ID不能为空"`
+}
+
+type CpLeaveTypesReq struct {
+	g.Meta   `path:"/leave/types/{cpUserId}" method:"get" tags:"CpLeave" summary:"Get leave types"`
+	CpUserId int64 `json:"cpUserId" v:"required#今日校园账号ID不能为空"`
+}
+
+type CpLeaveTypeCfgReq struct {
+	g.Meta   `path:"/leave/typeCfg" method:"post" tags:"CpLeave" summary:"Get leave type config"`
+	CpUserId int64 `json:"cpUserId" v:"required#今日校园账号ID不能为空"`
+	Code     *int  `json:"code"`
+}
+
+type CpLeaveApproveFlowReq struct {
+	g.Meta    `path:"/leave/approveFlow" method:"post" tags:"CpLeave" summary:"Get approve flow"`
+	CpUserId  int64  `json:"cpUserId" v:"required#今日校园账号ID不能为空"`
+	LeaveType *int   `json:"leaveType"`
+	StartTime string `json:"startTime" v:"required#开始时间不能为空"`
+	EndTime   string `json:"endTime" v:"required#结束时间不能为空"`
+}
+
+type CpLeaveApplyReq struct {
+	g.Meta        `path:"/leave/apply" method:"post" tags:"CpLeave" summary:"Apply leave"`
+	CpUserId      int64  `json:"cpUserId" v:"required#今日校园账号ID不能为空"`
+	LeaveType     *int   `json:"leaveType"`
+	StartTime     string `json:"startTime" v:"required#开始时间不能为空"`
+	EndTime       string `json:"endTime" v:"required#结束时间不能为空"`
+	UrgencyMobile string `json:"urgencyMobile"`
+	LeaveReason   string `json:"leaveReason" v:"required#请假原因不能为空"`
+	OutStatus     bool   `json:"outStatus"`
+	Address       string `json:"address"`
+	DetailAddress string `json:"detailAddress"`
+	Longitude     string `json:"longitude" v:"required#经度不能为空"`
+	Latitude      string `json:"latitude" v:"required#纬度不能为空"`
+	LocationAddr  string `json:"locationAddr" v:"required#定位地址不能为空"`
+	ImageUrl      string `json:"imageUrl"`
+	ApproverWid   string `json:"approverWid"`
+	ApproverId    string `json:"approverId"`
+	ApproverName  string `json:"approverName"`
+}
@@ -24,6 +24,7 @@ type CpTaskListReq struct {
 	TaskType   cptask.TaskType   `json:"type"`
 	Username   string            `json:"username"`
 	TaskStatus cptask.TaskStatus `json:"task_status"`
+	Ids        string            `json:"ids"`
 	Page       int               `json:"page" d:"1"`
 	Size       int               `json:"size" d:"10"`
 }
@@ -51,6 +52,13 @@ type PostCpTaskExecuteReq struct {
 	NotificationType cptask.NotificationType `json:"notification_type"`
 	ExecuteHour      int                     `json:"execute_hour"`
 	ExecuteMinute    int                     `json:"execute_minute"`
+	ExecuteDays      []int                   `json:"execute_days"`
+}
+
+type UpdateTaskTitleReq struct {
+	g.Meta `path:"/task/title/{id}" method:"put" tags:"CpTask" summary:"修改任务标题"`
+	Id     int64  `json:"id"`
+	Title  string `json:"title" v:"required#标题不能为空"`
 }

 type DeleteTaskReq struct {
@@ -76,3 +84,11 @@ type FindLocationReq struct {
 type GetTaskStatisticsReq struct {
 	g.Meta `path:"/task/statistics" method:"get" tags:"CpTask" summary:"获取近七日任务统计数据"`
 }
+
+type GetTaskStatisticsV2Req struct {
+	g.Meta `path:"/task/statisticsV2" method:"get" tags:"CpTask" summary:"获取近七日任务统计数据V2"`
+}
+
+type GetDashboardSummaryReq struct {
+	g.Meta `path:"/task/dashboard" method:"get" tags:"CpTask" summary:"获取首页概览数据"`
+}
@@ -85,7 +85,20 @@ type CpUserAuthorizeConfirmReq struct {
 	DataKey string `json:"dataKey"`
 }

-type CpUserAuthorizeRandomReq struct {
-	g.Meta `path:"/user/authorizeRandom" method:"post" tags:"CpUser" summary:"随机设备码"`
-	Id     int64 `json:"id"`
+type CpUserCustomDeviceReq struct {
+	g.Meta     `path:"/user/customDevice" method:"post" tags:"CpUser" summary:"自定义设备码"`
+	Id         int64  `json:"id" v:"required#请指定用户"`
+	MobileCode string `json:"mobileCode" v:"required#请输入设备码"`
+	MobileType string `json:"mobileType" v:"required|in:random,manual#请指定设备码类型|设备码类型无效"`
+}
+
+// ---- 二维码获取设备码流程 ----
+
+type CpUserGenerateQrReq struct {
+	g.Meta `path:"/user/generateQr" method:"post" tags:"CpUser" summary:"生成设备码二维码"`
+}
+
+type CpUserCheckQrReq struct {
+	g.Meta `path:"/user/checkQr" method:"get" tags:"CpUser" summary:"校验二维码UUID是否有效" auth:"false"`
+	Uuid   string `json:"uuid" v:"required#请提供二维码UUID"`
 }
@@ -4,6 +4,10 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )

+type RefreshTokenReq struct {
+	g.Meta `path:"/refreshToken" method:"GET" tags:"UserInfo" summary:"刷新Token"`
+}
+
 type ResetPasswordReq struct {
 	g.Meta          `path:"/resetPassword" method:"POST" tags:"UserInfo" summary:"重置密码"`
 	OldPassword     string `json:"OldPassword"`
@@ -16,13 +16,14 @@ func ApiSemiOCRVerification(bytes []byte, shape1, shape2 int64) string {
 	data := Bytes2Base64(bytes)
 	ctx := gctx.GetInitCtx()
 	baseUrl := g.Config().MustGetWithEnv(ctx, cst.ConfigCaptchaBaseUrl).String() + "/semiOcr"
+	apiKey := g.Config().MustGetWithEnv(ctx, cst.ConfigCaptchaApiKey).String()
 	client := httpclient.Cpdaily.Clone(ctx)
 	client.SetDoNotParseResponse(false)
 	post, err := client.R().SetBody(map[string]any{
 		"base64": data,
 		"shape1": shape1,
 		"shape2": shape2,
-	}).Post(baseUrl)
+	}).SetHeader("X-Api-Key", apiKey).Post(baseUrl)
 	utils.OkOrPanic(err, func(err error) error {
 		return oops.
 			With("SemiOCRVerification", baseUrl).
@@ -37,11 +38,31 @@ func ApiAutoOCRVerification(bytes []byte) string {
 	data := Bytes2Base64(bytes)
 	ctx := gctx.GetInitCtx()
 	baseUrl := g.Config().MustGetWithEnv(ctx, cst.ConfigCaptchaBaseUrl).String() + "/ocr"
+	apiKey := g.Config().MustGetWithEnv(ctx, cst.ConfigCaptchaApiKey).String()
 	client := httpclient.Cpdaily.Clone(ctx)
 	client.SetDoNotParseResponse(false)
 	post, err := client.R().SetBody(map[string]any{
 		"base64": data,
-	}).Post(baseUrl)
+	}).SetHeader("X-Api-Key", apiKey).Post(baseUrl)
+	utils.OkOrPanic(err, func(err error) error {
+		return oops.
+			With("AutoOCRVerification", baseUrl).
+			WithContext(ctx).
+			Wrap(err)
+	})
+	result := post.String()
+	return gjson.Get(result, "data").String()
+}
+
+func ApiAutoCalcVerification(b64 string) string {
+	ctx := gctx.GetInitCtx()
+	baseUrl := g.Config().MustGetWithEnv(ctx, cst.ConfigCaptchaBaseUrl).String() + "/calc"
+	apiKey := g.Config().MustGetWithEnv(ctx, cst.ConfigCaptchaApiKey).String()
+	client := httpclient.Cpdaily.Clone(ctx)
+	client.SetDoNotParseResponse(false)
+	post, err := client.R().SetBody(map[string]any{
+		"base64": b64,
+	}).SetHeader("X-Api-Key", apiKey).Post(baseUrl)
 	utils.OkOrPanic(err, func(err error) error {
 		return oops.
 			With("AutoOCRVerification", baseUrl).
@@ -48,22 +48,8 @@ func (p *PersistCookieJar) SetCookies(u *url.URL, cookies []*http.Cookie) {
 			delete(globalCookies, cookie.Name)
 		}

-		// 查找是否存在相同 name, path 和 domain 的 cookie
-		existingCookies := p.hostMap[host][cookie.Name]
-		found := false
-		for i, existing := range existingCookies {
-			if existing.Path == cookie.Path && existing.Domain == cookie.Domain {
-				// 找到完全匹配的 cookie，替换它
-				existingCookies[i] = cookie
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			// 没有找到匹配的，添加新的 cookie
-			p.hostMap[host][cookie.Name] = append(p.hostMap[host][cookie.Name], cookie)
-		}
+		// 同一 host 下同名 cookie 直接覆盖，避免多个同名 cookie 导致旧值被选中
+		p.hostMap[host][cookie.Name] = []*http.Cookie{cookie}
 	}

 }
@@ -0,0 +1,167 @@
+package leave
+
+import (
+	"context"
+	"fmt"
+	v1 "likedream-goframe/internal/api/v1"
+	"likedream-goframe/internal/application/cpdaily"
+	"likedream-goframe/internal/application/cpdaily/leave/model"
+	"likedream-goframe/internal/application/cpdaily/taskhelper"
+	"likedream-goframe/internal/common/errors"
+	"likedream-goframe/internal/utils"
+
+	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/tidwall/gjson"
+)
+
+// CheckOnceLeave 检查是否允许请假
+func (c *CpdailyReportApp) CheckOnceLeave() error {
+	post, err := c.client.R().SetBody(map[string]any{}).
+		Post(fmt.Sprintf("%s/wec-counselor-leave-apps/leave/stu/checkOnceLeave", c.host))
+	if err != nil {
+		return err
+	}
+	result := utils.ReadGjsonResult(post.Body)
+	if result.Get("code").String() != "0" {
+		return errors.NewBusinessError(400, result.Get("message").String())
+	}
+	return nil
+}
+
+// QueryLeaveTypes 获取请假类型列表
+func (c *CpdailyReportApp) QueryLeaveTypes() gjson.Result {
+	post, err := c.client.R().SetBody(map[string]any{}).
+		Post(fmt.Sprintf("%s/wec-counselor-leave-apps/leave/queryLeaveTypes", c.host))
+	utils.OkOrPanic(err)
+	result := utils.ReadGjsonResult(post.Body)
+	if result.Get("code").String() != "0" {
+		utils.OkOrPanic(errors.NewBusinessError(503, result.Get("message").String()))
+	}
+	return result.Get("datas.leaveType")
+}
+
+// QueryLeaveTypeCfg 查询请假类型配置
+func (c *CpdailyReportApp) QueryLeaveTypeCfg(code int) gjson.Result {
+	post, err := c.client.R().SetBody(map[string]any{"code": code}).
+		Post(fmt.Sprintf("%s/wec-counselor-leave-apps/leave/stu/queryLeaveTypeCfg", c.host))
+	utils.OkOrPanic(err)
+	result := utils.ReadGjsonResult(post.Body)
+	if result.Get("code").String() != "0" {
+		utils.OkOrPanic(errors.NewBusinessError(503, result.Get("message").String()))
+	}
+	return result.Get("datas")
+}
+
+// ObtainApproveFlow 获取审批人列表
+func (c *CpdailyReportApp) ObtainApproveFlow(leaveType int, startTime, endTime string) gjson.Result {
+	post, err := c.client.R().SetBody(map[string]any{
+		"leaveType": leaveType,
+		"startTime": startTime,
+		"endTime":   endTime,
+	}).Post(fmt.Sprintf("%s/wec-counselor-leave-apps/leave/stu/obtainApproveFlow", c.host))
+	utils.OkOrPanic(err)
+	result := utils.ReadGjsonResult(post.Body)
+	if result.Get("code").String() != "0" {
+		utils.OkOrPanic(errors.NewBusinessError(503, result.Get("message").String()))
+	}
+	return result.Get("datas")
+}
+
+// SubmitLeaveApply 提交请假申请
+func (c *CpdailyReportApp) SubmitLeaveApply(ctx context.Context, req *v1.CpLeaveApplyReq, username, deviceId string) {
+	cpdailyInfo := cpdaily.GetInfo(ctx)
+	leaveType := 0
+	if req.LeaveType != nil {
+		leaveType = *req.LeaveType
+	}
+	urgencyMobile := req.UrgencyMobile
+	address := req.Address
+	detailAddress := req.DetailAddress
+	destination := ""
+	if req.OutStatus {
+		destination = address
+		if detailAddress != "" {
+			if destination != "" {
+				destination += "/"
+			}
+			destination += detailAddress
+		}
+	} else {
+		urgencyMobile = ""
+		address = ""
+		detailAddress = ""
+	}
+
+	// 构造请假申请体
+	applyBody := map[string]any{
+		"leaveType":            leaveType,
+		"startTime":            req.StartTime,
+		"endTime":              req.EndTime,
+		"urgencyMobile":        urgencyMobile,
+		"leaveReason":          req.LeaveReason,
+		"isAttendance":         nil,
+		"outStatus":            req.OutStatus,
+		"address":              address,
+		"detailAddress":        detailAddress,
+		"destination":          destination,
+		"holidayAutoDefineVos": []any{},
+		"appVersion":           cpdailyInfo.AppVersion,
+		"deviceId":             deviceId,
+		"ccInfo":               map[string]any{"teachers": []any{}, "students": []any{}},
+		"cheatType":            nil,
+		"source":               1,
+		"location": map[string]any{
+			"deviceId":      deviceId,
+			"systemName":    "Android",
+			"systemVersion": cpdailyInfo.SystemVersion,
+			"model":         "Redmi Note 8 Pro",
+			"address":       req.LocationAddr,
+			"latitude":      req.Latitude,
+			"longitude":     req.Longitude,
+		},
+		"locationType":      0,
+		"disclaimers":       "本人承诺填写的信息真实有效，并对本次提交请假申请的信息真实性负责。",
+		"uaIsCpadaily":      "true",
+		"leaveApplyExplain": nil,
+	}
+
+	// 审批人信息
+	if req.ApproverWid != "" {
+		applyBody["approverWid"] = req.ApproverWid
+		applyBody["approverId"] = req.ApproverId
+		applyBody["approverName"] = req.ApproverName
+	}
+
+	// 图片附件
+	if req.ImageUrl != "" {
+		applyBody["applyAttach"] = []model.Attach{{Type: 1, Url: req.ImageUrl}}
+	} else {
+		applyBody["applyAttach"] = []any{}
+	}
+
+	// 构造加密扩展头
+	extensionForm := map[string]*gvar.Var{
+		"lon":           gvar.New(req.Longitude),
+		"lat":           gvar.New(req.Latitude),
+		"model":         gvar.New("Redmi Note 8 Pro"),
+		"appVersion":    gvar.New(cpdailyInfo.AppVersion),
+		"systemVersion": gvar.New(cpdailyInfo.SystemVersion),
+		"userId":        gvar.New(username),
+		"systemName":    gvar.New("android"),
+		"deviceId":      gvar.New(deviceId),
+	}
+	extensionString := taskhelper.GetCpdailyExtension(ctx, extensionForm)
+
+	// 提交请假
+	response, e := c.client.R().
+		SetBody(applyBody).
+		WithContext(ctx).
+		SetHeader("Cpdaily-Extension", extensionString).
+		Post(fmt.Sprintf("%s/wec-counselor-leave-apps/leave/apply", c.host))
+
+	utils.OkOrPanic(e)
+	responseJSON := utils.ReadGjsonResult(response.Body)
+	if responseJSON.Get("code").String() != "0" {
+		utils.OkOrPanic(errors.NewBusinessError(503, responseJSON.Get("message").String()))
+	}
+}
@@ -22,6 +22,8 @@ func GetCpdailyLoginBySchoolInfo(ctx context.Context, info *school.SchoolDetailI
 	// 河北石油职业技术大学
 	case "01e270d1-00e2-4ce9-b0af-5d5fbd462b8a":
 		return NewIap(ctx)
+	case "676c9395-a29c-4068-97a8-b48e05dae499":
+		return NewHnuu(ctx)
 	default:
 		if info.IsIap() {
 			return NewIap(ctx)
@@ -4,13 +4,16 @@ import (
 	"context"
 	"fmt"
 	"likedream-goframe/internal/application/cookiejar"
+	"likedream-goframe/internal/application/cpdaily/school"
 	"likedream-goframe/internal/application/httpclient"
 	"likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/ent/cpuser"
+	"likedream-goframe/internal/framework/logger"
 	"likedream-goframe/internal/utils"
 	"strings"

 	"github.com/samber/oops"
+	"go.uber.org/zap"
 	"resty.dev/v3"
 )

@@ -97,12 +100,71 @@ func CookieEnabled(ctx context.Context, host string, client *resty.Client, login

 	utils.OkOrPanic(err)
 	needLogin := sessionResponse.StatusCode() == 302
-	if needLogin && loginType == cpuser.LoginTypePhone {
-		utils.OkOrPanic(errors.NewBusinessError(500, "登录信息失效，请重新通过短信验证码登录"))
-	}
 	return !needLogin
 }

+// RefreshCookieParams 刷新 cookie 所需的用户参数
+type RefreshCookieParams struct {
+	ID        int64
+	Cookie    string
+	Tgc       string
+	LoginType cpuser.LoginType
+	Username  string
+	Password  string
+	SchoolID  string
+}
+
+// RefreshCookieResult 刷新 cookie 的结果
+type RefreshCookieResult struct {
+	Client *resty.Client
+	Cookie string
+	Tgc    string
+}
+
+// EnsureCookieValid 检测 cookie 是否过期，过期则自动刷新。
+// phone 类型用 TGC 刷新，account 类型用账号密码重新登录。
+func EnsureCookieValid(ctx context.Context, params *RefreshCookieParams, schoolDetail *school.SchoolDetailInfo) *RefreshCookieResult {
+	client := GetClient(ctx, params.Cookie)
+	if CookieEnabled(ctx, schoolDetail.WecloudUrl, client, params.LoginType) {
+		logger.Logger.Info("[TGC] cookie有效，无需刷新",
+			zap.Int64("userId", params.ID),
+			zap.String("loginType", string(params.LoginType)),
+		)
+		return &RefreshCookieResult{Client: client, Cookie: params.Cookie, Tgc: params.Tgc}
+	}
+
+	logger.Logger.Info("[TGC] cookie已失效，开始刷新",
+		zap.Int64("userId", params.ID),
+		zap.String("loginType", string(params.LoginType)),
+		zap.Bool("tgcEmpty", params.Tgc == ""),
+	)
+
+	var newCookie, newTgc string
+
+	if params.LoginType == cpuser.LoginTypePhone {
+		if params.Tgc == "" {
+			utils.OkOrPanic(errors.NewBusinessError(500, "TGC为空，请重新通过短信验证码登录"))
+		}
+		smsHandler := NewSmsWithoutDeviceID()
+		newCookie, newTgc = smsHandler.RefreshByTgc(ctx, params.Tgc, params.SchoolID)
+		logger.Logger.Info("[TGC] RefreshByTgc完成",
+			zap.Int64("userId", params.ID),
+			zap.Bool("cookieChanged", newCookie != params.Cookie),
+		)
+	} else {
+		loginExecutor := GetCpdailyLoginBySchoolInfo(ctx, schoolDetail)
+		loginExecutor.Login(ctx, schoolDetail, params.Username, params.Password)
+		newCookie = loginExecutor.GetCookieString()
+		newTgc = params.Tgc
+	}
+
+	return &RefreshCookieResult{
+		Client: GetClient(ctx, newCookie),
+		Cookie: newCookie,
+		Tgc:    newTgc,
+	}
+}
+
 func GetClient(ctx context.Context, cookie string) *resty.Client {
 	cookieJar := cookiejar.NewPersistCookieJar()
 	cookieJar.Deserialize(cookie)
@@ -0,0 +1,180 @@
+package login
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"likedream-goframe/internal/application/cookiejar"
+	"likedream-goframe/internal/application/cpdaily/cryptoutil"
+	"likedream-goframe/internal/application/cpdaily/school"
+	"likedream-goframe/internal/application/httpclient"
+	"likedream-goframe/internal/common/errors"
+	"likedream-goframe/internal/utils"
+	"net/http"
+	"net/url"
+
+	"github.com/PuerkitoBio/goquery"
+	"github.com/samber/oops"
+	"resty.dev/v3"
+)
+
+var RSA_KEY_MAP = map[string]string{
+	"public_exponent":  "010001",
+	"private_exponent": "413798867d69babed22e0dd3d4031c635f3e9dbca0fa50a32974a0e230787b7f7ba78caefbee828a051c690357a8cc31dba8efc738b4db22e887571ef1ec5a5a55b6d866f6a67527f6a7d78a127c9f687008bb540228b50aa2d1ca5a4ff71107234f936b611ac46432a26da9c302eaa7180820df70593353b3f8c0247fe97a45",
+	"modulus":          "00b5eeb166e069920e80bebd1fea4829d3d1f3216f2aabe79b6c47a3c18dcee5fd22c2e7ac519cab59198ece036dcf289ea8201e2a0b9ded307f8fb704136eaeb670286f5ad44e691005ba9ea5af04ada5367cd724b5a26fdb5120cc95b6431604bd219c6b7d83a6f8f24b43918ea988a76f93c333aa5a20991493d4eb1117e7b1",
+}
+
+// 淮南联合大学登录实现 RSA加密 & 验证码必出（加法验证码）
+type CpdailyHnuuLogin struct {
+	client *resty.Client
+}
+
+func (c CpdailyHnuuLogin) Login(ctx context.Context, schoolDetail *school.SchoolDetailInfo, username, password string) {
+	jar := cookiejar.NewPersistCookieJar()
+
+	c.client.SetCookieJar(jar).SetRedirectPolicy(resty.FlexibleRedirectPolicy(20))
+	// 获取合法的登录URL
+	loginUrl := getCasValidLoginUrl(schoolDetail)
+
+	// 请求登录页面并获取真正的登录URL
+	loginPageResponse, err := c.client.R().
+		WithContext(ctx).
+		Get(loginUrl)
+
+	utils.OkOrPanic(err)
+
+	defer loginPageResponse.Body.Close()
+	loginPageBytes, err := io.ReadAll(loginPageResponse.Body)
+	utils.OkOrPanic(err)
+	loginResponseUrl := loginPageResponse.RawResponse.Request.URL
+	// 解析登录页面
+	loginPage, err := goquery.NewDocumentFromReader(bytes.NewReader(loginPageBytes))
+	utils.OkOrPanic(err)
+	// 判断登录类型
+	var (
+		allInputs = map[string]string{}
+		formNode  = loginPage.Find(".ant-form").First()
+	)
+	inputs := formNode.Find("input")
+	for _, input := range inputs.EachIter() {
+		name, exists := input.Attr("name")
+		if !exists {
+			continue
+		}
+		value, _ := input.Attr("value")
+		allInputs[name] = value
+	}
+
+	allInputs["username"] = username
+	pair := cryptoutil.NewNutRSAKeyPair(RSA_KEY_MAP["public_exponent"], "", RSA_KEY_MAP["modulus"])
+	// 处理密码
+	allInputs["password"] = pair.EncryptedString(password)
+
+	// 解决验证码
+	// 解决常规图片验证码
+	captchaUrl := getHnuuCaptchaUrl(loginResponseUrl)
+	code, uid := ResolveCalcCaptcha(ctx, captchaUrl, c.client)
+
+	allInputs["code"] = code
+	allInputs["id"] = uid
+	jar = cookiejar.NewPersistCookieJar()
+	c.client.SetCookieJar(jar)
+	// 登录提交
+	loginPostResponse, err := c.client.R().
+		SetFormData(allInputs).
+		WithContext(ctx).
+		Post(getHnuuLoginPostUrl(loginResponseUrl))
+	utils.OkOrPanic(err, func(err error) error {
+		return oops.
+			WithContext(ctx).
+			With("loginResponseUrl", loginResponseUrl).
+			With("allInputs", allInputs).
+			Wrap(err)
+	})
+	defer loginPostResponse.Body.Close()
+
+	type LoginResponse struct {
+		Meta struct {
+			Success    bool   `json:"success"`
+			StatusCode int    `json:"statusCode"`
+			Message    string `json:"message"`
+		} `json:"meta"`
+		Data struct {
+			Code string `json:"code"`
+		} `json:"data"`
+		Tgt    string `json:"tgt"`
+		Ticket string `json:"ticket"`
+	}
+	json := utils.ReadJson[LoginResponse](loginPostResponse.Body)
+	if json.Tgt != "" {
+		handleHnuuLoginSuccess(ctx, c.client, loginResponseUrl.Query().Get("service"), json.Ticket, json.Tgt, schoolDetail.WecloudUrl)
+	} else {
+		errMsg := ""
+		if json.Data.Code == "CODEFALSE" {
+			errMsg = "验证码错误"
+		} else if json.Data.Code == "FALSE" {
+			errMsg = "请检查账号密码是否正确"
+		} else if json.Data.Code != "PASSERROR" {
+			errMsg = "密码错误"
+		} else if json.Data.Code != "NOUSER" {
+			errMsg = "账号不存在"
+		} else if json.Data.Code != "USERLOCK" {
+			errMsg = "账号锁定"
+		} else {
+			errMsg = "未知错误" + json.Data.Code
+		}
+		utils.OkOrPanic(errors.NewBusinessError(500, errMsg))
+
+	}
+
+}
+
+func handleHnuuLoginSuccess(ctx context.Context, client *resty.Client, url, ticket string, tgt string, host string) {
+	redirectUrl := fmt.Sprintf("%s&ticket=%s", url, ticket)
+	client.R().SetHeader("Referer", "https://cas.hnuu.edu.cn/").Get(redirectUrl)
+	response, err2 := client.R().SetHeader("Referer", "https://cas.hnuu.edu.cn/").Get("https://hnuu.campusphere.net/iap/login")
+	utils.OkOrPanic(err2)
+	newUrl := response.RawResponse.Request.URL
+	ticketUrl := fmt.Sprintf("https://cas.hnuu.edu.cn/lyuapServer/v1/tickets/%s", tgt)
+	get, err := client.R().SetFormData(map[string]string{
+		"service":    url,
+		"loginToken": "loginToken",
+	}).Post(ticketUrl)
+	utils.OkOrPanic(err)
+	defer get.Body.Close()
+	ticket = utils.ReadString(get.Body)
+	redirectUrl = fmt.Sprintf("%s&ticket=%s", newUrl.Query().Get("service"), ticket)
+	client.R().SetHeader("Referer", "https://cas.hnuu.edu.cn/").Get(redirectUrl)
+	ActivateSession(ctx, host, client)
+}
+
+func getHnuuLoginPostUrl(url *url.URL) string {
+	// https://cas.hnuu.edu.cn/lyuapServer/v1/tickets
+	return fmt.Sprintf("%s://%s/lyuapServer/v1/tickets", url.Scheme, url.Host)
+}
+
+func getHnuuCaptchaUrl(url *url.URL) string {
+	// https://cas.hnuu.edu.cn/lyuapServer/kaptcha?_t=1766803822&uid=
+	return fmt.Sprintf("%s://%s/lyuapServer/kaptcha?_t=%d&uid=", url.Scheme, url.Host, utils.GetCurrentTimeMillis())
+}
+
+func (c CpdailyHnuuLogin) GetCookieJar() http.CookieJar {
+	return c.client.CookieJar()
+}
+
+func (c CpdailyHnuuLogin) GetCookieString() string {
+	cookieJar := c.GetCookieJar()
+	serializableJar := cookieJar.(*cookiejar.PersistCookieJar)
+	return serializableJar.Serialize()
+}
+
+func (c CpdailyHnuuLogin) GetClient() *resty.Client {
+	return c.client
+}
+
+func NewHnuu(ctx context.Context) CpdailyLogin {
+	return &CpdailyHnuuLogin{
+		client: httpclient.NewCpdailyClient(),
+	}
+}
@@ -15,6 +15,32 @@ func ResolveOcrCaptcha(ctx context.Context, url string, client *resty.Client) st
 	return captcha.ApiAutoOCRVerification(byteData)
 }

+func ResolveCalcCaptcha(ctx context.Context, url string, client *resty.Client) (string, string) {
+	b64, uid := DownBase64(ctx, url, client)
+	return captcha.ApiAutoCalcVerification(b64), uid
+}
+
+func DownBase64(ctx context.Context, url string, client *resty.Client) (string, string) {
+	res, err := client.R().
+		WithContext(ctx).
+		Get(url)
+	utils.OkOrPanic(err, func(err error) error {
+		return oops.
+			With("captchaUrl", url).
+			WithContext(ctx).
+			Wrap(err)
+	})
+	defer res.Body.Close()
+	type CaptchResponse struct {
+		KaptchaType string `json:"kaptchaType"`
+		UID         string `json:"uid"`
+		Content     string `json:"content"`
+		Timeout     int    `json:"timeout"`
+	}
+	json := utils.ReadJson[CaptchResponse](res.Body)
+	return json.Content, json.UID
+}
+
 func DownCode2Byte(ctx context.Context, url string, client *resty.Client) []byte {
 	res, err := client.R().
 		WithContext(ctx).
@@ -11,12 +11,15 @@ import (
 	"likedream-goframe/internal/application/httpclient"
 	"likedream-goframe/internal/common/cst"
 	"likedream-goframe/internal/common/errors"
+	"likedream-goframe/internal/framework/logger"
 	"likedream-goframe/internal/utils"
 	"net/http"
 	"net/url"
+	"strings"

 	"github.com/bytedance/sonic"
 	"github.com/samber/oops"
+	"go.uber.org/zap"
 	"resty.dev/v3"
 )

@@ -199,6 +202,7 @@ func (s *SmsLoginHandler) SetLoginCookie(ctx context.Context, jar http.CookieJar
 		jar.SetCookies(targetSchoolUrl, []*http.Cookie{cookie})
 		jar.SetCookies(targetApiUrl, []*http.Cookie{cookie})
 	}
+
 	s.client.SetRedirectPolicy(resty.FlexibleRedirectPolicy(50))
 	req := s.client.R().
 		SetHeader("AmpCookies", ampToken).
@@ -278,3 +282,93 @@ func (s *SmsLoginHandler) GetCookieString() string {
 	serializableJar := cookieJar.(*cookiejar.PersistCookieJar)
 	return serializableJar.Serialize()
 }
+
+// RefreshByTgc 使用保存的完整 cookie（包含 CASTGC 等长期凭证）重新去学校换取 CAS cookie。
+// tgc 参数是 SetLoginCookie 之后序列化的完整 cookie jar，包含 CASTGC（有效期10年）、
+// sessionToken 等认证信息。流程：先用 sessionToken 调用 getImUserToken 换取新的 CAS cookie，
+// 再激活 session。
+func (s *SmsLoginHandler) RefreshByTgc(ctx context.Context, tgc string, schoolId string) (cookie string, newTgc string) {
+	jar := cookiejar.NewPersistCookieJar()
+	jar.Deserialize(tgc)
+	// 合并所有 host 的 cookie 到 global，消除因多 host 存储导致的重复 cookie
+	jar.RemoveCookieInfo()
+	s.client = httpclient.NewCpdailyClient()
+	s.client.SetCookieJar(jar)
+
+	detail := school.GetSchoolDetail(ctx, schoolId)
+
+	logger.Logger.Info("[TGC] RefreshByTgc 开始用TGC换取CAS cookie",
+		zap.String("schoolId", schoolId),
+		zap.String("wecloudUrl", detail.WecloudUrl),
+		zap.Int("tgcLen", len(tgc)),
+	)
+
+	// 从 cookie jar 中提取 sessionToken，用于换取新的 CAS cookie
+	schoolUrl, _ := url.Parse(detail.WecloudUrl)
+	sessionToken := ""
+	for _, c := range jar.Cookies(schoolUrl) {
+		if c.Name == "sessionToken" {
+			sessionToken = c.Value
+			break
+		}
+	}
+
+	if sessionToken != "" {
+		// 换取新的 CAS cookie（与 SetLoginCookie 相同的流程）
+		getCookieUrl := fmt.Sprintf("%s%s", detail.WecloudUrl, "/wec-im-group/group/imUserToken/getImUserToken")
+
+		ampCookieMap := map[string]any{
+			"AMP2": []map[string]any{
+				{"path": "/", "value": sessionToken, "domain": "", "name": "sessionToken"},
+			},
+			"AMP1": []map[string]any{
+				{"path": "/", "value": sessionToken, "domain": "", "name": "sessionToken"},
+			},
+		}
+
+		ampTokenString, e := sonic.Marshal(ampCookieMap)
+		utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
+
+		ampTokenEncrypted := cryptoutil.DesEncrypt(ampTokenString, cryptoutil.Normal)
+		ampToken := base64.StdEncoding.EncodeToString(ampTokenEncrypted)
+
+		ctx = utils.NewCpdailySmsContextBuilder().
+			WithDeviceID(s.deviceID).
+			WithTenantID(detail.Id).
+			WithSessionToken(sessionToken).
+			Build(ctx)
+
+		// 使用不复制 Cookie 头的重定向策略，避免旧 Cookie 覆盖 jar 中更新的值
+		s.client.SetRedirectPolicy(resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
+			if len(via) >= 50 {
+				return fmt.Errorf("resty: stopped after 50 redirects")
+			}
+			// 只复制非 Cookie 头，让 jar 自动管理 Cookie
+			for key, val := range via[0].Header {
+				if !strings.EqualFold(key, "Cookie") {
+					req.Header[key] = val
+				}
+			}
+			return nil
+		}))
+		req := s.client.R().
+			SetHeader("AmpCookies", ampToken).
+			SetContext(ctx)
+
+		setSmsRequestHeaders(ctx, req)
+
+		resp, e := req.Get(getCookieUrl)
+		utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
+
+		respJson := utils.ReadJson[cpdailySmsCommonResponse[any]](resp.Body)
+		respJson.EnsureSuccess()
+
+		logger.Logger.Info("[TGC] RefreshByTgc 换取CAS cookie完成")
+	} else {
+		logger.Logger.Warn("[TGC] RefreshByTgc 未找到sessionToken，跳过换取CAS cookie步骤")
+	}
+
+	newTgc = tgc // TGC 保持不变（CASTGC 有效期10年）
+	cookie = s.GetCookieString()
+	return
+}
@@ -5,10 +5,8 @@ import (
 	"fmt"
 	"likedream-goframe/internal/application/cpdaily"
 	"likedream-goframe/internal/application/cpdaily/cryptoutil"
-	"likedream-goframe/internal/application/cpdaily/imageuploader"
 	"likedream-goframe/internal/application/cpdaily/task/formtype"
 	"likedream-goframe/internal/application/cpdaily/taskhelper"
-	"likedream-goframe/internal/application/cpdaily/types"
 	"likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/utils"
 	"maps"
@@ -454,31 +452,26 @@ func (c *CpdailyCollectionTask) FillCustomForm(ctx context.Context, form map[str
 				newRowObj["value"] = gvar.New(strings.Join(values, ","))
 			}
 		} else if c.isPicType(fieldType) {
-			// 图片类型
+			// 图片类型 - content 中存储的是今日校园的 previewUrl，逗号分隔
 			if param.Content == "" {
 				utils.OkOrPanic(errors.NewBusinessError(400, "查寝需要图片，但是当前图片为空"), oops.WithContext(ctx).Wrap)
 			}

-			imageUuidSeq := strings.Split(param.Content, ",")
-			var imageUuids []string
-			for _, imageUuid := range imageUuidSeq {
-				imageUuid = strings.TrimSpace(imageUuid)
-				if imageUuid == "" {
-					continue
+			previewUrls := strings.Split(param.Content, ",")
+			var validUrls []string
+			for _, url := range previewUrls {
+				url = strings.TrimSpace(url)
+				if url != "" {
+					validUrls = append(validUrls, url)
 				}
-				imageUuids = append(imageUuids, imageUuid)
 			}

-			if len(imageUuids) == 0 {
+			if len(validUrls) == 0 {
 				utils.OkOrPanic(errors.NewBusinessError(400, "查寝照片未上传"), oops.WithContext(ctx).Wrap)
 			}

 			// 随机选择一张照片
-			imageUuid := imageUuids[rand.IntN(len(imageUuids))]
-			imageId, e := uuid.Parse(imageUuid)
-			utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-
-			previewUrl := imageuploader.UploadImageFromStorage(ctx, c.host, imageId, types.TaskTypeCollection, c.client)
+			previewUrl := validUrls[rand.IntN(len(validUrls))]
 			newRowObj["value"] = gvar.New(previewUrl)
 		} else {
 			utils.OkOrPanic(errors.NewBusinessError(500, "出现未知类型表单，请反馈表单类型："+fieldType), oops.WithContext(ctx).Wrap)
@@ -5,14 +5,15 @@ import (
 	"fmt"
 	"likedream-goframe/internal/application/cpdaily"
 	"likedream-goframe/internal/application/cpdaily/cryptoutil"
-	"likedream-goframe/internal/application/cpdaily/imageuploader"
 	"likedream-goframe/internal/application/cpdaily/submitcaptcha"
 	"likedream-goframe/internal/application/cpdaily/task/formtype"
 	"likedream-goframe/internal/application/cpdaily/taskhelper"
 	"likedream-goframe/internal/application/cpdaily/types"
+	"likedream-goframe/internal/common/cst"
 	"likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/utils"
 	"slices"
+	"strconv"
 	"strings"
 	"time"

@@ -20,6 +21,7 @@ import (
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/google/uuid"
 	"github.com/samber/oops"
+	"github.com/tidwall/gjson"
 	"github.com/tidwall/match"
 	"resty.dev/v3"
 )
@@ -221,6 +223,88 @@ func (c *CpdailyAutoSignTask) QueryFormByTitle(ctx context.Context, titleGlob st
 	result["realTitle"] = gvar.New(realTitle)
 	result["taskInfo"] = gvar.New(matchTask)
 	result["rows"] = gvar.New(formDatas)
+
+	// 尝试从已签到的历史任务中获取历史数据用于预填充
+	signedMatch := findMatchTitle(signedTasks)
+	if signedMatch != nil {
+		if matchTask != nil && signedMatch["signInstanceWid"] != nil && matchTask["signInstanceWid"] != nil &&
+			signedMatch["signInstanceWid"].String() == matchTask["signInstanceWid"].String() {
+			// 任务已签到（同一个 instanceWid），自身 rows 中的 longitude/latitude/position 就是用户自己提交的数据
+			result["historyRows"] = gvar.New(formDatas)
+		} else {
+			histResp, histErr := c.client.R().
+				SetBody(map[string]*gvar.Var{
+					"taskName":        gvar.New(signedMatch["taskName"].String()),
+					"signWid":         signedMatch["signWid"],
+					"signInstanceWid": signedMatch["signInstanceWid"],
+				}).
+				WithContext(ctx).
+				Post(c.getReqUrl("detailSignInstance"))
+			if histErr == nil {
+				histJSON := utils.ReadJson[map[string]*gvar.Var](histResp.Body)
+				histDatas := histJSON["datas"].MapStrVar()
+				if len(histDatas) > 0 {
+					result["historyRows"] = gvar.New(histDatas)
+				}
+			}
+		}
+	}
+	// 今天没有已签到的同名任务，从历史月份中只查 signedTasks
+	if result["historyRows"] == nil {
+		func() {
+			defer func() { recover() }()
+			now := time.Now().In(cst.TimeZoneShangHai)
+			year := strconv.Itoa(now.Year())
+			month := strconv.Itoa(int(now.Month()))
+			if len(month) == 1 {
+				month = "0" + month
+			}
+			resp, e := c.client.R().
+				SetBody(map[string]any{
+					"statisticYearMonth": fmt.Sprintf("%s-%s", year, month),
+				}).
+				WithContext(ctx).
+				Post(c.getReqUrl("getStuSignInfosByWeekMonth"))
+			if e != nil {
+				return
+			}
+			respJSON := utils.ReadJson[map[string]*gvar.Var](resp.Body)
+			monthDatas := respJSON["datas"].MapStrVar()
+			monthRows := monthDatas["rows"].Vars()
+
+			for _, row := range monthRows {
+				rowMap := row.MapStrVar()
+				signed := rowMap["signedTasks"].Vars()
+				for _, st := range signed {
+					item := st.MapStrVar()
+					tn, exist := item["taskName"]
+					if !exist || tn.String() == "" {
+						continue
+					}
+					if match.Match(tn.String(), titleGlob) {
+						dr, de := c.client.R().
+							SetBody(map[string]*gvar.Var{
+								"signInstanceWid": item["signInstanceWid"],
+								"signWid":         item["signWid"],
+								"taskName":        gvar.New(tn.String()),
+							}).
+							WithContext(ctx).
+							Post(c.getReqUrl("detailSignInstance"))
+						if de != nil {
+							continue
+						}
+						dj := utils.ReadJson[map[string]*gvar.Var](dr.Body)
+						dd := dj["datas"].MapStrVar()
+						if len(dd) > 0 {
+							result["historyRows"] = gvar.New(dd)
+							return
+						}
+					}
+				}
+			}
+		}()
+	}
+
 	return result
 }

@@ -356,30 +440,81 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 		utils.OkOrPanic(errors.NewBusinessError(503, "任务表单为空"), oops.WithContext(ctx).Wrap)
 	}

+	// 优先从 historyRows（已签到的历史任务详情）中提取历史值，否则从 rows 中提取
+	histRows := rows
+	hasHistory := false
+	if hr := rawJson["historyRows"]; hr != nil {
+		if hrMap := hr.MapStrVar(); len(hrMap) > 0 {
+			histRows = hrMap
+			hasHistory = true
+		}
+	}
+
 	var list []*formtype.CpTaskFormItem

-	// 经纬度
-	//dto := &formtype.CpTaskFormItem{
-	//	Title:    "经度",
-	//	ColName:  "lon",
-	//	Type:     formtype.ItemTypeInput,
-	//	Required: true,
-	//}
-	//list = append(list, dto)
-	//
-	//dto = &formtype.CpTaskFormItem{
-	//	Title:    "纬度",
-	//	ColName:  "lat",
-	//	Type:     formtype.ItemTypeInput,
-	//	Required: true,
-	//}
-	//list = append(list, dto)
+	// 从任务详情中提取历史值用于预填充
+	histLatAndLon := ""
+	histAddress := ""
+	histSignPhotoUrl := ""
+	histIsMalposition := ""
+
+	// 优先使用历史签到数据（真实地址），无历史时保底使用管理员配置的范围信息
+	if hasHistory {
+		// 从历史签到数据中提取用户真实的地址和经纬度
+		if lon := histRows["longitude"]; lon != nil && lon.String() != "" {
+			if lat := histRows["latitude"]; lat != nil && lat.String() != "" {
+				histLatAndLon = lon.String() + "," + lat.String()
+			}
+		}
+		if histAddress == "" {
+			if pos := histRows["position"]; pos != nil && pos.String() != "" {
+				histAddress = pos.String()
+			}
+		}
+		if histAddress == "" {
+			if addr := histRows["signAddress"]; addr != nil && addr.String() != "" {
+				histAddress = addr.String()
+			}
+		}
+		if photo := histRows["signPhotoUrl"]; photo != nil && photo.String() != "" {
+			histSignPhotoUrl = photo.String()
+		}
+		if mal := histRows["isMalposition"]; mal != nil {
+			if mal.Int() == 1 {
+				histIsMalposition = "是"
+			} else {
+				histIsMalposition = "否"
+			}
+		}
+	}
+	// 无历史签到数据时，保底使用管理员配置的范围信息
+	if histLatAndLon == "" && histAddress == "" {
+		if sps := rows["signPlaceSelected"]; sps != nil && sps.String() != "" && sps.String() != "[]" {
+			placeArr := gjson.Parse(sps.String()).Array()
+			if len(placeArr) > 0 {
+				place := placeArr[0]
+				lng := place.Get("longitude").String()
+				lat := place.Get("latitude").String()
+				addr := place.Get("address").String()
+				if lng != "" && lat != "" {
+					histLatAndLon = lng + "," + lat
+				}
+				if addr != "" {
+					histAddress = addr
+				}
+			}
+		}
+	}
+
 	dto := &formtype.CpTaskFormItem{
-		Title:    "经纬度",
-		ColName:  "latAndLon",
-		Type:     formtype.ItemTypeLatAndLon,
-		Required: true,
-		Tip:      "您可以通过地址搜索签到经纬度，如果觉得不够准确可以自行修改",
+		Title:      "经纬度",
+		ColName:    "latAndLon",
+		Type:       formtype.ItemTypeLatAndLon,
+		Required:   true,
+		Content:    histLatAndLon,
+		Default:    histLatAndLon,
+		OtherValue: histAddress,
+		Tip:        "您可以通过地址搜索签到经纬度，如果觉得不够准确可以自行修改",
 	}
 	list = append(list, dto)

@@ -388,6 +523,8 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 		ColName:  "address",
 		Type:     formtype.ItemTypeInput,
 		Required: true,
+		Content:  histAddress,
+		Default:  histAddress,
 		Tip:      "这个就是指签到完毕后查看时最底部那个最详细的地址信息哦",
 	}
 	list = append(list, dto)
@@ -398,6 +535,8 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 			ColName:  "signImg",
 			Type:     formtype.ItemTypeImage,
 			Required: true,
+			Content:  histSignPhotoUrl,
+			Default:  histSignPhotoUrl,
 			Tip:      "您可以上传多张图片，会顺序轮换更新的哦~",
 		}
 		list = append(list, dto)
@@ -409,6 +548,8 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 		ColName:  "isMalposition",
 		Type:     formtype.ItemTypeSingle,
 		Required: true,
+		Content:  histIsMalposition,
+		Default:  histIsMalposition,
 		Options: []formtype.CpTaskFormItemOption{
 			{
 				Content:      "是",
@@ -527,12 +668,8 @@ func (c *CpdailyAutoSignTask) FillCustomForm(ctx context.Context, form map[strin
 			utils.OkOrPanic(errors.NewBusinessError(400, "签到照片未上传"), oops.WithContext(ctx).Wrap)
 		}

-		imageId, e := uuid.Parse(imgId)
-		utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-
-		previewUrl := imageuploader.UploadImageFromStorage(ctx, c.host, imageId, types.TaskTypeSign, c.client)
-
-		resultForm["signPhotoUrl"] = gvar.New(previewUrl)
+		// imgId 现在直接就是今日校园的 previewUrl，无需再上传
+		resultForm["signPhotoUrl"] = gvar.New(imgId)
 	}

 	// 处理验证码
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"likedream-goframe/internal/application/cpdaily"
 	"likedream-goframe/internal/application/cpdaily/cryptoutil"
-	"likedream-goframe/internal/application/cpdaily/imageuploader"
 	"likedream-goframe/internal/application/cpdaily/submitcaptcha"
 	"likedream-goframe/internal/application/cpdaily/task/formtype"
 	"likedream-goframe/internal/application/cpdaily/taskhelper"
@@ -277,6 +276,91 @@ func (c *CpdailySleepCheckTask) QueryFormByTitle(ctx context.Context, titleGlob
 	result["realTitle"] = gvar.New(realTitle)
 	result["taskInfo"] = gvar.New(matchTask)
 	result["rows"] = gvar.New(datas)
+
+	// 尝试从已签到的历史任务中获取历史数据用于预填充
+	// 无论当前任务是否已签到，都尝试获取历史数据
+	signedMatch := findMatchTitle(signedTasks)
+	if signedMatch != nil {
+		if matchTask != nil && signedMatch["signInstanceWid"] != nil && matchTask["signInstanceWid"] != nil &&
+			signedMatch["signInstanceWid"].String() == matchTask["signInstanceWid"].String() {
+			// 任务已签到（同一个 instanceWid），自身 rows 中的 longitude/latitude/position 就是用户自己提交的数据
+			result["historyRows"] = gvar.New(datas)
+		} else {
+			histResp, histErr := c.client.R().
+				SetBody(map[string]*gvar.Var{
+					"taskName":        gvar.New(signedMatch["taskName"].String()),
+					"signWid":         signedMatch["signWid"],
+					"signInstanceWid": signedMatch["signInstanceWid"],
+				}).
+				WithContext(ctx).
+				Post(c.getReqUrl("detailSignInstance"))
+			if histErr == nil {
+				histJSON := utils.ReadJson[map[string]*gvar.Var](histResp.Body)
+				histDatas := histJSON["datas"].MapStrVar()
+				if len(histDatas) > 0 {
+					result["historyRows"] = gvar.New(histDatas)
+				}
+			}
+		}
+	}
+	// 今天没有已签到的同名任务，从历史月份中只查 signedTasks
+	if result["historyRows"] == nil {
+		func() {
+			defer func() { recover() }()
+			now := time.Now().In(cst.TimeZoneShangHai)
+			year := strconv.Itoa(now.Year())
+			month := strconv.Itoa(int(now.Month()))
+			if len(month) == 1 {
+				month = "0" + month
+			}
+			resp, e := c.client.R().
+				SetBody(map[string]any{
+					"statisticYearMonth": fmt.Sprintf("%s-%s", year, month),
+				}).
+				WithContext(ctx).
+				Post(c.getReqUrl("getStuSignInfosByWeekMonth"))
+			if e != nil {
+				return
+			}
+			respJSON := utils.ReadJson[map[string]*gvar.Var](resp.Body)
+			monthDatas := respJSON["datas"].MapStrVar()
+			monthRows := monthDatas["rows"].Vars()
+
+			// 只从 signedTasks 中查找匹配的已签到任务
+			for _, row := range monthRows {
+				rowMap := row.MapStrVar()
+				signed := rowMap["signedTasks"].Vars()
+				for _, st := range signed {
+					item := st.MapStrVar()
+					tn, exist := item["taskName"]
+					if !exist || tn.String() == "" {
+						continue
+					}
+					if match.Match(tn.String(), titleGlob) {
+						// 找到已签到的历史任务，获取详情
+						dr, de := c.client.R().
+							SetBody(map[string]*gvar.Var{
+								"signInstanceWid": item["signInstanceWid"],
+								"signWid":         item["signWid"],
+								"taskName":        gvar.New(tn.String()),
+							}).
+							WithContext(ctx).
+							Post(c.getReqUrl("detailSignInstance"))
+						if de != nil {
+							continue
+						}
+						dj := utils.ReadJson[map[string]*gvar.Var](dr.Body)
+						dd := dj["datas"].MapStrVar()
+						if len(dd) > 0 {
+							result["historyRows"] = gvar.New(dd)
+							return
+						}
+					}
+				}
+			}
+		}()
+	}
+
 	return result
 }

@@ -432,30 +516,82 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 		utils.OkOrPanic(errors.NewBusinessError(503, "任务表单为空"), oops.WithContext(ctx).Wrap)
 	}

+	// 优先从 historyRows（已签到的历史任务详情）中提取历史值，否则从 rows 中提取
+	histRows := rows
+	hasHistory := false
+	if hr := rawJson["historyRows"]; hr != nil {
+		if hrMap := hr.MapStrVar(); len(hrMap) > 0 {
+			histRows = hrMap
+			hasHistory = true
+		}
+	}
+
 	var list []*formtype.CpTaskFormItem

-	// 经纬度
-	//dto := &formtype.CpTaskFormItem{
-	//	Title:    "经度",
-	//	ColName:  "lon",
-	//	Type:     formtype.ItemTypeInput,
-	//	Required: true,
-	//}
-	//list = append(list, dto)
-	//
-	//dto = &formtype.CpTaskFormItem{
-	//	Title:    "纬度",
-	//	ColName:  "lat",
-	//	Type:     formtype.ItemTypeInput,
-	//	Required: true,
-	//}
-	//list = append(list, dto)
+	// 从任务详情中提取历史值用于预填充
+	// signPlaceSelected 包含签到地点信息（经纬度、地址）
+	histLatAndLon := ""
+	histAddress := ""
+	histSignPhotoUrl := ""
+	histIsMalposition := ""
+
+	// 优先使用历史签到数据（真实地址），无历史时保底使用管理员配置的范围信息
+	if hasHistory {
+		// 从历史签到数据中提取用户真实的地址和经纬度
+		if lon := histRows["longitude"]; lon != nil && lon.String() != "" {
+			if lat := histRows["latitude"]; lat != nil && lat.String() != "" {
+				histLatAndLon = lon.String() + "," + lat.String()
+			}
+		}
+		if histAddress == "" {
+			if pos := histRows["position"]; pos != nil && pos.String() != "" {
+				histAddress = pos.String()
+			}
+		}
+		if histAddress == "" {
+			if addr := histRows["signAddress"]; addr != nil && addr.String() != "" {
+				histAddress = addr.String()
+			}
+		}
+		if photo := histRows["signPhotoUrl"]; photo != nil && photo.String() != "" {
+			histSignPhotoUrl = photo.String()
+		}
+		if mal := histRows["isMalposition"]; mal != nil {
+			if mal.Int() == 1 {
+				histIsMalposition = "是"
+			} else {
+				histIsMalposition = "否"
+			}
+		}
+	}
+	// 无历史签到数据时，保底使用管理员配置的范围信息
+	if histLatAndLon == "" && histAddress == "" {
+		if sps := rows["signPlaceSelected"]; sps != nil && sps.String() != "" && sps.String() != "[]" {
+			placeArr := gjson.Parse(sps.String()).Array()
+			if len(placeArr) > 0 {
+				place := placeArr[0]
+				lng := place.Get("longitude").String()
+				lat := place.Get("latitude").String()
+				addr := place.Get("address").String()
+				if lng != "" && lat != "" {
+					histLatAndLon = lng + "," + lat
+				}
+				if addr != "" {
+					histAddress = addr
+				}
+			}
+		}
+	}
+
 	dto := &formtype.CpTaskFormItem{
-		Title:    "经纬度",
-		ColName:  "latAndLon",
-		Type:     formtype.ItemTypeLatAndLon,
-		Required: true,
-		Tip:      "您可以通过地址搜索签到经纬度，如果觉得不够准确可以自行修改",
+		Title:      "经纬度",
+		ColName:    "latAndLon",
+		Type:       formtype.ItemTypeLatAndLon,
+		Required:   true,
+		Content:    histLatAndLon,
+		Default:    histLatAndLon,
+		OtherValue: histAddress,
+		Tip:        "您可以通过地址搜索签到经纬度，如果觉得不够准确可以自行修改",
 	}
 	list = append(list, dto)
 	dto = &formtype.CpTaskFormItem{
@@ -463,6 +599,8 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 		ColName:  "address",
 		Type:     formtype.ItemTypeInput,
 		Required: true,
+		Content:  histAddress,
+		Default:  histAddress,
 		Tip:      "这个就是指签到完毕后查看时最底部那个最详细的地址信息哦",
 	}
 	list = append(list, dto)
@@ -473,6 +611,8 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 			ColName:  "signImg",
 			Type:     formtype.ItemTypeImage,
 			Required: true,
+			Content:  histSignPhotoUrl,
+			Default:  histSignPhotoUrl,
 			Tip:      "您可以上传多张图片，会顺序轮换更新的哦~",
 		}
 		list = append(list, dto)
@@ -485,6 +625,8 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 		ColName:  "isMalposition",
 		Type:     formtype.ItemTypeSingle,
 		Required: true,
+		Content:  histIsMalposition,
+		Default:  histIsMalposition,
 		Options: []formtype.CpTaskFormItemOption{
 			{
 				Content:      "是",
@@ -577,12 +719,8 @@ func (c *CpdailySleepCheckTask) FillCustomForm(ctx context.Context, form map[str
 			utils.OkOrPanic(errors.NewBusinessError(503, "未找到查寝照片参数，请上传照片"), oops.WithContext(ctx).Wrap)
 		}

-		imageId, e := uuid.Parse(imgId)
-		utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-
-		previewUrl := imageuploader.UploadImageFromStorage(ctx, c.host, imageId, types.TaskTypeSleepCheck, c.client)
-
-		resultForm["signPhotoUrl"] = gvar.New(previewUrl)
+		// imgId 现在直接就是今日校园的 previewUrl，无需再上传
+		resultForm["signPhotoUrl"] = gvar.New(imgId)
 	}

 	// 判断是否存在二维码查寝
@@ -1,8 +1,10 @@
 package httpclient

 import (
-	"resty.dev/v3"
+	"likedream-goframe/internal/utils"
 	"time"
+
+	"resty.dev/v3"
 )

 var Common = resty.New().
@@ -10,3 +12,11 @@ var Common = resty.New().
 	SetRetryCount(5).
 	SetTimeout(30*time.Second).
 	SetHeader("User-Agent", "likedream")
+
+func init() {
+	if !utils.IsDebug() {
+		Common.SetDebug(false)
+	} else {
+		Common.SetProxy("http://127.0.0.1:9000")
+	}
+}
@@ -0,0 +1,11 @@
+package music
+
+import (
+	"testing"
+)
+
+func Test_GetMusic(t *testing.T) {
+	ctx := t.Context()
+	result := MusicDownloader.Search(ctx, "天外来物")
+	t.Log(result)
+}
@@ -11,6 +11,7 @@ const (
 	PointTypeWork      PointType = "insertwork"
 	PointTypeHyperlink PointType = "insertlink"
 	PointTypeLive      PointType = "insertlive"
+	PointTypeExam      PointType = "insertexam" // 考试任务点
 )

 // PointVideoDto 视频任务点
@@ -85,6 +86,25 @@ type PointHyperlinkDto struct {
 	IsJob       bool // 是否是任务点
 }

+// PointExamDto 考试任务点
+type PointExamDto struct {
+	CardIndex      int
+	CourseID       string
+	ClassID        string
+	KnowledgeID    int
+	Cpi            string
+	ExamID         string  // 考试ID
+	Title          string  // 考试标题
+	JobID          string  // 任务ID
+	Enc            string  // 加密参数
+	PaperId        string  // 试卷ID
+	ExamRelationId string  // 考试关联ID
+	TotalScore     float64 // 总分
+	Duration       int     // 考试时长(分钟)
+	IsPassed       bool    // 是否已完成
+	IsJob          bool    // 是否是任务点
+}
+
 // PointLiveDto 直播任务点
 type PointLiveDto struct {
 	CardIndex            int
@@ -187,6 +207,7 @@ const (
 	ChapterPointTypeWork      ChapterPointType = 3 // 作业
 	ChapterPointTypeHyperlink ChapterPointType = 4 // 外链
 	ChapterPointTypeLive      ChapterPointType = 5 // 直播
+	ChapterPointTypeExam      ChapterPointType = 6 // 考试
 )

 // ChapterPoint 统一的章节任务点结构（与Card一一对应）
@@ -245,6 +266,13 @@ type ChapterPoint struct {
 	LiveSetEnc           string
 	LiveSwDsEnc          string
 	VideoCompletePercent float64
+
+	// 考试相关字段
+	ExamID         string  // 考试ID
+	PaperId        string  // 试卷ID
+	ExamRelationId string  // 考试关联ID
+	TotalScore     float64 // 总分
+	ExamDuration   int     // 考试时长(分钟)
 }

 // QuestionType 题目类型
@@ -10,8 +10,11 @@ import (
 )

 // ApiVerifyCodeBytes 获取学习通验证码图片
-func ApiVerifyCodeBytes(client *resty.Client) ([]byte, error) {
-	urlStr := "https://mooc1-api.chaoxing.com/processVerifyPng.ac?t=" + fmt.Sprintf("%d", time.Now().UnixMilli())
+func ApiVerifyCodeBytes(client *resty.Client, prefixUrl string) ([]byte, error) {
+	if prefixUrl == "" {
+		prefixUrl = "https://mooc1-api.chaoxing.com"
+	}
+	urlStr := prefixUrl + "/processVerifyPng.ac?t=" + fmt.Sprintf("%d", time.Now().UnixMilli())

 	req := client.R()
 	req.Header.Add("User-Agent", GetUA("mobile"))
@@ -31,12 +34,15 @@ func ApiVerifyCodeBytes(client *resty.Client) ([]byte, error) {
 }

 // ApiPassVerifyCode 提交学习通验证码
-func ApiPassVerifyCode(client *resty.Client, code string, retryCount int) bool {
+func ApiPassVerifyCode(client *resty.Client, code string, prefixUrl string, retryCount int) bool {
 	if retryCount < 0 {
 		return false
 	}
+	if prefixUrl == "" {
+		prefixUrl = "https://mooc1-api.chaoxing.com"
+	}
 	//urlStr := "https://mooc1-api.chaoxing.com/html/processVerify.ac"
-	urlStr := "https://mooc1-api.chaoxing.com/json/processVerify.ac"
+	urlStr := prefixUrl + "/html/processVerify.ac"
 	client.SetRedirectPolicy(resty.NoRedirectPolicy())
 	req := client.R()
 	req.SetMultipartField("ucode", "", "", strings.NewReader(code))
@@ -47,8 +53,8 @@ func ApiPassVerifyCode(client *resty.Client, code string, retryCount int) bool {
 	req.Header.Add("Connection", "keep-alive")
 	res, err := req.Post(urlStr)
 	if err != nil {
-		return ApiPassVerifyCode(client, code, retryCount-1)
+		return ApiPassVerifyCode(client, code, prefixUrl, retryCount-1)
 	}
 	client.SetRedirectPolicy(resty.FlexibleRedirectPolicy(20))
-	return res.StatusCode() == 302
+	return res.StatusCode() == 302 || strings.Contains(res.String(), "解锁成功")
 }
@@ -232,13 +232,13 @@ func (c *XuexitongCourse) FetchChapterCards(ctx context.Context, course entity.X
 		if strings.Contains(body, "请输入验证码") {
 			logger.Logger.Warn("触发验证码，正在进行AI智能识别绕过.....")
 			e := retry.Do(func() error {
-				bytes, e := ApiVerifyCodeBytes(c.client)
+				bytes, e := ApiVerifyCodeBytes(c.client, "")
 				if e != nil {
 					return e
 				}
 				codeResult := captcha.ApiSemiOCRVerification(bytes, 1, 23)
 				time.Sleep(5 * time.Second)
-				if ApiPassVerifyCode(c.client, codeResult, 5) {
+				if ApiPassVerifyCode(c.client, codeResult, "", 5) {
 					return nil
 				}
 				return errors2.NewBusinessError(503, "验证码识别失败")
@@ -288,7 +288,9 @@ func (c *XuexitongCourse) FetchChapterCards(ctx context.Context, course entity.X
 			logger.Logger.Debug("解析卡片失败", zap.Error(err))
 			continue
 		}
-
+		if iframes == nil {
+			continue
+		}
 		for _, iframe := range iframes {
 			if !iframe.HasData {
 				continue
@@ -319,7 +321,7 @@ func (c *XuexitongCourse) FetchChapterCards(ctx context.Context, course entity.X
 				point.ObjectID = objectID
 				point.JobID = jobID

-				cords2, err := c.FetchChapterCards2(ctx, course, card.KnowledgeID)
+				cords2, err := c.FetchChapterCards2(ctx, course, cardIndex, card.KnowledgeID)
 				if err == nil && cords2 != nil {
 					c.fillVideoPointFromCards2(cords2, &point, objectID)
 				}
@@ -524,9 +526,9 @@ func (c *XuexitongCourse) parseIframeData(htmlString string) ([]entity.IframeAtt
 }

 // FetchChapterCards2 获取章节卡片（新接口，用于获取 otherInfo 等）
-func (c *XuexitongCourse) FetchChapterCards2(ctx context.Context, course entity.XueXiTCourse, knowledgeID int) (map[string]interface{}, error) {
-	urlStr := fmt.Sprintf("%s?clazzid=%s&courseid=%s&knowledgeid=%d&num=0&ut=s&cpi=%d&v=2025-0424-1038-3&mooc2=1&isMicroCourse=false&editorPreview=0",
-		ApiChapterCards2, course.Key, course.CourseID, knowledgeID, course.Cpi)
+func (c *XuexitongCourse) FetchChapterCards2(ctx context.Context, course entity.XueXiTCourse, num int, knowledgeID int) (map[string]interface{}, error) {
+	urlStr := fmt.Sprintf("%s?clazzid=%s&courseid=%s&knowledgeid=%d&num=%d&ut=s&cpi=%d&v=2025-0424-1038-3&mooc2=1&isMicroCourse=false&editorPreview=0",
+		ApiChapterCards2, course.Key, course.CourseID, knowledgeID, num, course.Cpi)

 	logger.Logger.Debug("FetchChapterCards2 请求",
 		zap.String("url", urlStr),
@@ -105,12 +105,12 @@ func (c *XuexitongCourse) PullCourseList(ctx context.Context) []entity.XueXiTCou
 		if strings.Contains(body, "请输入验证码") {
 			logger.Logger.Warn("触发验证码，正在进行AI智能识别绕过.....")
 			e := retry.Do(func() error {
-				bytes, e := ApiVerifyCodeBytes(c.client)
+				bytes, e := ApiVerifyCodeBytes(c.client, "")
 				if e != nil {
 					return e
 				}
 				codeResult := captcha.ApiSemiOCRVerification(bytes, 1, 23)
-				if ApiPassVerifyCode(c.client, codeResult, 5) {
+				if ApiPassVerifyCode(c.client, codeResult, "", 5) {
 					return nil
 				}
 				return errors2.NewBusinessError(503, "验证码识别失败")
@@ -3,11 +3,13 @@ package xuexitong
 import (
 	"context"
 	"likedream-goframe/internal/application/quesbank"
+	"likedream-goframe/internal/application/xuexitong/entity"
 	"likedream-goframe/internal/common/db"
 	"likedream-goframe/internal/ent/sysconfig"
 	"likedream-goframe/internal/framework/errors"
 	"likedream-goframe/internal/framework/logger"
 	"likedream-goframe/internal/utils"
+	"strconv"
 	"strings"
 	"testing"

@@ -37,7 +39,7 @@ func getAIConfig(ctx context.Context) *quesbank.AIConfig {
 func TestSchedule(t *testing.T) {
 	ctx := context.Background()
 	xuexitongLogin := NewXuexitongLogin(ctx)
-	err := xuexitongLogin.Login(context.Background(), "13151832241", "yyz@083422", 5)
+	err := xuexitongLogin.Login(context.Background(), "15754238084", "1575423yuan.dby", 5)
 	utils.OkOrPanic(err)

 	client := xuexitongLogin.GetClient()
@@ -54,7 +56,7 @@ func TestSchedule(t *testing.T) {
 		logger.Logger.Warn("AI配置为空，作业将被跳过")
 	}

-	err = courseService.AutoStudyByCourseIDWithOptions(ctx, "258109701", &AutoStudyOptions{
+	err = courseService.AutoStudyByCourseIDWithOptions(ctx, "255690793", &AutoStudyOptions{
 		AIConfig:   config,
 		AutoSubmit: true, // 默认不自动提交，仅保存
 		Thread:     1,
@@ -188,3 +190,229 @@ func TestSplitWords(t *testing.T) {
 	split := strings.Split(str, "")
 	t.Log(split)
 }
+
+// TestExam 测试考试功能 - 完成整个考试流程但不提交（只暂存）
+func TestExam(t *testing.T) {
+	ctx := context.Background()
+
+	// 登录
+	xuexitongLogin := NewXuexitongLogin(ctx)
+	err := xuexitongLogin.Login(ctx, "17320926947", "zhijie2001", 5)
+	utils.OkOrPanic(err)
+
+	client := xuexitongLogin.GetClient()
+	courseService := NewXuexitongCourse(client)
+
+	// 获取AI配置（可选，用于AI答题兜底）
+	aiConfig := getAIConfig(ctx)
+	if aiConfig != nil {
+		t.Logf("AI配置加载成功: %s %s", aiConfig.Type, aiConfig.Model)
+	} else {
+		t.Log("未配置AI，将仅使用题库答题")
+	}
+
+	// 创建统一答题服务（本地题库 -> 第三方题库 -> AI答题）
+	answerService := quesbank.NewUnifiedAnswerService(aiConfig)
+
+	// 获取课程列表，找到指定课程
+	courseList := courseService.PullCourseList(ctx)
+	var targetCourse *entity.XueXiTCourse
+	for i, course := range courseList {
+		if course.CourseID == "259828097" {
+			targetCourse = &courseList[i]
+			break
+		}
+	}
+
+	if targetCourse == nil {
+		t.Fatal("未找到指定课程")
+	}
+
+	t.Logf("找到课程: %s (ID: %s)", targetCourse.CourseName, targetCourse.CourseID)
+
+	// 使用考试列表API获取考试
+	examList, err := courseService.FetchExamTaskList(ctx, *targetCourse)
+	if err != nil {
+		t.Fatalf("获取考试列表失败: %v", err)
+	}
+
+	t.Logf("考试数量: %d", len(examList))
+	for _, exam := range examList {
+		t.Logf("考试: %s (状态: %s, TaskRefId: %s)",
+			exam.Name, exam.Status, exam.TaskRefId)
+	}
+
+	// 找一个待做的考试
+	var targetExam *ExamTaskItem
+	for i := range examList {
+		if examList[i].Status == "待做" {
+			targetExam = &examList[i]
+			break
+		}
+	}
+
+	if targetExam == nil {
+		t.Log("没有待做的考试")
+		return
+	}
+
+	t.Logf("开始考试: %s", targetExam.Name)
+
+	// 进入考试
+	err = courseService.EnterExam(ctx, targetExam)
+	if err != nil {
+		t.Fatalf("进入考试失败: %v", err)
+	}
+
+	t.Logf("进入考试成功, 题目数: %d, ExamRelationId: %s, AnswerId: %s",
+		targetExam.QuestionTotal, targetExam.ExamRelationId, targetExam.AnswerId)
+
+	if targetExam.QuestionTotal == 0 {
+		t.Log("考试没有题目")
+		return
+	}
+
+	// 遍历所有题目
+	for i := 0; i < targetExam.QuestionTotal; i++ {
+		t.Logf("========== 第 %d/%d 题 ==========", i, targetExam.QuestionTotal)
+
+		// 拉取题目
+		question, err := courseService.PullExamQuestion(ctx, targetExam, i)
+		if err != nil {
+			t.Logf("拉取第%d题失败: %v", i, err)
+			continue
+		}
+
+		t.Logf("题目类型: %s", question.QuestionTypeStr)
+		t.Logf("题目内容: %s", question.Content)
+		if len(question.Options) > 0 {
+			t.Logf("选项: %v", question.Options)
+		}
+
+		// 使用统一答题服务获取答案（本地题库 -> 第三方题库 -> AI答题）
+		questionInfo := quesbank.QuestionInfo{
+			Content:    question.Content,
+			TypeCode:   question.QuestionTypeCode,
+			TypeName:   quesbank.GetQuestionTypeName(question.QuestionTypeCode),
+			Options:    question.Options,
+			CourseName: targetCourse.CourseName,
+			QuestionID: question.QuestionId,
+		}
+
+		result, err := answerService.GetAnswer(ctx, questionInfo)
+		if err != nil {
+			t.Logf("获取答案失败: %v, 使用默认答案", err)
+			question.Answers = []string{"A"}
+		} else {
+			question.Answers = result.Answers
+			t.Logf("答案来源: %s, 答案: %v", result.Source, result.Answers)
+		}
+
+		// 提交答案（暂存，不交卷）
+		// tempSave=true 表示暂存，不交卷
+		submitResult, err := courseService.SubmitExamAnswer(ctx, question, true)
+		if err != nil {
+			t.Logf("提交第%d题答案失败: %v", i, err)
+		} else {
+			t.Logf("提交第%d题答案成功: %s", i, submitResult)
+		}
+	}
+
+	t.Log("========== 考试完成（已暂存，未交卷）==========")
+}
+
+// buildExamQuestionPrompt 构建考试题目的AI提示词
+func buildExamQuestionPrompt(q *ExamQuestion) string {
+	var prompt strings.Builder
+
+	switch q.QuestionTypeCode {
+	case "0": // 单选题
+		prompt.WriteString("题目类型：单选题\n")
+		prompt.WriteString("题目内容：" + q.Content + "\n")
+		for _, opt := range q.Options {
+			prompt.WriteString(opt + "\n")
+		}
+		prompt.WriteString("\n请只回答选项字母，不要解释。格式：[\"A\"]")
+
+	case "1": // 多选题
+		prompt.WriteString("题目类型：多选题\n")
+		prompt.WriteString("题目内容：" + q.Content + "\n")
+		for _, opt := range q.Options {
+			prompt.WriteString(opt + "\n")
+		}
+		prompt.WriteString("\n请只回答选项字母，不要解释。格式：[\"A\",\"B\"]")
+
+	case "3": // 判断题
+		prompt.WriteString("题目类型：判断题\n")
+		prompt.WriteString("题目内容：" + q.Content + "\n")
+		for _, opt := range q.Options {
+			prompt.WriteString(opt + "\n")
+		}
+		prompt.WriteString("\n请只回答\"A\"(正确)或\"B\"(错误)，不要解释。格式：[\"A\"]")
+
+	case "2": // 填空题
+		prompt.WriteString("题目类型：填空题\n")
+		prompt.WriteString("题目内容：" + q.Content + "\n")
+		blankCount := len(q.Options)
+		if blankCount == 0 {
+			blankCount = 1
+		}
+		prompt.WriteString("共有" + strconv.Itoa(blankCount) + "个空\n")
+		prompt.WriteString("\n请按顺序回答每个空的答案，不要解释。格式：[\"答案1\",\"答案2\"]")
+
+	case "4", "6": // 简答题、论述题
+		prompt.WriteString("题目类型：简答题\n")
+		prompt.WriteString("题目内容：" + q.Content + "\n")
+		prompt.WriteString("\n请直接回答问题，格式：[\"你的答案\"]")
+
+	default:
+		prompt.WriteString("题目：" + q.Content + "\n")
+		prompt.WriteString("请回答这道题，格式：[\"答案\"]")
+	}
+
+	return prompt.String()
+}
+
+// TestExamDetail 测试获取考试详情
+func TestExamDetail(t *testing.T) {
+	ctx := context.Background()
+
+	// 登录
+	xuexitongLogin := NewXuexitongLogin(ctx)
+	err := xuexitongLogin.Login(ctx, "13151832241", "yyz@083422", 5)
+	utils.OkOrPanic(err)
+
+	client := xuexitongLogin.GetClient()
+	courseService := NewXuexitongCourse(client)
+
+	// 获取课程列表，找到指定课程
+	courseList := courseService.PullCourseList(ctx)
+	var targetCourse *entity.XueXiTCourse
+	for i, course := range courseList {
+		if course.CourseID == "258109701" {
+			targetCourse = &courseList[i]
+			break
+		}
+	}
+
+	if targetCourse == nil {
+		t.Fatal("未找到指定课程 courseId=258109701")
+	}
+
+	// 获取考试列表
+	examList, err := courseService.FetchExamTaskList(ctx, *targetCourse)
+	if err != nil {
+		t.Fatalf("获取考试列表失败: %v", err)
+	}
+
+	if len(examList) == 0 {
+		t.Log("该课程没有考试")
+		return
+	}
+
+	// 打印所有考试信息
+	for i, exam := range examList {
+		t.Logf("考试%d: 标题=%s, 状态=%s, TaskRefId=%s, CourseId=%s, ClazzId=%s",
+			i+1, exam.Name, exam.Status, exam.TaskRefId, exam.CourseId, exam.ClazzId)
+	}
+}
@@ -252,6 +252,7 @@ func (c *XuexitongCourse) attachmentDetectVideo(attachment *entity.AttachmentSet

 // AutoPlayVideoByPoint 自动播放视频（使用统一的 ChapterPoint）
 func (c *XuexitongCourse) AutoPlayVideoByPoint(ctx context.Context, course entity.XueXiTCourse, p *entity.ChapterPoint) error {
+
 	if err := c.VideoDtoFetchByPoint(ctx, p); err != nil {
 		return fmt.Errorf("获取视频信息失败: %w", err)
 	}
@@ -15,6 +15,7 @@ const (
 	ConfigAuthorizationKey      = "server.authorization"
 	ConfigJwtKey                = "server.jwt"
 	ConfigCaptchaBaseUrl        = "captcha.baseUrl"
+	ConfigCaptchaApiKey         = "captcha.apiKey"
 	ConfigS3AccessKey           = "s3.accessKey"
 	ConfigS3SecretKey           = "s3.secretKey"
 	ConfigS3BaseUrl             = "s3.baseUrl"
@@ -28,33 +29,40 @@ const (

 	ConfigTaskConcurrency = "task.concurrency"

-	// Email配置常量
-	ConfigEmailSMTPHost     = "email.smtpHost"
-	ConfigEmailSMTPPort     = "email.smtpPort"
-	ConfigEmailSMTPUsername = "email.smtpUsername"
-	ConfigEmailSMTPPassword = "email.smtpPassword"
-	ConfigEmailFromEmail    = "email.fromEmail"
-	ConfigEmailFromName     = "email.fromName"
+	ConfigEmailAuthMode          = "email.authMode"
+	ConfigEmailSMTPHost          = "email.smtpHost"
+	ConfigEmailSMTPPort          = "email.smtpPort"
+	ConfigEmailSMTPUsername      = "email.smtpUsername"
+	ConfigEmailSMTPPassword      = "email.smtpPassword"
+	ConfigEmailFromEmail         = "email.fromEmail"
+	ConfigEmailFromName          = "email.fromName"
+	ConfigEmailOAuthTenant       = "email.oauthTenant"
+	ConfigEmailOAuthClientID     = "email.oauthClientId"
+	ConfigEmailOAuthClientSecret = "email.oauthClientSecret"
+	ConfigEmailOAuthRedirectURL  = "email.oauthRedirectUrl"
+	ConfigEmailOAuthRefreshToken = "email.oauthRefreshToken"
+	ConfigEmailOAuthScope        = "email.oauthScope"

-	// 基础积分配置
 	ConfigBasePointCpdailyTask  = "basePoint.cpdailyTask"
 	ConfigBasePointCpdailyLeave = "basePoint.cpdailyLeave"
 	ConfigBasePointCpdailyPhone = "basePoint.cpdailyPhone"

-	// 系统配置
-	ConfigSystemAllowRegister = "system.allowRegister" // 是否允许注册
+	ConfigSystemAllowRegister     = "system.allowRegister"
+	ConfigSystemRequireInviteCode = "system.requireInviteCode"

 	ConfigRedisCpdailyTask  = "price.cpdaily_task"
 	ConfigRedisCpdailyLeave = "price.cpdaily_leave"
 	ConfigRedisCpdailyPhone = "price.cpdaily_phone"
 	ConfigRedisXxt          = "price.xxt"
 	ConfigRedisSmarteduSc   = "price.smartedu_sc"
+
+	ConfigQuesBankUrl = "quesbank.url"
+	ConfigQuesBankKey = "quesbank.key"
 )

 const (
-	// 应用程序常量
 	AppName      = "若梦系统"
-	AppCopyright = "© 2025 若梦系统. 保留所有权利."
+	AppCopyright = "© 2025 若梦系统. 保留所有权利"
 )

 var (
@@ -7,6 +7,7 @@ const (
 	RedisBalanceMigrate  = "balancemigrate:" // 积分转移token
 	RedisCpUserLogin     = "cpuserlogin:"
 	RedisCpUserAuthorize = "cpuser:authorize:"
+	RedisCpUserQrCode    = "cpuser:qrcode:" // 二维码UUID -> 系统用户ID
 	RedisSchoolInfo      = "cpuser:schoolinfo:"
 )

@@ -17,5 +18,6 @@ var (
 	RedisBalanceMigrateExpire  = int64(3600) // 积分转移链接1小时有效
 	RedisCpUserLoginExpire     = int64(180)
 	RedisCpUserAuthorizeExpire = int64(1800)
-	RedisSchoolInfoExpire      = int64(3600) // 学校信息1小时有效
+	RedisCpUserQrCodeExpire    = int64(300)            // 二维码5分钟有效
+	RedisSchoolInfoExpire      = int64(3600 * 24 * 30) // 学校信息30天有效
 )
@@ -1,11 +1,12 @@
 package cst

 const (
-	TaskCpdaily      = "task:cpdaily"
-	TaskEmail        = "task:email"
-	TaskResetDaily   = "task:reset:daily"
-	TaskXuexitong    = "task:xuexitong"
-	TaskXuexitongVio = "task:xuexitong:violence"
+	TaskCpdaily             = "task:cpdaily"
+	TaskEmail               = "task:email"
+	TaskResetDaily          = "task:reset:daily"
+	TaskRefreshSchoolDetail = "task:refresh:school:detail"
+	TaskXuexitong           = "task:xuexitong"
+	TaskXuexitongVio        = "task:xuexitong:violence"

 	TaskCpdailyId = "cpdaily:task:schedule:%d"

@@ -33,18 +33,22 @@ func InitDB() {
 	Global = client
 	dbDsn2, err := g.Cfg().Get(gctx.New(), cst.ConfigDatabaseDsn2)
 	utils.OkOrPanic(err)
-	GlobalGorm, err = gorm.Open(postgres.Open(dbDsn2.String()), &gorm.Config{})
-	if err != nil {
-		logger.Logger.Fatal("连接pg数据库失败: %v", zap.Error(err))
+	// PG 数据库为可选配置，如果 dsn2 为空则跳过
+	if dbDsn2.String() != "" {
+		GlobalGorm, err = gorm.Open(postgres.Open(dbDsn2.String()), &gorm.Config{})
+		if err != nil {
+			logger.Logger.Warn("连接pg数据库失败, 跳过: %v", zap.Error(err))
+		} else {
+			// 可选：配置连接池
+			sqlDB, err := GlobalGorm.DB()
+			if err != nil {
+				logger.Logger.Warn("获取pg数据库实例失败, 跳过: %v", zap.Error(err))
+			} else {
+				// 设置连接池参数
+				sqlDB.SetMaxIdleConns(10)   // 设置空闲连接池中连接的最大数量
+				sqlDB.SetMaxOpenConns(100)  // 设置打开数据库连接的最大数量
+				sqlDB.SetConnMaxLifetime(0) // 设置连接可复用的最大时间（0表示永久）
+			}
+		}
 	}
-	// 可选：配置连接池
-	sqlDB, err := GlobalGorm.DB()
-	if err != nil {
-		logger.Logger.Fatal("获取数据库实例失败: %v", zap.Error(err))
-	}
-
-	// 设置连接池参数
-	sqlDB.SetMaxIdleConns(10)   // 设置空闲连接池中连接的最大数量
-	sqlDB.SetMaxOpenConns(100)  // 设置打开数据库连接的最大数量
-	sqlDB.SetConnMaxLifetime(0) // 设置连接可复用的最大时间（0表示永久）
 }
@@ -2,14 +2,14 @@ package config

 import (
 	"context"
+
 	v1 "likedream-goframe/internal/api/v1"
 	"likedream-goframe/internal/ent"
 	"likedream-goframe/internal/service"
 	"likedream-goframe/internal/utils"
 )

-type ConfigCtrlV1 struct {
-}
+type ConfigCtrlV1 struct{}

 func (c ConfigCtrlV1) Get(ctx context.Context, req *v1.ConfigGetReq) (res *utils.Response[*ent.SysConfig], err error) {
 	defer utils.Pass(&err)
@@ -31,13 +31,11 @@ func (c ConfigCtrlV1) Update(ctx context.Context, req *v1.ConfigUpdateReq) (res
 	return service.Global.Config.Update(ctx, req), nil
 }

-// GetPriceConfig 获取费率配置
 func (c ConfigCtrlV1) GetPriceConfig(ctx context.Context, req *v1.PriceConfigGetReq) (res *utils.Response[*v1.PriceConfigResp], err error) {
 	defer utils.Pass(&err)
 	return service.Global.Config.GetPriceConfig(ctx, req), nil
 }

-// UpdatePriceConfig 更新费率配置
 func (c ConfigCtrlV1) UpdatePriceConfig(ctx context.Context, req *v1.PriceConfigUpdateReq) (res *utils.Response[any], err error) {
 	defer utils.Pass(&err)
 	return service.Global.Config.UpdatePriceConfig(ctx, req), nil
@@ -46,3 +44,23 @@ func (c ConfigCtrlV1) UpdatePriceConfig(ctx context.Context, req *v1.PriceConfig
 func NewConfigCtrlV1() IConfigCtrlV1 {
 	return &ConfigCtrlV1{}
 }
+
+func (c ConfigCtrlV1) GetSmtpConfig(ctx context.Context, req *v1.SmtpConfigGetReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.Config.GetSmtpConfig(ctx, req), nil
+}
+
+func (c ConfigCtrlV1) UpdateSmtpConfig(ctx context.Context, req *v1.SmtpConfigUpdateReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.Config.UpdateSmtpConfig(ctx, req), nil
+}
+
+func (c ConfigCtrlV1) TestSmtp(ctx context.Context, req *v1.SmtpTestReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.Config.TestSmtp(ctx, req), nil
+}
+
+func (c ConfigCtrlV1) GetOutlookOAuthAuthorizeURL(ctx context.Context, req *v1.OutlookOAuthAuthorizeURLReq) (res *utils.Response[*v1.OutlookOAuthAuthorizeURLResp], err error) {
+	defer utils.Pass(&err)
+	return service.Global.Config.GetOutlookOAuthAuthorizeURL(ctx, req), nil
+}
@@ -2,6 +2,7 @@ package config

 import (
 	"context"
+
 	v1 "likedream-goframe/internal/api/v1"
 	"likedream-goframe/internal/ent"
 	"likedream-goframe/internal/utils"
@@ -14,4 +15,8 @@ type IConfigCtrlV1 interface {
 	Update(ctx context.Context, req *v1.ConfigUpdateReq) (*utils.Response[any], error)
 	GetPriceConfig(ctx context.Context, req *v1.PriceConfigGetReq) (*utils.Response[*v1.PriceConfigResp], error)
 	UpdatePriceConfig(ctx context.Context, req *v1.PriceConfigUpdateReq) (*utils.Response[any], error)
+	GetSmtpConfig(ctx context.Context, req *v1.SmtpConfigGetReq) (*utils.Response[any], error)
+	UpdateSmtpConfig(ctx context.Context, req *v1.SmtpConfigUpdateReq) (*utils.Response[any], error)
+	TestSmtp(ctx context.Context, req *v1.SmtpTestReq) (*utils.Response[any], error)
+	GetOutlookOAuthAuthorizeURL(ctx context.Context, req *v1.OutlookOAuthAuthorizeURLReq) (*utils.Response[*v1.OutlookOAuthAuthorizeURLResp], error)
 }
@@ -0,0 +1,37 @@
+package config
+
+import (
+	"context"
+	"fmt"
+
+	v1 "likedream-goframe/internal/api/v1"
+	mailservice "likedream-goframe/internal/service/email"
+	"likedream-goframe/internal/utils"
+
+	"github.com/gogf/gf/v2/net/ghttp"
+)
+
+type MailOAuthCtrlV1 struct{}
+
+func NewMailOAuthCtrlV1() *MailOAuthCtrlV1 {
+	return &MailOAuthCtrlV1{}
+}
+
+func (c *MailOAuthCtrlV1) OutlookCallback(ctx context.Context, req *v1.OutlookOAuthCallbackReq) (res *utils.Response[any], err error) {
+	r := ghttp.RequestFromCtx(ctx)
+	r.Response.Header().Set("Content-Type", "text/html; charset=utf-8")
+
+	if req.Error != "" {
+		r.Response.Write(mailservice.BuildOutlookOAuthErrorHTML(fmt.Sprintf("%s: %s", req.Error, req.ErrorDescription)))
+		return nil, nil
+	}
+
+	refreshToken, frontendOrigin, exchangeErr := mailservice.NewV1().ExchangeOutlookAuthorizeCode(ctx, req.State, req.Code)
+	if exchangeErr != nil {
+		r.Response.Write(mailservice.BuildOutlookOAuthPopupHTML("*", false, exchangeErr.Error(), ""))
+		return nil, nil
+	}
+
+	r.Response.Write(mailservice.BuildOutlookOAuthPopupHTML(frontendOrigin, true, "授权成功", refreshToken))
+	return nil, nil
+}
@@ -31,6 +31,31 @@ func (c CpLeaveCtrlV1) Upload(ctx context.Context, req *v1.CpLeaveUploadReq) (re
 	return service.Global.CpLeave.Upload(ctx, req), nil
 }

+func (c CpLeaveCtrlV1) CheckLeave(ctx context.Context, req *v1.CpLeaveCheckReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpLeave.CheckLeave(ctx, req), nil
+}
+
+func (c CpLeaveCtrlV1) GetLeaveTypes(ctx context.Context, req *v1.CpLeaveTypesReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpLeave.GetLeaveTypes(ctx, req), nil
+}
+
+func (c CpLeaveCtrlV1) GetLeaveTypeCfg(ctx context.Context, req *v1.CpLeaveTypeCfgReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpLeave.GetLeaveTypeCfg(ctx, req), nil
+}
+
+func (c CpLeaveCtrlV1) GetApproveFlow(ctx context.Context, req *v1.CpLeaveApproveFlowReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpLeave.GetApproveFlow(ctx, req), nil
+}
+
+func (c CpLeaveCtrlV1) Apply(ctx context.Context, req *v1.CpLeaveApplyReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpLeave.Apply(ctx, req), nil
+}
+
 func NewCpLeaveCtrlV1() ICpLeaveCtrlV1 {
 	return &CpLeaveCtrlV1{}
 }
@@ -56,6 +56,11 @@ func (c CpTaskCtrlV1) Delete(ctx context.Context, req *v1.DeleteTaskReq) (res *u
 	return service.Global.CpTask.Delete(ctx, req), nil
 }

+func (c CpTaskCtrlV1) UpdateTaskTitle(ctx context.Context, req *v1.UpdateTaskTitleReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpTask.UpdateTaskTitle(ctx, req), nil
+}
+
 func (c CpTaskCtrlV1) ExecuteNow(ctx context.Context, req *v1.ExecuteNowReq) (res *utils.Response[any], err error) {
 	defer utils.Pass(&err)
 	return service.Global.CpTask.ExecuteNow(ctx, req), nil
@@ -71,6 +76,16 @@ func (c CpTaskCtrlV1) GetTaskStatistics(ctx context.Context, req *v1.GetTaskStat
 	return service.Global.CpTask.GetTaskStatistics(ctx, req), nil
 }

+func (c CpTaskCtrlV1) GetTaskStatisticsV2(ctx context.Context, req *v1.GetTaskStatisticsV2Req) (res *utils.Response[[]*v1.TaskStatisticsV2Item], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpTask.GetTaskStatisticsV2(ctx, req), nil
+}
+
+func (c CpTaskCtrlV1) GetDashboardSummary(ctx context.Context, req *v1.GetDashboardSummaryReq) (res *utils.Response[*v1.DashboardSummary], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpTask.GetDashboardSummary(ctx, req), nil
+}
+
 func NewCpTaskCtrlV1() ICpTaskCtrlV1 {
 	return &CpTaskCtrlV1{}
 }
@@ -66,9 +66,9 @@ func (c CpUserCtrlV1) AuthorizeConfirm(ctx context.Context, req *v1.CpUserAuthor
 	return service.Global.CpUser.AuthorizeConfirm(ctx, req), nil
 }

-func (c CpUserCtrlV1) AuthorizeRandom(ctx context.Context, req *v1.CpUserAuthorizeRandomReq) (res *utils.Response[any], err error) {
+func (c CpUserCtrlV1) CustomDevice(ctx context.Context, req *v1.CpUserCustomDeviceReq) (res *utils.Response[any], err error) {
 	defer utils.Pass(&err)
-	return service.Global.CpUser.AuthorizeRandom(ctx, req), nil
+	return service.Global.CpUser.CustomDevice(ctx, req), nil
 }
 func (c CpUserCtrlV1) LoginGetCode(ctx context.Context, req *v1.LoginGetCode) (res *utils.Response[any], err error) {
 	defer utils.Pass(&err)
@@ -101,3 +101,13 @@ func (c CpUserCtrlV1) AddByCode(ctx context.Context, req *v1.AddByCode) (res *ut
 	}
 	return service.Global.CpUser.AddByCode(ctx, req), nil
 }
+
+func (c CpUserCtrlV1) GenerateQr(ctx context.Context, req *v1.CpUserGenerateQrReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpUser.GenerateQr(ctx, req), nil
+}
+
+func (c CpUserCtrlV1) CheckQr(ctx context.Context, req *v1.CpUserCheckQrReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpUser.CheckQr(ctx, req), nil
+}
@@ -12,4 +12,9 @@ type ICpLeaveCtrlV1 interface {
 	List(ctx context.Context, req *v1.CpLeaveListReq) (*utils.Response[[]*ent.CpLeave], error)
 	Report(ctx context.Context, req *v1.CpLeaveReportReq) (*utils.Response[any], error)
 	Upload(ctx context.Context, req *v1.CpLeaveUploadReq) (*utils.Response[string], error)
+	CheckLeave(ctx context.Context, req *v1.CpLeaveCheckReq) (*utils.Response[any], error)
+	GetLeaveTypes(ctx context.Context, req *v1.CpLeaveTypesReq) (*utils.Response[any], error)
+	GetLeaveTypeCfg(ctx context.Context, req *v1.CpLeaveTypeCfgReq) (*utils.Response[any], error)
+	GetApproveFlow(ctx context.Context, req *v1.CpLeaveApproveFlowReq) (*utils.Response[any], error)
+	Apply(ctx context.Context, req *v1.CpLeaveApplyReq) (*utils.Response[any], error)
 }
@@ -19,5 +19,8 @@ type ICpTaskCtrlV1 interface {
 	ExecuteNow(ctx context.Context, req *v1.ExecuteNowReq) (res *utils.Response[any], err error)
 	PauseTask(ctx context.Context, req *v1.PauseTaskReq) (res *utils.Response[any], err error)
 	FindLocation(ctx context.Context, req *v1.FindLocationReq) (res *utils.Response[any], err error)
+	UpdateTaskTitle(ctx context.Context, req *v1.UpdateTaskTitleReq) (res *utils.Response[any], err error)
 	GetTaskStatistics(ctx context.Context, req *v1.GetTaskStatisticsReq) (res *utils.Response[[]*v1.TaskStatisticsItem], err error)
+	GetTaskStatisticsV2(ctx context.Context, req *v1.GetTaskStatisticsV2Req) (res *utils.Response[[]*v1.TaskStatisticsV2Item], err error)
+	GetDashboardSummary(ctx context.Context, req *v1.GetDashboardSummaryReq) (res *utils.Response[*v1.DashboardSummary], err error)
 }
@@ -25,10 +25,14 @@ type ICpUserCtrlV1 interface {
 	AuthorizeDevice(ctx context.Context, req *v1.CpUserAuthorizeDeviceReq) (*utils.Response[any], error)
 	// 验证授权是否成功
 	AuthorizeConfirm(ctx context.Context, req *v1.CpUserAuthorizeConfirmReq) (*utils.Response[any], error)
-	// 随机授权
-	AuthorizeRandom(ctx context.Context, req *v1.CpUserAuthorizeRandomReq) (res *utils.Response[any], err error)
+	// 自定义设备码
+	CustomDevice(ctx context.Context, req *v1.CpUserCustomDeviceReq) (res *utils.Response[any], err error)

 	// 手机登录获取验证码
 	LoginGetCode(ctx context.Context, req *v1.LoginGetCode) (*utils.Response[any], error)
 	AddByCode(ctx context.Context, req *v1.AddByCode) (*utils.Response[any], error)
+
+	// 二维码获取设备码
+	GenerateQr(ctx context.Context, req *v1.CpUserGenerateQrReq) (*utils.Response[any], error)
+	CheckQr(ctx context.Context, req *v1.CpUserCheckQrReq) (*utils.Response[any], error)
 }
@@ -9,4 +9,6 @@ import (
 type ICpImageCtrlV1 interface {
 	Upload(ctx context.Context, req *v1.UploadImageReq) (res *utils.Response[any], err error)
 	Preview(ctx context.Context, req *v1.PreviewImageReq) (res *utils.Response[any], err error)
+	GetUploadPolicy(ctx context.Context, req *v1.GetUploadPolicyReq) (res *utils.Response[any], err error)
+	GetPreviewUrl(ctx context.Context, req *v1.GetPreviewUrlReq) (res *utils.Response[any], err error)
 }
@@ -20,6 +20,16 @@ func (c CpImageCtrlV1) Preview(ctx context.Context, req *v1.PreviewImageReq) (re
 	return service.Global.CpImage.Preview(ctx, req), nil
 }

+func (c CpImageCtrlV1) GetUploadPolicy(ctx context.Context, req *v1.GetUploadPolicyReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpImage.GetUploadPolicy(ctx, req), nil
+}
+
+func (c CpImageCtrlV1) GetPreviewUrl(ctx context.Context, req *v1.GetPreviewUrlReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return service.Global.CpImage.GetPreviewUrl(ctx, req), nil
+}
+
 func NewCpImageCtrlV1() ICpImageCtrlV1 {
 	return &CpImageCtrlV1{}
 }
@@ -8,6 +8,8 @@ import (
 )

 type IUserInfoV1 interface {
+	// 刷新Token
+	RefreshToken(ctx context.Context, req *v1.RefreshTokenReq) (*utils.Response[any], error)
 	PermissionList(ctx context.Context, _ *v1.CommonReq) (*utils.Response[*v1.UserPermissionRes], error)
 	//用户基础信息
 	UserInfo(ctx context.Context, _ *v1.CommonReq) (*utils.Response[any], error)
@@ -3,6 +3,7 @@ package user_login
 import (
 	"context"
 	v1 "likedream-goframe/internal/api/v1"
+	cst "likedream-goframe/internal/common/cst"
 	"likedream-goframe/internal/ent"
 	"likedream-goframe/internal/framework/captcha"
 	"likedream-goframe/internal/framework/redis"
@@ -10,6 +11,7 @@ import (
 	"likedream-goframe/internal/utils"

 	"github.com/bytedance/sonic"
+	"github.com/gogf/gf/v2/net/ghttp"
 )

 type UserInfoV1 struct {
@@ -19,6 +21,15 @@ func NewUserInfoV1() IUserInfoV1 {
 	return &UserInfoV1{}
 }

+// 刷新Token（token有效期内可换取新token）
+func (c *UserInfoV1) RefreshToken(ctx context.Context, _ *v1.RefreshTokenReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	user := utils.GetUserInfoFromCtx(ctx)
+	r := ghttp.RequestFromCtx(ctx)
+	r.Response.Header().Set(cst.AuthorizationKey, utils.GenerateToken(user.ID))
+	return utils.SuccessWithMsg("刷新成功"), nil
+}
+
 // 获取用户权限列表
 func (c *UserInfoV1) PermissionList(ctx context.Context, _ *v1.CommonReq) (res *utils.Response[*v1.UserPermissionRes], err error) {
 	defer utils.Pass(&err)
@@ -126,6 +126,7 @@ type Type string
 // Type values.
 const (
 	TypeReport Type = "report"
+	TypeApply  Type = "apply"
 )

 func (_type Type) String() string {
@@ -135,7 +136,7 @@ func (_type Type) String() string {
 // TypeValidator is a validator for the "type" field enum values. It is called by the builders before save.
 func TypeValidator(_type Type) error {
 	switch _type {
-	case TypeReport:
+	case TypeReport, TypeApply:
 		return nil
 	default:
 		return fmt.Errorf("cpleave: invalid enum value for type field: %q", _type)
@@ -3,6 +3,7 @@
 package ent

 import (
+	"encoding/json"
 	"fmt"
 	"likedream-goframe/internal/ent/cptask"
 	"likedream-goframe/internal/ent/cpuser"
@@ -51,6 +52,8 @@ type CpTask struct {
 	ExecuteMinute *int `json:"execute_minute,omitempty"`
 	// NextExecuteTime holds the value of the "next_execute_time" field.
 	NextExecuteTime *int64 `json:"next_execute_time,omitempty"`
+	// 执行星期 1-7，1=周一，7=周日
+	ExecuteDays []int `json:"execute_days,omitempty"`
 	// Edges holds the relations/edges for other nodes in the graph.
 	// The values are being populated by the CpTaskQuery when eager-loading is set.
 	Edges        CpTaskEdges `json:"edges"`
@@ -107,6 +110,8 @@ func (*CpTask) scanValues(columns []string) ([]any, error) {
 	values := make([]any, len(columns))
 	for i := range columns {
 		switch columns[i] {
+		case cptask.FieldExecuteDays:
+			values[i] = new([]byte)
 		case cptask.FieldCreateTime, cptask.FieldUpdateTime:
 			values[i] = new(ent2.CustomTime)
 		case cptask.FieldID, cptask.FieldCpUserID, cptask.FieldUserID, cptask.FieldFrequency, cptask.FieldSuccessCount, cptask.FieldExecuteHour, cptask.FieldExecuteMinute, cptask.FieldNextExecuteTime:
@@ -233,6 +238,14 @@ func (_m *CpTask) assignValues(columns []string, values []any) error {
 				_m.NextExecuteTime = new(int64)
 				*_m.NextExecuteTime = value.Int64
 			}
+		case cptask.FieldExecuteDays:
+			if value, ok := values[i].(*[]byte); !ok {
+				return fmt.Errorf("unexpected type %T for field execute_days", values[i])
+			} else if value != nil && len(*value) > 0 {
+				if err := json.Unmarshal(*value, &_m.ExecuteDays); err != nil {
+					return fmt.Errorf("unmarshal field execute_days: %w", err)
+				}
+			}
 		default:
 			_m.selectValues.Set(columns[i], values[i])
 		}
@@ -337,6 +350,9 @@ func (_m *CpTask) String() string {
 		builder.WriteString("next_execute_time=")
 		builder.WriteString(fmt.Sprintf("%v", *v))
 	}
+	builder.WriteString(", ")
+	builder.WriteString("execute_days=")
+	builder.WriteString(fmt.Sprintf("%v", _m.ExecuteDays))
 	builder.WriteByte(')')
 	return builder.String()
 }
@@ -48,6 +48,8 @@ const (
 	FieldExecuteMinute = "execute_minute"
 	// FieldNextExecuteTime holds the string denoting the next_execute_time field in the database.
 	FieldNextExecuteTime = "next_execute_time"
+	// FieldExecuteDays holds the string denoting the execute_days field in the database.
+	FieldExecuteDays = "execute_days"
 	// EdgeCpUser holds the string denoting the cp_user edge name in mutations.
 	EdgeCpUser = "cp_user"
 	// EdgeSysUser holds the string denoting the sys_user edge name in mutations.
@@ -98,6 +100,7 @@ var Columns = []string{
 	FieldExecuteHour,
 	FieldExecuteMinute,
 	FieldNextExecuteTime,
+	FieldExecuteDays,
 }

 // ValidColumn reports if the column name is valid (part of the table columns).
@@ -821,6 +821,16 @@ func NextExecuteTimeNotNil() predicate.CpTask {
 	return predicate.CpTask(sql.FieldNotNull(FieldNextExecuteTime))
 }

+// ExecuteDaysIsNil applies the IsNil predicate on the "execute_days" field.
+func ExecuteDaysIsNil() predicate.CpTask {
+	return predicate.CpTask(sql.FieldIsNull(FieldExecuteDays))
+}
+
+// ExecuteDaysNotNil applies the NotNil predicate on the "execute_days" field.
+func ExecuteDaysNotNil() predicate.CpTask {
+	return predicate.CpTask(sql.FieldNotNull(FieldExecuteDays))
+}
+
 // HasCpUser applies the HasEdge predicate on the "cp_user" edge.
 func HasCpUser() predicate.CpTask {
 	return predicate.CpTask(func(s *sql.Selector) {
@@ -177,6 +177,12 @@ func (_c *CpTaskCreate) SetNillableNextExecuteTime(v *int64) *CpTaskCreate {
 	return _c
 }

+// SetExecuteDays sets the "execute_days" field.
+func (_c *CpTaskCreate) SetExecuteDays(v []int) *CpTaskCreate {
+	_c.mutation.SetExecuteDays(v)
+	return _c
+}
+
 // SetCpUser sets the "cp_user" edge to the CpUser entity.
 func (_c *CpTaskCreate) SetCpUser(v *CpUser) *CpTaskCreate {
 	return _c.SetCpUserID(v.ID)
@@ -420,6 +426,10 @@ func (_c *CpTaskCreate) createSpec() (*CpTask, *sqlgraph.CreateSpec) {
 		_spec.SetField(cptask.FieldNextExecuteTime, field.TypeInt64, value)
 		_node.NextExecuteTime = &value
 	}
+	if value, ok := _c.mutation.ExecuteDays(); ok {
+		_spec.SetField(cptask.FieldExecuteDays, field.TypeJSON, value)
+		_node.ExecuteDays = value
+	}
 	if nodes := _c.mutation.CpUserIDs(); len(nodes) > 0 {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.M2O,
@@ -765,6 +775,24 @@ func (u *CpTaskUpsert) ClearNextExecuteTime() *CpTaskUpsert {
 	return u
 }

+// SetExecuteDays sets the "execute_days" field.
+func (u *CpTaskUpsert) SetExecuteDays(v []int) *CpTaskUpsert {
+	u.Set(cptask.FieldExecuteDays, v)
+	return u
+}
+
+// UpdateExecuteDays sets the "execute_days" field to the value that was provided on create.
+func (u *CpTaskUpsert) UpdateExecuteDays() *CpTaskUpsert {
+	u.SetExcluded(cptask.FieldExecuteDays)
+	return u
+}
+
+// ClearExecuteDays clears the value of the "execute_days" field.
+func (u *CpTaskUpsert) ClearExecuteDays() *CpTaskUpsert {
+	u.SetNull(cptask.FieldExecuteDays)
+	return u
+}
+
 // UpdateNewValues updates the mutable fields using the new values that were set on create.
 // Using this option is equivalent to using:
 //
@@ -1090,6 +1118,27 @@ func (u *CpTaskUpsertOne) ClearNextExecuteTime() *CpTaskUpsertOne {
 	})
 }

+// SetExecuteDays sets the "execute_days" field.
+func (u *CpTaskUpsertOne) SetExecuteDays(v []int) *CpTaskUpsertOne {
+	return u.Update(func(s *CpTaskUpsert) {
+		s.SetExecuteDays(v)
+	})
+}
+
+// UpdateExecuteDays sets the "execute_days" field to the value that was provided on create.
+func (u *CpTaskUpsertOne) UpdateExecuteDays() *CpTaskUpsertOne {
+	return u.Update(func(s *CpTaskUpsert) {
+		s.UpdateExecuteDays()
+	})
+}
+
+// ClearExecuteDays clears the value of the "execute_days" field.
+func (u *CpTaskUpsertOne) ClearExecuteDays() *CpTaskUpsertOne {
+	return u.Update(func(s *CpTaskUpsert) {
+		s.ClearExecuteDays()
+	})
+}
+
 // Exec executes the query.
 func (u *CpTaskUpsertOne) Exec(ctx context.Context) error {
 	if len(u.create.conflict) == 0 {
@@ -1581,6 +1630,27 @@ func (u *CpTaskUpsertBulk) ClearNextExecuteTime() *CpTaskUpsertBulk {
 	})
 }

+// SetExecuteDays sets the "execute_days" field.
+func (u *CpTaskUpsertBulk) SetExecuteDays(v []int) *CpTaskUpsertBulk {
+	return u.Update(func(s *CpTaskUpsert) {
+		s.SetExecuteDays(v)
+	})
+}
+
+// UpdateExecuteDays sets the "execute_days" field to the value that was provided on create.
+func (u *CpTaskUpsertBulk) UpdateExecuteDays() *CpTaskUpsertBulk {
+	return u.Update(func(s *CpTaskUpsert) {
+		s.UpdateExecuteDays()
+	})
+}
+
+// ClearExecuteDays clears the value of the "execute_days" field.
+func (u *CpTaskUpsertBulk) ClearExecuteDays() *CpTaskUpsertBulk {
+	return u.Update(func(s *CpTaskUpsert) {
+		s.ClearExecuteDays()
+	})
+}
+
 // Exec executes the query.
 func (u *CpTaskUpsertBulk) Exec(ctx context.Context) error {
 	if u.create.err != nil {
@@ -16,6 +16,7 @@ import (

 	"entgo.io/ent/dialect/sql"
 	"entgo.io/ent/dialect/sql/sqlgraph"
+	"entgo.io/ent/dialect/sql/sqljson"
 	"entgo.io/ent/schema/field"
 )

@@ -300,6 +301,24 @@ func (_u *CpTaskUpdate) ClearNextExecuteTime() *CpTaskUpdate {
 	return _u
 }

+// SetExecuteDays sets the "execute_days" field.
+func (_u *CpTaskUpdate) SetExecuteDays(v []int) *CpTaskUpdate {
+	_u.mutation.SetExecuteDays(v)
+	return _u
+}
+
+// AppendExecuteDays appends value to the "execute_days" field.
+func (_u *CpTaskUpdate) AppendExecuteDays(v []int) *CpTaskUpdate {
+	_u.mutation.AppendExecuteDays(v)
+	return _u
+}
+
+// ClearExecuteDays clears the value of the "execute_days" field.
+func (_u *CpTaskUpdate) ClearExecuteDays() *CpTaskUpdate {
+	_u.mutation.ClearExecuteDays()
+	return _u
+}
+
 // SetCpUser sets the "cp_user" edge to the CpUser entity.
 func (_u *CpTaskUpdate) SetCpUser(v *CpUser) *CpTaskUpdate {
 	return _u.SetCpUserID(v.ID)
@@ -519,6 +538,17 @@ func (_u *CpTaskUpdate) sqlSave(ctx context.Context) (_node int, err error) {
 	if _u.mutation.NextExecuteTimeCleared() {
 		_spec.ClearField(cptask.FieldNextExecuteTime, field.TypeInt64)
 	}
+	if value, ok := _u.mutation.ExecuteDays(); ok {
+		_spec.SetField(cptask.FieldExecuteDays, field.TypeJSON, value)
+	}
+	if value, ok := _u.mutation.AppendedExecuteDays(); ok {
+		_spec.AddModifier(func(u *sql.UpdateBuilder) {
+			sqljson.Append(u, cptask.FieldExecuteDays, value)
+		})
+	}
+	if _u.mutation.ExecuteDaysCleared() {
+		_spec.ClearField(cptask.FieldExecuteDays, field.TypeJSON)
+	}
 	if _u.mutation.CpUserCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.M2O,
@@ -920,6 +950,24 @@ func (_u *CpTaskUpdateOne) ClearNextExecuteTime() *CpTaskUpdateOne {
 	return _u
 }

+// SetExecuteDays sets the "execute_days" field.
+func (_u *CpTaskUpdateOne) SetExecuteDays(v []int) *CpTaskUpdateOne {
+	_u.mutation.SetExecuteDays(v)
+	return _u
+}
+
+// AppendExecuteDays appends value to the "execute_days" field.
+func (_u *CpTaskUpdateOne) AppendExecuteDays(v []int) *CpTaskUpdateOne {
+	_u.mutation.AppendExecuteDays(v)
+	return _u
+}
+
+// ClearExecuteDays clears the value of the "execute_days" field.
+func (_u *CpTaskUpdateOne) ClearExecuteDays() *CpTaskUpdateOne {
+	_u.mutation.ClearExecuteDays()
+	return _u
+}
+
 // SetCpUser sets the "cp_user" edge to the CpUser entity.
 func (_u *CpTaskUpdateOne) SetCpUser(v *CpUser) *CpTaskUpdateOne {
 	return _u.SetCpUserID(v.ID)
@@ -1169,6 +1217,17 @@ func (_u *CpTaskUpdateOne) sqlSave(ctx context.Context) (_node *CpTask, err erro
 	if _u.mutation.NextExecuteTimeCleared() {
 		_spec.ClearField(cptask.FieldNextExecuteTime, field.TypeInt64)
 	}
+	if value, ok := _u.mutation.ExecuteDays(); ok {
+		_spec.SetField(cptask.FieldExecuteDays, field.TypeJSON, value)
+	}
+	if value, ok := _u.mutation.AppendedExecuteDays(); ok {
+		_spec.AddModifier(func(u *sql.UpdateBuilder) {
+			sqljson.Append(u, cptask.FieldExecuteDays, value)
+		})
+	}
+	if _u.mutation.ExecuteDaysCleared() {
+		_spec.ClearField(cptask.FieldExecuteDays, field.TypeJSON)
+	}
 	if _u.mutation.CpUserCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.M2O,
@@ -37,6 +37,8 @@ type CpUser struct {
 	MobileCode string `json:"mobile_code,omitempty"`
 	// Cookie holds the value of the "cookie" field.
 	Cookie string `json:"cookie,omitempty"`
+	// Tgc holds the value of the "tgc" field.
+	Tgc string `json:"tgc,omitempty"`
 	// MobileType holds the value of the "mobile_type" field.
 	MobileType cpuser.MobileType `json:"mobile_type,omitempty"`
 	// LoginType holds the value of the "login_type" field.
@@ -125,7 +127,7 @@ func (*CpUser) scanValues(columns []string) ([]any, error) {
 			values[i] = new(ent2.CustomTime)
 		case cpuser.FieldID, cpuser.FieldUserID:
 			values[i] = new(sql.NullInt64)
-		case cpuser.FieldUsername, cpuser.FieldPassword, cpuser.FieldSchoolID, cpuser.FieldEmail, cpuser.FieldMobileCode, cpuser.FieldCookie, cpuser.FieldMobileType, cpuser.FieldLoginType:
+		case cpuser.FieldUsername, cpuser.FieldPassword, cpuser.FieldSchoolID, cpuser.FieldEmail, cpuser.FieldMobileCode, cpuser.FieldCookie, cpuser.FieldTgc, cpuser.FieldMobileType, cpuser.FieldLoginType:
 			values[i] = new(sql.NullString)
 		default:
 			values[i] = new(sql.UnknownType)
@@ -202,6 +204,12 @@ func (_m *CpUser) assignValues(columns []string, values []any) error {
 			} else if value.Valid {
 				_m.Cookie = value.String
 			}
+		case cpuser.FieldTgc:
+			if value, ok := values[i].(*sql.NullString); !ok {
+				return fmt.Errorf("unexpected type %T for field tgc", values[i])
+			} else if value.Valid {
+				_m.Tgc = value.String
+			}
 		case cpuser.FieldMobileType:
 			if value, ok := values[i].(*sql.NullString); !ok {
 				return fmt.Errorf("unexpected type %T for field mobile_type", values[i])
@@ -302,6 +310,9 @@ func (_m *CpUser) String() string {
 	builder.WriteString("cookie=")
 	builder.WriteString(_m.Cookie)
 	builder.WriteString(", ")
+	builder.WriteString("tgc=")
+	builder.WriteString(_m.Tgc)
+	builder.WriteString(", ")
 	builder.WriteString("mobile_type=")
 	builder.WriteString(fmt.Sprintf("%v", _m.MobileType))
 	builder.WriteString(", ")
@@ -34,6 +34,8 @@ const (
 	FieldMobileCode = "mobile_code"
 	// FieldCookie holds the string denoting the cookie field in the database.
 	FieldCookie = "cookie"
+	// FieldTgc holds the string denoting the tgc field in the database.
+	FieldTgc = "tgc"
 	// FieldMobileType holds the string denoting the mobile_type field in the database.
 	FieldMobileType = "mobile_type"
 	// FieldLoginType holds the string denoting the login_type field in the database.
@@ -99,6 +101,7 @@ var Columns = []string{
 	FieldEmail,
 	FieldMobileCode,
 	FieldCookie,
+	FieldTgc,
 	FieldMobileType,
 	FieldLoginType,
 }
@@ -137,6 +140,7 @@ type MobileType string
 const (
 	MobileTypeRandom    MobileType = "random"
 	MobileTypeAuthorize MobileType = "authorize"
+	MobileTypeManual    MobileType = "manual"
 )

 func (mt MobileType) String() string {
@@ -146,7 +150,7 @@ func (mt MobileType) String() string {
 // MobileTypeValidator is a validator for the "mobile_type" field enum values. It is called by the builders before save.
 func MobileTypeValidator(mt MobileType) error {
 	switch mt {
-	case MobileTypeRandom, MobileTypeAuthorize:
+	case MobileTypeRandom, MobileTypeAuthorize, MobileTypeManual:
 		return nil
 	default:
 		return fmt.Errorf("cpuser: invalid enum value for mobile_type field: %q", mt)
@@ -232,6 +236,11 @@ func ByCookie(opts ...sql.OrderTermOption) OrderOption {
 	return sql.OrderByField(FieldCookie, opts...).ToFunc()
 }

+// ByTgc orders the results by the tgc field.
+func ByTgc(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldTgc, opts...).ToFunc()
+}
+
 // ByMobileType orders the results by the mobile_type field.
 func ByMobileType(opts ...sql.OrderTermOption) OrderOption {
 	return sql.OrderByField(FieldMobileType, opts...).ToFunc()
@@ -101,6 +101,11 @@ func Cookie(v string) predicate.CpUser {
 	return predicate.CpUser(sql.FieldEQ(FieldCookie, v))
 }

+// Tgc applies equality check predicate on the "tgc" field. It's identical to TgcEQ.
+func Tgc(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldEQ(FieldTgc, v))
+}
+
 // CreateTimeEQ applies the EQ predicate on the "create_time" field.
 func CreateTimeEQ(v *ent2.CustomTime) predicate.CpUser {
 	return predicate.CpUser(sql.FieldEQ(FieldCreateTime, v))
@@ -691,6 +696,81 @@ func CookieContainsFold(v string) predicate.CpUser {
 	return predicate.CpUser(sql.FieldContainsFold(FieldCookie, v))
 }

+// TgcEQ applies the EQ predicate on the "tgc" field.
+func TgcEQ(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldEQ(FieldTgc, v))
+}
+
+// TgcNEQ applies the NEQ predicate on the "tgc" field.
+func TgcNEQ(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldNEQ(FieldTgc, v))
+}
+
+// TgcIn applies the In predicate on the "tgc" field.
+func TgcIn(vs ...string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldIn(FieldTgc, vs...))
+}
+
+// TgcNotIn applies the NotIn predicate on the "tgc" field.
+func TgcNotIn(vs ...string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldNotIn(FieldTgc, vs...))
+}
+
+// TgcGT applies the GT predicate on the "tgc" field.
+func TgcGT(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldGT(FieldTgc, v))
+}
+
+// TgcGTE applies the GTE predicate on the "tgc" field.
+func TgcGTE(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldGTE(FieldTgc, v))
+}
+
+// TgcLT applies the LT predicate on the "tgc" field.
+func TgcLT(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldLT(FieldTgc, v))
+}
+
+// TgcLTE applies the LTE predicate on the "tgc" field.
+func TgcLTE(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldLTE(FieldTgc, v))
+}
+
+// TgcContains applies the Contains predicate on the "tgc" field.
+func TgcContains(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldContains(FieldTgc, v))
+}
+
+// TgcHasPrefix applies the HasPrefix predicate on the "tgc" field.
+func TgcHasPrefix(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldHasPrefix(FieldTgc, v))
+}
+
+// TgcHasSuffix applies the HasSuffix predicate on the "tgc" field.
+func TgcHasSuffix(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldHasSuffix(FieldTgc, v))
+}
+
+// TgcIsNil applies the IsNil predicate on the "tgc" field.
+func TgcIsNil() predicate.CpUser {
+	return predicate.CpUser(sql.FieldIsNull(FieldTgc))
+}
+
+// TgcNotNil applies the NotNil predicate on the "tgc" field.
+func TgcNotNil() predicate.CpUser {
+	return predicate.CpUser(sql.FieldNotNull(FieldTgc))
+}
+
+// TgcEqualFold applies the EqualFold predicate on the "tgc" field.
+func TgcEqualFold(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldEqualFold(FieldTgc, v))
+}
+
+// TgcContainsFold applies the ContainsFold predicate on the "tgc" field.
+func TgcContainsFold(v string) predicate.CpUser {
+	return predicate.CpUser(sql.FieldContainsFold(FieldTgc, v))
+}
+
 // MobileTypeEQ applies the EQ predicate on the "mobile_type" field.
 func MobileTypeEQ(v MobileType) predicate.CpUser {
 	return predicate.CpUser(sql.FieldEQ(FieldMobileType, v))
@@ -113,6 +113,20 @@ func (_c *CpUserCreate) SetNillableCookie(v *string) *CpUserCreate {
 	return _c
 }

+// SetTgc sets the "tgc" field.
+func (_c *CpUserCreate) SetTgc(v string) *CpUserCreate {
+	_c.mutation.SetTgc(v)
+	return _c
+}
+
+// SetNillableTgc sets the "tgc" field if the given value is not nil.
+func (_c *CpUserCreate) SetNillableTgc(v *string) *CpUserCreate {
+	if v != nil {
+		_c.SetTgc(*v)
+	}
+	return _c
+}
+
 // SetMobileType sets the "mobile_type" field.
 func (_c *CpUserCreate) SetMobileType(v cpuser.MobileType) *CpUserCreate {
 	_c.mutation.SetMobileType(v)
@@ -357,6 +371,10 @@ func (_c *CpUserCreate) createSpec() (*CpUser, *sqlgraph.CreateSpec) {
 		_spec.SetField(cpuser.FieldCookie, field.TypeString, value)
 		_node.Cookie = value
 	}
+	if value, ok := _c.mutation.Tgc(); ok {
+		_spec.SetField(cpuser.FieldTgc, field.TypeString, value)
+		_node.Tgc = value
+	}
 	if value, ok := _c.mutation.MobileType(); ok {
 		_spec.SetField(cpuser.FieldMobileType, field.TypeEnum, value)
 		_node.MobileType = value
@@ -624,6 +642,24 @@ func (u *CpUserUpsert) ClearCookie() *CpUserUpsert {
 	return u
 }

+// SetTgc sets the "tgc" field.
+func (u *CpUserUpsert) SetTgc(v string) *CpUserUpsert {
+	u.Set(cpuser.FieldTgc, v)
+	return u
+}
+
+// UpdateTgc sets the "tgc" field to the value that was provided on create.
+func (u *CpUserUpsert) UpdateTgc() *CpUserUpsert {
+	u.SetExcluded(cpuser.FieldTgc)
+	return u
+}
+
+// ClearTgc clears the value of the "tgc" field.
+func (u *CpUserUpsert) ClearTgc() *CpUserUpsert {
+	u.SetNull(cpuser.FieldTgc)
+	return u
+}
+
 // SetMobileType sets the "mobile_type" field.
 func (u *CpUserUpsert) SetMobileType(v cpuser.MobileType) *CpUserUpsert {
 	u.Set(cpuser.FieldMobileType, v)
@@ -833,6 +869,27 @@ func (u *CpUserUpsertOne) ClearCookie() *CpUserUpsertOne {
 	})
 }

+// SetTgc sets the "tgc" field.
+func (u *CpUserUpsertOne) SetTgc(v string) *CpUserUpsertOne {
+	return u.Update(func(s *CpUserUpsert) {
+		s.SetTgc(v)
+	})
+}
+
+// UpdateTgc sets the "tgc" field to the value that was provided on create.
+func (u *CpUserUpsertOne) UpdateTgc() *CpUserUpsertOne {
+	return u.Update(func(s *CpUserUpsert) {
+		s.UpdateTgc()
+	})
+}
+
+// ClearTgc clears the value of the "tgc" field.
+func (u *CpUserUpsertOne) ClearTgc() *CpUserUpsertOne {
+	return u.Update(func(s *CpUserUpsert) {
+		s.ClearTgc()
+	})
+}
+
 // SetMobileType sets the "mobile_type" field.
 func (u *CpUserUpsertOne) SetMobileType(v cpuser.MobileType) *CpUserUpsertOne {
 	return u.Update(func(s *CpUserUpsert) {
@@ -1212,6 +1269,27 @@ func (u *CpUserUpsertBulk) ClearCookie() *CpUserUpsertBulk {
 	})
 }

+// SetTgc sets the "tgc" field.
+func (u *CpUserUpsertBulk) SetTgc(v string) *CpUserUpsertBulk {
+	return u.Update(func(s *CpUserUpsert) {
+		s.SetTgc(v)
+	})
+}
+
+// UpdateTgc sets the "tgc" field to the value that was provided on create.
+func (u *CpUserUpsertBulk) UpdateTgc() *CpUserUpsertBulk {
+	return u.Update(func(s *CpUserUpsert) {
+		s.UpdateTgc()
+	})
+}
+
+// ClearTgc clears the value of the "tgc" field.
+func (u *CpUserUpsertBulk) ClearTgc() *CpUserUpsertBulk {
+	return u.Update(func(s *CpUserUpsert) {
+		s.ClearTgc()
+	})
+}
+
 // SetMobileType sets the "mobile_type" field.
 func (u *CpUserUpsertBulk) SetMobileType(v cpuser.MobileType) *CpUserUpsertBulk {
 	return u.Update(func(s *CpUserUpsert) {
@@ -163,6 +163,26 @@ func (_u *CpUserUpdate) ClearCookie() *CpUserUpdate {
 	return _u
 }

+// SetTgc sets the "tgc" field.
+func (_u *CpUserUpdate) SetTgc(v string) *CpUserUpdate {
+	_u.mutation.SetTgc(v)
+	return _u
+}
+
+// SetNillableTgc sets the "tgc" field if the given value is not nil.
+func (_u *CpUserUpdate) SetNillableTgc(v *string) *CpUserUpdate {
+	if v != nil {
+		_u.SetTgc(*v)
+	}
+	return _u
+}
+
+// ClearTgc clears the value of the "tgc" field.
+func (_u *CpUserUpdate) ClearTgc() *CpUserUpdate {
+	_u.mutation.ClearTgc()
+	return _u
+}
+
 // SetMobileType sets the "mobile_type" field.
 func (_u *CpUserUpdate) SetMobileType(v cpuser.MobileType) *CpUserUpdate {
 	_u.mutation.SetMobileType(v)
@@ -438,6 +458,12 @@ func (_u *CpUserUpdate) sqlSave(ctx context.Context) (_node int, err error) {
 	if _u.mutation.CookieCleared() {
 		_spec.ClearField(cpuser.FieldCookie, field.TypeString)
 	}
+	if value, ok := _u.mutation.Tgc(); ok {
+		_spec.SetField(cpuser.FieldTgc, field.TypeString, value)
+	}
+	if _u.mutation.TgcCleared() {
+		_spec.ClearField(cpuser.FieldTgc, field.TypeString)
+	}
 	if value, ok := _u.mutation.MobileType(); ok {
 		_spec.SetField(cpuser.FieldMobileType, field.TypeEnum, value)
 	}
@@ -802,6 +828,26 @@ func (_u *CpUserUpdateOne) ClearCookie() *CpUserUpdateOne {
 	return _u
 }

+// SetTgc sets the "tgc" field.
+func (_u *CpUserUpdateOne) SetTgc(v string) *CpUserUpdateOne {
+	_u.mutation.SetTgc(v)
+	return _u
+}
+
+// SetNillableTgc sets the "tgc" field if the given value is not nil.
+func (_u *CpUserUpdateOne) SetNillableTgc(v *string) *CpUserUpdateOne {
+	if v != nil {
+		_u.SetTgc(*v)
+	}
+	return _u
+}
+
+// ClearTgc clears the value of the "tgc" field.
+func (_u *CpUserUpdateOne) ClearTgc() *CpUserUpdateOne {
+	_u.mutation.ClearTgc()
+	return _u
+}
+
 // SetMobileType sets the "mobile_type" field.
 func (_u *CpUserUpdateOne) SetMobileType(v cpuser.MobileType) *CpUserUpdateOne {
 	_u.mutation.SetMobileType(v)
@@ -1107,6 +1153,12 @@ func (_u *CpUserUpdateOne) sqlSave(ctx context.Context) (_node *CpUser, err erro
 	if _u.mutation.CookieCleared() {
 		_spec.ClearField(cpuser.FieldCookie, field.TypeString)
 	}
+	if value, ok := _u.mutation.Tgc(); ok {
+		_spec.SetField(cpuser.FieldTgc, field.TypeString, value)
+	}
+	if _u.mutation.TgcCleared() {
+		_spec.ClearField(cpuser.FieldTgc, field.TypeString)
+	}
 	if value, ok := _u.mutation.MobileType(); ok {
 		_spec.SetField(cpuser.FieldMobileType, field.TypeEnum, value)
 	}
@@ -146,6 +146,7 @@ var schemaGraph = func() *sqlgraph.Schema {
 			cptask.FieldExecuteHour:      {Type: field.TypeInt, Column: cptask.FieldExecuteHour},
 			cptask.FieldExecuteMinute:    {Type: field.TypeInt, Column: cptask.FieldExecuteMinute},
 			cptask.FieldNextExecuteTime:  {Type: field.TypeInt64, Column: cptask.FieldNextExecuteTime},
+			cptask.FieldExecuteDays:      {Type: field.TypeJSON, Column: cptask.FieldExecuteDays},
 		},
 	}
 	graph.Nodes[5] = &sqlgraph.Node{
@@ -189,6 +190,7 @@ var schemaGraph = func() *sqlgraph.Schema {
 			cpuser.FieldEmail:      {Type: field.TypeString, Column: cpuser.FieldEmail},
 			cpuser.FieldMobileCode: {Type: field.TypeString, Column: cpuser.FieldMobileCode},
 			cpuser.FieldCookie:     {Type: field.TypeString, Column: cpuser.FieldCookie},
+			cpuser.FieldTgc:        {Type: field.TypeString, Column: cpuser.FieldTgc},
 			cpuser.FieldMobileType: {Type: field.TypeEnum, Column: cpuser.FieldMobileType},
 			cpuser.FieldLoginType:  {Type: field.TypeEnum, Column: cpuser.FieldLoginType},
 		},
@@ -1381,6 +1383,11 @@ func (f *CpTaskFilter) WhereNextExecuteTime(p entql.Int64P) {
 	f.Where(p.Field(cptask.FieldNextExecuteTime))
 }

+// WhereExecuteDays applies the entql json.RawMessage predicate on the execute_days field.
+func (f *CpTaskFilter) WhereExecuteDays(p entql.BytesP) {
+	f.Where(p.Field(cptask.FieldExecuteDays))
+}
+
 // WhereHasCpUser applies a predicate to check if query has an edge cp_user.
 func (f *CpTaskFilter) WhereHasCpUser() {
 	f.Where(entql.HasEdge("cp_user"))
@@ -1630,6 +1637,11 @@ func (f *CpUserFilter) WhereCookie(p entql.StringP) {
 	f.Where(p.Field(cpuser.FieldCookie))
 }

+// WhereTgc applies the entql string predicate on the tgc field.
+func (f *CpUserFilter) WhereTgc(p entql.StringP) {
+	f.Where(p.Field(cpuser.FieldTgc))
+}
+
 // WhereMobileType applies the entql string predicate on the mobile_type field.
 func (f *CpUserFilter) WhereMobileType(p entql.StringP) {
 	f.Where(p.Field(cpuser.FieldMobileType))
@@ -77,7 +77,7 @@ var (
 		{Name: "leave_id", Type: field.TypeString},
 		{Name: "title", Type: field.TypeString},
 		{Name: "status", Type: field.TypeEnum, Enums: []string{"done", "fail"}},
-		{Name: "type", Type: field.TypeEnum, Enums: []string{"report"}},
+		{Name: "type", Type: field.TypeEnum, Enums: []string{"report", "apply"}},
 		{Name: "desc", Type: field.TypeString, Nullable: true, Size: 2147483647},
 		{Name: "cp_user_id", Type: field.TypeInt64},
 		{Name: "user_id", Type: field.TypeInt64},
@@ -134,6 +134,7 @@ var (
 		{Name: "execute_hour", Type: field.TypeInt, Nullable: true},
 		{Name: "execute_minute", Type: field.TypeInt, Nullable: true},
 		{Name: "next_execute_time", Type: field.TypeInt64, Nullable: true},
+		{Name: "execute_days", Type: field.TypeJSON, Nullable: true},
 		{Name: "cp_user_id", Type: field.TypeInt64},
 		{Name: "user_id", Type: field.TypeInt64},
 	}
@@ -145,13 +146,13 @@ var (
 		ForeignKeys: []*schema.ForeignKey{
 			{
 				Symbol:     "cp_tasks_cp_users_cptasks",
-				Columns:    []*schema.Column{CpTasksColumns[15]},
+				Columns:    []*schema.Column{CpTasksColumns[16]},
 				RefColumns: []*schema.Column{CpUsersColumns[0]},
 				OnDelete:   schema.Cascade,
 			},
 			{
 				Symbol:     "cp_tasks_sys_user_cp_task",
-				Columns:    []*schema.Column{CpTasksColumns[16]},
+				Columns:    []*schema.Column{CpTasksColumns[17]},
 				RefColumns: []*schema.Column{SysUserColumns[0]},
 				OnDelete:   schema.Cascade,
 			},
@@ -205,7 +206,8 @@ var (
 		{Name: "email", Type: field.TypeString, Nullable: true},
 		{Name: "mobile_code", Type: field.TypeString, Nullable: true},
 		{Name: "cookie", Type: field.TypeString, Nullable: true, Size: 2147483647},
-		{Name: "mobile_type", Type: field.TypeEnum, Enums: []string{"random", "authorize"}},
+		{Name: "tgc", Type: field.TypeString, Nullable: true, Size: 2147483647},
+		{Name: "mobile_type", Type: field.TypeEnum, Enums: []string{"random", "authorize", "manual"}},
 		{Name: "login_type", Type: field.TypeEnum, Enums: []string{"account", "phone"}, Default: "account"},
 		{Name: "school_id", Type: field.TypeString},
 		{Name: "user_id", Type: field.TypeInt64},
@@ -218,13 +220,13 @@ var (
 		ForeignKeys: []*schema.ForeignKey{
 			{
 				Symbol:     "cp_users_cp_schools_cpusers",
-				Columns:    []*schema.Column{CpUsersColumns[10]},
+				Columns:    []*schema.Column{CpUsersColumns[11]},
 				RefColumns: []*schema.Column{CpSchoolsColumns[0]},
 				OnDelete:   schema.NoAction,
 			},
 			{
 				Symbol:     "cp_users_sys_user_cpuser",
-				Columns:    []*schema.Column{CpUsersColumns[11]},
+				Columns:    []*schema.Column{CpUsersColumns[12]},
 				RefColumns: []*schema.Column{SysUserColumns[0]},
 				OnDelete:   schema.Cascade,
 			},
@@ -3766,6 +3766,8 @@ type CpTaskMutation struct {
 	addexecute_minute    *int
 	next_execute_time    *int64
 	addnext_execute_time *int64
+	execute_days         *[]int
+	appendexecute_days   []int
 	clearedFields        map[string]struct{}
 	cp_user              *int64
 	clearedcp_user       bool
@@ -4621,6 +4623,71 @@ func (m *CpTaskMutation) ResetNextExecuteTime() {
 	delete(m.clearedFields, cptask.FieldNextExecuteTime)
 }

+// SetExecuteDays sets the "execute_days" field.
+func (m *CpTaskMutation) SetExecuteDays(i []int) {
+	m.execute_days = &i
+	m.appendexecute_days = nil
+}
+
+// ExecuteDays returns the value of the "execute_days" field in the mutation.
+func (m *CpTaskMutation) ExecuteDays() (r []int, exists bool) {
+	v := m.execute_days
+	if v == nil {
+		return
+	}
+	return *v, true
+}
+
+// OldExecuteDays returns the old "execute_days" field's value of the CpTask entity.
+// If the CpTask object wasn't provided to the builder, the object is fetched from the database.
+// An error is returned if the mutation operation is not UpdateOne, or the database query fails.
+func (m *CpTaskMutation) OldExecuteDays(ctx context.Context) (v []int, err error) {
+	if !m.op.Is(OpUpdateOne) {
+		return v, errors.New("OldExecuteDays is only allowed on UpdateOne operations")
+	}
+	if m.id == nil || m.oldValue == nil {
+		return v, errors.New("OldExecuteDays requires an ID field in the mutation")
+	}
+	oldValue, err := m.oldValue(ctx)
+	if err != nil {
+		return v, fmt.Errorf("querying old value for OldExecuteDays: %w", err)
+	}
+	return oldValue.ExecuteDays, nil
+}
+
+// AppendExecuteDays adds i to the "execute_days" field.
+func (m *CpTaskMutation) AppendExecuteDays(i []int) {
+	m.appendexecute_days = append(m.appendexecute_days, i...)
+}
+
+// AppendedExecuteDays returns the list of values that were appended to the "execute_days" field in this mutation.
+func (m *CpTaskMutation) AppendedExecuteDays() ([]int, bool) {
+	if len(m.appendexecute_days) == 0 {
+		return nil, false
+	}
+	return m.appendexecute_days, true
+}
+
+// ClearExecuteDays clears the value of the "execute_days" field.
+func (m *CpTaskMutation) ClearExecuteDays() {
+	m.execute_days = nil
+	m.appendexecute_days = nil
+	m.clearedFields[cptask.FieldExecuteDays] = struct{}{}
+}
+
+// ExecuteDaysCleared returns if the "execute_days" field was cleared in this mutation.
+func (m *CpTaskMutation) ExecuteDaysCleared() bool {
+	_, ok := m.clearedFields[cptask.FieldExecuteDays]
+	return ok
+}
+
+// ResetExecuteDays resets all changes to the "execute_days" field.
+func (m *CpTaskMutation) ResetExecuteDays() {
+	m.execute_days = nil
+	m.appendexecute_days = nil
+	delete(m.clearedFields, cptask.FieldExecuteDays)
+}
+
 // ClearCpUser clears the "cp_user" edge to the CpUser entity.
 func (m *CpTaskMutation) ClearCpUser() {
 	m.clearedcp_user = true
@@ -4776,7 +4843,7 @@ func (m *CpTaskMutation) Type() string {
 // order to get all numeric fields that were incremented/decremented, call
 // AddedFields().
 func (m *CpTaskMutation) Fields() []string {
-	fields := make([]string, 0, 16)
+	fields := make([]string, 0, 17)
 	if m.create_time != nil {
 		fields = append(fields, cptask.FieldCreateTime)
 	}
@@ -4825,6 +4892,9 @@ func (m *CpTaskMutation) Fields() []string {
 	if m.next_execute_time != nil {
 		fields = append(fields, cptask.FieldNextExecuteTime)
 	}
+	if m.execute_days != nil {
+		fields = append(fields, cptask.FieldExecuteDays)
+	}
 	return fields
 }

@@ -4865,6 +4935,8 @@ func (m *CpTaskMutation) Field(name string) (ent.Value, bool) {
 		return m.ExecuteMinute()
 	case cptask.FieldNextExecuteTime:
 		return m.NextExecuteTime()
+	case cptask.FieldExecuteDays:
+		return m.ExecuteDays()
 	}
 	return nil, false
 }
@@ -4906,6 +4978,8 @@ func (m *CpTaskMutation) OldField(ctx context.Context, name string) (ent.Value,
 		return m.OldExecuteMinute(ctx)
 	case cptask.FieldNextExecuteTime:
 		return m.OldNextExecuteTime(ctx)
+	case cptask.FieldExecuteDays:
+		return m.OldExecuteDays(ctx)
 	}
 	return nil, fmt.Errorf("unknown CpTask field %s", name)
 }
@@ -5027,6 +5101,13 @@ func (m *CpTaskMutation) SetField(name string, value ent.Value) error {
 		}
 		m.SetNextExecuteTime(v)
 		return nil
+	case cptask.FieldExecuteDays:
+		v, ok := value.([]int)
+		if !ok {
+			return fmt.Errorf("unexpected type %T for field %s", value, name)
+		}
+		m.SetExecuteDays(v)
+		return nil
 	}
 	return fmt.Errorf("unknown CpTask field %s", name)
 }
@@ -5135,6 +5216,9 @@ func (m *CpTaskMutation) ClearedFields() []string {
 	if m.FieldCleared(cptask.FieldNextExecuteTime) {
 		fields = append(fields, cptask.FieldNextExecuteTime)
 	}
+	if m.FieldCleared(cptask.FieldExecuteDays) {
+		fields = append(fields, cptask.FieldExecuteDays)
+	}
 	return fields
 }

@@ -5164,6 +5248,9 @@ func (m *CpTaskMutation) ClearField(name string) error {
 	case cptask.FieldNextExecuteTime:
 		m.ClearNextExecuteTime()
 		return nil
+	case cptask.FieldExecuteDays:
+		m.ClearExecuteDays()
+		return nil
 	}
 	return fmt.Errorf("unknown CpTask nullable field %s", name)
 }
@@ -5220,6 +5307,9 @@ func (m *CpTaskMutation) ResetField(name string) error {
 	case cptask.FieldNextExecuteTime:
 		m.ResetNextExecuteTime()
 		return nil
+	case cptask.FieldExecuteDays:
+		m.ResetExecuteDays()
+		return nil
 	}
 	return fmt.Errorf("unknown CpTask field %s", name)
 }
@@ -6251,6 +6341,7 @@ type CpUserMutation struct {
 	email               *string
 	mobile_code         *string
 	cookie              *string
+	tgc                 *string
 	mobile_type         *cpuser.MobileType
 	login_type          *cpuser.LoginType
 	clearedFields       map[string]struct{}
@@ -6746,6 +6837,55 @@ func (m *CpUserMutation) ResetCookie() {
 	delete(m.clearedFields, cpuser.FieldCookie)
 }

+// SetTgc sets the "tgc" field.
+func (m *CpUserMutation) SetTgc(s string) {
+	m.tgc = &s
+}
+
+// Tgc returns the value of the "tgc" field in the mutation.
+func (m *CpUserMutation) Tgc() (r string, exists bool) {
+	v := m.tgc
+	if v == nil {
+		return
+	}
+	return *v, true
+}
+
+// OldTgc returns the old "tgc" field's value of the CpUser entity.
+// If the CpUser object wasn't provided to the builder, the object is fetched from the database.
+// An error is returned if the mutation operation is not UpdateOne, or the database query fails.
+func (m *CpUserMutation) OldTgc(ctx context.Context) (v string, err error) {
+	if !m.op.Is(OpUpdateOne) {
+		return v, errors.New("OldTgc is only allowed on UpdateOne operations")
+	}
+	if m.id == nil || m.oldValue == nil {
+		return v, errors.New("OldTgc requires an ID field in the mutation")
+	}
+	oldValue, err := m.oldValue(ctx)
+	if err != nil {
+		return v, fmt.Errorf("querying old value for OldTgc: %w", err)
+	}
+	return oldValue.Tgc, nil
+}
+
+// ClearTgc clears the value of the "tgc" field.
+func (m *CpUserMutation) ClearTgc() {
+	m.tgc = nil
+	m.clearedFields[cpuser.FieldTgc] = struct{}{}
+}
+
+// TgcCleared returns if the "tgc" field was cleared in this mutation.
+func (m *CpUserMutation) TgcCleared() bool {
+	_, ok := m.clearedFields[cpuser.FieldTgc]
+	return ok
+}
+
+// ResetTgc resets all changes to the "tgc" field.
+func (m *CpUserMutation) ResetTgc() {
+	m.tgc = nil
+	delete(m.clearedFields, cpuser.FieldTgc)
+}
+
 // SetMobileType sets the "mobile_type" field.
 func (m *CpUserMutation) SetMobileType(ct cpuser.MobileType) {
 	m.mobile_type = &ct
@@ -7081,7 +7221,7 @@ func (m *CpUserMutation) Type() string {
 // order to get all numeric fields that were incremented/decremented, call
 // AddedFields().
 func (m *CpUserMutation) Fields() []string {
-	fields := make([]string, 0, 11)
+	fields := make([]string, 0, 12)
 	if m.create_time != nil {
 		fields = append(fields, cpuser.FieldCreateTime)
 	}
@@ -7109,6 +7249,9 @@ func (m *CpUserMutation) Fields() []string {
 	if m.cookie != nil {
 		fields = append(fields, cpuser.FieldCookie)
 	}
+	if m.tgc != nil {
+		fields = append(fields, cpuser.FieldTgc)
+	}
 	if m.mobile_type != nil {
 		fields = append(fields, cpuser.FieldMobileType)
 	}
@@ -7141,6 +7284,8 @@ func (m *CpUserMutation) Field(name string) (ent.Value, bool) {
 		return m.MobileCode()
 	case cpuser.FieldCookie:
 		return m.Cookie()
+	case cpuser.FieldTgc:
+		return m.Tgc()
 	case cpuser.FieldMobileType:
 		return m.MobileType()
 	case cpuser.FieldLoginType:
@@ -7172,6 +7317,8 @@ func (m *CpUserMutation) OldField(ctx context.Context, name string) (ent.Value,
 		return m.OldMobileCode(ctx)
 	case cpuser.FieldCookie:
 		return m.OldCookie(ctx)
+	case cpuser.FieldTgc:
+		return m.OldTgc(ctx)
 	case cpuser.FieldMobileType:
 		return m.OldMobileType(ctx)
 	case cpuser.FieldLoginType:
@@ -7248,6 +7395,13 @@ func (m *CpUserMutation) SetField(name string, value ent.Value) error {
 		}
 		m.SetCookie(v)
 		return nil
+	case cpuser.FieldTgc:
+		v, ok := value.(string)
+		if !ok {
+			return fmt.Errorf("unexpected type %T for field %s", value, name)
+		}
+		m.SetTgc(v)
+		return nil
 	case cpuser.FieldMobileType:
 		v, ok := value.(cpuser.MobileType)
 		if !ok {
@@ -7307,6 +7461,9 @@ func (m *CpUserMutation) ClearedFields() []string {
 	if m.FieldCleared(cpuser.FieldCookie) {
 		fields = append(fields, cpuser.FieldCookie)
 	}
+	if m.FieldCleared(cpuser.FieldTgc) {
+		fields = append(fields, cpuser.FieldTgc)
+	}
 	return fields
 }

@@ -7333,6 +7490,9 @@ func (m *CpUserMutation) ClearField(name string) error {
 	case cpuser.FieldCookie:
 		m.ClearCookie()
 		return nil
+	case cpuser.FieldTgc:
+		m.ClearTgc()
+		return nil
 	}
 	return fmt.Errorf("unknown CpUser nullable field %s", name)
 }
@@ -7368,6 +7528,9 @@ func (m *CpUserMutation) ResetField(name string) error {
 	case cpuser.FieldCookie:
 		m.ResetCookie()
 		return nil
+	case cpuser.FieldTgc:
+		m.ResetTgc()
+		return nil
 	case cpuser.FieldMobileType:
 		m.ResetMobileType()
 		return nil
@@ -21,7 +21,7 @@ func (CpLeave) Fields() []ent.Field {
 		field.String("leave_id").NotEmpty(),
 		field.String("title").NotEmpty(),
 		field.Enum("status").Values("done", "fail"),
-		field.Enum("type").Values("report"),
+		field.Enum("type").Values("report", "apply"),
 		field.Text("desc").Optional(),
 	}
 }
@@ -31,6 +31,7 @@ func (CpTask) Fields() []ent.Field {
 		field.Int("execute_hour").Optional().Nillable(),
 		field.Int("execute_minute").Optional().Nillable(),
 		field.Int64("next_execute_time").Optional().Nillable(),
+		field.JSON("execute_days", []int{}).Optional().Comment("执行星期 1-7，1=周一，7=周日"),
 	}
 }

@@ -24,7 +24,8 @@ func (CpUser) Fields() []ent.Field {
 		field.String("email").Optional(),
 		field.String("mobile_code").Optional(),
 		field.Text("cookie").Optional(),
-		field.Enum("mobile_type").Values("random", "authorize"),
+		field.Text("tgc").Optional(),
+		field.Enum("mobile_type").Values("random", "authorize", "manual"),
 		field.Enum("login_type").Values("account", "phone").Default("account"),
 	}
 }
@@ -15,6 +15,8 @@ func init() {
 	config := zap.NewProductionConfig()
 	if IsDebug() {
 		config.Level = zap.NewAtomicLevelAt(zap.DebugLevel) // Enable debug logs
+	} else {
+		config.Level = zap.NewAtomicLevelAt(zap.InfoLevel)
 	}
 	config.EncoderConfig.EncodeTime = BeijingTimeEncoder

@@ -1,13 +1,24 @@
 package email

 type SendPayload struct {
-	To           string
-	Subject      string
-	Body         string
-	FromName     string
-	FromEmail    string
+	To      string
+	Subject string
+	Body    string
+
+	AuthMode string
+
+	FromName  string
+	FromEmail string
+
 	SMTPHost     string
 	SMTPPort     int
 	SMTPUsername string
 	SMTPPassword string
+
+	OAuthTenant       string
+	OAuthClientID     string
+	OAuthClientSecret string
+	OAuthRedirectURL  string
+	OAuthRefreshToken string
+	OAuthScope        string
 }
@@ -4,10 +4,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/gob"
+	"likedream-goframe/internal/application/cpdaily/imageuploader"
 	"likedream-goframe/internal/application/cpdaily/login"
 	"likedream-goframe/internal/application/cpdaily/school"
 	task2 "likedream-goframe/internal/application/cpdaily/task"
 	"likedream-goframe/internal/application/cpdaily/task/formtype"
+	"likedream-goframe/internal/application/cpdaily/types"
 	"likedream-goframe/internal/common/db"
 	errors2 "likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/ent"
@@ -22,6 +24,7 @@ import (
 	"time"

 	"github.com/bytedance/sonic"
+	"github.com/google/uuid"
 	"github.com/hibiken/asynq"
 	"github.com/samber/oops"
 	"go.uber.org/zap"
@@ -43,15 +46,18 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 	// 先注册错误处理，确保任何阶段的错误都能被捕获并重置状态
 	var targetTask *ent.CpTask
 	defer utils.HandleError(func(err error) {
+		// 使用独立的 context，避免 asynq 超时 cancel ctx 后数据库操作失败导致状态无法更新
+		bgCtx := context.Background()
+
 		// 如果 targetTask 还没查询到，只能重置状态为 not_start，让任务重新入队
 		if targetTask == nil {
-			db.Global.CpTask.UpdateOneID(taskPayload.CpTaskID).SetTaskStatus(cptask.TaskStatusNotStart).Exec(ctx)
+			db.Global.CpTask.UpdateOneID(taskPayload.CpTaskID).SetTaskStatus(cptask.TaskStatusNotStart).Exec(bgCtx)
 			panic(err)
 		}

 		// 执行失败应该更新下次执行时间
 		executeTime := utils.GetCpdailyNextExecuteTime(targetTask)
-		e := db.Global.CpTask.UpdateOneID(taskPayload.CpTaskID).SetNextExecuteTime(executeTime).SetTaskStatus(cptask.TaskStatusFail).Exec(ctx)
+		e := db.Global.CpTask.UpdateOneID(taskPayload.CpTaskID).SetNextExecuteTime(executeTime).SetTaskStatus(cptask.TaskStatusFail).Exec(bgCtx)
 		utils.LogError(ctx, "设置任务状态失败", oops.With("task_id", taskPayload.CpTaskID).Wrap(e))

 		var errorMessage string
@@ -97,15 +103,19 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task)

 	// 查询学校详情
 	schoolDetail := school.GetSchoolDetail(ctx, targetTask.Edges.CpUser.SchoolID)
-	cookie := targetTask.Edges.CpUser.Cookie
-	restyClient := login.GetClient(ctx, cookie)
-	if !login.CookieEnabled(ctx, schoolDetail.WecloudUrl, restyClient, targetTask.Edges.CpUser.LoginType) {
-		loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail)
-		loginExecutor.Login(ctx, &schoolDetail, targetTask.Edges.CpUser.Username, targetTask.Edges.CpUser.Password)
-		cookie = loginExecutor.GetCookieString()
-		db.Global.CpUser.UpdateOneID(targetTask.Edges.CpUser.ID).SetCookie(cookie).ExecX(ctx)
-		restyClient = login.GetClient(ctx, cookie)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID:        targetTask.Edges.CpUser.ID,
+		Cookie:    targetTask.Edges.CpUser.Cookie,
+		Tgc:       targetTask.Edges.CpUser.Tgc,
+		LoginType: targetTask.Edges.CpUser.LoginType,
+		Username:  targetTask.Edges.CpUser.Username,
+		Password:  targetTask.Edges.CpUser.Password,
+		SchoolID:  targetTask.Edges.CpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != targetTask.Edges.CpUser.Cookie {
+		db.Global.CpUser.UpdateOneID(targetTask.Edges.CpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
 	}
+	restyClient := refreshResult.Client
 	// 获取任务执行handler
 	taskExecutor := task2.GetCpdailyTaskService(ctx, targetTask.TaskType, restyClient, schoolDetail)

@@ -142,6 +152,22 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 	deviceID := targetTask.Edges.CpUser.MobileCode
 	// 固定获取图片id
 	imgId := GetNextImgId(customFormItems, targetTask.UsedImg)
+	// 兼容旧数据：旧数据存的是 S3 的 UUID，新数据存的是今日校园 previewUrl
+	if imgId != "" && !strings.Contains(imgId, "/") && !strings.Contains(imgId, ":") {
+		// 不含 / 和 : 说明不是 URL，可能是旧的 UUID，尝试从 S3 上传到今日校园
+		if parsedUUID, uuidErr := uuid.Parse(imgId); uuidErr == nil {
+			var imgTaskType types.TaskType
+			switch targetTask.TaskType {
+			case cptask.TaskTypeSign:
+				imgTaskType = types.TaskTypeSign
+			case cptask.TaskTypeSleepCheck:
+				imgTaskType = types.TaskTypeSleepCheck
+			case cptask.TaskTypeCollection:
+				imgTaskType = types.TaskTypeCollection
+			}
+			imgId = imageuploader.UploadImageFromStorage(ctx, schoolDetail.WecloudUrl, parsedUUID, imgTaskType, restyClient)
+		}
+	}
 	submitForm := taskExecutor.FillCustomForm(ctx, cpdailyRealTask, customFormItems, deviceID, imgId)
 	taskExecutor.Submit(ctx, submitForm, targetTask.Edges.CpUser.Username, deviceID)

@@ -4,58 +4,41 @@ import (
 	"bytes"
 	"context"
 	"encoding/gob"
+
 	"likedream-goframe/internal/framework/logger"
-	"likedream-goframe/internal/framework/model/email"
+	payloadmodel "likedream-goframe/internal/framework/model/email"
+	mailservice "likedream-goframe/internal/service/email"
 	"likedream-goframe/internal/utils"
-	"time"

 	"github.com/hibiken/asynq"
 	"github.com/samber/oops"
-	"github.com/wneessen/go-mail"
 	"go.uber.org/zap"
 )

-type EmailTaskHandler struct {
-}
+type EmailTaskHandler struct{}

 func (h *EmailTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task) (err error) {
 	defer utils.Pass(&err)
-	var payload email.SendPayload
-	e := gob.NewDecoder(bytes.NewReader(task.Payload())).Decode(&payload)
-	utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-	logger.Logger.Info("开始处理邮件发送", zap.String("邮箱", payload.To))
+
+	var payload payloadmodel.SendPayload
+	if e := gob.NewDecoder(bytes.NewReader(task.Payload())).Decode(&payload); e != nil {
+		utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
+	}
+
+	logger.Logger.Info("start sending email", zap.String("to", payload.To))
 	defer func() {
 		if r := recover(); r != nil {
-			// 打印日志
-			logger.Logger.Error("邮件发送失败", zap.String("邮箱", payload.To), zap.Error(r.(error)))
-			// 重新抛出相同的 panic
+			logger.Logger.Error("send email failed", zap.String("to", payload.To), zap.Error(r.(error)))
 			panic(r)
 		}
 	}()

-	message := mail.NewMsg()
+	svc := mailservice.NewV1()
+	cfg := mailservice.ConfigFromPayload(payload)
+	if e := svc.SendMessageNow(ctx, cfg, payload.To, payload.Subject, payload.Body); e != nil {
+		utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
+	}

-	e = message.FromFormat(payload.FromName, payload.FromEmail)
-	utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-
-	e = message.AddTo(payload.To)
-	utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-
-	message.Subject(payload.Subject)
-
-	message.SetBodyString(mail.TypeTextHTML, payload.Body)
-
-	client, e := mail.NewClient(payload.SMTPHost, mail.WithPort(payload.SMTPPort),
-		mail.WithSMTPAuth(mail.SMTPAuthLogin), // Outlook 使用 LOGIN 认证
-		mail.WithTLSPortPolicy(mail.TLSMandatory),
-		mail.WithTimeout(30*time.Second), // 连接超时 30 秒
-		mail.WithUsername(payload.SMTPUsername), mail.WithPassword(payload.SMTPPassword))
-	utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-
-	defer utils.LogError(ctx, "关闭邮件客户端失败", client.Close())
-
-	e = client.DialAndSendWithContext(ctx, message)
-	utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-	logger.Logger.Info("邮件发送完成", zap.String("邮箱", payload.To))
-	return
+	logger.Logger.Info("email sent", zap.String("to", payload.To))
+	return nil
 }
@@ -61,11 +61,12 @@ func cleanupStuckTasks(ctx context.Context) {
 		g.Log().Infof(ctx, "已清理 %d 个 archived 状态的 asynq 任务", len(archivedTasks))
 	}

-	// 重置数据库中卡住的任务状态
+	// 重置数据库中卡住的任务状态（queue 和 doing 都需要重置）
 	affected, err := db.Global.CpTask.Update().
 		Where(
 			cptask.Or(
 				cptask.TaskStatusEQ(cptask.TaskStatusQueue),
+				cptask.TaskStatusEQ(cptask.TaskStatusDoing),
 			),
 		).
 		SetTaskStatus(cptask.TaskStatusNotStart).
@@ -36,7 +36,6 @@ type periodicTaskConfigProvider struct{}
 func (p *periodicTaskConfigProvider) GetConfigs() ([]*asynq.PeriodicTaskConfig, error) {
 	return []*asynq.PeriodicTaskConfig{
 		{
-			//Cronspec: "0 1 * * *", // 每天凌晨1点执行
 			Cronspec: "0 1 * * * ",
 			Task:     asynq.NewTask(cst.TaskResetDaily, nil),
 			Opts: []asynq.Option{
@@ -45,5 +44,14 @@ func (p *periodicTaskConfigProvider) GetConfigs() ([]*asynq.PeriodicTaskConfig,
 				asynq.Timeout(0), // 使用默认超时
 			},
 		},
+		{
+			Cronspec: "0 14 * * *",
+			Task:     asynq.NewTask(cst.TaskRefreshSchoolDetail, nil),
+			Opts: []asynq.Option{
+				asynq.Queue(cst.TaskQueueDefault),
+				asynq.MaxRetry(1),
+				asynq.Timeout(0),
+			},
+		},
 	}, nil
 }
@@ -112,12 +112,27 @@ func (ts *TaskScanner) scanCpdailyTask() {
 			func(selector *sql.Selector) {
 				selector.Where(sql.ExprP("success_count < frequency"))
 			}).
-		Select(cptask.FieldID, cptask.FieldExecuteHour, cptask.FieldExecuteMinute, cptask.FieldNextExecuteTime).
+		Select(cptask.FieldID, cptask.FieldExecuteHour, cptask.FieldExecuteMinute, cptask.FieldNextExecuteTime, cptask.FieldExecuteDays).
 		AllX(ts.ctx)

 	var failedIDS []int64

+	// 当前星期几（ISO: 周一=1, 周日=7）
+	todayWeekday := int(currentTime.Weekday())
+	if todayWeekday == 0 {
+		todayWeekday = 7
+	}
+
 	for _, task := range allTasks {
+		// 检查今天是否在执行日内
+		if len(task.ExecuteDays) > 0 && !slices.Contains(task.ExecuteDays, todayWeekday) {
+			// 今天不执行，重置到下一个执行日
+			nextExecuteAt := utils.GetCpdailyNextExecuteTime(task)
+			db.Global.CpTask.UpdateOneID(task.ID).Where(cptask.NextExecuteTimeNotNil()).SetNextExecuteTime(nextExecuteAt).Exec(ts.ctx)
+			failedIDS = append(failedIDS, task.ID)
+			continue
+		}
+
 		// 30分钟之前的任务不再执行，但是要重置下次执行时间
 		if *task.NextExecuteTime < minExecuteTime {
 			originExecuteTime := time.Unix(*task.NextExecuteTime, 0).In(cst2.TimeZoneShangHai).Format("2006-01-02 15:04:05")
@@ -0,0 +1,30 @@
+package schedule
+
+import (
+	"context"
+	"likedream-goframe/internal/application/cpdaily/school"
+	"likedream-goframe/internal/framework/logger"
+	"likedream-goframe/internal/utils"
+
+	"github.com/hibiken/asynq"
+	"go.uber.org/zap"
+)
+
+type RefreshSchoolDetailTaskHandler struct{}
+
+// ProcessTask 每天中午刷新一次全部学校详情缓存
+func (h *RefreshSchoolDetailTaskHandler) ProcessTask(ctx context.Context, _ *asynq.Task) (err error) {
+	defer utils.Pass(&err)
+	logger.Logger.Info("开始批量刷新学校详情缓存信息")
+	schools := school.GetSchoolList(ctx)
+	for _, item := range schools {
+		func() {
+			defer utils.HandleError(func(err error) {
+				logger.Logger.Warn("刷新学校详情缓存失败", zap.String("school_id", item.Id), zap.Error(err))
+			})
+			school.GetSchoolDetail(ctx, item.Id)
+		}()
+	}
+
+	return
+}
@@ -68,6 +68,7 @@ func initServer(ctx context.Context) {
 	auxMux := asynq.NewServeMux()
 	auxMux.Handle(cst2.TaskEmail, &EmailTaskHandler{})
 	auxMux.Handle(cst2.TaskResetDaily, &ResetTaskHandler{})
+	auxMux.Handle(cst2.TaskRefreshSchoolDetail, &RefreshSchoolDetailTaskHandler{})

 	e := globalServer.Start(mainMux)
 	utils.OkOrPanic(e)
@@ -26,7 +26,7 @@ func ExceptionHandler(r *ghttp.Request) {
 	if err == nil && r.Response.BufferLength() > 0 {
 		return
 	}
-	if r.Response.Header().Get("Content-Type") == "image/png" {
+	if ct := r.Response.Header().Get("Content-Type"); ct != "" && len(ct) > 6 && ct[:6] == "image/" {
 		return
 	}

@@ -2,41 +2,39 @@ package config

 import (
 	"context"
+	"fmt"
+
 	v1 "likedream-goframe/internal/api/v1"
+	cst2 "likedream-goframe/internal/common/cst"
 	"likedream-goframe/internal/common/db"
 	errors2 "likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/ent"
 	"likedream-goframe/internal/ent/sysconfig"
+	mailservice "likedream-goframe/internal/service/email"
 	"likedream-goframe/internal/utils"
 )

-type ConfigServiceV1 struct {
-}
+type ConfigServiceV1 struct{}

 func NewV1() *ConfigServiceV1 {
 	return &ConfigServiceV1{}
 }

-// Get 获取配置
 func (s *ConfigServiceV1) Get(ctx context.Context, req *v1.ConfigGetReq) *utils.Response[*ent.SysConfig] {
 	config, err := db.Global.SysConfig.Query().
 		Where(sysconfig.KeyEQ(req.Key)).
 		Only(ctx)
-
 	if err != nil {
 		if ent.IsNotFound(err) {
 			utils.OkOrPanic(errors2.NewBusinessError(404, "配置不存在"))
 		}
 		utils.OkOrPanic(err)
 	}
-
 	return utils.SuccessWithData[*ent.SysConfig](config)
 }

-// PublicGet 获取公开配置（无需认证）
 func (s *ConfigServiceV1) PublicGet(ctx context.Context, req *v1.ConfigPublicGetReq) *utils.Response[*ent.SysConfig] {
-	// 只允许获取特定的公开配置
-	allowedKeys := []string{"system.announcement", "system.allowRegister"}
+	allowedKeys := []string{"system.announcement", "system.allowRegister", "system.requireInviteCode"}

 	allowed := false
 	for _, key := range allowedKeys {
@@ -45,7 +43,6 @@ func (s *ConfigServiceV1) PublicGet(ctx context.Context, req *v1.ConfigPublicGet
 			break
 		}
 	}
-
 	if !allowed {
 		utils.OkOrPanic(errors2.NewBusinessError(403, "该配置不允许公开访问"))
 	}
@@ -53,10 +50,8 @@ func (s *ConfigServiceV1) PublicGet(ctx context.Context, req *v1.ConfigPublicGet
 	config, err := db.Global.SysConfig.Query().
 		Where(sysconfig.KeyEQ(req.Key)).
 		Only(ctx)
-
 	if err != nil {
 		if ent.IsNotFound(err) {
-			// 如果配置不存在，返回空值
 			return utils.SuccessWithData[*ent.SysConfig](nil)
 		}
 		utils.OkOrPanic(err)
@@ -65,7 +60,6 @@ func (s *ConfigServiceV1) PublicGet(ctx context.Context, req *v1.ConfigPublicGet
 	return utils.SuccessWithData[*ent.SysConfig](config)
 }

-// List 获取配置列表
 func (s *ConfigServiceV1) List(ctx context.Context, req *v1.ConfigListReq) *utils.Response[[]*ent.SysConfig] {
 	query := db.Global.SysConfig.Query().
 		Order(ent.Asc(sysconfig.FieldKey))
@@ -83,37 +77,30 @@ func (s *ConfigServiceV1) List(ctx context.Context, req *v1.ConfigListReq) *util
 	return utils.SuccessWithTotal[[]*ent.SysConfig](data, total)
 }

-// Update 更新配置
 func (s *ConfigServiceV1) Update(ctx context.Context, req *v1.ConfigUpdateReq) *utils.Response[any] {
-	// 检查配置是否存在
 	config, err := db.Global.SysConfig.Query().
 		Where(sysconfig.KeyEQ(req.Key)).
 		Only(ctx)
-
 	if err != nil {
 		if ent.IsNotFound(err) {
-			// 如果不存在，创建新配置
 			db.Global.SysConfig.Create().
 				SetKey(req.Key).
 				SetValue(req.Value).
 				SetDescription(req.Description).
-				SetType("markdown"). // 默认为 markdown 类型
+				SetType("markdown").
 				SaveX(ctx)
 			return utils.SuccessWithMsg("配置创建成功")
 		}
 		utils.OkOrPanic(err)
 	}

-	// 更新配置
 	db.Global.SysConfig.UpdateOne(config).
 		SetValue(req.Value).
 		SetDescription(req.Description).
 		ExecX(ctx)
-
 	return utils.SuccessWithMsg("配置更新成功")
 }

-// 费率配置键常量
 const (
 	PriceKeyCpdailyTask  = "price.cpdaily_task"
 	PriceKeyCpdailyLeave = "price.cpdaily_leave"
@@ -122,7 +109,6 @@ const (
 	PriceKeySmarteduSc   = "price.smartedu_sc"
 )

-// GetPriceConfig 获取费率配置
 func (s *ConfigServiceV1) GetPriceConfig(ctx context.Context, req *v1.PriceConfigGetReq) *utils.Response[*v1.PriceConfigResp] {
 	resp := &v1.PriceConfigResp{
 		CpdailyTask:  s.getConfigValue(ctx, PriceKeyCpdailyTask, "0.5"),
@@ -134,7 +120,6 @@ func (s *ConfigServiceV1) GetPriceConfig(ctx context.Context, req *v1.PriceConfi
 	return utils.SuccessWithData[*v1.PriceConfigResp](resp)
 }

-// getConfigValue 获取配置值，不存在则返回默认值
 func (s *ConfigServiceV1) getConfigValue(ctx context.Context, key, defaultValue string) string {
 	config, err := db.Global.SysConfig.Query().
 		Where(sysconfig.KeyEQ(key)).
@@ -145,9 +130,7 @@ func (s *ConfigServiceV1) getConfigValue(ctx context.Context, key, defaultValue
 	return config.Value
 }

-// UpdatePriceConfig 更新费率配置
 func (s *ConfigServiceV1) UpdatePriceConfig(ctx context.Context, req *v1.PriceConfigUpdateReq) *utils.Response[any] {
-	// 更新各项费率配置
 	if req.CpdailyTask != "" {
 		s.upsertConfig(ctx, PriceKeyCpdailyTask, req.CpdailyTask, "今日校园签到单价")
 	}
@@ -166,12 +149,10 @@ func (s *ConfigServiceV1) UpdatePriceConfig(ctx context.Context, req *v1.PriceCo
 	return utils.SuccessWithMsg("费率配置更新成功")
 }

-// upsertConfig 更新或创建配置
 func (s *ConfigServiceV1) upsertConfig(ctx context.Context, key, value, description string) {
 	config, err := db.Global.SysConfig.Query().
 		Where(sysconfig.KeyEQ(key)).
 		Only(ctx)
-
 	if err != nil {
 		if ent.IsNotFound(err) {
 			db.Global.SysConfig.Create().
@@ -189,3 +170,155 @@ func (s *ConfigServiceV1) upsertConfig(ctx context.Context, key, value, descript
 		SetValue(value).
 		ExecX(ctx)
 }
+
+func (s *ConfigServiceV1) GetSmtpConfig(ctx context.Context, req *v1.SmtpConfigGetReq) *utils.Response[any] {
+	keys := []string{
+		cst2.ConfigEmailAuthMode,
+		cst2.ConfigEmailSMTPHost,
+		cst2.ConfigEmailSMTPPort,
+		cst2.ConfigEmailSMTPUsername,
+		cst2.ConfigEmailSMTPPassword,
+		cst2.ConfigEmailFromEmail,
+		cst2.ConfigEmailFromName,
+		cst2.ConfigEmailOAuthTenant,
+		cst2.ConfigEmailOAuthClientID,
+		cst2.ConfigEmailOAuthClientSecret,
+		cst2.ConfigEmailOAuthRedirectURL,
+		cst2.ConfigEmailOAuthRefreshToken,
+		cst2.ConfigEmailOAuthScope,
+	}
+
+	result := make(map[string]string, len(keys))
+	for _, key := range keys {
+		config, err := db.Global.SysConfig.Query().Where(sysconfig.KeyEQ(key)).Only(ctx)
+		if err == nil {
+			result[key] = config.Value
+		}
+	}
+
+	cfg := mailservice.NormalizeConfig(mailservice.EmailConfig{
+		AuthMode:          result[cst2.ConfigEmailAuthMode],
+		SMTPHost:          result[cst2.ConfigEmailSMTPHost],
+		SMTPPort:          atoiOrZero(result[cst2.ConfigEmailSMTPPort]),
+		SMTPUsername:      result[cst2.ConfigEmailSMTPUsername],
+		SMTPPassword:      result[cst2.ConfigEmailSMTPPassword],
+		FromEmail:         result[cst2.ConfigEmailFromEmail],
+		FromName:          result[cst2.ConfigEmailFromName],
+		OAuthTenant:       result[cst2.ConfigEmailOAuthTenant],
+		OAuthClientID:     result[cst2.ConfigEmailOAuthClientID],
+		OAuthClientSecret: result[cst2.ConfigEmailOAuthClientSecret],
+		OAuthRedirectURL:  result[cst2.ConfigEmailOAuthRedirectURL],
+		OAuthRefreshToken: result[cst2.ConfigEmailOAuthRefreshToken],
+		OAuthScope:        result[cst2.ConfigEmailOAuthScope],
+	})
+
+	return utils.SuccessWithData[any](map[string]any{
+		"authMode":          cfg.AuthMode,
+		"smtpHost":          cfg.SMTPHost,
+		"smtpPort":          cfg.SMTPPort,
+		"smtpUsername":      cfg.SMTPUsername,
+		"smtpPassword":      cfg.SMTPPassword,
+		"fromEmail":         cfg.FromEmail,
+		"fromName":          cfg.FromName,
+		"oauthTenant":       cfg.OAuthTenant,
+		"oauthClientId":     cfg.OAuthClientID,
+		"oauthClientSecret": cfg.OAuthClientSecret,
+		"oauthRedirectUrl":  cfg.OAuthRedirectURL,
+		"oauthRefreshToken": cfg.OAuthRefreshToken,
+		"oauthScope":        cfg.OAuthScope,
+	})
+}
+
+func (s *ConfigServiceV1) UpdateSmtpConfig(ctx context.Context, req *v1.SmtpConfigUpdateReq) *utils.Response[any] {
+	cfg := mailservice.NormalizeConfig(mailservice.EmailConfig{
+		AuthMode:          req.AuthMode,
+		SMTPHost:          req.SmtpHost,
+		SMTPPort:          req.SmtpPort,
+		SMTPUsername:      req.SmtpUsername,
+		SMTPPassword:      req.SmtpPassword,
+		FromEmail:         req.FromEmail,
+		FromName:          req.FromName,
+		OAuthTenant:       req.OAuthTenant,
+		OAuthClientID:     req.OAuthClientID,
+		OAuthClientSecret: req.OAuthClientSecret,
+		OAuthRedirectURL:  req.OAuthRedirectURL,
+		OAuthRefreshToken: req.OAuthRefreshToken,
+		OAuthScope:        req.OAuthScope,
+	})
+	if err := mailservice.NewV1().ValidateConfig(cfg); err != nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, err.Error()))
+	}
+
+	configs := map[string]string{
+		cst2.ConfigEmailAuthMode:          cfg.AuthMode,
+		cst2.ConfigEmailSMTPHost:          cfg.SMTPHost,
+		cst2.ConfigEmailSMTPPort:          fmt.Sprintf("%d", cfg.SMTPPort),
+		cst2.ConfigEmailSMTPUsername:      cfg.SMTPUsername,
+		cst2.ConfigEmailSMTPPassword:      cfg.SMTPPassword,
+		cst2.ConfigEmailFromEmail:         cfg.FromEmail,
+		cst2.ConfigEmailFromName:          cfg.FromName,
+		cst2.ConfigEmailOAuthTenant:       cfg.OAuthTenant,
+		cst2.ConfigEmailOAuthClientID:     cfg.OAuthClientID,
+		cst2.ConfigEmailOAuthClientSecret: cfg.OAuthClientSecret,
+		cst2.ConfigEmailOAuthRedirectURL:  cfg.OAuthRedirectURL,
+		cst2.ConfigEmailOAuthRefreshToken: cfg.OAuthRefreshToken,
+		cst2.ConfigEmailOAuthScope:        cfg.OAuthScope,
+	}
+
+	for key, value := range configs {
+		exists, _ := db.Global.SysConfig.Query().Where(sysconfig.KeyEQ(key)).Exist(ctx)
+		if exists {
+			db.Global.SysConfig.Update().Where(sysconfig.KeyEQ(key)).SetValue(value).ExecX(ctx)
+		} else {
+			db.Global.SysConfig.Create().
+				SetKey(key).
+				SetValue(value).
+				SetDescription("邮件配置").
+				ExecX(ctx)
+		}
+	}
+
+	return utils.SuccessWithMsg("邮件配置保存成功")
+}
+
+func (s *ConfigServiceV1) TestSmtp(ctx context.Context, req *v1.SmtpTestReq) *utils.Response[any] {
+	emailService := mailservice.NewV1()
+	cfg := emailService.GetConfig()
+	if err := emailService.ValidateConfig(cfg); err != nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, err.Error()))
+	}
+
+	subject := "邮件配置测试"
+	body := "<h2>邮件配置测试成功</h2><p>如果您收到此邮件，说明当前邮件配置可以正常发信。</p>"
+	if err := emailService.SendMessageNow(ctx, cfg, req.ToEmail, subject, body); err != nil {
+		utils.OkOrPanic(err)
+	}
+	return utils.SuccessWithMsg("测试邮件发送成功")
+}
+
+func (s *ConfigServiceV1) GetOutlookOAuthAuthorizeURL(ctx context.Context, req *v1.OutlookOAuthAuthorizeURLReq) *utils.Response[*v1.OutlookOAuthAuthorizeURLResp] {
+	cfg := mailservice.NormalizeConfig(mailservice.EmailConfig{
+		AuthMode:          mailservice.AuthModeOutlookOAuth2,
+		FromEmail:         req.FromEmail,
+		FromName:          "Microsoft Graph OAuth2",
+		OAuthTenant:       req.OAuthTenant,
+		OAuthClientID:     req.OAuthClientID,
+		OAuthClientSecret: req.OAuthClientSecret,
+		OAuthScope:        req.OAuthScope,
+	})
+
+	resp, err := mailservice.NewV1().BuildOutlookAuthorizeURL(cfg, req.CallbackBaseURL, req.FrontendOrigin)
+	if err != nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, err.Error()))
+	}
+	return utils.SuccessWithData(resp)
+}
+
+func atoiOrZero(value string) int {
+	if value == "" {
+		return 0
+	}
+	var result int
+	_, _ = fmt.Sscanf(value, "%d", &result)
+	return result
+}
@@ -59,19 +59,6 @@ func (s CourseServiceV1) List(ctx context.Context, req *v1.CourseListReq) *utils
 func (s CourseServiceV1) AddCourse(ctx context.Context, req *v1.AddCourseReq) *utils.Response[any] {
 	user := utils.GetUserInfoFromCtx(ctx)

-	// 检查是否已经存在相同的刷课任务
-	exists := db2.Global.CourseEntity.Query().
-		Where(
-			courseentity.HasSysUserWith(sysuser.ID(user.ID)),
-			courseentity.Username(req.Username),
-			courseentity.CourseID(req.CourseID),
-		).
-		ExistX(ctx)
-
-	if exists {
-		utils.OkOrPanic(errors2.NewBusinessError(400, "该课程已存在刷课任务"))
-	}
-
 	// 登录学习通获取节点信息
 	loginClient := xuexitong.NewXuexitongLogin(ctx)
 	err := loginClient.Login(ctx, req.Username, req.Password, 3)
@@ -4,12 +4,20 @@ import (
 	"context"
 	"io"
 	v1 "likedream-goframe/internal/api/v1"
+	"likedream-goframe/internal/application/cpdaily/imageuploader"
+	"likedream-goframe/internal/application/cpdaily/login"
+	"likedream-goframe/internal/application/cpdaily/school"
+	"likedream-goframe/internal/application/cpdaily/types"
 	"likedream-goframe/internal/application/filestorage"
 	"likedream-goframe/internal/common/db"
+	errors2 "likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/ent/cpimage"
+	"likedream-goframe/internal/ent/cptask"
+	"likedream-goframe/internal/ent/cpuser"
+	"likedream-goframe/internal/ent/sysuser"
 	"likedream-goframe/internal/utils"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/google/uuid"
 	"github.com/samber/oops"
 )
@@ -19,36 +27,146 @@ type CpImageServiceV1 struct {

 func (v CpImageServiceV1) Upload(ctx context.Context, req *v1.UploadImageReq) *utils.Response[any] {
 	user := utils.GetUserInfoFromCtx(ctx)
-	file := req.File
-	open, err := file.Open()
-	utils.OkOrPanic(err, oops.WithContext(ctx).Wrap)
-	key := utils.GenerateFileName("cpdaily/")
-	filestorage.GlobalS3.UploadFile(ctx, key, open)
-	img := db.Global.CpImage.Create().
-		SetUserID(user.ID).
-		SetKey(key).
-		SetContentType(file.Header.Get("Content-Type")).
-		SetContentLength(file.Size).
-		SaveX(ctx)
+	// 校验 cpUser 归属
+	cpUser := db.Global.CpUser.Query().
+		Where(cpuser.ID(req.CpUserId), cpuser.HasSysuserWith(sysuser.ID(user.ID))).
+		WithSchool().
+		OnlyX(ctx)
+	if cpUser == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
+	}
+
+	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
+	}
+	client := refreshResult.Client
+
+	taskType := convertTaskType(ctx, req.TaskType)
+	previewUrl := imageuploader.UploadImageFromFile(ctx, schoolDetail.WecloudUrl, req.File, taskType, client)
+
 	return utils.SuccessWithData[any](v1.UploadImageRes{
-		FileKey:  img.ImageID.String(),
-		FileSize: &file.Size,
+		PreviewUrl: previewUrl,
 	})
 }

 func (v CpImageServiceV1) Preview(ctx context.Context, req *v1.PreviewImageReq) *utils.Response[any] {
-	id, err := uuid.Parse(req.Key)
+	// 解析 key，可能是 UUID（旧数据）或直接的 S3 key
+	parsedUUID, uuidErr := uuid.Parse(req.Key)
+	var s3Key string
+	var contentType string
+
+	if uuidErr == nil {
+		// 是 UUID，从 cpimage 表查询对应的 S3 key
+		targetImage, e := db.Global.CpImage.Query().
+			Where(cpimage.ImageID(parsedUUID)).
+			Select(cpimage.FieldKey, cpimage.FieldContentType).
+			Only(ctx)
+		if e != nil {
+			return utils.Fail(404, "图片不存在")
+		}
+		s3Key = targetImage.Key
+		contentType = targetImage.ContentType
+	} else {
+		// 不是 UUID，直接当作 S3 key 使用
+		s3Key = req.Key
+		contentType = "image/jpeg"
+	}
+
+	// 从 S3 获取图片
+	file := filestorage.GlobalS3.GetFile(ctx, s3Key)
+	defer file.Close()
+
+	// 直接写入 HTTP 响应流
+	r := ghttp.RequestFromCtx(ctx)
+	r.Response.Header().Set("Content-Type", contentType)
+	r.Response.Header().Set("Cache-Control", "public, max-age=86400")
+	_, err := io.Copy(r.Response.Writer, file)
 	utils.OkOrPanic(err, oops.WithContext(ctx).Wrap)
-	cpImage := db.Global.CpImage.Query().Where(cpimage.ImageID(id)).OnlyX(ctx)
-	file := filestorage.GlobalS3.GetFile(ctx, cpImage.Key)
-	r := g.RequestFromCtx(ctx)
-	r.Response.Header().Set("Content-Type", "image/png")
-	// 将文件写入
-	io.Copy(r.Response.Writer, file)
-	r.Exit()
+
 	return nil
 }

+// convertTaskType 将 ent 的 TaskType 转换为 cpdaily types.TaskType
+func convertTaskType(ctx context.Context, tt cptask.TaskType) types.TaskType {
+	switch tt {
+	case cptask.TaskTypeCollection:
+		return types.TaskTypeCollection
+	case cptask.TaskTypeSign:
+		return types.TaskTypeSign
+	case cptask.TaskTypeSleepCheck:
+		return types.TaskTypeSleepCheck
+	default:
+		utils.OkOrPanic(errors2.NewBusinessError(400, "不支持的任务类型"), oops.WithContext(ctx).Wrap)
+		panic("unreachable")
+	}
+}
+
 func NewCpImageServiceV1() *CpImageServiceV1 {
 	return &CpImageServiceV1{}
 }
+
+func (v CpImageServiceV1) GetUploadPolicy(ctx context.Context, req *v1.GetUploadPolicyReq) *utils.Response[any] {
+	user := utils.GetUserInfoFromCtx(ctx)
+	cpUser := db.Global.CpUser.Query().
+		Where(cpuser.ID(req.CpUserId), cpuser.HasSysuserWith(sysuser.ID(user.ID))).
+		WithSchool().
+		OnlyX(ctx)
+	if cpUser == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
+	}
+
+	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
+	}
+
+	taskType := convertTaskType(ctx, req.TaskType)
+	policy := imageuploader.GetUploadPolicyAsync(ctx, schoolDetail.WecloudUrl, taskType, refreshResult.Client)
+
+	return utils.SuccessWithData[any](v1.UploadPolicyRes{
+		Host:      policy.Host,
+		AccessId:  policy.AccessId,
+		FileName:  policy.FileName,
+		Policy:    policy.Policy,
+		Signature: policy.Signature,
+	})
+}
+
+func (v CpImageServiceV1) GetPreviewUrl(ctx context.Context, req *v1.GetPreviewUrlReq) *utils.Response[any] {
+	user := utils.GetUserInfoFromCtx(ctx)
+	cpUser := db.Global.CpUser.Query().
+		Where(cpuser.ID(req.CpUserId), cpuser.HasSysuserWith(sysuser.ID(user.ID))).
+		WithSchool().
+		OnlyX(ctx)
+	if cpUser == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
+	}
+
+	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
+	}
+
+	taskType := convertTaskType(ctx, req.TaskType)
+	previewUrl := imageuploader.GetPreviewUrlAsync(ctx, schoolDetail.WecloudUrl, req.FileKey, taskType, refreshResult.Client)
+
+	return utils.SuccessWithData[any](v1.PreviewUrlRes{
+		PreviewUrl: previewUrl,
+	})
+}
@@ -17,6 +17,7 @@ import (
 	"likedream-goframe/internal/ent/sysuser"
 	"likedream-goframe/internal/service/balance"
 	"likedream-goframe/internal/utils"
+	"strings"

 	"github.com/shopspring/decimal"
 )
@@ -24,6 +25,29 @@ import (
 type CpLeaveServiceV1 struct {
 }

+func requireIntField(value *int, message string) int {
+	if value == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, message))
+	}
+	return *value
+}
+
+func validateLeaveApply(req *v1.CpLeaveApplyReq) int {
+	leaveType := requireIntField(req.LeaveType, "请假类型不能为空")
+	if req.OutStatus {
+		if strings.TrimSpace(req.UrgencyMobile) == "" {
+			utils.OkOrPanic(errors2.NewBusinessError(400, "紧急联系人手机号不能为空"))
+		}
+		if strings.TrimSpace(req.Address) == "" {
+			utils.OkOrPanic(errors2.NewBusinessError(400, "目的地不能为空"))
+		}
+		if strings.TrimSpace(req.DetailAddress) == "" {
+			utils.OkOrPanic(errors2.NewBusinessError(400, "详细地址不能为空"))
+		}
+	}
+	return leaveType
+}
+
 // GetLeaveListFromSystem 获取今日校园系统中的请假列表
 func (v CpLeaveServiceV1) GetLeaveListFromSystem(ctx context.Context, req *v1.GetLeaveListFromSystemReq) *utils.Response[any] {
 	user := utils.GetUserInfoFromCtx(ctx)
@@ -41,17 +65,16 @@ func (v CpLeaveServiceV1) GetLeaveListFromSystem(ctx context.Context, req *v1.Ge

 	// 获取学校详情
 	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
-	cookie := cpUser.Cookie
-	client := login.GetClient(ctx, cookie)

-	// 检查cookie是否有效
-	if !login.CookieEnabled(ctx, schoolDetail.WecloudUrl, client, cpUser.LoginType) {
-		loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail)
-		loginExecutor.Login(ctx, &schoolDetail, cpUser.Username, cpUser.Password)
-		cookie = loginExecutor.GetCookieString()
-		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(cookie).ExecX(ctx)
-		client = login.GetClient(ctx, cookie)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
 	}
+	client := refreshResult.Client

 	// 创建销假服务
 	reportApp := leave.NewCpdailyReportApp(client, schoolDetail.WecloudUrl)
@@ -149,17 +172,16 @@ func (v CpLeaveServiceV1) Report(ctx context.Context, req *v1.CpLeaveReportReq)

 	// 获取学校详情
 	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
-	cookie := cpUser.Cookie
-	client := login.GetClient(ctx, cookie)

-	// 检查cookie是否有效
-	if !login.CookieEnabled(ctx, schoolDetail.WecloudUrl, client, cpUser.LoginType) {
-		loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail)
-		loginExecutor.Login(ctx, &schoolDetail, cpUser.Username, cpUser.Password)
-		cookie = loginExecutor.GetCookieString()
-		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(cookie).ExecX(ctx)
-		client = login.GetClient(ctx, cookie)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
 	}
+	client := refreshResult.Client

 	// 创建销假服务
 	reportApp := leave.NewCpdailyReportApp(client, schoolDetail.WecloudUrl)
@@ -191,14 +213,15 @@ func (v CpLeaveServiceV1) Upload(ctx context.Context, req *v1.CpLeaveUploadReq)
 		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
 	}
 	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
-	client := login.GetClient(ctx, cpUser.Cookie)
-	if !login.CookieEnabled(ctx, schoolDetail.WecloudUrl, client, cpUser.LoginType) {
-		loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail)
-		loginExecutor.Login(ctx, &schoolDetail, cpUser.Username, cpUser.Password)
-		cookie := loginExecutor.GetCookieString()
-		db2.Global.CpUser.UpdateOne(cpUser).SetCookie(cookie).ExecX(ctx)
-		client = login.GetClient(ctx, cookie)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOne(cpUser).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
 	}
+	client := refreshResult.Client
 	// 创建销假服务
 	reportApp := leave.NewCpdailyReportApp(client, schoolDetail.WecloudUrl)

@@ -209,3 +232,176 @@ func (v CpLeaveServiceV1) Upload(ctx context.Context, req *v1.CpLeaveUploadReq)
 func NewCpLeaveServiceV1() *CpLeaveServiceV1 {
 	return &CpLeaveServiceV1{}
 }
+
+// CheckLeave 检查是否允许请假
+func (v CpLeaveServiceV1) CheckLeave(ctx context.Context, req *v1.CpLeaveCheckReq) *utils.Response[any] {
+	user := utils.GetUserInfoFromCtx(ctx)
+
+	cpUser := db2.Global.CpUser.Query().
+		Where(cpuser.ID(req.CpUserId), cpuser.HasSysuserWith(sysuser.ID(user.ID))).
+		WithSysuser().WithSchool().OnlyX(ctx)
+	if cpUser.Edges.Sysuser == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
+	}
+
+	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
+	}
+
+	reportApp := leave.NewCpdailyReportApp(refreshResult.Client, schoolDetail.WecloudUrl)
+	err := reportApp.CheckOnceLeave()
+	if err != nil {
+		utils.OkOrPanic(err)
+	}
+	return utils.SuccessWithMsg("允许请假")
+}
+
+// GetLeaveTypes 获取请假类型列表
+func (v CpLeaveServiceV1) GetLeaveTypes(ctx context.Context, req *v1.CpLeaveTypesReq) *utils.Response[any] {
+	user := utils.GetUserInfoFromCtx(ctx)
+
+	cpUser := db2.Global.CpUser.Query().
+		Where(cpuser.ID(req.CpUserId), cpuser.HasSysuserWith(sysuser.ID(user.ID))).
+		WithSysuser().WithSchool().OnlyX(ctx)
+	if cpUser.Edges.Sysuser == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
+	}
+
+	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
+	}
+
+	reportApp := leave.NewCpdailyReportApp(refreshResult.Client, schoolDetail.WecloudUrl)
+	leaveTypes := reportApp.QueryLeaveTypes()
+	return utils.SuccessWithData[any](leaveTypes.Value())
+}
+
+// GetLeaveTypeCfg 查询请假类型配置
+func (v CpLeaveServiceV1) GetLeaveTypeCfg(ctx context.Context, req *v1.CpLeaveTypeCfgReq) *utils.Response[any] {
+	user := utils.GetUserInfoFromCtx(ctx)
+
+	cpUser := db2.Global.CpUser.Query().
+		Where(cpuser.ID(req.CpUserId), cpuser.HasSysuserWith(sysuser.ID(user.ID))).
+		WithSysuser().WithSchool().OnlyX(ctx)
+	if cpUser.Edges.Sysuser == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
+	}
+
+	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
+	}
+
+	reportApp := leave.NewCpdailyReportApp(refreshResult.Client, schoolDetail.WecloudUrl)
+	cfg := reportApp.QueryLeaveTypeCfg(requireIntField(req.Code, "请假类型不能为空"))
+	return utils.SuccessWithData[any](cfg.Value())
+}
+
+// GetApproveFlow 获取审批人列表
+func (v CpLeaveServiceV1) GetApproveFlow(ctx context.Context, req *v1.CpLeaveApproveFlowReq) *utils.Response[any] {
+	user := utils.GetUserInfoFromCtx(ctx)
+
+	cpUser := db2.Global.CpUser.Query().
+		Where(cpuser.ID(req.CpUserId), cpuser.HasSysuserWith(sysuser.ID(user.ID))).
+		WithSysuser().WithSchool().OnlyX(ctx)
+	if cpUser.Edges.Sysuser == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
+	}
+
+	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
+	}
+
+	reportApp := leave.NewCpdailyReportApp(refreshResult.Client, schoolDetail.WecloudUrl)
+	flow := reportApp.ObtainApproveFlow(requireIntField(req.LeaveType, "请假类型不能为空"), req.StartTime, req.EndTime)
+	return utils.SuccessWithData[any](flow.Value())
+}
+
+// Apply 提交请假申请
+func (v CpLeaveServiceV1) Apply(ctx context.Context, req *v1.CpLeaveApplyReq) *utils.Response[any] {
+	user := utils.GetUserInfoFromCtx(ctx)
+	_ = validateLeaveApply(req)
+
+	cpUser := db2.Global.CpUser.Query().
+		Where(cpuser.ID(req.CpUserId), cpuser.HasSysuserWith(sysuser.ID(user.ID))).
+		WithSysuser().WithSchool().OnlyX(ctx)
+	if cpUser.Edges.Sysuser == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
+	}
+
+	// 计算扣款金额
+	basePoint, err := decimal.NewFromString(db2.Global.SysConfig.Query().Where(sysconfig.KeyEQ(cst2.ConfigRedisCpdailyLeave)).OnlyX(ctx).Value)
+	utils.OkOrPanic(err)
+	if user.Edges.Agent != nil {
+		basePoint = basePoint.Mul(user.Edges.Agent.Rate)
+	}
+
+	// 先扣款
+	balance.BalanceService.ChangeUserBalance(ctx, user.ID, basePoint.Neg(), "今日校园请假")
+
+	// 创建请假记录
+	leaveRecord := db2.Global.CpLeave.Create().
+		SetCpUserID(req.CpUserId).
+		SetUserID(user.ID).
+		SetLeaveID(fmt.Sprintf("apply_%d", req.CpUserId)).
+		SetTitle(fmt.Sprintf("请假申请: %s ~ %s", req.StartTime, req.EndTime)).
+		SetStatus(cpleave.StatusFail).
+		SetType(cpleave.TypeApply).
+		SetDesc("正在处理中...").
+		SaveX(ctx)
+
+	defer func() {
+		if r := recover(); r != nil {
+			balance.BalanceService.ChangeUserBalance(ctx, user.ID, basePoint, "请假失败退款")
+			desc := fmt.Sprintf("请假失败: %v", r)
+			db2.Global.CpLeave.UpdateOne(leaveRecord).
+				SetStatus(cpleave.StatusFail).
+				SetDesc(desc).
+				ExecX(ctx)
+			utils.OkOrPanic(errors2.NewBusinessError(500, desc))
+		}
+	}()
+
+	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
+	}
+
+	reportApp := leave.NewCpdailyReportApp(refreshResult.Client, schoolDetail.WecloudUrl)
+	reportApp.SubmitLeaveApply(ctx, req, cpUser.Username, cpUser.MobileCode)
+
+	db2.Global.CpLeave.UpdateOne(leaveRecord).
+		SetStatus(cpleave.StatusDone).
+		SetDesc("已提交").
+		ExecX(ctx)
+
+	return utils.SuccessWithMsg("请假申请提交成功")
+}
@@ -22,6 +22,8 @@ import (
 	"likedream-goframe/internal/framework/schedule"
 	"likedream-goframe/internal/service/balance"
 	"likedream-goframe/internal/utils"
+	"strconv"
+	"strings"
 	"time"

 	"entgo.io/ent/dialect/sql"
@@ -43,14 +45,15 @@ func (v CpTaskServiceV1) GetRecentTasks(ctx context.Context, req *v1.GetRecentTa
 		utils.OkOrPanic(errors2.NewBusinessError(400, "非法的今日校园账号"))
 	}
 	schoolDetail := school.GetSchoolDetail(ctx, cpUser.SchoolID)
-	client := login.GetClient(ctx, cpUser.Cookie)
-	if !login.CookieEnabled(ctx, schoolDetail.WecloudUrl, client, cpUser.LoginType) {
-		loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail)
-		loginExecutor.Login(ctx, &schoolDetail, cpUser.Username, cpUser.Password)
-		cookie := loginExecutor.GetCookieString()
-		db2.Global.CpUser.UpdateOne(cpUser).SetCookie(cookie).ExecX(ctx)
-		client = login.GetClient(ctx, cookie)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cpUser.Cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cpUser.Cookie {
+		db2.Global.CpUser.UpdateOne(cpUser).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
 	}
+	client := refreshResult.Client
 	taskService := task.GetCpdailyTaskService(ctx, req.Type, client, schoolDetail)
 	titleList := taskService.GetRecentTaskTitle(ctx)
 	return utils.SuccessWithData[[]string](titleList)
@@ -87,6 +90,18 @@ func (v CpTaskServiceV1) List(ctx context.Context, req *v1.CpTaskListReq) *utils
 	if req.TaskStatus != "" {
 		query.Where(cptask.TaskStatusEQ(req.TaskStatus))
 	}
+	if req.Ids != "" {
+		var ids []int64
+		for _, s := range strings.Split(req.Ids, ",") {
+			s = strings.TrimSpace(s)
+			if id, err := strconv.ParseInt(s, 10, 64); err == nil {
+				ids = append(ids, id)
+			}
+		}
+		if len(ids) > 0 {
+			query.Where(cptask.IDIn(ids...))
+		}
+	}
 	total := query.CountX(ctx)
 	var data []*ent.CpTask
 	if total > 0 {
@@ -118,17 +133,19 @@ func (v CpTaskServiceV1) TaskFormData(ctx context.Context, req *v1.GetCpTaskForm
 	}
 	schoolDetail := school.GetSchoolDetail(ctx, cpTask.Edges.CpUser.SchoolID)
 	cookie := cpUser.Cookie
-	client := login.GetClient(ctx, cookie)
-	if !login.CookieEnabled(ctx, schoolDetail.WecloudUrl, client, cpUser.LoginType) {
-		loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail)
-		loginExecutor.Login(ctx, &schoolDetail, cpUser.Username, cpUser.Password)
-		cookie = loginExecutor.GetCookieString()
-		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(cookie).ExecX(ctx)
-		client = login.GetClient(ctx, cookie)
+	refreshResult := login.EnsureCookieValid(ctx, &login.RefreshCookieParams{
+		ID: cpUser.ID, Cookie: cookie, Tgc: cpUser.Tgc,
+		LoginType: cpUser.LoginType, Username: cpUser.Username,
+		Password: cpUser.Password, SchoolID: cpUser.SchoolID,
+	}, &schoolDetail)
+	if refreshResult.Cookie != cookie {
+		db2.Global.CpUser.UpdateOneID(cpUser.ID).SetCookie(refreshResult.Cookie).SetTgc(refreshResult.Tgc).ExecX(ctx)
 	}
+	client := refreshResult.Client
 	taskService := task.GetCpdailyTaskService(ctx, cpTask.TaskType, client, schoolDetail)
 	formMap := taskService.QueryFormByTitle(ctx, cpTask.Title)
 	formDetail := taskService.ParseFormJson(ctx, formMap)
+
 	return utils.SuccessWithData[any](formDetail)
 }

@@ -196,7 +213,8 @@ func (v CpTaskServiceV1) PostExecute(ctx context.Context, req *v1.PostCpTaskExec
 			SetTaskStatus(cptask.TaskStatusNotStart).
 			SetNotificationType(req.NotificationType).
 			SetExecuteHour(req.ExecuteHour).
-			SetExecuteMinute(req.ExecuteMinute)
+			SetExecuteMinute(req.ExecuteMinute).
+			SetExecuteDays(req.ExecuteDays)
 		if cpTask.Step == cptask.StepExecute {
 			update.SetTaskStatus(cptask.TaskStatusNotStart)
 		}
@@ -212,6 +230,18 @@ func (v CpTaskServiceV1) PostExecute(ctx context.Context, req *v1.PostCpTaskExec
 	return utils.SuccessWithMsg("更新成功")
 }

+func (v CpTaskServiceV1) UpdateTaskTitle(ctx context.Context, req *v1.UpdateTaskTitleReq) *utils.Response[any] {
+	user := utils.GetUserInfoFromCtx(ctx)
+	cpTask := db2.Global.CpTask.Query().
+		Where(cptask.ID(req.Id), cptask.HasSysUserWith(sysuser.ID(user.ID))).
+		OnlyX(ctx)
+	if cpTask == nil {
+		utils.OkOrPanic(errors2.NewBusinessError(404, "任务不存在"))
+	}
+	db2.Global.CpTask.UpdateOne(cpTask).SetTitle(req.Title).ExecX(ctx)
+	return utils.SuccessWithMsg("修改成功")
+}
+
 func (v CpTaskServiceV1) Delete(ctx context.Context, req *v1.DeleteTaskReq) *utils.Response[any] {
 	user := utils.GetUserInfoFromCtx(ctx)
 	// 检测是否属于自己的cpTask
@@ -347,6 +377,153 @@ func (v CpTaskServiceV1) GetTaskStatistics(ctx context.Context, req *v1.GetTaskS
 	return utils.SuccessWithData[[]*v1.TaskStatisticsItem](statistics)
 }

+// GetTaskStatisticsV2 近七日统计（从日志表按任务id去重，当天额外查待执行数）
+func (v CpTaskServiceV1) GetTaskStatisticsV2(ctx context.Context, _ *v1.GetTaskStatisticsV2Req) *utils.Response[[]*v1.TaskStatisticsV2Item] {
+	user := utils.GetUserInfoFromCtx(ctx)
+	now := time.Now()
+	today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	statistics := make([]*v1.TaskStatisticsV2Item, 7)
+
+	for i := 6; i >= 0; i-- {
+		date := now.AddDate(0, 0, -i)
+		dateStr := date.Format("2006-01-02")
+		startOfDay := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, date.Location())
+		endOfDay := startOfDay.AddDate(0, 0, 1)
+
+		// 成功任务数（按 cp_task_id 去重）
+		var successIds []int64
+		db2.Global.CpTaskLog.Query().
+			Where(func(s *sql.Selector) {
+				s.Where(sql.GTE(s.C("create_time"), startOfDay))
+				s.Where(sql.LT(s.C("create_time"), endOfDay))
+				s.Where(sql.EQ(s.C("is_success"), true))
+				s.Where(sql.EQ(s.C("system_user_id"), user.ID))
+			}).
+			Unique(false).
+			Select("cp_task_id").
+			Modify(func(s *sql.Selector) {
+				s.Distinct()
+			}).
+			ScanX(ctx, &successIds)
+
+		// 失败任务数（按 cp_task_id 去重）
+		var failIds []int64
+		db2.Global.CpTaskLog.Query().
+			Where(func(s *sql.Selector) {
+				s.Where(sql.GTE(s.C("create_time"), startOfDay))
+				s.Where(sql.LT(s.C("create_time"), endOfDay))
+				s.Where(sql.EQ(s.C("is_success"), false))
+				s.Where(sql.EQ(s.C("system_user_id"), user.ID))
+			}).
+			Unique(false).
+			Select("cp_task_id").
+			Modify(func(s *sql.Selector) {
+				s.Distinct()
+			}).
+			ScanX(ctx, &failIds)
+
+		item := &v1.TaskStatisticsV2Item{
+			Date:           dateStr,
+			SuccessTask:    len(successIds),
+			FailTask:       len(failIds),
+			SuccessTaskIds: successIds,
+			FailTaskIds:    failIds,
+		}
+
+		// 仅当天查待执行任务数及ID列表
+		if startOfDay.Equal(today) {
+			pendingIds := db2.Global.CpTask.Query().
+				Where(
+					cptask.HasSysUserWith(sysuser.ID(user.ID)),
+					cptask.TaskStatusNEQ(cptask.TaskStatusPause),
+					cptask.FrequencyGT(0),
+				).
+				Where(func(s *sql.Selector) {
+					s.Where(sql.ExprP("frequency > success_count"))
+				}).
+				IDsX(ctx)
+			item.PendingTask = len(pendingIds)
+			item.PendingTaskIds = pendingIds
+		}
+
+		statistics[6-i] = item
+	}
+
+	return utils.SuccessWithData[[]*v1.TaskStatisticsV2Item](statistics)
+}
+
+// GetDashboardSummary 首页概览：余额、消费对比、任务数对比
+func (v CpTaskServiceV1) GetDashboardSummary(ctx context.Context, _ *v1.GetDashboardSummaryReq) *utils.Response[*v1.DashboardSummary] {
+	user := utils.GetUserInfoFromCtx(ctx)
+	now := time.Now()
+	today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	yesterday := today.AddDate(0, 0, -1)
+	week1Start := today.AddDate(0, 0, -7)
+	week2Start := today.AddDate(0, 0, -14)
+
+	// 当前余额
+	balanceStr := user.Balance.String()
+
+	// 查询某时间段内的消费总额（type=decrease）
+	queryCost := func(start, end time.Time) string {
+		type SumResult struct {
+			Total *string `json:"total"`
+		}
+		var results []SumResult
+		db2.Global.SysBalanceRecord.Query().
+			Where(func(s *sql.Selector) {
+				s.Where(sql.EQ(s.C("user_id"), user.ID))
+				s.Where(sql.EQ(s.C("type"), "decrease"))
+				s.Where(sql.GTE(s.C("create_time"), start))
+				s.Where(sql.LT(s.C("create_time"), end))
+			}).
+			Modify(func(s *sql.Selector) {
+				s.Select(sql.As(sql.Sum(s.C("amount")), "total"))
+			}).
+			ScanX(ctx, &results)
+		if len(results) > 0 && results[0].Total != nil {
+			return *results[0].Total
+		}
+		return "0"
+	}
+
+	todayCost := queryCost(today, today.AddDate(0, 0, 1))
+	yesterdayCost := queryCost(yesterday, today)
+	week1Cost := queryCost(week1Start, today)
+	week2Cost := queryCost(week2Start, week1Start)
+
+	// 查询某天的任务数（成功+失败，按任务id去重）
+	queryTaskCount := func(start, end time.Time) int {
+		var taskIds []int64
+		db2.Global.CpTaskLog.Query().
+			Where(func(s *sql.Selector) {
+				s.Where(sql.GTE(s.C("create_time"), start))
+				s.Where(sql.LT(s.C("create_time"), end))
+				s.Where(sql.EQ(s.C("system_user_id"), user.ID))
+			}).
+			Unique(false).
+			Select("cp_task_id").
+			Modify(func(s *sql.Selector) {
+				s.Distinct()
+			}).
+			ScanX(ctx, &taskIds)
+		return len(taskIds)
+	}
+
+	todayTaskCount := queryTaskCount(today, today.AddDate(0, 0, 1))
+	ydayTaskCount := queryTaskCount(yesterday, today)
+
+	return utils.SuccessWithData[*v1.DashboardSummary](&v1.DashboardSummary{
+		Balance:        balanceStr,
+		TodayCost:      todayCost,
+		YesterdayCost:  yesterdayCost,
+		Week1Cost:      week1Cost,
+		Week2Cost:      week2Cost,
+		TodayTaskCount: todayTaskCount,
+		YdayTaskCount:  ydayTaskCount,
+	})
+}
+
 func NewCpTaskServiceV1() *CpTaskServiceV1 {
 	return &CpTaskServiceV1{}
 }
@@ -94,6 +94,7 @@ func (v CpUserServiceV1) List(ctx context.Context, req *v1.CpUserListReq) *utils
 	for _, v := range data {
 		v.Password = ""
 		v.Cookie = ""
+		v.Tgc = ""
 	}
 	return utils.SuccessWithTotal[[]*ent.CpUser](data, total)
 }
@@ -169,14 +170,14 @@ func (v CpUserServiceV1) AuthorizeConfirm(ctx context.Context, req *v1.CpUserAut
 	return utils.SuccessWithMsg("已确认授权")
 }

-func (v CpUserServiceV1) AuthorizeRandom(ctx context.Context, req *v1.CpUserAuthorizeRandomReq) *utils.Response[any] {
+func (v CpUserServiceV1) CustomDevice(ctx context.Context, req *v1.CpUserCustomDeviceReq) *utils.Response[any] {
 	user := utils.GetUserInfoFromCtx(ctx)
 	cpUser := db.Global.CpUser.Query().Where(cpuser.ID(req.Id), cpuser.HasSysuserWith(sysuser.ID(user.ID))).FirstX(ctx)
 	if cpUser == nil {
 		return utils.FailParam("用户不存在")
 	}
-	db.Global.CpUser.UpdateOne(cpUser).SetMobileCode(utils.UUID()).SetMobileType(cpuser.MobileTypeRandom).ExecX(ctx)
-	return utils.SuccessWithMsg("已改为随机设备码")
+	db.Global.CpUser.UpdateOne(cpUser).SetMobileCode(req.MobileCode).SetMobileType(cpuser.MobileType(req.MobileType)).ExecX(ctx)
+	return utils.SuccessWithMsg("自定义设备码设置成功")
 }

 func (v CpUserServiceV1) LoginGetCode(ctx context.Context, req *v1.LoginGetCode) *utils.Response[any] {
@@ -203,6 +204,8 @@ func (v CpUserServiceV1) AddByCode(ctx context.Context, req *v1.AddByCode) *util
 	loginExecutor := login.NewSmsWithoutDeviceID()
 	data := loginExecutor.LoginByCode(context.Background(), req.Mobile, req.Code, jar)
 	loginExecutor.SetLoginCookie(context.Background(), jar, data)
+	// SetLoginCookie 之后保存完整 cookie 作为 TGC（包含 CASTGC，有效期10年）
+	tgc := loginExecutor.GetCookieString()
 	// 扣费
 	//basePoint, err := decimal.NewFromString(g.Cfg().MustGet(ctx, cst.ConfigBasePointCpdailyPhone).String())
 	basePoint, err := decimal.NewFromString(db.Global.SysConfig.Query().Where(sysconfig.KeyEQ(cst.ConfigRedisCpdailyPhone)).OnlyX(ctx).Value)
@@ -217,6 +220,7 @@ func (v CpUserServiceV1) AddByCode(ctx context.Context, req *v1.AddByCode) *util
 			SetEmail(req.Email).
 			SetSchoolID(req.SchoolId).
 			SetCookie(loginExecutor.GetCookieString()).
+			SetTgc(tgc).
 			SetMobileCode(utils.UUID()).
 			SetMobileType(cpuser.MobileTypeRandom).
 			SetSysuserID(user.ID).
@@ -226,6 +230,7 @@ func (v CpUserServiceV1) AddByCode(ctx context.Context, req *v1.AddByCode) *util
 	} else {
 		db.Global.CpUser.UpdateOneID(req.Id).
 			SetCookie(loginExecutor.GetCookieString()).
+			SetTgc(tgc).
 			ExecX(ctx)
 		return utils.SuccessWithMsg("更新成功")
 	}
@@ -235,3 +240,22 @@ func (v CpUserServiceV1) LoginUrl(ctx context.Context, req *v1.CpUserLoginUrlReq
 	sc := db.Global.CpSchool.Query().Where(cpschool.NameEQ(req.Name)).Limit(1).OnlyX(ctx)
 	return utils.SuccessWithData[any](school.GetSchoolDetail(ctx, sc.ID))
 }
+
+// GenerateQr 生成二维码UUID
+func (v CpUserServiceV1) GenerateQr(ctx context.Context, req *v1.CpUserGenerateQrReq) *utils.Response[any] {
+	uuid := utils.UUID()
+	expire := time.Duration(cst.RedisCpUserQrCodeExpire) * time.Second
+	redis.GetClient().Set(ctx, cst.RedisCpUserQrCode+uuid, "1", expire)
+	return utils.SuccessWithData[any](map[string]string{
+		"uuid": uuid,
+	})
+}
+
+// CheckQr 校验二维码UUID是否有效（无需登录）
+func (v CpUserServiceV1) CheckQr(ctx context.Context, req *v1.CpUserCheckQrReq) *utils.Response[any] {
+	val := redis.GetClient().Get(ctx, cst.RedisCpUserQrCode+req.Uuid).Val()
+	if val == "" {
+		return utils.Fail(400, "二维码无效，请重新获取")
+	}
+	return utils.SuccessWithMsg("二维码有效")
+}
@@ -0,0 +1,70 @@
+package email
+
+import (
+	"sync"
+
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+// Brand 品牌标识
+type Brand string
+
+const (
+	BrandDefault Brand = "default" // 老系统（若梦系统）- MD3 风格
+	BrandNew     Brand = "new"     // 新系统（天神系统）- shadcn 风格
+)
+
+// BrandConfig 品牌配置
+type BrandConfig struct {
+	AppName               string
+	AppCopyright          string
+	EmailConfirmBaseUrl   string
+	EmailResetPasswordUrl string
+	BalanceMigrateUrl     string
+}
+
+var (
+	currentBrand Brand
+	brandConfig  *BrandConfig
+	brandOnce    sync.Once
+)
+
+// initBrand 从 config.toml 读取品牌配置（只执行一次）
+func initBrand() {
+	ctx := gctx.New()
+	cfg := g.Cfg()
+
+	// app.brand: "default" 或 "new"，未设置默认 "default"
+	brandStr := cfg.MustGet(ctx, "app.brand", "default").String()
+	if brandStr == "new" {
+		currentBrand = BrandNew
+	} else {
+		currentBrand = BrandDefault
+	}
+
+	brandConfig = &BrandConfig{
+		AppName:               cfg.MustGet(ctx, "app.name", "若梦系统").String(),
+		AppCopyright:          cfg.MustGet(ctx, "app.copyright", "© 2025 若梦系统. 保留所有权利.").String(),
+		EmailConfirmBaseUrl:   cfg.MustGet(ctx, "app.emailConfirmBaseUrl", cfg.MustGet(ctx, "server.emailConfirmBaseUrl").String()).String(),
+		EmailResetPasswordUrl: cfg.MustGet(ctx, "app.emailResetPasswordUrl", cfg.MustGet(ctx, "server.emailResetPasswordUrl").String()).String(),
+		BalanceMigrateUrl:     cfg.MustGet(ctx, "app.balanceMigrateUrl", cfg.MustGet(ctx, "server.balanceMigrateUrl").String()).String(),
+	}
+}
+
+// GetCurrentBrand 获取当前品牌标识
+func GetCurrentBrand() Brand {
+	brandOnce.Do(initBrand)
+	return currentBrand
+}
+
+// GetBrandConfig 获取当前品牌配置
+func GetBrandConfig() *BrandConfig {
+	brandOnce.Do(initBrand)
+	return brandConfig
+}
+
+// IsNewBrand 是否为新系统品牌
+func IsNewBrand() bool {
+	return GetCurrentBrand() == BrandNew
+}
@@ -5,85 +5,457 @@ import (
 	"context"
 	"embed"
 	"encoding/gob"
+	"encoding/json"
 	"fmt"
 	"html/template"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
 	cst2 "likedream-goframe/internal/common/cst"
+	db "likedream-goframe/internal/common/db"
+	"likedream-goframe/internal/ent/sysconfig"
 	"likedream-goframe/internal/framework/logger"
 	email2 "likedream-goframe/internal/framework/model/email"
 	"likedream-goframe/internal/framework/queue"
 	"likedream-goframe/internal/utils"
-	"sync"
-	"time"

-	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/hibiken/asynq"
-	"github.com/samber/oops"
+	mail "github.com/wneessen/go-mail"
 	"go.uber.org/zap"
 )

 //go:embed templates/*.gohtml
 var templateFiles embed.FS

-type EmailServiceV1 struct {
-	config    EmailConfig
-	templates *template.Template
-	tmplOnce  sync.Once
-}
+const (
+	AuthModeSMTP          = "smtp"
+	AuthModeOutlookOAuth2 = "outlook_oauth2"
+
+	DefaultOutlookSMTPHost    = "smtp-mail.outlook.com"
+	DefaultOutlookSMTPPort    = 587
+	DefaultOutlookTenant      = "consumers"
+	DefaultOutlookOAuthScope  = "offline_access https://graph.microsoft.com/Mail.Send"
+	DefaultOutlookRedirectURL = "http://localhost:3200/api/v1/mail/oauth/outlook/callback"
+	DefaultGraphSendMailURL   = "https://graph.microsoft.com/v1.0/me/sendMail"
+)
+
+type EmailServiceV1 struct{}

 type EmailConfig struct {
+	AuthMode string
+
 	SMTPHost     string
 	SMTPPort     int
 	SMTPUsername string
 	SMTPPassword string
-	FromEmail    string
-	FromName     string
+
+	FromEmail string
+	FromName  string
+
+	OAuthTenant       string
+	OAuthClientID     string
+	OAuthClientSecret string
+	OAuthRedirectURL  string
+	OAuthRefreshToken string
+	OAuthScope        string
 }

 func NewV1() *EmailServiceV1 {
-	ctx := gctx.New()
-	cfg := g.Cfg()
+	return &EmailServiceV1{}
+}

-	config := EmailConfig{
-		SMTPHost:     cfg.MustGetWithEnv(ctx, cst2.ConfigEmailSMTPHost).String(),
-		SMTPPort:     cfg.MustGetWithEnv(ctx, cst2.ConfigEmailSMTPPort).Int(),
-		SMTPUsername: cfg.MustGetWithEnv(ctx, cst2.ConfigEmailSMTPUsername).String(),
-		SMTPPassword: cfg.MustGetWithEnv(ctx, cst2.ConfigEmailSMTPPassword).String(),
-		FromEmail:    cfg.MustGetWithEnv(ctx, cst2.ConfigEmailFromEmail).String(),
-		FromName:     cfg.MustGetWithEnv(ctx, cst2.ConfigEmailFromName).String(),
+func (s *EmailServiceV1) GetConfig() EmailConfig {
+	ctx := gctx.New()
+
+	getVal := func(key string) string {
+		config, err := db.Global.SysConfig.Query().
+			Where(sysconfig.KeyEQ(key)).
+			Only(ctx)
+		if err == nil {
+			return config.Value
+		}
+		return ""
 	}

-	return &EmailServiceV1{
-		config: config,
+	port, _ := strconv.Atoi(getVal(cst2.ConfigEmailSMTPPort))
+
+	cfg := EmailConfig{
+		AuthMode:          getVal(cst2.ConfigEmailAuthMode),
+		SMTPHost:          getVal(cst2.ConfigEmailSMTPHost),
+		SMTPPort:          port,
+		SMTPUsername:      getVal(cst2.ConfigEmailSMTPUsername),
+		SMTPPassword:      getVal(cst2.ConfigEmailSMTPPassword),
+		FromEmail:         getVal(cst2.ConfigEmailFromEmail),
+		FromName:          getVal(cst2.ConfigEmailFromName),
+		OAuthTenant:       getVal(cst2.ConfigEmailOAuthTenant),
+		OAuthClientID:     getVal(cst2.ConfigEmailOAuthClientID),
+		OAuthClientSecret: getVal(cst2.ConfigEmailOAuthClientSecret),
+		OAuthRedirectURL:  getVal(cst2.ConfigEmailOAuthRedirectURL),
+		OAuthRefreshToken: getVal(cst2.ConfigEmailOAuthRefreshToken),
+		OAuthScope:        getVal(cst2.ConfigEmailOAuthScope),
+	}
+
+	return NormalizeConfig(cfg)
+}
+
+func NormalizeConfig(cfg EmailConfig) EmailConfig {
+	if cfg.AuthMode == "" {
+		cfg.AuthMode = AuthModeSMTP
+	}
+	if cfg.FromEmail != "" && cfg.SMTPUsername == "" {
+		cfg.SMTPUsername = cfg.FromEmail
+	}
+	if cfg.AuthMode == AuthModeOutlookOAuth2 {
+		cfg.OAuthTenant = DefaultOutlookTenant
+		cfg.OAuthScope = DefaultOutlookOAuthScope
+		cfg.OAuthRedirectURL = DefaultOutlookRedirectURL
+	} else if cfg.SMTPPort == 0 {
+		cfg.SMTPPort = 587
+	}
+	return cfg
+}
+
+func (s *EmailServiceV1) SaveAuthorizedOutlookConfig(ctx context.Context, cfg EmailConfig) error {
+	cfg = NormalizeConfig(cfg)
+
+	configs := map[string]string{
+		cst2.ConfigEmailAuthMode:          AuthModeOutlookOAuth2,
+		cst2.ConfigEmailFromEmail:         cfg.FromEmail,
+		cst2.ConfigEmailOAuthTenant:       cfg.OAuthTenant,
+		cst2.ConfigEmailOAuthClientID:     cfg.OAuthClientID,
+		cst2.ConfigEmailOAuthClientSecret: cfg.OAuthClientSecret,
+		cst2.ConfigEmailOAuthRedirectURL:  cfg.OAuthRedirectURL,
+		cst2.ConfigEmailOAuthRefreshToken: cfg.OAuthRefreshToken,
+		cst2.ConfigEmailOAuthScope:        cfg.OAuthScope,
+	}
+
+	for key, value := range configs {
+		exists, err := db.Global.SysConfig.Query().Where(sysconfig.KeyEQ(key)).Exist(ctx)
+		if err != nil {
+			return err
+		}
+		if exists {
+			if _, err = db.Global.SysConfig.Update().Where(sysconfig.KeyEQ(key)).SetValue(value).Save(ctx); err != nil {
+				return err
+			}
+			continue
+		}
+		if _, err = db.Global.SysConfig.Create().
+			SetKey(key).
+			SetValue(value).
+			SetDescription("邮件配置").
+			Save(ctx); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (s *EmailServiceV1) ValidateConfig(cfg EmailConfig) error {
+	cfg = NormalizeConfig(cfg)
+
+	if cfg.FromEmail == "" {
+		return fmt.Errorf("fromEmail is required")
+	}
+	if cfg.FromName == "" {
+		return fmt.Errorf("fromName is required")
+	}
+
+	switch cfg.AuthMode {
+	case AuthModeSMTP:
+		if cfg.SMTPHost == "" {
+			return fmt.Errorf("smtpHost is required")
+		}
+		if cfg.SMTPPort <= 0 {
+			return fmt.Errorf("smtpPort is required")
+		}
+		if cfg.SMTPUsername == "" {
+			return fmt.Errorf("smtpUsername is required")
+		}
+		if cfg.SMTPPassword == "" {
+			return fmt.Errorf("smtpPassword is required")
+		}
+	case AuthModeOutlookOAuth2:
+		if cfg.OAuthClientID == "" {
+			return fmt.Errorf("oauthClientId is required")
+		}
+		if cfg.OAuthClientSecret == "" {
+			return fmt.Errorf("oauthClientSecret is required")
+		}
+		if cfg.OAuthRefreshToken == "" {
+			return fmt.Errorf("oauthRefreshToken is required")
+		}
+	default:
+		return fmt.Errorf("unsupported authMode: %s", cfg.AuthMode)
+	}
+
+	return nil
+}
+
+func (s *EmailServiceV1) AccessToken(ctx context.Context, cfg EmailConfig) (string, error) {
+	cfg = NormalizeConfig(cfg)
+	if cfg.AuthMode != AuthModeOutlookOAuth2 {
+		return "", fmt.Errorf("access token is only available in oauth2 mode")
+	}
+
+	form := url.Values{
+		"client_id":     {cfg.OAuthClientID},
+		"client_secret": {cfg.OAuthClientSecret},
+		"grant_type":    {"refresh_token"},
+		"refresh_token": {cfg.OAuthRefreshToken},
+		"scope":         {cfg.OAuthScope},
+	}
+	if cfg.OAuthRedirectURL != "" {
+		form.Set("redirect_uri", cfg.OAuthRedirectURL)
+	}
+
+	tokenURL := fmt.Sprintf("https://login.microsoftonline.com/%s/oauth2/v2.0/token", cfg.OAuthTenant)
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, tokenURL, strings.NewReader(form.Encode()))
+	if err != nil {
+		return "", err
+	}
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	bodyBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+
+	var tokenResp struct {
+		AccessToken      string `json:"access_token"`
+		Scope            string `json:"scope"`
+		TokenType        string `json:"token_type"`
+		ExpiresIn        int64  `json:"expires_in"`
+		Error            string `json:"error"`
+		ErrorDescription string `json:"error_description"`
+	}
+	if err := json.Unmarshal(bodyBytes, &tokenResp); err != nil {
+		return "", fmt.Errorf("decode oauth token response failed: %w", err)
+	}
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		if tokenResp.ErrorDescription != "" {
+			return "", fmt.Errorf("oauth token refresh failed: %s (%s)", tokenResp.ErrorDescription, tokenResp.Error)
+		}
+		return "", fmt.Errorf("oauth token refresh failed with status %d", resp.StatusCode)
+	}
+	if tokenResp.AccessToken == "" {
+		return "", fmt.Errorf("empty access token returned by oauth2 token endpoint")
+	}
+	return strings.TrimSpace(tokenResp.AccessToken), nil
+}
+
+func (s *EmailServiceV1) newClient(ctx context.Context, cfg EmailConfig) (*mail.Client, error) {
+	cfg = NormalizeConfig(cfg)
+	if err := s.ValidateConfig(cfg); err != nil {
+		return nil, err
+	}
+	if cfg.AuthMode != AuthModeSMTP {
+		return nil, fmt.Errorf("smtp client is only available in smtp mode")
+	}
+
+	options := []mail.Option{
+		mail.WithPort(cfg.SMTPPort),
+		mail.WithTLSPortPolicy(mail.TLSMandatory),
+		mail.WithTimeout(30 * time.Second),
+		mail.WithUsername(cfg.SMTPUsername),
+	}
+
+	options = append(options,
+		mail.WithSMTPAuth(mail.SMTPAuthLogin),
+		mail.WithPassword(cfg.SMTPPassword),
+	)
+
+	return mail.NewClient(cfg.SMTPHost, options...)
+}
+
+func (s *EmailServiceV1) newMessage(fromName, fromEmail, to, subject, body string) (*mail.Msg, error) {
+	msg := mail.NewMsg()
+	if err := msg.FromFormat(fromName, fromEmail); err != nil {
+		return nil, err
+	}
+	if err := msg.AddTo(to); err != nil {
+		return nil, err
+	}
+	msg.Subject(subject)
+	msg.SetBodyString(mail.TypeTextHTML, body)
+	return msg, nil
+}
+
+func (s *EmailServiceV1) SendMessageNow(ctx context.Context, cfg EmailConfig, to, subject, body string) error {
+	cfg = NormalizeConfig(cfg)
+	if err := s.ValidateConfig(cfg); err != nil {
+		return err
+	}
+
+	if cfg.AuthMode == AuthModeOutlookOAuth2 {
+		return s.sendGraphMessageNow(ctx, cfg, to, subject, body)
+	}
+
+	msg, err := s.newMessage(cfg.FromName, cfg.FromEmail, to, subject, body)
+	if err != nil {
+		return err
+	}
+
+	client, err := s.newClient(ctx, cfg)
+	if err != nil {
+		return err
+	}
+	defer client.Close()
+
+	return client.DialAndSendWithContext(ctx, msg)
+}
+
+func (s *EmailServiceV1) sendGraphMessageNow(ctx context.Context, cfg EmailConfig, to, subject, body string) error {
+	accessToken, err := s.AccessToken(ctx, cfg)
+	if err != nil {
+		return err
+	}
+
+	payload := map[string]any{
+		"message": map[string]any{
+			"subject": subject,
+			"body": map[string]any{
+				"contentType": "HTML",
+				"content":     body,
+			},
+			"toRecipients": []map[string]any{
+				{
+					"emailAddress": map[string]any{
+						"address": to,
+					},
+				},
+			},
+		},
+		"saveToSentItems": true,
+	}
+
+	bodyBytes, err := json.Marshal(payload)
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, DefaultGraphSendMailURL, bytes.NewReader(bodyBytes))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Authorization", "Bearer "+accessToken)
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusAccepted {
+		var graphErr struct {
+			Error struct {
+				Code    string `json:"code"`
+				Message string `json:"message"`
+			} `json:"error"`
+		}
+		_ = json.NewDecoder(resp.Body).Decode(&graphErr)
+		if graphErr.Error.Message != "" {
+			return fmt.Errorf("graph sendMail failed: %s (%s)", graphErr.Error.Message, graphErr.Error.Code)
+		}
+		return fmt.Errorf("graph sendMail failed with status %d", resp.StatusCode)
+	}
+
+	return nil
+}
+
+func ConfigFromPayload(payload email2.SendPayload) EmailConfig {
+	return NormalizeConfig(EmailConfig{
+		AuthMode:          payload.AuthMode,
+		SMTPHost:          payload.SMTPHost,
+		SMTPPort:          payload.SMTPPort,
+		SMTPUsername:      payload.SMTPUsername,
+		SMTPPassword:      payload.SMTPPassword,
+		FromEmail:         payload.FromEmail,
+		FromName:          payload.FromName,
+		OAuthTenant:       payload.OAuthTenant,
+		OAuthClientID:     payload.OAuthClientID,
+		OAuthClientSecret: payload.OAuthClientSecret,
+		OAuthRedirectURL:  payload.OAuthRedirectURL,
+		OAuthRefreshToken: payload.OAuthRefreshToken,
+		OAuthScope:        payload.OAuthScope,
+	})
+}
+
+func PayloadFromConfig(cfg EmailConfig, to, subject, body string) *email2.SendPayload {
+	cfg = NormalizeConfig(cfg)
+	return &email2.SendPayload{
+		To:                to,
+		Subject:           subject,
+		Body:              body,
+		AuthMode:          cfg.AuthMode,
+		FromName:          cfg.FromName,
+		FromEmail:         cfg.FromEmail,
+		SMTPHost:          cfg.SMTPHost,
+		SMTPPort:          cfg.SMTPPort,
+		SMTPUsername:      cfg.SMTPUsername,
+		SMTPPassword:      cfg.SMTPPassword,
+		OAuthTenant:       cfg.OAuthTenant,
+		OAuthClientID:     cfg.OAuthClientID,
+		OAuthClientSecret: cfg.OAuthClientSecret,
+		OAuthRedirectURL:  cfg.OAuthRedirectURL,
+		OAuthRefreshToken: cfg.OAuthRefreshToken,
+		OAuthScope:        cfg.OAuthScope,
 	}
 }

-// SendSignupEmail 发送注册成功邮件
+func templatePrefix() string {
+	if IsNewBrand() {
+		return "new_"
+	}
+	return ""
+}
+
+func brandAppName() string {
+	return GetBrandConfig().AppName
+}
+
+func brandCopyright() string {
+	return GetBrandConfig().AppCopyright
+}
+
 func (s *EmailServiceV1) SendSignupEmail(ctx context.Context, toEmail, username string, token string) *utils.Response[any] {
-	if s.config.SMTPUsername == "" || s.config.SMTPPassword == "" {
-		logger.Logger.Error("邮件服务未配置")
+	cfg := s.GetConfig()
+	if err := s.ValidateConfig(cfg); err != nil {
+		logger.Logger.Error("mail config is invalid", zap.Error(err))
 		return utils.FailBusiness("邮件服务未配置")
 	}

-	subject := fmt.Sprintf("欢迎注册%s", cst2.AppName)
+	subject := fmt.Sprintf("欢迎注册%s", brandAppName())
 	body, err := s.renderSignupEmailTemplate(username, token)
 	if err != nil {
-		logger.Logger.Error("邮件模板渲染失败")
+		logger.Logger.Error("render signup email failed", zap.Error(err))
 		return utils.FailBusiness(fmt.Sprintf("邮件模板渲染失败: %v", err))
 	}

-	err = s.sendEmail(ctx, toEmail, subject, body)
-	if err != nil {
-		logger.Logger.Error("邮件发送失败")
+	if err = s.sendEmail(ctx, toEmail, subject, body); err != nil {
+		logger.Logger.Error("send signup email failed", zap.Error(err))
 		return utils.FailBusiness(fmt.Sprintf("邮件发送失败: %v", err))
 	}

 	return utils.SuccessWithMsg("注册邮件发送成功")
 }

-// SendTaskNotificationEmail 发送任务状态通知邮件
 func (s *EmailServiceV1) SendTaskNotificationEmail(ctx context.Context, toEmail, taskName string, status email2.TaskStatus, details map[string]string) *utils.Response[any] {
-	if s.config.SMTPUsername == "" || s.config.SMTPPassword == "" {
+	cfg := s.GetConfig()
+	if err := s.ValidateConfig(cfg); err != nil {
 		return utils.FailBusiness("邮件服务未配置")
 	}

@@ -93,192 +465,150 @@ func (s *EmailServiceV1) SendTaskNotificationEmail(ctx context.Context, toEmail,
 		return utils.FailBusiness(fmt.Sprintf("邮件模板渲染失败: %v", err))
 	}

-	err = s.sendEmail(ctx, toEmail, subject, body)
-	if err != nil {
+	if err = s.sendEmail(ctx, toEmail, subject, body); err != nil {
 		return utils.FailBusiness(fmt.Sprintf("邮件发送失败: %v", err))
 	}

 	return utils.SuccessWithMsg("通知邮件发送成功")
 }

-// SendResetPasswordEmail 发送重置密码邮件
 func (s *EmailServiceV1) SendResetPasswordEmail(ctx context.Context, toEmail, username string, token string) *utils.Response[any] {
-	if s.config.SMTPUsername == "" || s.config.SMTPPassword == "" {
-		logger.Logger.Error("邮件服务未配置")
+	cfg := s.GetConfig()
+	if err := s.ValidateConfig(cfg); err != nil {
+		logger.Logger.Error("mail config is invalid", zap.Error(err))
 		return utils.FailBusiness("邮件服务未配置")
 	}

-	subject := fmt.Sprintf("重置%s账户密码", cst2.AppName)
+	subject := fmt.Sprintf("重置%s账户密码", brandAppName())
 	body, err := s.renderResetPasswordEmailTemplate(username, token)
 	if err != nil {
-		logger.Logger.Error("邮件模板渲染失败")
+		logger.Logger.Error("render reset password email failed", zap.Error(err))
 		return utils.FailBusiness(fmt.Sprintf("邮件模板渲染失败: %v", err))
 	}

-	err = s.sendEmail(ctx, toEmail, subject, body)
-	if err != nil {
-		logger.Logger.Error("邮件发送失败")
+	if err = s.sendEmail(ctx, toEmail, subject, body); err != nil {
+		logger.Logger.Error("send reset password email failed", zap.Error(err))
 		return utils.FailBusiness(fmt.Sprintf("邮件发送失败: %v", err))
 	}

 	return utils.SuccessWithMsg("重置密码邮件发送成功")
 }

-// sendEmail 发送邮件的底层方法
-func (s *EmailServiceV1) sendEmail(ctx context.Context, to, subject, body string) error {
-
-	payload := bytes.NewBuffer(nil)
-
-	e := gob.NewEncoder(payload).Encode(&email2.SendPayload{
-		To:           to,
-		Subject:      subject,
-		Body:         body,
-		FromName:     s.config.FromName,
-		FromEmail:    s.config.FromEmail,
-		SMTPHost:     s.config.SMTPHost,
-		SMTPPort:     s.config.SMTPPort,
-		SMTPUsername: s.config.SMTPUsername,
-		SMTPPassword: s.config.SMTPPassword,
-	})
-	utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
-
-	task := queue.AddTask(ctx, asynq.NewTask(cst2.TaskEmail, payload.Bytes()), asynq.Queue(cst2.TaskQueueEmail),
-		asynq.MaxRetry(1),
-		asynq.Timeout(5*time.Minute),
-	)
-	logger.Logger.Info("添加任务: ", zap.String("task_id", task.ID), zap.String("邮箱", to))
-	return nil
-}
-
-// initTemplates 初始化邮件模板
-func (s *EmailServiceV1) initTemplates() error {
-	var err error
-	s.templates, err = template.ParseFS(templateFiles, "templates/*.gohtml")
-	if err != nil {
-		return fmt.Errorf("解析邮件模板失败: %v", err)
-	}
-	return nil
-}
-
-// getTemplates 获取模板实例，使用sync.Once确保只初始化一次
-func (s *EmailServiceV1) getTemplates() (*template.Template, error) {
-	var err error
-	s.tmplOnce.Do(func() {
-		err = s.initTemplates()
-	})
-	if err != nil {
-		return nil, err
-	}
-	return s.templates, nil
-}
-
-// renderSignupEmailTemplate 渲染注册邮件模板
-func (s *EmailServiceV1) renderSignupEmailTemplate(username string, token string) (string, error) {
-	// 单独解析注册确认模板
-	tmpl, err := template.ParseFS(templateFiles, "templates/layout.gohtml", "templates/signup_confirm.gohtml")
-	if err != nil {
-		return "", fmt.Errorf("解析注册邮件模板失败: %v", err)
-	}
-
-	get, err := g.Cfg().Get(gctx.New(), cst2.ConfigEmailConfirmBaseUrl)
-	if err != nil {
-		return "", err
-	}
-	data := NewSignupTemplateData(username, cst2.AppName, cst2.AppCopyright, get.String()+token)
-
-	var buf bytes.Buffer
-	err = tmpl.ExecuteTemplate(&buf, "signup_confirm.gohtml", data)
-	if err != nil {
-		return "", fmt.Errorf("渲染注册邮件模板失败: %v", err)
-	}
-
-	return buf.String(), nil
-}
-
-// renderTaskNotificationTemplate 渲染任务通知邮件模板
-func (s *EmailServiceV1) renderTaskNotificationTemplate(taskName string, status email2.TaskStatus, details map[string]string) (string, error) {
-	// 单独解析任务通知模板
-	tmpl, err := template.ParseFS(templateFiles, "templates/layout.gohtml", "templates/task_notification.gohtml")
-	if err != nil {
-		return "", fmt.Errorf("解析任务通知邮件模板失败: %v", err)
-	}
-
-	data := NewTaskNotificationTemplateData(taskName, status, details, cst2.AppName, cst2.AppCopyright)
-
-	var buf bytes.Buffer
-	err = tmpl.ExecuteTemplate(&buf, "task_notification.gohtml", data)
-	if err != nil {
-		return "", fmt.Errorf("渲染任务通知邮件模板失败: %v", err)
-	}
-
-	return buf.String(), nil
-}
-
-// renderResetPasswordEmailTemplate 渲染重置密码邮件模板
-func (s *EmailServiceV1) renderResetPasswordEmailTemplate(username string, token string) (string, error) {
-	// 单独解析重置密码模板
-	tmpl, err := template.ParseFS(templateFiles, "templates/layout.gohtml", "templates/reset_password.gohtml")
-	if err != nil {
-		return "", fmt.Errorf("解析重置密码邮件模板失败: %v", err)
-	}
-
-	get, err := g.Cfg().Get(gctx.New(), cst2.ConfigEmailResetPasswordUrl)
-	if err != nil {
-		return "", err
-	}
-	data := NewResetPasswordTemplateData(username, cst2.AppName, cst2.AppCopyright, get.String()+token)
-
-	var buf bytes.Buffer
-	err = tmpl.ExecuteTemplate(&buf, "reset_password.gohtml", data)
-	if err != nil {
-		return "", fmt.Errorf("渲染重置密码邮件模板失败: %v", err)
-	}
-
-	return buf.String(), nil
-}
-
-// SendBalanceMigrateEmail 发送积分转移邮件
 func (s *EmailServiceV1) SendBalanceMigrateEmail(ctx context.Context, toEmail, username string, balance int, token string) *utils.Response[any] {
-	if s.config.SMTPUsername == "" || s.config.SMTPPassword == "" {
-		logger.Logger.Error("邮件服务未配置")
+	cfg := s.GetConfig()
+	if err := s.ValidateConfig(cfg); err != nil {
+		logger.Logger.Error("mail config is invalid", zap.Error(err))
 		return utils.FailBusiness("邮件服务未配置")
 	}

-	subject := fmt.Sprintf("%s积分转移通知", cst2.AppName)
+	subject := fmt.Sprintf("%s积分转移通知", brandAppName())
 	body, err := s.renderBalanceMigrateEmailTemplate(username, balance, token)
 	if err != nil {
-		logger.Logger.Error("邮件模板渲染失败")
+		logger.Logger.Error("render balance migrate email failed", zap.Error(err))
 		return utils.FailBusiness(fmt.Sprintf("邮件模板渲染失败: %v", err))
 	}

-	err = s.sendEmail(ctx, toEmail, subject, body)
-	if err != nil {
-		logger.Logger.Error("邮件发送失败")
+	if err = s.sendEmail(ctx, toEmail, subject, body); err != nil {
+		logger.Logger.Error("send balance migrate email failed", zap.Error(err))
 		return utils.FailBusiness(fmt.Sprintf("邮件发送失败: %v", err))
 	}

 	return utils.SuccessWithMsg("积分转移邮件发送成功")
 }

-// renderBalanceMigrateEmailTemplate 渲染积分转移邮件模板
+func (s *EmailServiceV1) sendEmail(ctx context.Context, to, subject, body string) error {
+	cfg := s.GetConfig()
+	if err := s.ValidateConfig(cfg); err != nil {
+		return err
+	}
+
+	payload := bytes.NewBuffer(nil)
+	if err := gob.NewEncoder(payload).Encode(PayloadFromConfig(cfg, to, subject, body)); err != nil {
+		return err
+	}
+
+	task := queue.AddTask(
+		ctx,
+		asynq.NewTask(cst2.TaskEmail, payload.Bytes()),
+		asynq.Queue(cst2.TaskQueueEmail),
+		asynq.MaxRetry(1),
+		asynq.Timeout(5*time.Minute),
+	)
+	logger.Logger.Info("add email task", zap.String("task_id", task.ID), zap.String("to", to))
+	return nil
+}
+
+func parseTemplates(contentTemplate string) (*template.Template, error) {
+	prefix := templatePrefix()
+	layoutFile := fmt.Sprintf("templates/%slayout.gohtml", prefix)
+	contentFile := fmt.Sprintf("templates/%s%s", prefix, contentTemplate)
+	return template.ParseFS(templateFiles, layoutFile, contentFile)
+}
+
+func (s *EmailServiceV1) renderSignupEmailTemplate(username string, token string) (string, error) {
+	tmpl, err := parseTemplates("signup_confirm.gohtml")
+	if err != nil {
+		return "", fmt.Errorf("解析注册邮件模板失败: %v", err)
+	}
+
+	bc := GetBrandConfig()
+	data := NewSignupTemplateData(username, bc.AppName, bc.AppCopyright, bc.EmailConfirmBaseUrl+token)
+
+	prefix := templatePrefix()
+	var buf bytes.Buffer
+	if err = tmpl.ExecuteTemplate(&buf, prefix+"signup_confirm.gohtml", data); err != nil {
+		return "", fmt.Errorf("渲染注册邮件模板失败: %v", err)
+	}
+	return buf.String(), nil
+}
+
+func (s *EmailServiceV1) renderTaskNotificationTemplate(taskName string, status email2.TaskStatus, details map[string]string) (string, error) {
+	tmpl, err := parseTemplates("task_notification.gohtml")
+	if err != nil {
+		return "", fmt.Errorf("解析任务通知邮件模板失败: %v", err)
+	}
+
+	bc := GetBrandConfig()
+	data := NewTaskNotificationTemplateData(taskName, status, details, bc.AppName, bc.AppCopyright)
+
+	prefix := templatePrefix()
+	var buf bytes.Buffer
+	if err = tmpl.ExecuteTemplate(&buf, prefix+"task_notification.gohtml", data); err != nil {
+		return "", fmt.Errorf("渲染任务通知邮件模板失败: %v", err)
+	}
+	return buf.String(), nil
+}
+
+func (s *EmailServiceV1) renderResetPasswordEmailTemplate(username string, token string) (string, error) {
+	tmpl, err := parseTemplates("reset_password.gohtml")
+	if err != nil {
+		return "", fmt.Errorf("解析重置密码邮件模板失败: %v", err)
+	}
+
+	bc := GetBrandConfig()
+	data := NewResetPasswordTemplateData(username, bc.AppName, bc.AppCopyright, bc.EmailResetPasswordUrl+token)
+
+	prefix := templatePrefix()
+	var buf bytes.Buffer
+	if err = tmpl.ExecuteTemplate(&buf, prefix+"reset_password.gohtml", data); err != nil {
+		return "", fmt.Errorf("渲染重置密码邮件模板失败: %v", err)
+	}
+	return buf.String(), nil
+}
+
 func (s *EmailServiceV1) renderBalanceMigrateEmailTemplate(username string, balance int, token string) (string, error) {
-	// 单独解析积分转移模板
-	tmpl, err := template.ParseFS(templateFiles, "templates/layout.gohtml", "templates/balance_migrate.gohtml")
+	tmpl, err := parseTemplates("balance_migrate.gohtml")
 	if err != nil {
 		return "", fmt.Errorf("解析积分转移邮件模板失败: %v", err)
 	}

-	get, err := g.Cfg().Get(gctx.New(), cst2.ConfigBalanceMigrateUrl)
-	if err != nil {
-		return "", err
-	}
-	data := NewBalanceMigrateTemplateData(username, cst2.AppName, cst2.AppCopyright, balance, get.String()+token)
+	bc := GetBrandConfig()
+	data := NewBalanceMigrateTemplateData(username, bc.AppName, bc.AppCopyright, balance, bc.BalanceMigrateUrl+token)

+	prefix := templatePrefix()
 	var buf bytes.Buffer
-	err = tmpl.ExecuteTemplate(&buf, "balance_migrate.gohtml", data)
-	if err != nil {
+	if err = tmpl.ExecuteTemplate(&buf, prefix+"balance_migrate.gohtml", data); err != nil {
 		return "", fmt.Errorf("渲染积分转移邮件模板失败: %v", err)
 	}
-
 	return buf.String(), nil
 }
@@ -3,12 +3,12 @@ package email
 import (
 	"context"
 	"fmt"
-	"likedream-goframe/internal/common/cst"
 	"testing"
 )

 func TestEmailTemplates(t *testing.T) {
 	service := &EmailServiceV1{}
+	bc := GetBrandConfig()

 	// 测试注册邮件模板
 	t.Run("signup_email_template", func(t *testing.T) {
@@ -26,17 +26,17 @@ func TestEmailTemplates(t *testing.T) {
 			t.Fatal("注册邮件模板中没有包含用户名")
 		}

-		// 检查是否包含网站名称常量
-		if !containsString(body, cst.AppName) {
-			t.Fatalf("注册邮件模板中没有包含网站名称: %s", cst.AppName)
+		// 检查是否包含品牌名称
+		if !containsString(body, bc.AppName) {
+			t.Fatalf("注册邮件模板中没有包含品牌名称: %s", bc.AppName)
 		}

-		// 检查是否包含版权信息常量
-		if !containsString(body, cst.AppCopyright) {
-			t.Fatalf("注册邮件模板中没有包含版权信息: %s", cst.AppCopyright)
+		// 检查是否包含版权信息
+		if !containsString(body, bc.AppCopyright) {
+			t.Fatalf("注册邮件模板中没有包含版权信息: %s", bc.AppCopyright)
 		}

-		fmt.Printf("注册邮件模板渲染成功，长度: %d\n", len(body))
+		fmt.Printf("注册邮件模板渲染成功 (品牌: %s)，长度: %d\n", bc.AppName, len(body))
 	})

 	// 测试任务通知邮件模板
@@ -60,12 +60,56 @@ func TestEmailTemplates(t *testing.T) {
 			t.Fatal("任务通知邮件模板中没有包含任务名称")
 		}

-		// 检查是否包含版权信息常量
-		if !containsString(body, cst.AppCopyright) {
-			t.Fatalf("任务通知邮件模板中没有包含版权信息: %s", cst.AppCopyright)
+		// 检查是否包含版权信息
+		if !containsString(body, bc.AppCopyright) {
+			t.Fatalf("任务通知邮件模板中没有包含版权信息: %s", bc.AppCopyright)
 		}

-		fmt.Printf("任务通知邮件模板渲染成功，长度: %d\n", len(body))
+		fmt.Printf("任务通知邮件模板渲染成功 (品牌: %s)，长度: %d\n", bc.AppName, len(body))
+	})
+
+	// 测试重置密码邮件模板
+	t.Run("reset_password_template", func(t *testing.T) {
+		body, err := service.renderResetPasswordEmailTemplate("测试用户", "test-token")
+		if err != nil {
+			t.Fatalf("渲染重置密码邮件模板失败: %v", err)
+		}
+
+		if body == "" {
+			t.Fatal("重置密码邮件模板内容为空")
+		}
+
+		if !containsString(body, "测试用户") {
+			t.Fatal("重置密码邮件模板中没有包含用户名")
+		}
+
+		if !containsString(body, bc.AppName) {
+			t.Fatalf("重置密码邮件模板中没有包含品牌名称: %s", bc.AppName)
+		}
+
+		fmt.Printf("重置密码邮件模板渲染成功 (品牌: %s)，长度: %d\n", bc.AppName, len(body))
+	})
+
+	// 测试积分转移邮件模板
+	t.Run("balance_migrate_template", func(t *testing.T) {
+		body, err := service.renderBalanceMigrateEmailTemplate("测试用户", 100, "test-token")
+		if err != nil {
+			t.Fatalf("渲染积分转移邮件模板失败: %v", err)
+		}
+
+		if body == "" {
+			t.Fatal("积分转移邮件模板内容为空")
+		}
+
+		if !containsString(body, "测试用户") {
+			t.Fatal("积分转移邮件模板中没有包含用户名")
+		}
+
+		if !containsString(body, "100") {
+			t.Fatal("积分转移邮件模板中没有包含积分数量")
+		}
+
+		fmt.Printf("积分转移邮件模板渲染成功 (品牌: %s)，长度: %d\n", bc.AppName, len(body))
 	})
 }

@@ -86,8 +130,6 @@ func findSubstring(s, substr string) int {
 func TestEmailSending(t *testing.T) {
 	//t.Skip("跳过真实邮件发送测试，需要SMTP配置")

-	// 这里可以添加真实的邮件发送测试
-	// 需要配置真实的SMTP信息
 	service := NewV1()

 	ctx := context.Background()
@@ -0,0 +1,177 @@
+package email
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"html"
+	"net/url"
+	"strings"
+	"sync"
+	"time"
+
+	v1 "likedream-goframe/internal/api/v1"
+
+	"github.com/google/uuid"
+	"golang.org/x/oauth2"
+)
+
+type outlookOAuthSession struct {
+	Config         EmailConfig
+	FrontendOrigin string
+	CallbackURL    string
+	ExpiresAt      time.Time
+}
+
+var outlookOAuthStateStore = struct {
+	mu       sync.Mutex
+	sessions map[string]outlookOAuthSession
+}{
+	sessions: make(map[string]outlookOAuthSession),
+}
+
+func (s *EmailServiceV1) BuildOutlookAuthorizeURL(cfg EmailConfig, callbackBaseURL, frontendOrigin string) (*v1.OutlookOAuthAuthorizeURLResp, error) {
+	cfg = NormalizeConfig(cfg)
+	if cfg.AuthMode != AuthModeOutlookOAuth2 {
+		cfg.AuthMode = AuthModeOutlookOAuth2
+	}
+	if cfg.OAuthClientID == "" || cfg.OAuthClientSecret == "" {
+		return nil, fmt.Errorf("client id and client secret are required")
+	}
+	if cfg.FromEmail == "" {
+		return nil, fmt.Errorf("fromEmail is required")
+	}
+
+	callbackURL, err := buildCallbackURL(callbackBaseURL)
+	if err != nil {
+		return nil, err
+	}
+	if _, err = url.ParseRequestURI(frontendOrigin); err != nil {
+		return nil, fmt.Errorf("frontendOrigin is invalid")
+	}
+
+	state := uuid.NewString()
+	oauthCfg := newOutlookOAuthConfig(cfg, callbackURL)
+	authURL := oauthCfg.AuthCodeURL(
+		state,
+		oauth2.SetAuthURLParam("prompt", "consent"),
+		oauth2.SetAuthURLParam("response_mode", "query"),
+	)
+
+	outlookOAuthStateStore.mu.Lock()
+	defer outlookOAuthStateStore.mu.Unlock()
+
+	now := time.Now()
+	for key, session := range outlookOAuthStateStore.sessions {
+		if session.ExpiresAt.Before(now) {
+			delete(outlookOAuthStateStore.sessions, key)
+		}
+	}
+	outlookOAuthStateStore.sessions[state] = outlookOAuthSession{
+		Config:         cfg,
+		FrontendOrigin: frontendOrigin,
+		CallbackURL:    callbackURL,
+		ExpiresAt:      now.Add(10 * time.Minute),
+	}
+
+	return &v1.OutlookOAuthAuthorizeURLResp{
+		AuthURL:     authURL,
+		CallbackURL: callbackURL,
+		State:       state,
+	}, nil
+}
+
+func (s *EmailServiceV1) ExchangeOutlookAuthorizeCode(ctx context.Context, state, code string) (string, string, error) {
+	outlookOAuthStateStore.mu.Lock()
+	session, ok := outlookOAuthStateStore.sessions[state]
+	if ok {
+		delete(outlookOAuthStateStore.sessions, state)
+	}
+	outlookOAuthStateStore.mu.Unlock()
+
+	if !ok {
+		return "", "", fmt.Errorf("oauth state is invalid or expired")
+	}
+	if time.Now().After(session.ExpiresAt) {
+		return "", "", fmt.Errorf("oauth state has expired")
+	}
+	if code == "" {
+		return "", "", fmt.Errorf("authorization code is empty")
+	}
+
+	token, err := newOutlookOAuthConfig(session.Config, session.CallbackURL).Exchange(ctx, code)
+	if err != nil {
+		return "", session.FrontendOrigin, err
+	}
+	if token.RefreshToken == "" {
+		return "", session.FrontendOrigin, fmt.Errorf("no refresh token returned, please ensure offline_access scope is granted")
+	}
+
+	session.Config.AuthMode = AuthModeOutlookOAuth2
+	session.Config.OAuthRedirectURL = session.CallbackURL
+	session.Config.OAuthRefreshToken = token.RefreshToken
+	if err = s.SaveAuthorizedOutlookConfig(ctx, session.Config); err != nil {
+		return "", session.FrontendOrigin, err
+	}
+
+	return token.RefreshToken, session.FrontendOrigin, nil
+}
+
+func BuildOutlookOAuthPopupHTML(targetOrigin string, success bool, message string, refreshToken string) string {
+	payload := map[string]any{
+		"source":  "likedream-outlook-oauth",
+		"success": success,
+		"message": message,
+	}
+	if refreshToken != "" {
+		payload["refreshToken"] = refreshToken
+	}
+	jsonPayload, _ := json.Marshal(payload)
+
+	return fmt.Sprintf(`<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>Outlook OAuth</title>
+</head>
+<body>
+  <script>
+    (function () {
+      const payload = %s;
+      const targetOrigin = %q;
+      if (window.opener && targetOrigin) {
+        window.opener.postMessage(payload, targetOrigin);
+      }
+      document.body.innerText = payload.success ? '授权成功，窗口即将关闭。' : ('授权失败：' + payload.message);
+      setTimeout(function () { window.close(); }, 300);
+    })();
+  </script>
+</body>
+</html>`, string(jsonPayload), targetOrigin)
+}
+
+func BuildOutlookOAuthErrorHTML(message string) string {
+	return fmt.Sprintf(`<!doctype html>
+<html>
+<head><meta charset="utf-8" /><title>Outlook OAuth Error</title></head>
+<body>%s</body>
+</html>`, html.EscapeString(message))
+}
+
+func buildCallbackURL(base string) (string, error) {
+	return DefaultOutlookRedirectURL, nil
+}
+
+func newOutlookOAuthConfig(cfg EmailConfig, callbackURL string) *oauth2.Config {
+	cfg = NormalizeConfig(cfg)
+	return &oauth2.Config{
+		ClientID:     cfg.OAuthClientID,
+		ClientSecret: cfg.OAuthClientSecret,
+		RedirectURL:  callbackURL,
+		Scopes:       strings.Fields(cfg.OAuthScope),
+		Endpoint: oauth2.Endpoint{
+			AuthURL:  fmt.Sprintf("https://login.microsoftonline.com/%s/oauth2/v2.0/authorize", cfg.OAuthTenant),
+			TokenURL: fmt.Sprintf("https://login.microsoftonline.com/%s/oauth2/v2.0/token", cfg.OAuthTenant),
+		},
+	}
+}
@@ -111,30 +111,3 @@ func NewBalanceMigrateTemplateData(username, appName, copyright string, balance
 		MigrateURL: migrateURL,
 	}
 }
-
-// TemplateType 模板类型枚举
-type TemplateType string
-
-const (
-	TemplateTypeSignup           TemplateType = "signup"            // 注册模板
-	TemplateTypeTaskNotification TemplateType = "task_notification" // 任务通知模板
-	TemplateTypeResetPassword    TemplateType = "reset_password"    // 重置密码模板
-	TemplateTypeBalanceMigrate   TemplateType = "balance_migrate"   // 积分转移模板
-)
-
-// GetTemplatePath 获取模板文件路径
-func (t TemplateType) GetTemplatePath() string {
-	switch t {
-	case TemplateTypeSignup:
-		return "internal/service/email/templates/signup.gohtml"
-	case TemplateTypeTaskNotification:
-		return "internal/service/email/templates/task_notification.gohtml"
-	default:
-		return ""
-	}
-}
-
-// GetLayoutPath 获取布局模板路径
-func GetLayoutPath() string {
-	return "internal/service/email/templates/layout.gohtml"
-}
@@ -0,0 +1,50 @@
+{{- /*gotype: likedream-goframe/internal/service/email.BalanceMigrateTemplateData*/ -}}
+
+{{template "layout" .}}
+
+{{define "extra-styles"}}
+<style>
+    .balance-card {
+        border: 1px solid hsl(240 5.9% 90%);
+        border-radius: 8px;
+        padding: 20px;
+        text-align: center;
+        margin: 16px 0;
+        background: hsl(240 4.8% 95.9%);
+    }
+    .balance-label {
+        font-size: 13px;
+        color: hsl(240 3.8% 46.1%);
+        margin-bottom: 4px;
+    }
+    .balance-amount {
+        font-size: 28px;
+        font-weight: 700;
+        color: hsl(240 10% 3.9%);
+        letter-spacing: -0.025em;
+    }
+</style>
+{{end}}
+
+{{define "content"}}
+    <p>你好 <span class="user-badge">{{.Username}}</span>，</p>
+    <p>检测到你在旧系统中有积分余额，可以转移到新系统。</p>
+
+    <div class="balance-card">
+        <div class="balance-label">旧系统积分余额</div>
+        <div class="balance-amount">{{.Balance}}</div>
+    </div>
+
+    <div style="text-align: center; margin: 24px 0;">
+        <a href="{{.MigrateURL}}" class="btn-warning">转移积分</a>
+    </div>
+
+    <div class="link-text">{{.MigrateURL}}</div>
+
+    <div class="alert alert-warning">
+        <p><strong>注意事项</strong></p>
+        <p>• 转移后旧系统积分将清空，请确认后操作</p>
+        <p>• 每个账户仅可转移一次</p>
+        <p>• 链接有效期 24 小时</p>
+    </div>
+{{end}}
@@ -0,0 +1,189 @@
+{{- /*gotype: likedream-goframe/internal/service/email.BaseTemplateData*/ -}}
+{{define "layout"}}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{.Title}}</title>
+    <style>
+        * { margin: 0; padding: 0; box-sizing: border-box; }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+            line-height: 1.6;
+            color: hsl(240 10% 3.9%);
+            background: hsl(0 0% 96%);
+            padding: 40px 16px;
+        }
+
+        .container {
+            max-width: 560px;
+            margin: 0 auto;
+            background: hsl(0 0% 100%);
+            border-radius: 12px;
+            border: 1px solid hsl(240 5.9% 90%);
+            overflow: hidden;
+        }
+
+        .header {
+            padding: 32px 32px 24px;
+            border-bottom: 1px solid hsl(240 5.9% 90%);
+        }
+
+        .header-title {
+            font-size: 18px;
+            font-weight: 600;
+            letter-spacing: -0.025em;
+            color: hsl(240 10% 3.9%);
+        }
+
+        .header-desc {
+            font-size: 14px;
+            color: hsl(240 3.8% 46.1%);
+            margin-top: 4px;
+        }
+
+        .content {
+            padding: 24px 32px 32px;
+        }
+
+        .content p {
+            font-size: 14px;
+            line-height: 1.7;
+            margin-bottom: 16px;
+            color: hsl(240 3.8% 46.1%);
+        }
+
+        .content strong {
+            color: hsl(240 10% 3.9%);
+            font-weight: 500;
+        }
+
+        .user-badge {
+            display: inline-block;
+            font-weight: 600;
+            color: hsl(240 5.9% 10%);
+        }
+
+        .btn-primary {
+            display: inline-block;
+            padding: 10px 24px;
+            background: hsl(240 5.9% 10%);
+            color: hsl(0 0% 98%) !important;
+            text-decoration: none;
+            border-radius: 6px;
+            font-size: 14px;
+            font-weight: 500;
+            letter-spacing: -0.01em;
+            transition: opacity 0.2s;
+        }
+
+        .btn-destructive {
+            display: inline-block;
+            padding: 10px 24px;
+            background: hsl(0 84.2% 60.2%);
+            color: hsl(0 0% 98%) !important;
+            text-decoration: none;
+            border-radius: 6px;
+            font-size: 14px;
+            font-weight: 500;
+        }
+
+        .btn-warning {
+            display: inline-block;
+            padding: 10px 24px;
+            background: hsl(24.6 95% 53.1%);
+            color: hsl(0 0% 98%) !important;
+            text-decoration: none;
+            border-radius: 6px;
+            font-size: 14px;
+            font-weight: 500;
+        }
+
+        .link-text {
+            font-size: 12px;
+            color: hsl(240 3.8% 46.1%);
+            word-break: break-all;
+            background: hsl(240 4.8% 95.9%);
+            padding: 8px 12px;
+            border-radius: 6px;
+            margin-top: 12px;
+        }
+
+        .alert {
+            border-radius: 8px;
+            padding: 12px 16px;
+            font-size: 13px;
+            margin: 16px 0;
+            border: 1px solid;
+        }
+
+        .alert-info {
+            background: hsl(214 95% 97%);
+            border-color: hsl(214 82% 90%);
+            color: hsl(214 60% 40%);
+        }
+
+        .alert-warning {
+            background: hsl(48 96% 97%);
+            border-color: hsl(48 80% 85%);
+            color: hsl(32 60% 35%);
+        }
+
+        .alert-destructive {
+            background: hsl(0 86% 97%);
+            border-color: hsl(0 74% 90%);
+            color: hsl(0 60% 40%);
+        }
+
+        .alert p {
+            margin: 4px 0;
+            font-size: 13px;
+        }
+
+        .separator {
+            border: none;
+            border-top: 1px solid hsl(240 5.9% 90%);
+            margin: 20px 0;
+        }
+
+        .footer {
+            padding: 20px 32px;
+            text-align: center;
+            border-top: 1px solid hsl(240 5.9% 90%);
+            background: hsl(240 4.8% 95.9%);
+        }
+
+        .footer p {
+            font-size: 12px;
+            color: hsl(240 3.8% 46.1%);
+            margin: 2px 0;
+            line-height: 1.5;
+        }
+
+        @media (max-width: 640px) {
+            body { padding: 16px 8px; }
+            .header, .content { padding-left: 20px; padding-right: 20px; }
+            .footer { padding: 16px 20px; }
+        }
+    </style>
+    {{block "extra-styles" .}}{{end}}
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            <div class="header-title">{{.HeaderTitle}}</div>
+            {{if .AppName}}<div class="header-desc">{{.AppName}}</div>{{end}}
+        </div>
+        <div class="content">
+            {{block "content" .}}{{end}}
+        </div>
+        <div class="footer">
+            <p>{{.AppCopyright}}</p>
+            <p>这是一封自动发送的邮件，请勿直接回复。</p>
+        </div>
+    </div>
+</body>
+</html>
+{{end}}
@@ -0,0 +1,25 @@
+{{- /*gotype: likedream-goframe/internal/service/email.ResetPasswordTemplateData*/ -}}
+
+{{template "layout" .}}
+
+{{define "extra-styles"}}{{end}}
+
+{{define "content"}}
+    <p>你好 <span class="user-badge">{{.Username}}</span>，</p>
+    <p>我们收到了重置 <strong>{{.AppName}}</strong> 账户密码的请求。点击下方按钮设置新密码：</p>
+
+    <div style="text-align: center; margin: 24px 0;">
+        <a href="{{.ResetURL}}" class="btn-destructive">重置密码</a>
+    </div>
+
+    <div class="link-text">{{.ResetURL}}</div>
+
+    <div class="alert alert-info">
+        <p>⏰ 链接有效期为 1 小时。</p>
+    </div>
+
+    <div class="alert alert-destructive">
+        <p><strong>安全提醒</strong></p>
+        <p>如果这不是你本人的操作，请忽略此邮件，账户不会受到影响。</p>
+    </div>
+{{end}}
@@ -0,0 +1,23 @@
+{{- /*gotype: likedream-goframe/internal/service/email.SignupTemplateData*/ -}}
+
+{{template "layout" .}}
+
+{{define "extra-styles"}}{{end}}
+
+{{define "content"}}
+    <p>你好 <span class="user-badge">{{.Username}}</span>，</p>
+    <p>感谢注册 <strong>{{.AppName}}</strong>。请点击下方按钮完成邮箱验证：</p>
+
+    <div style="text-align: center; margin: 24px 0;">
+        <a href="{{.VerificationURL}}" class="btn-primary">验证邮箱</a>
+    </div>
+
+    <div class="link-text">{{.VerificationURL}}</div>
+
+    <div class="alert alert-info">
+        <p>⏰ 链接有效期为 24 小时，过期需重新注册。</p>
+    </div>
+
+    <hr class="separator">
+    <p>如有问题请联系技术支持。</p>
+{{end}}
@@ -0,0 +1,70 @@
+{{- /*gotype: likedream-goframe/internal/service/email.TaskNotificationTemplateData*/ -}}
+
+{{template "layout" .}}
+
+{{define "extra-styles"}}
+<style>
+    .task-card {
+        border: 1px solid hsl(240 5.9% 90%);
+        border-radius: 8px;
+        overflow: hidden;
+        margin: 16px 0;
+    }
+    .task-card-header {
+        padding: 12px 16px;
+        background: hsl(240 4.8% 95.9%);
+        border-bottom: 1px solid hsl(240 5.9% 90%);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .task-card-header span {
+        font-size: 14px;
+        font-weight: 500;
+        color: hsl(240 10% 3.9%);
+    }
+    .status-tag {
+        display: inline-block;
+        padding: 2px 10px;
+        border-radius: 9999px;
+        font-size: 12px;
+        font-weight: 500;
+    }
+    .task-card-body {
+        padding: 0;
+    }
+    .detail-row {
+        display: flex;
+        justify-content: space-between;
+        padding: 10px 16px;
+        font-size: 13px;
+        border-bottom: 1px solid hsl(240 5.9% 90%);
+    }
+    .detail-row:last-child { border-bottom: none; }
+    .detail-key { color: hsl(240 3.8% 46.1%); }
+    .detail-val { color: hsl(240 10% 3.9%); font-weight: 500; }
+</style>
+{{end}}
+
+{{define "content"}}
+    <div class="task-card">
+        <div class="task-card-header">
+            <span>{{.TaskName}}</span>
+            <span class="status-tag" style="background: {{.Status.GetStatusColor}}20; color: {{.Status.GetStatusColor}};">{{.StatusText}}</span>
+        </div>
+        {{if .Details}}
+        <div class="task-card-body">
+            {{range $key, $value := .Details}}
+            <div class="detail-row">
+                <span class="detail-key">{{$key}}</span>
+                <span class="detail-val">{{$value}}</span>
+            </div>
+            {{end}}
+        </div>
+        {{end}}
+    </div>
+
+    <div class="alert alert-info">
+        <p>如需查看更多详情，请登录系统查看任务执行记录。</p>
+    </div>
+{{end}}
@@ -270,6 +270,9 @@ func (s *UserInfoServiceV1) RequestBalanceMigrate(ctx context.Context, req *v1.R
 	}

 	// 查询旧系统数据库中是否存在该邮箱的用户
+	if db.GlobalGorm == nil {
+		return utils.SuccessWithMsg("如果该邮箱在旧系统中存在积分，转移链接已发送")
+	}
 	var oldUser AspNetUser
 	err := db.GlobalGorm.Table("AspNetUsers").Where("email = ?", oldSystemEmail).First(&oldUser).Error
 	if err != nil {
@@ -343,6 +346,9 @@ func (s *UserInfoServiceV1) BalanceMigrate(ctx context.Context, req *v1.BalanceM
 	}

 	// 查询旧系统用户
+	if db.GlobalGorm == nil {
+		return utils.FailParam("旧系统数据库未连接")
+	}
 	var oldUser AspNetUser
 	err := db.GlobalGorm.Table("AspNetUsers").Where("email = ?", oldSystemEmail).First(&oldUser).Error
 	if err != nil {
@@ -54,6 +54,11 @@ func (s *UserLoginServiceV1) Register(ctx context.Context, req *v1.UserRegisterR
 		return utils.FailParam("系统当前不允许注册")
 	}

+	// 检查是否必须邀请码
+	if s.IsInviteCodeRequired(ctx) && req.InviteCode == "" {
+		return utils.FailParam("注册需要邀请码")
+	}
+
 	//邀请码查询
 	var parent *ent.SysUser
 	if req.InviteCode != "" {
@@ -277,3 +282,16 @@ func (s *UserLoginServiceV1) IsRegistrationAllowed(ctx context.Context) bool {
 	// 检查配置值，"true" 或 "1" 表示允许注册
 	return config.Value == "true" || config.Value == "1"
 }
+
+// IsInviteCodeRequired 检查是否必须邀请码
+func (s *UserLoginServiceV1) IsInviteCodeRequired(ctx context.Context) bool {
+	config, err := db.Global.SysConfig.Query().
+		Where(sysconfig.KeyEQ(cst2.ConfigSystemRequireInviteCode)).
+		Only(ctx)
+
+	if err != nil {
+		return false
+	}
+
+	return config.Value == "true" || config.Value == "1"
+}
@@ -11,6 +11,7 @@ import (
 // 如果任务的执行时间为nil，则返回 math.MaxInt64
 // 如果任务的执行时间不为nil，则返回下次执行时间的Unix时间
 // 注意：如果任务的执行时间在当前时间之前，则返回明天的执行时间
+// 同时考虑 execute_days（周几执行），跳过不在执行日的日期
 func GetCpdailyNextExecuteTime(task *ent.CpTask) int64 {
 	executeHour, executeMinute := task.ExecuteHour, task.ExecuteMinute
 	if executeHour == nil || executeMinute == nil {
@@ -18,15 +19,41 @@ func GetCpdailyNextExecuteTime(task *ent.CpTask) int64 {
 	}
 	current := time.Now().In(cst.TimeZoneShangHai)

-	// 如果当天执行时间未过，返回当天执行时间
-	if current.Hour() < *executeHour || (current.Hour() == *executeHour && current.Minute() < *executeMinute) {
-		executeTime := time.Date(current.Year(), current.Month(), current.Day(), *executeHour, *executeMinute, 0, 0, cst.TimeZoneShangHai)
-		return executeTime.Unix()
+	// 先确定候选日期：如果当天时间未过用当天，否则从明天开始
+	candidate := time.Date(current.Year(), current.Month(), current.Day(), *executeHour, *executeMinute, 0, 0, cst.TimeZoneShangHai)
+	if !current.Before(candidate) {
+		candidate = candidate.AddDate(0, 0, 1)
 	}

-	// 如果当天执行时间已过，返回明天的执行时间
-	executeTime := time.Date(current.Year(), current.Month(), current.Day(), *executeHour, *executeMinute, 0, 0, cst.TimeZoneShangHai)
-	executeTime = executeTime.AddDate(0, 0, 1)
+	// 如果没有设置 execute_days 或为空，视为每天执行
+	if len(task.ExecuteDays) == 0 {
+		return candidate.Unix()
+	}

-	return executeTime.Unix()
+	// 构建快速查找 set
+	daySet := make(map[int]bool, len(task.ExecuteDays))
+	for _, d := range task.ExecuteDays {
+		daySet[d] = true
+	}
+
+	// 最多查找7天，找到第一个匹配的执行日
+	for i := 0; i < 7; i++ {
+		weekday := isoWeekday(candidate)
+		if daySet[weekday] {
+			return candidate.Unix()
+		}
+		candidate = candidate.AddDate(0, 0, 1)
+	}
+
+	// 理论上不会到这里（7天内必有匹配），兜底返回
+	return math.MaxInt64
+}
+
+// isoWeekday 返回 ISO 星期几：周一=1, 周日=7
+func isoWeekday(t time.Time) int {
+	d := int(t.Weekday())
+	if d == 0 {
+		return 7 // Sunday
+	}
+	return d
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
becomer	d454ecc7cf	fix: 无历史时保底使用管理员配置的签到范围信息 ci/woodpecker/tag/build Pipeline was successful Details - 有历史签到数据 → 优先使用历史中的真实地址和经纬度 - 无历史签到数据 → 保底从 signPlaceSelected 提取管理员配置的范围信息	2026-07-04 01:04:10 +08:00
becomer	7ede964c4c	fix: 未签到任务表单中地址和经纬度仍错误使用管理员配置数据 ci/woodpecker/tag/build Pipeline was successful Details - ParseFormJson: 完全移除 signPlaceSelected 提取（始终是管理员范围数据） - ParseFormJson: 将 longitude/latitude/position/signAddress 提取全部包进 if hasHistory - QueryFormByTitle: 已签到（相同 instanceWid）时将自身 rows 设为 historyRows - 确保无历史数据的未签到任务不会错误显示管理员范围名称（如"7"）	2026-07-04 00:59:33 +08:00
becomer	4b50af3ae0	fix: woodpecker 只应在推送 tag 时触发，移除 push event	2026-07-04 00:51:27 +08:00
becomer	65293c4f81	fix: 编辑表单时签到地址错误显示为管理员范围名称的问题 ci/woodpecker/push/build Pipeline was successful Details ci/woodpecker/tag/build Pipeline was successful Details 当任务没有历史已签到数据时，ParseFormJson 中 histRows 回退到 rows （当前任务定义），此时 signPlaceSelected 包含的是管理员后台圈定范围的数据（范围名称如"7"），而不是用户实际签到地址。修复： 1. ParseFormJson: 只有有实际历史数据（historyRows 存在）时才从 signPlaceSelected 提取地址/经纬度，否则跳过 2. QueryFormByTitle: 当前任务自身已签到时，不再将自身 rows 作为 historyRows，让逻辑正常从历史月份查找其他已签到实例	2026-07-04 00:48:58 +08:00
becomer	a41341e732	fix: 修复历史任务经纬度/地址获取到的是教师边界坐标而非用户历史提交数据的问题 ci/woodpecker/tag/build Pipeline was successful Details ci/woodpecker/push/build Pipeline was successful Details - sign.go: 移除 signInstanceWid 比较限制，当已签到任务与当前任务是同一实例时，直接复用已有详情数据作为历史数据，确保 ParseFormJson 能从 signPlaceSelected 提取用户真实坐标 - sleepcheck.go: 移除 if !isFromSigned 守卫条件，无论当前任务是否已签到都尝试获取历史数据	2026-07-02 00:36:42 +08:00
becomer	ecfa50359b	fix: add X-Api-Key header for captcha OCR requests ci/woodpecker/push/build Pipeline was canceled Details ci/woodpecker/tag/build Pipeline was successful Details The captcha OCR service now requires X-Api-Key authentication. Add captcha.apiKey config option and pass it as header in all OCR-related API calls (ocr, semiOcr, calc).	2026-07-01 20:22:03 +08:00
becomer	2879336ce4	feat: make PostgreSQL connection optional ci/woodpecker/push/build Pipeline was successful Details Remove hard requirement on PG database (likedream-pg container). PG is now only initialized when dsn2 is configured; skip gracefully when empty. Add nil-safety checks on GlobalGorm references in balance migration logic. Remove dsn2 from default config.	2026-07-01 14:08:36 +08:00
becomer	f706968618	fix: force-remove temp container in cleanup step ci/woodpecker/push/build Pipeline was successful Details ci/woodpecker/tag/build Pipeline was successful Details	2026-07-01 12:49:10 +08:00
becomer	69e198f745	fix: use wget instead of curl for health check ci/woodpecker/push/build Pipeline was successful Details The 'docker' CLI image does not include curl binary, causing the health check to always fail. Switch to wget.	2026-07-01 12:47:05 +08:00
becomer	70f907d909	fix: replace shell ${VAR} with $VAR to avoid Woodpecker pre-processing ci/woodpecker/push/build Pipeline failed Details Woodpecker interprets ${...} as its own template syntax and strips unrecognized variables. Using $VAR (no braces) passes through to bash.	2026-07-01 12:43:56 +08:00
becomer	3a3d17e9b4	feat: blue-green zero-downtime deploy via 1Panel ci/woodpecker/push/build Pipeline failed Details - Set up 1Panel website tianshen.eu.cc (HTTP 80, ready for HTTPS) - /api/* → likedream-go with prefix stripping - /* → likedream-web (Caddy, port 3080) - Blue-green deployment: start on standby port → switch proxy → stop old → switch back - Nginx reload is hot (zero connection drops) - Detects current active port from proxy config automatically	2026-07-01 12:40:01 +08:00
becomer	d560c9f678	fix: override clone remote to local Gitea URL ci/woodpecker/push/build Pipeline is running Details ci/woodpecker/tag/build Pipeline was successful Details Add clone.git.settings.remote in .woodpecker/build.yml to use fast local clone (http://10.10.10.128:3000) instead of external Cloudflare-proxied URL (https://git.xsvb.cn) for tag builds.	2026-07-01 01:09:16 +08:00
becomer	7a9b49794c	chore: retry with correct clone URL ci/woodpecker/push/build Pipeline was successful Details ci/woodpecker/tag/build Pipeline is running Details	2026-07-01 00:56:01 +08:00
becomer	e3f8dc8aac	fix: set GOPROXY to goproxy.cn for Go module downloads ci/woodpecker/push/build Pipeline was successful Details ci/woodpecker/tag/build Pipeline is running Details proxy.golang.org is not reachable from this server; use goproxy.cn mirror.	2026-07-01 00:39:04 +08:00
becomer	1228c30a75	chore: trigger ci with new forge url config ci/woodpecker/push/build Pipeline failed Details	2026-07-01 00:30:25 +08:00
becomer	4762e71308	fix: replace tags filter with branch filter in when clause ci/woodpecker/push/build Pipeline is running Details ci/woodpecker/tag/build Pipeline was canceled Details Woodpecker v3 does not support `tags` in the when clause; use `branch` with glob patterns instead for matching tag events.	2026-07-01 00:02:44 +08:00
becomer	2082ee3e68	ci: support tag-triggered pipelines with versioned Docker images - Allow triggering on v* tags in addition to pushes to main/master - Tag Docker images with CI_COMMIT_TAG when triggered by a tag	2026-07-01 00:01:56 +08:00
becomer	10cb7d7ac6	ci: 添加 Woodpecker CI/CD 流水线 - 构建 Docker 镜像并推送 - 自动部署到本地 Docker - 配置文件和网络管理	2026-06-30 23:51:01 +08:00
sugarBecomer	261153067c	✨ 后端支持统计返回任务ID + 列表按ID筛选 1. TaskStatisticsV2Item 新增 successTaskIds/failTaskIds/pendingTaskIds 字段 2. GetTaskStatisticsV2 返回每日对应的任务ID列表 3. CpTaskListReq 新增 ids 参数，List 方法支持按ID列表筛选	2026-04-24 12:32:54 +08:00
sugarBecomer	19a13a0ad2	✨ 后端新增修改任务标题接口新增 PUT /task/title/{id} 接口，支持修改今日校园任务标题	2026-04-23 10:41:40 +08:00
sugarBecomer	5d7f79a619	🐛 修改域名	2026-04-07 14:37:12 +08:00
sugarBecomer	0934994f51	🐛 修复邮件问题	2026-03-27 16:12:35 +08:00
sugarBecomer	ef61d405ba	🐛 更新golang版本	2026-03-27 15:32:24 +08:00
sugarBecomer	60165e4851	🐛 请假问题	2026-03-27 00:38:15 +08:00
sugarBecomer	39cb44bc22	✨ graph api发送邮件	2026-03-26 15:19:51 +08:00
sugarBecomer	9fa83657e3	✨ graph api发送邮件	2026-03-26 15:19:43 +08:00
sugarBecomer	5a244c329e	✨ smtp服务	2026-03-26 11:37:38 +08:00
sugarBecomer	93f696d4df	✨ 新增是否必填邀请码	2026-03-25 14:49:11 +08:00
sugarBecomer	988cc7be6f	✨ 请假功能	2026-03-25 13:57:15 +08:00
sugarBecomer	b890929d0b	✨ 请假功能	2026-03-25 13:47:11 +08:00
sugarBecomer	adbf885d95	🐛 调整两个版本邮件格式	2026-03-24 22:27:32 +08:00
sugarBecomer	99c58a3d5f	🐛 调整两个版本邮件格式	2026-03-24 22:13:02 +08:00
sugarBecomer	c89f7e9bbb	🐛 调整dockerfile问题	2026-03-24 19:43:57 +08:00
sugarBecomer	a6babba00d	🐛 适配新版ui	2026-03-24 19:36:16 +08:00
sugarBecomer	4c7bc950c7	🐛 调整定时任务时间	2026-03-16 13:29:39 +08:00
sugarBecomer	b857d55e25	🐛 漏掉的文件	2026-03-16 12:14:05 +08:00
sugarBecomer	ca20be8b7e	🐛 学校信息缓存	2026-03-16 11:20:19 +08:00
sugarBecomer	ce98ce4afe	🐛 授权方式修复	2026-03-13 21:37:35 +08:00
sugarBecomer	c65318c545	🐛 修复短信登录	2026-03-13 21:21:09 +08:00
sugarBecomer	63b91629fa	:bug 修复问题	2026-03-13 18:04:15 +08:00
sugarBecomer	658a9c2b3e	🐛 图片预览	2026-03-12 08:07:33 +08:00
sugarBecomer	60789ded9d	调整golang版本	2026-03-12 00:01:13 +08:00
sugarBecomer	7d8998d83f	🐛 修复淮南联合大学登录功能	2026-03-11 21:11:50 +08:00
sugarBecomer	8974bd26a5	🐛 修复淮南联合大学登录功能	2025-12-27 14:36:33 +08:00
sugarBecomer	6f25652183	🐛 修复淮南联合大学登录功能	2025-12-27 14:36:16 +08:00
sugarBecomer	a8f4a2afa6	🐛 修复学习通刷课问题	2025-12-22 17:25:51 +08:00