Merge pull request 'v1.0.25' (#35) from dev into master

Reviewed-on: #35

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.imyeyu.timiserverapi</groupId>
 	<artifactId>TimiServerAPI</artifactId>
-	<version>1.0.17</version>
+	<version>1.0.25</version>
 	<packaging>jar</packaging>
 	<name>TimiServerAPI</name>
 	<description>imyeyu.com API</description>
@@ -205,10 +205,15 @@
 			<artifactId>timi-utils</artifactId>
 			<version>0.0.13</version>
 		</dependency>
+		<dependency>
+			<groupId>me.majiajie</groupId>
+			<artifactId>tinypinyin</artifactId>
+			<version>2.0.3</version>
+		</dependency>
 		<dependency>
 			<groupId>com.imyeyu.font.icon</groupId>
 			<artifactId>timi-icon-font</artifactId>
-			<version>0.0.1</version>
+			<version>0.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -236,9 +241,13 @@
 			<artifactId>flyway-mysql</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.e2ins.ms.notify</groupId>
+			<groupId>com.tencentcloudapi</groupId>
-			<artifactId>e2ins-msg-notify-service-sdk</artifactId>
+			<artifactId>tencentcloud-sdk-java-sms</artifactId>
-			<version>0.0.9</version>
+			<version>3.1.1281</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-mail</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/imyeyu/api/bean/CorePermissionCode.java

@@ -55,6 +55,11 @@ public enum CorePermissionCode implements BuiltinPermissionCode {
 	FEEDBACK_UPDATE("FEEDBACK:UPDATE", "反馈修改", false, true),
 	FEEDBACK_DELETE("FEEDBACK:DELETE", "反馈删除", false, true),
 
+	NOTIFY_CREATE("NOTIFY:CREATE", "通知创建", false, true),
+	NOTIFY_READ("NOTIFY:READ", "通知读取", false, true),
+	NOTIFY_DELETE("NOTIFY:DELETE", "通知删除", false, true),
+	NOTIFY_CANCEL("NOTIFY:CANCEL", "通知取消", false, true),
+
 	USER_ROLE_CREATE("USER_ROLE:CREATE", "用户角色创建", true, true),
 	USER_ROLE_READ("USER_ROLE:READ", "用户角色读取", true, true),
 	USER_ROLE_DELETE("USER_ROLE:DELETE", "用户角色删除", true, true);

src/main/java/com/imyeyu/api/config/BeanConfig.java

@@ -1,12 +1,9 @@
 package com.imyeyu.api.config;
 
-import com.e2ins.ms.notify.SmsNotifyService;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.imyeyu.utils.Time;
@@ -32,12 +29,6 @@ public class BeanConfig {
 		                 .build();
 	}
 
-	@Bean
-	public SmsNotifyService smsNotifyService() {
-		// TODO
-		return new SmsNotifyService(null, null);
-	}
-
 	@Bean
 	public Yaml yaml() {
 		return new Yaml();

src/main/java/com/imyeyu/api/modules/common/bean/attachment/Metadata.java

@@ -1,48 +0,0 @@
-package com.imyeyu.api.modules.common.bean.attachment;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author 夜雨
- * @since 2025-12-11 18:14
- */
-public class Metadata {
-
-	/**
-	 * 图片
-	 *
-	 * @author 夜雨
-	 * @since 2025-12-11 18:15
-	 */
-	@Data
-	public static class Image {
-
-		private int width;
-
-		private int height;
-	}
-
-	/**
-	 * 缩略图
-	 *
-	 * @author 夜雨
-	 * @since 2026-01-04 18:10
-	 */
-	@Data
-	@EqualsAndHashCode(callSuper = true)
-	public static class ThumbImage extends Image {
-
-		private String sourceId;
-
-		private String sourceMongoId;
-
-		private String sourceMimeType;
-
-		/** 请求宽度（缓存键之一，null 表示未指定） */
-		private Integer requestWidth;
-
-		/** 请求高度（缓存键之一，null 表示未指定） */
-		private Integer requestHeight;
-	}
-}

src/main/java/com/imyeyu/api/modules/common/bean/attachment/ThumbnailFitMode.java

@@ -0,0 +1,17 @@
+package com.imyeyu.api.modules.common.bean.attachment;
+
+/// 缩略图缩放模式
+///
+/// @author 夜雨
+/// @since 2026-08-21
+public enum ThumbnailFitMode {
+
+	/// 保持比例完整放入目标尺寸
+	FIT,
+
+	/// 保持比例裁剪填满目标尺寸
+	COVER,
+
+	/// 强制缩放到目标尺寸，可能导致图片变形
+	STRETCH
+}

src/main/java/com/imyeyu/api/modules/common/config/NotifyQueueConfig.java

@@ -0,0 +1,81 @@
+package com.imyeyu.api.modules.common.config;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/// 通知消息队列配置
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "notify.queue")
+public class NotifyQueueConfig {
+
+	private Mail mail = new Mail();
+
+	private Sms sms = new Sms();
+
+	private Wechat wechat = new Wechat();
+
+	private HTTP http = new HTTP();
+
+	/// 邮件队列配置
+	@Data
+	@EqualsAndHashCode(callSuper = true)
+	public static class Mail extends Queue {
+
+		private String defaultFrom;
+	}
+
+	/// 短信队列配置
+	@Data
+	@EqualsAndHashCode(callSuper = true)
+	public static class Sms extends Queue {
+
+		private String appId;
+
+		private String sign;
+
+		private String secretId;
+
+		private String secretKey;
+
+		private Captcha captcha;
+
+		/// 短信验证码
+		@Data
+		public static class Captcha {
+
+			private String templateId;
+
+			private int ttlMinute;
+
+			private int argIndex;
+		}
+	}
+
+	/// 微信队列配置
+	@Data
+	@EqualsAndHashCode(callSuper = true)
+	public static class Wechat extends Queue {
+	}
+
+	/// HTTP 队列配置
+	@Data
+	@EqualsAndHashCode(callSuper = true)
+	public static class HTTP extends Queue {
+	}
+
+	/// 通用队列配置
+	@Data
+	public static class Queue {
+
+		/// true 为启用
+		private boolean enable;
+
+		private String cron = "0/30 * * * * ?";
+	}
+}

src/main/java/com/imyeyu/api/modules/common/controller/AttachmentController.java

@@ -1,7 +1,9 @@
 package com.imyeyu.api.modules.common.controller;
 
 import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.api.modules.common.bean.attachment.ThumbnailFitMode;
 import com.imyeyu.api.modules.common.service.AttachmentService;
+import com.imyeyu.api.modules.common.service.AttachmentVariantService;
 import com.imyeyu.api.modules.common.service.TempFileService;
 import com.imyeyu.api.modules.common.vo.attach.TempFileResp;
 import com.imyeyu.java.TimiJava;
@@ -41,6 +43,7 @@ public class AttachmentController {
 
 	private final TempFileService tempFileService;
 	private final AttachmentService service;
+	private final AttachmentVariantService variantService;
 
 	/**
 	 * 查询附件详情
@@ -184,14 +187,19 @@ public class AttachmentController {
 	@AOPLog
 	@IgnoreGlobalReturn
 	@GetMapping({"/read/{id}", "/download/{id}"})
-	public void readById(@PathVariable String id, @RequestParam(required = false) Integer thumbWidth, @RequestParam(required = false) Integer thumbHeight) throws UnsupportedEncodingException {
+	public void readById(
+		@PathVariable String id,
+		@RequestParam(required = false) Integer thumbWidth,
+		@RequestParam(required = false) Integer thumbHeight,
+		@RequestParam(defaultValue = "FIT") ThumbnailFitMode fitMode
+	) throws UnsupportedEncodingException {
 		HttpServletResponse resp = TimiSpring.getResponse();
 		Attachment attach = service.get(id);
 		if (attach == null) {
 			resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
 			return;
 		}
-		responseAttachment(attach, thumbWidth, thumbHeight);
+		responseAttachment(attach, thumbWidth, thumbHeight, fitMode);
 	}
 
 	@AOPLog
@@ -207,21 +215,31 @@ public class AttachmentController {
 	public void read(@RequestParam String id) throws UnsupportedEncodingException {
 		HttpServletResponse resp = TimiSpring.getResponse();
 		Attachment attach = service.get(id);
+		if (attach == null) {
+			resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+			return;
+		}
 		if (TimiSpring.getRequest().getRequestURI().endsWith("/download")) {
 			resp.setHeader("Content-Disposition", Network.getFileDownloadHeader(attach.getName()));
 		}
-		response(attach);
+		response(attach, false);
 	}
 
-	private void responseAttachment(Attachment attach, Integer thumbWidth, Integer thumbHeight) throws UnsupportedEncodingException {
+	private void responseAttachment(
-		HttpServletResponse resp = TimiSpring.getResponse();
+		Attachment attach,
-		if (attach != null && TimiSpring.getRequest().getRequestURI().endsWith("/download") && attach.getName() != null) {
+		Integer thumbWidth,
-			resp.setHeader("Content-Disposition", Network.getFileDownloadHeader(attach.getName()));
+		Integer thumbHeight,
-		}
+		ThumbnailFitMode fitMode
-		responseThumb(attach, thumbWidth, thumbHeight);
+	) throws UnsupportedEncodingException {
+		responseThumb(attach, thumbWidth, thumbHeight, fitMode);
 	}
 
-	protected void responseThumb(Attachment attachment, Integer thumbWidth, Integer thumbHeight) {
+	protected void responseThumb(
+		Attachment attachment,
+		Integer thumbWidth,
+		Integer thumbHeight,
+		ThumbnailFitMode fitMode
+	) throws UnsupportedEncodingException {
 		HttpServletResponse resp = TimiSpring.getResponse();
 		if (TimiJava.isEmpty(attachment)) {
 			resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
@@ -229,21 +247,65 @@ public class AttachmentController {
 		}
 		if (thumbWidth == null && thumbHeight == null) {
 			// 原图
+			setDownloadHeader(attachment);
 			response(attachment);
 			return;
 		}
 		// 缩略图
-		Attachment thumb = service.fetchThumb(attachment, thumbWidth, thumbHeight);
+		Attachment thumb = variantService.fetchThumb(attachment, thumbWidth, thumbHeight, fitMode);
-		response(TimiJava.defaultIfNull(thumb, attachment));
+		setDownloadHeader(thumb);
+		response(thumb);
+	}
+
+	private void setDownloadHeader(Attachment attachment) throws UnsupportedEncodingException {
+		if (attachment != null && TimiSpring.getRequest().getRequestURI().endsWith("/download") && attachment.getName() != null) {
+			TimiSpring.getResponse().setHeader("Content-Disposition", Network.getFileDownloadHeader(attachment.getName()));
+		}
+	}
+
+	/// 设置附件缓存头并处理条件请求
+	///
+	/// @param attachment 实际响应附件
+	/// @return true 表示客户端缓存仍有效，已返回 304
+	private boolean responseCache(Attachment attachment) {
+		HttpServletResponse resp = TimiSpring.getResponse();
+		resp.setHeader("Cache-Control", "private, no-cache");
+		String md5 = attachment.getMd5();
+		if (md5 == null || md5.isBlank()) {
+			return false;
+		}
+		String etag = "\"%s\"".formatted(md5);
+		resp.setHeader("ETag", etag);
+		String ifNoneMatch = TimiSpring.getHeader("If-None-Match");
+		if (ifNoneMatch == null) {
+			return false;
+		}
+		for (String value : ifNoneMatch.split(",")) {
+			String candidate = value.trim();
+			if ("*".equals(candidate) || etag.equals(candidate) || ("W/" + etag).equals(candidate)) {
+				resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+				return true;
+			}
+		}
+		return false;
 	}
 
 	protected void response(Attachment attachment) {
+		response(attachment, true);
+	}
+
+	private void response(Attachment attachment, boolean cacheable) {
 		HttpServletResponse resp = TimiSpring.getResponse();
 		try {
 			if (TimiJava.isEmpty(attachment)) {
 				resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
 				return;
 			}
+			if (!cacheable) {
+				resp.setHeader("Cache-Control", "private, no-store");
+			} else if (responseCache(attachment)) {
+				return;
+			}
 			resp.setContentType(attachment.getMimeType());
 			attachment.doResponse();
 		} catch (Exception e) {

src/main/java/com/imyeyu/api/modules/common/controller/FeedbackController.java

@@ -36,21 +36,19 @@ public class FeedbackController {
 
 	/// 提交反馈。登录用户和匿名用户均需提交图形验证码，匿名用户按 IP 限流
 	///
-	/// @param req 带图形验证码的反馈请求
+	/// @param captchaData 带图形验证码的反馈请求
-	/// @return 已创建反馈
 	@AOPLog
 	@JsonView(ResponseView.Public.class)
 	@CaptchaValid
 	@RequestRateLimit(value = 3, inSeconds = 60)
-	@PostMapping("/submit")
+	@PostMapping("/create")
-	public Feedback submit(@RequestBody @Valid CaptchaData<Feedback> req) {
+	public void create(@RequestBody @Valid CaptchaData<Feedback> captchaData) {
-		Feedback feedback = req.getData();
+		Feedback feedback = captchaData.getData();
 		feedback.setIp(TimiSpring.getRequestIP());
-		if (userLoginService.getLoginUser() != null) {
+		if (userLoginService.isLogged()) {
-			feedback.setUserId(userLoginService.getLoginUser().getId());
+			feedback.setUserId(userLoginService.getRequireLoginUserId());
 		}
 		service.create(feedback);
-		return feedback;
 	}
 
 	/// 查询反馈列表
@@ -77,20 +75,6 @@ public class FeedbackController {
 		return service.get(id);
 	}
 
-	/// 后台创建反馈
-	///
-	/// @param feedback 反馈
-	/// @return 反馈
-	@AOPLog
-	@JsonView(ResponseView.Admin.class)
-	@RequestRateLimit
-	@RequireCorePermission(CorePermissionCode.FEEDBACK_CREATE)
-	@PostMapping("/create")
-	public Feedback create(@RequestBody Feedback feedback) {
-		service.create(feedback);
-		return feedback;
-	}
-
 	/// 更新反馈
 	///
 	/// @param feedback 反馈

src/main/java/com/imyeyu/api/modules/common/controller/NotifyController.java

@@ -0,0 +1,189 @@
+package com.imyeyu.api.modules.common.controller;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import com.imyeyu.api.annotation.RequireCorePermission;
+import com.imyeyu.api.bean.CorePermissionCode;
+import com.imyeyu.api.modules.common.entity.Notify;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.service.NotifyDetailService;
+import com.imyeyu.api.modules.common.service.NotifyService;
+import com.imyeyu.api.modules.common.service.SmsService;
+import com.imyeyu.api.modules.user.entity.User;
+import com.imyeyu.api.modules.user.service.UserLoginService;
+import com.imyeyu.api.modules.user.service.UserService;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.spring.annotation.AOPLog;
+import com.imyeyu.spring.annotation.CaptchaValid;
+import com.imyeyu.spring.annotation.RequestRateLimit;
+import com.imyeyu.spring.annotation.RequiredToken;
+import com.imyeyu.spring.bean.CaptchaData;
+import com.imyeyu.spring.bean.Page;
+import com.imyeyu.spring.bean.PageResult;
+import com.imyeyu.spring.util.ResponseView;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/// 通知接口
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/notify")
+public class NotifyController {
+
+
+	private final SmsService smsService;
+	private final UserService userService;
+	private final NotifyService service;
+	private final UserLoginService userLoginService;
+	private final NotifyDetailService detailService;
+
+	/// 创建通知，同时创建通知详情
+	///
+	/// @param notify 通知及通知详情
+	/// @return 创建后的通知
+	@RequireCorePermission(CorePermissionCode.NOTIFY_CREATE)
+	@RequiredToken
+	@PostMapping("/create")
+	public Notify create(@RequestBody Notify notify) {
+		service.create(notify);
+		return notify;
+	}
+
+	/// 查询通知详情
+	///
+	/// @param id 通知 ID
+	/// @return 通知及通知详情
+	@JsonView(ResponseView.Public.class)
+	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
+	@RequiredToken
+	@RequestMapping("/detail")
+	public Notify detail(@RequestParam String id) {
+		Notify notify = service.get(id);
+		{
+			List<NotifyDetail> detailList = detailService.listByNotifyId(id);
+			Set<String> userIdSet = detailList.stream()
+			                                  .filter(item -> item.getMsgType() == NotifyDetail.MsgType.INTERNAL)
+			                                  .flatMap(item -> Stream.of(item.getSendFrom(), item.getSendTo()))
+			                                  .collect(Collectors.toSet());
+			Map<String, User> userMap = userService.mapByIdList(userIdSet);
+			for (NotifyDetail detail : detailList) {
+				if (TimiJava.isNotEmpty(detail.getSendFrom())) {
+					detail.setFromUser(userMap.get(detail.getSendFrom()));
+				}
+				if (TimiJava.isNotEmpty(detail.getSendTo())) {
+					detail.setToUser(userMap.get(detail.getSendTo()));
+				}
+			}
+			notify.setDetailList(detailList);
+		}
+		return notify;
+	}
+
+	/// 删除通知及其通知详情
+	///
+	/// @param id 通知 ID
+	@RequireCorePermission(CorePermissionCode.NOTIFY_DELETE)
+	@RequiredToken
+	@PostMapping("/delete")
+	public void delete(@RequestParam String id) {
+		service.delete(id);
+	}
+
+	/// 取消尚未成功发送的通知详情
+	///
+	/// @param id 通知 ID
+	@RequireCorePermission(CorePermissionCode.NOTIFY_CANCEL)
+	@RequiredToken
+	@PostMapping("/cancel")
+	public void cancel(@RequestParam String id) {
+		service.cancel(id);
+	}
+
+	@AOPLog
+	@CaptchaValid
+	@RequestRateLimit(value = 1, inSeconds = 59)
+	@PostMapping("/sms/captcha/create")
+	public String smsCaptchaCreate(@RequestBody CaptchaData<Notify> req) {
+		return smsService.captchaCreate(req.getData());
+	}
+
+	/// 查询当前用户的站内通知
+	///
+	/// @param page 分页参数
+	/// @param unreadOnly true 为只查询未读通知
+	/// @return 站内通知分页结果
+	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
+	@RequiredToken
+	@PostMapping("/internal/internal")
+	public PageResult<NotifyDetail> listInternal(
+		@RequestBody(required = false) Page<NotifyDetail> page,
+		@RequestParam(defaultValue = "false") boolean unreadOnly
+	) {
+		return detailService.pageInternalByUserId(page, userLoginService.getRequireLoginUserId(), unreadOnly);
+	}
+
+	@JsonView(ResponseView.Public.class)
+	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
+	@RequiredToken
+	@PostMapping("/internal/detail")
+	public NotifyDetail internalDetail(@RequestParam String id) {
+		NotifyDetail detail = detailService.getInternalByUserId(id, userLoginService.getRequireLoginUserId());
+		if (TimiJava.isNotEmpty(detail.getSendFrom())) {
+			detail.setFromUser(userService.get(detail.getSendFrom()));
+		}
+		if (TimiJava.isNotEmpty(detail.getSendTo())) {
+			detail.setToUser(userService.get(detail.getSendTo()));
+		}
+		return detail;
+	}
+
+	/// 删除当前用户的一条站内通知
+	///
+	/// @param id 通知详情 ID
+	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
+	@RequiredToken
+	@PostMapping("/internal/delete")
+	public void deleteInternal(@RequestParam String id) {
+		detailService.deleteInternalByUserId(id, userLoginService.getRequireLoginUserId());
+	}
+
+	/// 查询当前用户未读通知数量
+	///
+	/// @return 未读通知数量
+	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
+	@RequiredToken
+	@PostMapping("/internal/unread/count")
+	public long countUnreadSite() {
+		return detailService.countUnreadSiteByUserId(userLoginService.getRequireLoginUserId());
+	}
+
+	/// 标记当前用户的一条站内通知已读
+	///
+	/// @param id 通知详情 ID
+	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
+	@RequiredToken
+	@PostMapping("/internal/read")
+	public void markSiteRead(@RequestParam String id) {
+		detailService.markSiteRead(userLoginService.getRequireLoginUserId(), id);
+	}
+
+	/// 标记当前用户全部站内通知已读
+	@RequireCorePermission(CorePermissionCode.NOTIFY_READ)
+	@RequiredToken
+	@PostMapping("/internal/read/all")
+	public void markAllSiteRead() {
+		detailService.markAllSiteRead(userLoginService.getRequireLoginUserId());
+	}
+}

src/main/java/com/imyeyu/api/modules/common/entity/Article.java

@@ -52,6 +52,19 @@ public class Article extends UUIDEntity implements SettingSupport {
 		TIP_TAP
 	}
 
+	/// 文章状态
+	public enum Status {
+
+		/// 草稿
+		DART,
+
+		/// 正常
+		NORMAL,
+
+		/// 隐藏
+		HIDDEN
+	}
+
 	/** 业务类型 */
 	protected BizType bizType;
 
@@ -61,8 +74,8 @@ public class Article extends UUIDEntity implements SettingSupport {
 	/** 标题 */
 	protected String title;
 
-	/** 摘要 */
+	/** 描述 */
-	protected String digest;
+	protected String description;
 
 	/** 正文类型 */
 	protected ContentType contentType;
@@ -77,6 +90,9 @@ public class Article extends UUIDEntity implements SettingSupport {
 	/** 喜欢数量 */
 	protected Integer likes;
 
+	/** 文章状态 */
+	protected Status status;
+
 	@Transient
 	protected List<Setting> settingList;
 

src/main/java/com/imyeyu/api/modules/common/entity/AttachmentVariant.java

@@ -0,0 +1,68 @@
+package com.imyeyu.api.modules.common.entity;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.imyeyu.api.modules.common.bean.attachment.ThumbnailFitMode;
+import com.imyeyu.spring.annotation.table.AutoUUID;
+import com.imyeyu.spring.annotation.table.Id;
+import lombok.Data;
+
+/// 附件缩略图变体记录
+///
+/// @author 夜雨
+/// @since 2026-08-21
+@Data
+public class AttachmentVariant {
+
+	/// 变体 ID
+	@Id
+	@AutoUUID
+	private String id;
+
+	/// 源附件 ID
+	private String sourceAttachmentId;
+
+	/// 源文件版本，使用源 GridFS ID
+	private String sourceMongoId;
+
+	/// 源文件摘要
+	private String sourceMd5;
+
+	/// 请求宽度，0 表示未指定
+	private int requestWidth;
+
+	/// 请求高度，0 表示未指定
+	private int requestHeight;
+
+	/// 缩放模式
+	private ThumbnailFitMode fitMode;
+
+	/// 输出格式
+	private String outputFormat;
+
+	/// 缩略图算法版本
+	private String algorithmVersion;
+
+	/// 缩略图 GridFS ID
+	private String mongoId;
+
+	/// 缩略图名称
+	private String name;
+
+	/// 缩略图 MIME 类型
+	private String mimeType;
+
+	/// 缩略图元数据
+	private ObjectNode metadata;
+
+	/// 缩略图大小
+	private long size;
+
+	/// 缩略图摘要
+	private String md5;
+
+	/// 创建时间
+	private long createdAt;
+
+	/// 过期时间
+	private long expireAt;
+}

src/main/java/com/imyeyu/api/modules/common/entity/BaseQueueEntity.java

@@ -0,0 +1,61 @@
+package com.imyeyu.api.modules.common.entity;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.imyeyu.spring.annotation.table.AutoUUID;
+import com.imyeyu.spring.annotation.table.Id;
+import com.imyeyu.spring.entity.Creatable;
+import com.imyeyu.spring.entity.Destroyable;
+import com.imyeyu.spring.entity.IDEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/// 通知基础队列实体
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Data
+@NoArgsConstructor
+public class BaseQueueEntity implements IDEntity<String>, Creatable, Destroyable {
+
+	/** 主键 */
+	@Id
+	@AutoUUID
+	protected String id;
+
+	/** 所属通知详情 ID */
+	protected String notifyDetailId;
+
+	/** 内容 */
+	protected String data;
+
+	/** 参数 */
+	protected JsonNode args;
+
+	/** 发送去向 */
+	protected String sendTo;
+
+	/** 发送时间 */
+	protected Long sendAt;
+
+	/** 剩余重试次数 */
+	protected Integer retry;
+
+	/** 超时时间 */
+	protected Long timeoutAt;
+
+	/** 创建时间 */
+	protected Long createdAt;
+
+	/// 从通知详情创建队列实体
+	///
+	/// @param detail 通知详情
+	public BaseQueueEntity(NotifyDetail detail) {
+		notifyDetailId = detail.getId();
+		data = detail.getData();
+		args = detail.getArgs();
+		sendTo = detail.getSendTo();
+		sendAt = detail.getSendAt();
+		retry = detail.getRetry();
+		timeoutAt = detail.getTimeoutAt();
+	}
+}

src/main/java/com/imyeyu/api/modules/common/entity/HTTPQueue.java

@@ -0,0 +1,26 @@
+package com.imyeyu.api.modules.common.entity;
+
+import com.imyeyu.spring.annotation.table.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/// HTTP 回调队列
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Table("http_queue")
+public class HTTPQueue extends BaseQueueEntity {
+
+	/** HTTP 请求方法 */
+	protected String method;
+
+	/// 从通知详情创建 HTTP 队列
+	///
+	/// @param detail 通知详情
+	public HTTPQueue(NotifyDetail detail) {
+		super(detail);
+		method = "POST";
+	}
+}

src/main/java/com/imyeyu/api/modules/common/entity/MailQueue.java

@@ -0,0 +1,54 @@
+package com.imyeyu.api.modules.common.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/// 邮件发送队列
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class MailQueue extends BaseQueueEntity {
+
+	/** 邮件标题 */
+	protected String subject;
+
+	/** 邮件附件 */
+	protected String attachments;
+
+	/** 发送来源 */
+	protected String sendFrom;
+
+	/// 从通知详情创建邮件队列
+	///
+	/// @param detail 通知详情
+	public MailQueue(NotifyDetail detail) {
+		super(detail);
+		subject = detail.getSubject();
+		sendFrom = detail.getSendFrom();
+	}
+
+	/// 邮件附件
+	@Data
+	public static class Attachment {
+
+		/** 附件类型 */
+		private Type type;
+
+		/** 附件值 */
+		private String value;
+
+		/// 附件来源类型
+		public enum Type {
+
+			/** 系统附件 */
+			E2INS_ATTACH,
+
+			/** URL 附件 */
+			URL
+		}
+	}
+}

src/main/java/com/imyeyu/api/modules/common/entity/Multilingual.java

@@ -1,6 +1,8 @@
 package com.imyeyu.api.modules.common.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.imyeyu.java.bean.Language;
+import com.imyeyu.spring.annotation.table.Column;
 import com.imyeyu.spring.entity.UUIDEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +17,18 @@ public class Multilingual extends UUIDEntity {
 
 	protected String zhCN;
 
+	@Column("zh_cn_pinyin_full")
+	@JsonIgnore
+	protected String zhCNPinyinFull;
+
+	@Column("zh_cn_pinyin_initial")
+	@JsonIgnore
+	protected String zhCNPinyinInitial;
+
+	@Column("zh_cn_pinyin_mixed")
+	@JsonIgnore
+	protected String zhCNPinyinMixed;
+
 	protected String zhTW;
 
 	protected String enUS;

src/main/java/com/imyeyu/api/modules/common/entity/Notify.java

@@ -1,7 +1,5 @@
 package com.imyeyu.api.modules.common.entity;
 
-import com.imyeyu.spring.annotation.table.AutoUUID;
-import com.imyeyu.spring.annotation.table.Id;
 import com.imyeyu.spring.annotation.table.Transient;
 import com.imyeyu.spring.entity.UUIDEntity;
 import lombok.Data;
@@ -19,11 +17,6 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class Notify extends UUIDEntity {
 
-	/** 主键 */
-	@Id
-	@AutoUUID
-	private String id;
-
 	/** 业务类型 */
 	private String bizType;
 

src/main/java/com/imyeyu/api/modules/common/entity/NotifyDetail.java

@@ -1,7 +1,17 @@
 package com.imyeyu.api.modules.common.entity;
 
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.imyeyu.api.TimiServerAPI;
+import com.imyeyu.api.modules.common.service.BaseQueueService;
+import com.imyeyu.api.modules.common.service.HTTPQueueService;
+import com.imyeyu.api.modules.common.service.MailQueueService;
+import com.imyeyu.api.modules.common.service.SmsQueueService;
+import com.imyeyu.api.modules.common.service.WechatQueueService;
+import com.imyeyu.api.modules.user.entity.User;
 import com.imyeyu.spring.annotation.table.Transient;
 import com.imyeyu.spring.entity.UUIDEntity;
+import com.imyeyu.spring.util.ResponseView;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,13 +35,32 @@ public class NotifyDetail extends UUIDEntity {
 	@AllArgsConstructor
 	public enum MsgType {
 
-		SMS,
+		/** 站内通知，不进入外部消息队列 */
+		INTERNAL(null),
 
-		MAIL,
+		SMS(SmsQueueService.class),
 
-		HTTP,
+		MAIL(MailQueueService.class),
 
-		WECHAT;
+		HTTP(HTTPQueueService.class),
+
+		WECHAT(WechatQueueService.class);
+
+		private final Class<? extends BaseQueueService<?>> queueServiceClass;
+
+		/// 获取消息队列服务
+		///
+		/// @return 消息队列服务
+		public BaseQueueService<?> getService() {
+			return TimiServerAPI.applicationContext.getBean(queueServiceClass);
+		}
+
+		/// 判断是否需要外部消息队列
+		///
+		/// @return true 为需要外部消息队列
+		public boolean isQueue() {
+			return queueServiceClass != null;
+		}
 	}
 
 	/**
@@ -54,44 +83,67 @@ public class NotifyDetail extends UUIDEntity {
 	}
 
 	/** 所属通知 ID */
+	@JsonView(ResponseView.Public.class)
 	private String notifyId;
 
 	/** 消息类型 */
+	@JsonView(ResponseView.Public.class)
 	private MsgType msgType;
 
 	/** 模板 ID */
+	@JsonView(ResponseView.Admin.class)
 	private String templateId;
 
 	/** 标题 */
+	@JsonView(ResponseView.Public.class)
 	private String subject;
 
 	/** 内容 */
+	@JsonView(ResponseView.Public.class)
 	private String data;
 
 	/** 参数 */
-	private String args;
+	@JsonView(ResponseView.Public.class)
+	private JsonNode args;
 
 	/** 发送来源 */
+	@JsonView(ResponseView.Public.class)
 	private String sendFrom;
 
 	/** 发送去向 */
+	@JsonView(ResponseView.Public.class)
 	private String sendTo;
 
 	/** 发送时间 */
+	@JsonView(ResponseView.Public.class)
 	private Long sendAt;
 
 	/** 重试计数 */
+	@JsonView(ResponseView.Admin.class)
 	private Integer retry;
 
 	/** 超时时间 */
+	@JsonView(ResponseView.Admin.class)
 	private Long timeoutAt;
 
 	/** 结果描述 */
+	@JsonView(ResponseView.Admin.class)
 	private String resultDesc;
 
 	/** 状态 */
+	@JsonView(ResponseView.Public.class)
 	private Status status;
 
+	/** 已读时间，站内通知未读时为空 */
+	@JsonView(ResponseView.Public.class)
+	private Long readAt;
+
 	@Transient
 	protected Notify notify;
+
+	@Transient
+	protected User fromUser;
+
+	@Transient
+	protected User toUser;
 }

src/main/java/com/imyeyu/api/modules/common/entity/SmsQueue.java

@@ -0,0 +1,26 @@
+package com.imyeyu.api.modules.common.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/// 短信发送队列
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SmsQueue extends BaseQueueEntity {
+
+	/** 短信模板 ID */
+	protected String templateId;
+
+	/// 从通知详情创建短信队列
+	///
+	/// @param detail 通知详情
+	public SmsQueue(NotifyDetail detail) {
+		super(detail);
+		templateId = detail.getTemplateId();
+	}
+}

src/main/java/com/imyeyu/api/modules/common/entity/WechatQueue.java

@@ -0,0 +1,20 @@
+package com.imyeyu.api.modules.common.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/// 微信消息发送队列
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WechatQueue extends BaseQueueEntity {
+
+	/// 从通知详情创建微信队列
+	///
+	/// @param detail 通知详情
+	public WechatQueue(NotifyDetail detail) {
+		super(detail);
+	}
+}

src/main/java/com/imyeyu/api/modules/common/mapper/AttachmentMapper.java

@@ -36,26 +36,6 @@ public interface AttachmentMapper extends BaseMapper<Attachment, String>, RawMap
 
 	long countByBizId(Attachment.BizType bizType, String bizId, List<String> attachTypes);
 
-	/**
-	 * 按源附件 ID 与请求尺寸查询已缓存缩略图
-	 *
-	 * @param bizType       源附件业务类型
-	 * @param sourceId      源附件 ID
-	 * @param requestWidth  请求宽度，{@code null} 表示未指定
-	 * @param requestHeight 请求高度，{@code null} 表示未指定
-	 * @return 缩略图附件，不存在返回 {@code null}
-	 */
-	Attachment selectThumb(Attachment.BizType bizType, String sourceId, Integer requestWidth, Integer requestHeight);
-
-	/**
-	 * 查询源附件的所有未销毁缩略图（含已软删除）
-	 *
-	 * @param sourceId 源附件 ID
-	 * @return 缩略图列表
-	 */
-	@Select("SELECT * FROM attachment WHERE biz_id = #{sourceId} AND attach_type = 'THUMB' AND is_destroyed = FALSE")
-	List<Attachment> selectThumbsBySourceId(String sourceId);
-
 	@Select("SELECT * FROM attachment WHERE `is_destroyed` = FALSE AND `destroy_at` < " + UNIX_TIME)
 	List<Attachment> selectNeedDestroy();
 }

src/main/java/com/imyeyu/api/modules/common/mapper/AttachmentVariantMapper.java

@@ -0,0 +1,78 @@
+package com.imyeyu.api.modules.common.mapper;
+
+import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.api.modules.common.entity.AttachmentVariant;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/// 附件缩略图变体 Mapper
+///
+/// @author 夜雨
+/// @since 2026-08-21
+public interface AttachmentVariantMapper {
+
+	/// 查询有效缩略图附件
+	///
+	/// @param sourceAttachmentId 源附件 ID
+	/// @param sourceMongoId      源 GridFS ID
+	/// @param requestWidth       请求宽度，0 表示未指定
+	/// @param requestHeight      请求高度，0 表示未指定
+	/// @param fitMode            缩放模式
+	/// @param outputFormat       输出格式
+	/// @param algorithmVersion   算法版本
+	/// @param now                当前时间
+	/// @return 缩略图附件
+	Attachment selectValidAttachment(
+		@Param("sourceAttachmentId") String sourceAttachmentId,
+		@Param("sourceMongoId") String sourceMongoId,
+		@Param("requestWidth") int requestWidth,
+		@Param("requestHeight") int requestHeight,
+		@Param("fitMode") String fitMode,
+		@Param("outputFormat") String outputFormat,
+		@Param("algorithmVersion") String algorithmVersion,
+		@Param("now") long now
+	);
+
+	/// 查询指定变体记录，不判断是否过期
+	///
+	/// @param sourceAttachmentId 源附件 ID
+	/// @param sourceMongoId      源 GridFS ID
+	/// @param requestWidth       请求宽度，0 表示未指定
+	/// @param requestHeight      请求高度，0 表示未指定
+	/// @param fitMode            缩放模式
+	/// @param outputFormat       输出格式
+	/// @param algorithmVersion   算法版本
+	/// @return 变体记录
+	AttachmentVariant selectByKey(
+		@Param("sourceAttachmentId") String sourceAttachmentId,
+		@Param("sourceMongoId") String sourceMongoId,
+		@Param("requestWidth") int requestWidth,
+		@Param("requestHeight") int requestHeight,
+		@Param("fitMode") String fitMode,
+		@Param("outputFormat") String outputFormat,
+		@Param("algorithmVersion") String algorithmVersion
+	);
+
+	/// 查询源附件的所有变体
+	///
+	/// @param sourceAttachmentId 源附件 ID
+	/// @return 变体列表
+	List<AttachmentVariant> selectBySourceAttachmentId(@Param("sourceAttachmentId") String sourceAttachmentId);
+
+	/// 查询已过期变体
+	///
+	/// @param now 当前时间
+	/// @return 已过期变体列表
+	List<AttachmentVariant> selectExpired(@Param("now") long now);
+
+	/// 新增变体
+	///
+	/// @param variant 变体
+	void insert(AttachmentVariant variant);
+
+	/// 删除变体
+	///
+	/// @param id 变体 ID
+	void delete(@Param("id") String id);
+}

src/main/java/com/imyeyu/api/modules/common/mapper/BaseQueueMapper.java

@@ -0,0 +1,26 @@
+package com.imyeyu.api.modules.common.mapper;
+
+import com.imyeyu.api.modules.common.entity.BaseQueueEntity;
+import com.imyeyu.api.modules.common.util.QueueSQLProvider;
+import com.imyeyu.spring.mapper.BaseMapper;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+
+import java.util.List;
+
+/// 通知队列基础 Mapper
+///
+/// @param <T> 队列实体类型
+/// @author 夜雨
+/// @since 2026-08-20
+public interface BaseQueueMapper<T extends BaseQueueEntity> extends BaseMapper<T, String> {
+
+	/** 查询已到发送时间的队列 */
+	@SelectProvider(type = QueueSQLProvider.class, method = "listReadyQueue")
+	List<T> listReadyQueue();
+
+	/** 根据通知详情 ID 物理删除队列 */
+	@DeleteProvider(type = QueueSQLProvider.class, method = "destroyByNotifyDetailId")
+	void destroyByNotifyDetailId(@Param("notifyDetailId") String notifyDetailId);
+}

src/main/java/com/imyeyu/api/modules/common/mapper/HTTPQueueMapper.java

@@ -0,0 +1,10 @@
+package com.imyeyu.api.modules.common.mapper;
+
+import com.imyeyu.api.modules.common.entity.HTTPQueue;
+
+/// HTTP 队列 Mapper
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public interface HTTPQueueMapper extends BaseQueueMapper<HTTPQueue> {
+}

src/main/java/com/imyeyu/api/modules/common/mapper/MailQueueMapper.java

@@ -0,0 +1,10 @@
+package com.imyeyu.api.modules.common.mapper;
+
+import com.imyeyu.api.modules.common.entity.MailQueue;
+
+/// 邮件队列 Mapper
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public interface MailQueueMapper extends BaseQueueMapper<MailQueue> {
+}

src/main/java/com/imyeyu/api/modules/common/mapper/NotifyDetailMapper.java

@@ -2,6 +2,11 @@ package com.imyeyu.api.modules.common.mapper;
 
 import com.imyeyu.api.modules.common.entity.NotifyDetail;
 import com.imyeyu.spring.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
 
 /**
  * 通知详情 Mapper
@@ -10,4 +15,36 @@ import com.imyeyu.spring.mapper.BaseMapper;
  * @since 2026-05-13 14:46
  */
 public interface NotifyDetailMapper extends BaseMapper<NotifyDetail, String> {
+
+	/** 查询用户的站内通知 */
+	@Select("SELECT * FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE + " ORDER BY `created_at` DESC LIMIT #{offset}, #{limit}")
+	List<NotifyDetail> selectSiteByUserId(@Param("userId") String userId, @Param("offset") long offset, @Param("limit") long limit);
+
+	/** 查询用户的未读站内通知 */
+	@Select("SELECT * FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE + " ORDER BY `created_at` DESC LIMIT #{offset}, #{limit}")
+	List<NotifyDetail> selectUnreadSiteByUserId(@Param("userId") String userId, @Param("offset") long offset, @Param("limit") long limit);
+
+	/** 统计用户的站内通知数量 */
+	@Select("SELECT COUNT(*) FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE)
+	long countSiteByUserId(@Param("userId") String userId);
+
+	/** 统计用户的未读站内通知数量 */
+	@Select("SELECT COUNT(*) FROM `notify_detail` WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
+	long countUnreadSiteByUserId(@Param("userId") String userId);
+
+	/** 查询用户拥有的站内通知 */
+	@Select("SELECT * FROM `notify_detail` WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE + " LIMIT 1")
+	NotifyDetail selectSiteByIdAndUserId(@Param("detailId") String detailId, @Param("userId") String userId);
+
+	/** 删除用户的站内通知 */
+	@Update("UPDATE `notify_detail` SET `deleted_at` = " + UNIX_TIME + ", `updated_at` = " + UNIX_TIME + " WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} " + NOT_DELETE)
+	int deleteSiteByIdAndUserId(@Param("detailId") String detailId, @Param("userId") String userId);
+
+	/** 标记站内通知已读 */
+	@Update("UPDATE `notify_detail` SET `read_at` = #{readAt}, `updated_at` = " + UNIX_TIME + " WHERE `id` = #{detailId} AND `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
+	int markSiteRead(@Param("detailId") String detailId, @Param("userId") String userId, @Param("readAt") long readAt);
+
+	/** 标记用户全部站内通知已读 */
+	@Update("UPDATE `notify_detail` SET `read_at` = #{readAt}, `updated_at` = " + UNIX_TIME + " WHERE `msg_type` = 'INTERNAL' AND `send_to` = #{userId} AND `read_at` IS NULL " + NOT_DELETE)
+	int markAllSiteRead(@Param("userId") String userId, @Param("readAt") long readAt);
 }

src/main/java/com/imyeyu/api/modules/common/mapper/SmsQueueMapper.java

@@ -0,0 +1,10 @@
+package com.imyeyu.api.modules.common.mapper;
+
+import com.imyeyu.api.modules.common.entity.SmsQueue;
+
+/// 短信队列 Mapper
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public interface SmsQueueMapper extends BaseQueueMapper<SmsQueue> {
+}

src/main/java/com/imyeyu/api/modules/common/mapper/TagMapper.java

@@ -15,5 +15,23 @@ public interface TagMapper extends BaseMapper<Tag, String> {
 
 	List<Tag> selectByIdList(Collection<String> idList);
 
+	/// 按归属和名称关键词查询标签总数
+	///
+	/// @param ownerType 归属类型
+	/// @param ownerId   归属 ID
+	/// @param keyword   名称关键词
+	/// @return 标签总数
+	long countByOwnerAndKeyword(@Param("ownerType") Tag.OwnerType ownerType, @Param("ownerId") String ownerId, @Param("keyword") String keyword);
+
+	/// 按归属和名称关键词分页查询标签
+	///
+	/// @param ownerType 归属类型
+	/// @param ownerId   归属 ID
+	/// @param keyword   名称关键词
+	/// @param offset    分页偏移量
+	/// @param limit     分页数量
+	/// @return 标签列表
+	List<Tag> selectByOwnerAndKeyword(@Param("ownerType") Tag.OwnerType ownerType, @Param("ownerId") String ownerId, @Param("keyword") String keyword, @Param("offset") long offset, @Param("limit") long limit);
+
 	Tag selectByOwnerAndZhCN(@Param("ownerType") Tag.OwnerType ownerType, @Param("ownerId") String ownerId, @Param("zhCN") String zhCN);
 }

src/main/java/com/imyeyu/api/modules/common/mapper/WechatQueueMapper.java

@@ -0,0 +1,10 @@
+package com.imyeyu.api.modules.common.mapper;
+
+import com.imyeyu.api.modules.common.entity.WechatQueue;
+
+/// 微信队列 Mapper
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public interface WechatQueueMapper extends BaseQueueMapper<WechatQueue> {
+}

src/main/java/com/imyeyu/api/modules/common/service/AttachmentService.java

@@ -25,18 +25,6 @@ public interface AttachmentService extends BaseService<Attachment, String> {
 	/// @return 克隆后的附件
 	Attachment clone(String id);
 
-	/**
-	 * 按需获取或创建缩略图附件。
-	 * <p>当附件为图片或视频时，若指定尺寸的缩略图已存在则直接返回缓存，
-	 * 否则生成并持久化后返回。不支持缩略图的附件类型返回 {@code null}。</p>
-	 *
-	 * @param source        源附件（必须已持久化，mimeType 已填充）
-	 * @param requestWidth  请求宽度，{@code null} 表示未指定
-	 * @param requestHeight 请求高度，{@code null} 表示未指定
-	 * @return 缩略图附件，不支持时返回 {@code null}
-	 */
-	Attachment fetchThumb(Attachment source, Integer requestWidth, Integer requestHeight);
-
 	Attachment getByBizId(Attachment.BizType bizType, String bizId);
 
 	Attachment getByAttachType(Attachment.BizType bizType, String bizId, String attachType);

src/main/java/com/imyeyu/api/modules/common/service/AttachmentVariantService.java

@@ -0,0 +1,28 @@
+package com.imyeyu.api.modules.common.service;
+
+import com.imyeyu.api.modules.common.bean.attachment.ThumbnailFitMode;
+import com.imyeyu.api.modules.common.entity.Attachment;
+
+/// 附件缩略图变体服务
+///
+/// @author 夜雨
+/// @since 2026-08-21
+public interface AttachmentVariantService {
+
+	/// 按需获取或创建缩略图附件
+	///
+	/// @param source        源附件
+	/// @param requestWidth  请求宽度
+	/// @param requestHeight 请求高度
+	/// @param fitMode       缩放模式
+	/// @return 缩略图附件
+	Attachment fetchThumb(Attachment source, Integer requestWidth, Integer requestHeight, ThumbnailFitMode fitMode);
+
+	/// 删除源附件对应的全部缩略图变体
+	///
+	/// @param sourceAttachmentId 源附件 ID
+	void deleteBySourceId(String sourceAttachmentId);
+
+	/// 清理已过期的缩略图变体
+	void clearExpired();
+}

src/main/java/com/imyeyu/api/modules/common/service/BaseQueueService.java

@@ -0,0 +1,30 @@
+package com.imyeyu.api.modules.common.service;
+
+import com.imyeyu.api.modules.common.entity.BaseQueueEntity;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+
+/// 通知队列基础服务
+///
+/// @param <T> 队列实体类型
+/// @author 夜雨
+/// @since 2026-08-20
+public interface BaseQueueService<T extends BaseQueueEntity> {
+
+	/// 创建队列
+	///
+	/// @param detail 通知详情
+	void createQueue(NotifyDetail detail);
+
+	/// 删除队列
+	///
+	/// @param detail 通知详情
+	void destroyQueue(NotifyDetail detail);
+
+	/// 执行已到期队列
+	void invokeQueue();
+
+	/// 发送队列消息
+	///
+	/// @param queue 队列
+	void send(T queue);
+}

src/main/java/com/imyeyu/api/modules/common/service/HTTPQueueService.java

@@ -0,0 +1,10 @@
+package com.imyeyu.api.modules.common.service;
+
+import com.imyeyu.api.modules.common.entity.HTTPQueue;
+
+/// HTTP 队列服务
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public interface HTTPQueueService extends BaseQueueService<HTTPQueue> {
+}

src/main/java/com/imyeyu/api/modules/common/service/MailQueueService.java

@@ -0,0 +1,10 @@
+package com.imyeyu.api.modules.common.service;
+
+import com.imyeyu.api.modules.common.entity.MailQueue;
+
+/// 邮件队列服务
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public interface MailQueueService extends BaseQueueService<MailQueue> {
+}

src/main/java/com/imyeyu/api/modules/common/service/NotifyDetailService.java

@@ -1,8 +1,12 @@
 package com.imyeyu.api.modules.common.service;
 
 import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.spring.bean.Page;
+import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.service.BaseService;
 
+import java.util.List;
+
 /**
  * 通知详情服务
  *
@@ -10,4 +14,53 @@ import com.imyeyu.spring.service.BaseService;
  * @since 2026-05-13 14:46
  */
 public interface NotifyDetailService extends BaseService<NotifyDetail, String> {
+
+	/// 查询通知下的全部详情
+	///
+	/// @param notifyId 通知 ID
+	/// @return 通知详情列表
+	List<NotifyDetail> listByNotifyId(String notifyId);
+
+	/// 重新将通知详情放入消息队列
+	///
+	/// @param detailId 通知详情 ID
+	void requeue(String detailId);
+
+	/// 分页查询用户的站内通知
+	///
+	/// @param page 分页参数
+	/// @param userId 用户 ID
+	/// @param unreadOnly true 为只查询未读通知
+	/// @return 站内通知分页结果
+	PageResult<NotifyDetail> pageInternalByUserId(Page<NotifyDetail> page, String userId, boolean unreadOnly);
+
+	/// 查询当前用户拥有的站内通知详情
+	///
+	/// @param detailId 通知详情 ID
+	/// @param userId 用户 ID
+	/// @return 通知详情
+	NotifyDetail getInternalByUserId(String detailId, String userId);
+
+	/// 删除当前用户拥有的站内通知详情
+	///
+	/// @param detailId 通知详情 ID
+	/// @param userId 用户 ID
+	void deleteInternalByUserId(String detailId, String userId);
+
+	/// 查询用户未读站内通知数量
+	///
+	/// @param userId 用户 ID
+	/// @return 未读数量
+	long countUnreadSiteByUserId(String userId);
+
+	/// 标记站内通知已读
+	///
+	/// @param userId 用户 ID
+	/// @param detailId 通知详情 ID
+	void markSiteRead(String userId, String detailId);
+
+	/// 标记用户全部站内通知已读
+	///
+	/// @param userId 用户 ID
+	void markAllSiteRead(String userId);
 }

src/main/java/com/imyeyu/api/modules/common/service/NotifyService.java

@@ -10,4 +10,9 @@ import com.imyeyu.spring.service.BaseService;
  * @since 2026-05-13 14:46
  */
 public interface NotifyService extends BaseService<Notify, String> {
+
+	/// 取消通知中尚未成功发送的通知详情
+	///
+	/// @param notifyId 通知 ID
+	void cancel(String notifyId);
 }

src/main/java/com/imyeyu/api/modules/common/service/SmsQueueService.java

@@ -0,0 +1,10 @@
+package com.imyeyu.api.modules.common.service;
+
+import com.imyeyu.api.modules.common.entity.SmsQueue;
+
+/// 短信队列服务
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public interface SmsQueueService extends BaseQueueService<SmsQueue> {
+}

src/main/java/com/imyeyu/api/modules/common/service/SmsService.java

@@ -0,0 +1,30 @@
+package com.imyeyu.api.modules.common.service;
+
+import com.imyeyu.api.modules.common.entity.Notify;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+
+/**
+ *
+ *
+ * @author 夜雨
+ * @since 2026-05-14 12:12
+ */
+public interface SmsService {
+
+	/**
+	 * 创建短信验证码通知
+	 *
+	 * @param detail 通知
+	 * @return 通知详情 ID
+	 */
+	String captchaCreate(Notify detail);
+
+	/**
+	 * 校验短信验证码
+	 *
+	 * @param detailId 通知详情 ID
+	 * @param captcha  请求验证码
+	 * @return 通知详情
+	 */
+	NotifyDetail captchaVerify(String detailId, String captcha);
+}

src/main/java/com/imyeyu/api/modules/common/service/TagService.java

@@ -2,6 +2,8 @@ package com.imyeyu.api.modules.common.service;
 
 import com.imyeyu.api.modules.common.entity.Tag;
 import com.imyeyu.api.modules.common.entity.TagApply;
+import com.imyeyu.spring.bean.Page;
+import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.service.BaseService;
 
 import java.util.Collection;
@@ -15,6 +17,15 @@ public interface TagService extends BaseService<Tag, String> {
 
 	List<Tag> listByIdList(Collection<String> idList);
 
+	/// 按归属和名称关键词分页查询标签
+	///
+	/// @param page      分页参数
+	/// @param ownerType 归属类型
+	/// @param ownerId   归属 ID
+	/// @param keyword   名称关键词
+	/// @return 标签分页
+	PageResult<Tag> pageByOwnerAndKeyword(Page<Tag> page, Tag.OwnerType ownerType, String ownerId, String keyword);
+
 	/// 按业务查询标签列表
 	///
 	/// @param bizType 业务类型
@@ -28,4 +39,10 @@ public interface TagService extends BaseService<Tag, String> {
 	/// @param bizId 业务 ID
 	/// @param tagIdList 标签 ID 列表
 	void apply(TagApply.BizType bizType, String bizId, List<String> tagIdList);
+
+	/// 删除指定归属下的全部标签
+	///
+	/// @param ownerType 归属类型
+	/// @param ownerId 归属 ID
+	void deleteByOwner(Tag.OwnerType ownerType, String ownerId);
 }

src/main/java/com/imyeyu/api/modules/common/service/WechatQueueService.java

@@ -0,0 +1,10 @@
+package com.imyeyu.api.modules.common.service;
+
+import com.imyeyu.api.modules.common.entity.WechatQueue;
+
+/// 微信队列服务
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public interface WechatQueueService extends BaseQueueService<WechatQueue> {
+}

src/main/java/com/imyeyu/api/modules/common/service/implement/AbstractQueueService.java

@@ -0,0 +1,126 @@
+package com.imyeyu.api.modules.common.service.implement;
+
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.imyeyu.api.modules.common.entity.BaseQueueEntity;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
+import com.imyeyu.api.modules.common.service.BaseQueueService;
+import com.imyeyu.api.modules.common.service.NotifyDetailService;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiCode;
+import com.imyeyu.java.bean.timi.TimiException;
+import com.imyeyu.utils.Time;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/// 通知队列抽象服务
+///
+/// @param <T> 队列实体类型
+/// @param <C> 队列配置类型
+/// @author 夜雨
+/// @since 2026-08-20
+@Slf4j
+public abstract class AbstractQueueService<T extends BaseQueueEntity, C extends NotifyQueueConfig.Queue> implements BaseQueueService<T> {
+
+	private NotifyDetailService notifyDetailService;
+
+	/// 注入通知详情服务
+	@Autowired
+	private void setNotifyDetailService(NotifyDetailService notifyDetailService) {
+		this.notifyDetailService = notifyDetailService;
+	}
+
+	/// 获取队列 Mapper
+	///
+	/// @return 队列 Mapper
+	protected abstract BaseQueueMapper<T> mapper();
+
+	/// 获取队列配置
+	///
+	/// @return 队列配置
+	protected abstract C config();
+
+	/// 校验发送目标
+	///
+	/// @param sendTo 发送目标
+	protected abstract void validateSendTo(String sendTo);
+
+	@Override
+	public void destroyQueue(NotifyDetail detail) {
+		TimiException.required(detail, "未找到通知详情");
+		TimiException.required(detail.getId(), "未找到通知详情 ID");
+		mapper().destroyByNotifyDetailId(detail.getId());
+	}
+
+	@Override
+	public void invokeQueue() {
+		for (T queue : mapper().listReadyQueue()) {
+			send(queue);
+		}
+	}
+
+	/// 处理单个队列消息
+	///
+	/// @param queue 队列
+	@Override
+	public final void send(T queue) {
+		TimiException.required(queue, "未找到通知队列");
+		NotifyDetail detail = notifyDetailService.get(queue.getNotifyDetailId());
+		if (detail == null) {
+			mapper().destroy(queue.getId());
+			return;
+		}
+
+		try {
+			long now = Time.now();
+			queue.setSendAt(now);
+			if (queue.getTimeoutAt() < now) {
+				throw new TimiException(TimiCode.RESULT_TIMEOUT, "通知队列已超时");
+			}
+			validateSendTo(queue.getSendTo());
+			if (!config().isEnable()) {
+				throw new TimiException(TimiCode.IGNORE, "通知队列未启用");
+			}
+			doSend(queue);
+			detail.setStatus(NotifyDetail.Status.REMINDED);
+		} catch (TimiException e) {
+			if (e.getCode() == TimiCode.IGNORE) {
+				detail.setStatus(NotifyDetail.Status.CANCEL);
+				detail.setResultDesc(e.getMessage());
+			} else if (e.getCode() == TimiCode.RESULT_TIMEOUT) {
+				detail.setStatus(NotifyDetail.Status.TIMEOUT);
+				detail.setResultDesc(e.getMessage());
+			} else {
+				log.error("处理通知队列失败", e);
+				detail.setStatus(NotifyDetail.Status.FAIL);
+				detail.setResultDesc(TimiJava.serializeThrowable(e));
+			}
+		} catch (Exception e) {
+			log.error("处理通知队列失败", e);
+			detail.setStatus(NotifyDetail.Status.FAIL);
+			detail.setResultDesc(TimiJava.serializeThrowable(e));
+		} finally {
+			try {
+				notifyDetailService.update(detail);
+				if (detail.getStatus() == NotifyDetail.Status.REMINDED
+					|| detail.getStatus() == NotifyDetail.Status.CANCEL
+					|| queue.getRetry() < 0
+				) {
+					mapper().destroy(queue.getId());
+				} else {
+					queue.setRetry(queue.getRetry() - 1);
+					mapper().update(queue);
+				}
+			} catch (Exception e) {
+				log.error("通知队列收尾处理失败", e);
+				mapper().destroy(queue.getId());
+			}
+		}
+	}
+
+	/// 执行实际发送动作
+	///
+	/// @param queue 队列
+	/// @throws Exception 发送异常
+	protected abstract void doSend(T queue) throws Exception;
+}

src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentServiceImplement.java

@@ -3,19 +3,14 @@ package com.imyeyu.api.modules.common.service.implement;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
-import com.imyeyu.api.modules.common.bean.attachment.MediaAttach;
-import com.imyeyu.api.modules.common.bean.attachment.Metadata;
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.mapper.AttachmentMapper;
 import com.imyeyu.api.modules.common.service.AttachmentService;
-import com.imyeyu.api.util.JavaCV;
+import com.imyeyu.api.modules.common.service.AttachmentVariantService;
 import com.imyeyu.io.IO;
 import com.imyeyu.java.TimiJava;
-import com.imyeyu.java.bean.CallbackArg;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
-import com.imyeyu.java.ref.Ref;
-import com.imyeyu.network.Network;
 import com.imyeyu.spring.TimiSpring;
 import com.imyeyu.spring.bean.Page;
 import com.imyeyu.spring.bean.PageResult;
@@ -26,7 +21,6 @@ import com.mongodb.client.gridfs.GridFSBucket;
 import com.mongodb.client.gridfs.model.GridFSFile;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import net.coobird.thumbnailator.Thumbnails;
 import org.apache.tika.Tika;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -36,9 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -47,7 +38,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -64,6 +54,7 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
 	private final ObjectMapper jackson;
 	private final GridFSBucket gridFSBucket;
 	private final GridFsTemplate gridFsTemplate;
+	private final AttachmentVariantService variantService;
 
 	@Override
 	protected BaseMapper<Attachment, String> mapper() {
@@ -124,6 +115,7 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
 			}
 			// 有新文件时，先查旧记录获取旧 mongoId 和兜底字段
 			Attachment old = mapper.selectRaw(attachment.getId());
+			TimiException.required(old, "not found attachment");
 			// 存储新文件
 			newMongoId = gridFsTemplate.store(stream, attachment.buildMongoName()).toString();
 			GridFSFile gridFSFile = gridFsTemplate.findOne(new Query(Criteria.where("_id").is(newMongoId)));
@@ -141,6 +133,8 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
 
 			// 更新数据库后删除旧 GridFS 文件
 			super.update(attachment);
+			// 源文件版本已变化，旧缩略图全部失效
+			variantService.deleteBySourceId(attachment.getId());
 			gridFsTemplate.delete(Query.query(Criteria.where("_id").is(old.getMongoId())));
 		} catch (Exception e) {
 			// 新文件已上传但后续操作失败，清理新文件防止孤儿数据
@@ -155,36 +149,18 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void delete(String id) {
-		mapper.selectThumbsBySourceId(id).forEach(thumb -> super.delete(thumb.getId()));
+		variantService.deleteBySourceId(id);
 		super.delete(id);
 	}
 
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void destroy(String id) {
-		CallbackArg<Attachment> doDestroy = attach -> {
+		variantService.deleteBySourceId(id);
-			try {
+		Attachment attachment = mapper.selectRaw(id);
-				if (attach.getMongoId() != null) {
+		if (attachment != null) {
-					gridFsTemplate.delete(Query.query(Criteria.where("_id").is(attach.getMongoId())));
+			destroyAttachment(attachment);
-				}
+		}
-				if (!attach.isDeleted()) {
-					attach.setDeletedAt(Time.now());
-				}
-				attach.setIsDestroyed(true);
-				attach.setDestroyAt(Time.now());
-				mapper.update(attach);
-
-				if (Ref.toType(MediaAttach.Type.class, attach.getAttachType()) == MediaAttach.Type.THUMB) {
-					// 缩略图记录物理删除
-					mapper.destroy(attach.getId());
-				}
-			} catch (Exception e) {
-				log.error("delete mongo file error, id={}", attach.getId(), e);
-				throw new TimiException(TimiCode.ERROR, "TODO delete mongo file error");
-			}
-		};
-		mapper.selectThumbsBySourceId(id).forEach(doDestroy::handler);
-		doDestroy.handler(mapper.selectRaw(id));
 	}
 
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
@@ -216,74 +192,20 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
 		}
 	}
 
-	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	private void destroyAttachment(Attachment attachment) {
-	@Override
-	public Attachment fetchThumb(Attachment source, Integer requestWidth, Integer requestHeight) {
-		TimiException.requiredTrue(requestWidth != null || requestHeight != null, "required width or height");
-		String mimeType = source.getMimeType();
-		boolean isImage = mimeType != null && Set.of("image/png", "image/bmp", "image/jpeg").contains(mimeType);
-		boolean isVideo = mimeType != null && Set.of("video/mp4", "video/quicktime").contains(mimeType);
-		if (!isImage && !isVideo) {
-			return null;
-		}
-		Attachment cached = mapper.selectThumb(source.getBizType(), source.getId(), requestWidth, requestHeight);
-		if (cached != null) {
-			// 命中缓存直接返回
-			return cached;
-		}
 		try {
-			ByteArrayOutputStream thumbStream = new ByteArrayOutputStream();
+			if (attachment.getMongoId() != null) {
-			CallbackArg<InputStream> applyThumbSize = inputStream -> {
+				gridFsTemplate.delete(Query.query(Criteria.where("_id").is(attachment.getMongoId())));
-				try {
-					Thumbnails.Builder<? extends InputStream> builder = Thumbnails.of(inputStream);
-					if (requestWidth != null && requestHeight != null) {
-						builder.size(requestWidth, requestHeight).keepAspectRatio(false).toOutputStream(thumbStream);
-					} else if (requestWidth != null) {
-						builder.width(requestWidth).keepAspectRatio(true).toOutputStream(thumbStream);
-					} else {
-						builder.height(requestHeight).keepAspectRatio(true).toOutputStream(thumbStream);
-					}
-				} catch (IOException e) {
-					log.error("applyThumbSize error for fetchThumb", e);
-					throw new RuntimeException(e);
-				}
-			};
-			if (isImage) {
-				applyThumbSize.handler(source.openInputStream());
-			} else {
-				String name = source.getName();
-				File tempFile = IO.file("temp/%s_%s".formatted(UUID.randomUUID(), name));
-				try {
-					IO.toFile(tempFile, source.openInputStream());
-					ByteArrayOutputStream baos = JavaCV.captureThumbnail(IO.getInputStream(tempFile), 2);
-					applyThumbSize.handler(IO.toInputStream(baos));
-				} finally {
-					IO.destroy(tempFile);
-				}
 			}
-			Metadata.ThumbImage thumbMeta = new Metadata.ThumbImage();
+			if (!attachment.isDeleted()) {
-			thumbMeta.setSourceId(source.getId());
+				attachment.setDeletedAt(Time.now());
-			thumbMeta.setSourceMongoId(source.getMongoId());
+			}
-			thumbMeta.setSourceMimeType(mimeType);
+			attachment.setIsDestroyed(true);
-			thumbMeta.setRequestWidth(requestWidth);
+			attachment.setDestroyAt(Time.now());
-			thumbMeta.setRequestHeight(requestHeight);
+			mapper.update(attachment);
-
-			Attachment thumb = new Attachment();
-			thumb.setName(Network.simpleURIFileName(source.getName()) + ".png");
-			thumb.setBizType(source.getBizType());
-			thumb.setBizId(source.getId());
-			thumb.setAttachType(MediaAttach.Type.THUMB.toString());
-			thumb.setMetadata(jackson.valueToTree(thumbMeta));
-			thumb.setInputStream(new ByteArrayInputStream(thumbStream.toByteArray()));
-			// 缩略图 7 天后过期，额外 1 天宽限供后台任务销毁
-			long expireAt = Time.now() + 7 * Time.D;
-			thumb.setDeletedAt(expireAt);
-			thumb.setDestroyAt(expireAt + Time.D);
-			create(thumb);
-			return thumb;
 		} catch (Exception e) {
-			log.error("create thumbnail error", e);
+			log.error("delete mongo file error, id={}", attachment.getId(), e);
-			throw new TimiException(TimiCode.ERROR, "exception.attachment.create.error");
+			throw new TimiException(TimiCode.ERROR, "TODO delete mongo file error", e);
 		}
 	}
 
@@ -390,6 +312,8 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
 				// 将临时文件的 GridFS 存储转移至当前永久记录，废弃临时记录
 				Attachment current = mapper.selectRaw(item.getId());
 				Attachment tempFile = mapper.selectRaw(tempFileId);
+				// 源文件版本已变化，旧缩略图全部失效
+				variantService.deleteBySourceId(current.getId());
 				// 删除旧 GridFS 文件
 				gridFsTemplate.delete(Query.query(Criteria.where("_id").is(current.getMongoId())));
 				// 将存储信息从临时记录迁移到永久记录

src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentVariantServiceImplement.java

@@ -0,0 +1,339 @@
+package com.imyeyu.api.modules.common.service.implement;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
+import com.imyeyu.api.modules.common.bean.attachment.MediaAttach;
+import com.imyeyu.api.modules.common.bean.attachment.ThumbnailFitMode;
+import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.api.modules.common.entity.AttachmentVariant;
+import com.imyeyu.api.modules.common.mapper.AttachmentVariantMapper;
+import com.imyeyu.api.modules.common.service.AttachmentVariantService;
+import com.imyeyu.api.util.JavaCV;
+import com.imyeyu.io.IO;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiCode;
+import com.imyeyu.java.bean.timi.TimiException;
+import com.imyeyu.network.Network;
+import com.imyeyu.spring.util.Redis;
+import com.imyeyu.utils.Time;
+import com.mongodb.client.gridfs.GridFSBucket;
+import com.mongodb.client.gridfs.model.GridFSFile;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+import net.coobird.thumbnailator.geometry.Positions;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.gridfs.GridFsTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Set;
+import java.util.UUID;
+
+/// 附件缩略图变体服务实现
+///
+/// 负责缩略图生成、变体缓存、并发控制和变体文件清理，源附件生命周期由 `AttachmentService` 负责
+///
+/// @author 夜雨
+/// @since 2026-08-21
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AttachmentVariantServiceImplement implements AttachmentVariantService {
+
+	private static final int THUMB_MAX_WIDTH = 4096;
+	private static final int THUMB_MAX_HEIGHT = 4096;
+	private static final long THUMB_MAX_PIXELS = 16_000_000L;
+	private static final long THUMB_CACHE_TTL = Time.D * 7;
+	private static final long THUMB_LOCK_TTL = Time.M * 10;
+	private static final double THUMB_TARGET_SECONDS = 2;
+	private static final String THUMB_OUTPUT_FORMAT = "png";
+	private static final String THUMB_ALGORITHM_VERSION = "v3";
+	private static final String THUMB_LOCK_KEY_PREFIX = "ATTACHMENT:THUMB:LOCK:";
+
+	private final AttachmentVariantMapper variantMapper;
+	private final ObjectMapper jackson;
+	private final GridFSBucket gridFSBucket;
+	private final GridFsTemplate gridFsTemplate;
+
+	@Qualifier("redisLocker")
+	private final Redis<String, Integer> redisLocker;
+
+	@Override
+	public Attachment fetchThumb(Attachment source, Integer requestWidth, Integer requestHeight, ThumbnailFitMode fitMode) {
+		TimiException.required(source, "not found source attachment");
+		TimiException.required(source.getId(), "not found source attachment.id");
+		TimiException.required(source.getMongoId(), "not found source attachment.mongoId");
+		TimiException.requiredTrue(requestWidth != null || requestHeight != null, "required width or height");
+		if (requestWidth != null && !(0 < requestWidth && requestWidth < THUMB_MAX_WIDTH + 1)) {
+			throw new TimiException(TimiCode.ARG_BAD, "attachment.thumbnail.width.invalid");
+		}
+		if (requestHeight != null && !(0 < requestHeight && requestHeight < THUMB_MAX_HEIGHT + 1)) {
+			throw new TimiException(TimiCode.ARG_BAD, "attachment.thumbnail.height.invalid");
+		}
+		if (requestWidth != null && requestHeight != null) {
+			long pixels = (long) requestWidth * requestHeight;
+			if (THUMB_MAX_PIXELS < pixels) {
+				throw new TimiException(TimiCode.ARG_BAD, "attachment.thumbnail.area.invalid");
+			}
+		}
+		fitMode = TimiJava.defaultIfNull(fitMode, ThumbnailFitMode.FIT);
+
+		String mimeType = source.getMimeType();
+		boolean isImage = mimeType != null && Set.of("image/png", "image/bmp", "image/jpeg").contains(mimeType);
+		boolean isVideo = mimeType != null && Set.of("video/mp4", "video/quicktime").contains(mimeType);
+		if (!isImage && !isVideo) {
+			throw new TimiException(TimiCode.ARG_BAD, "attachment.thumbnail.not.support");
+		}
+
+		int width = TimiJava.defaultIfNull(requestWidth, 0);
+		int height = TimiJava.defaultIfNull(requestHeight, 0);
+		long now = Time.now();
+		Attachment cached = variantMapper.selectValidAttachment(
+			source.getId(),
+			source.getMongoId(),
+			width,
+			height,
+			fitMode.toString(),
+			THUMB_OUTPUT_FORMAT,
+			THUMB_ALGORITHM_VERSION,
+			now
+		);
+		if (cached != null) {
+			return cached;
+		}
+
+		String lockKey = buildThumbLockKey(source, width, height, fitMode);
+		if (!redisLocker.lock(lockKey, 1, THUMB_LOCK_TTL)) {
+			throw new TimiException(TimiCode.ERROR_SERVICE_BUSY, "attachment.thumbnail.generating");
+		}
+		try {
+			cached = variantMapper.selectValidAttachment(
+				source.getId(),
+				source.getMongoId(),
+				width,
+				height,
+				fitMode.toString(),
+				THUMB_OUTPUT_FORMAT,
+				THUMB_ALGORITHM_VERSION,
+				Time.now()
+			);
+			if (cached != null) {
+				return cached;
+			}
+			AttachmentVariant oldVariant = variantMapper.selectByKey(
+				source.getId(),
+				source.getMongoId(),
+				width,
+				height,
+				fitMode.toString(),
+				THUMB_OUTPUT_FORMAT,
+				THUMB_ALGORITHM_VERSION
+			);
+			if (oldVariant != null) {
+				deleteVariant(oldVariant);
+			}
+			File thumbFile = null;
+			AttachmentVariant variant = null;
+			boolean variantInserted = false;
+			try {
+				thumbFile = createThumbFile(source, requestWidth, requestHeight, fitMode, isImage);
+				variant = new AttachmentVariant();
+				variant.setId(UUID.randomUUID().toString());
+				variant.setName(Network.simpleURIFileName(source.getName()) + "." + THUMB_OUTPUT_FORMAT);
+				variant.setMimeType("image/" + THUMB_OUTPUT_FORMAT);
+				long expireAt = Time.now() + THUMB_CACHE_TTL;
+				variant.setSourceAttachmentId(source.getId());
+				variant.setSourceMongoId(source.getMongoId());
+				variant.setSourceMd5(source.getMd5());
+				variant.setRequestWidth(width);
+				variant.setRequestHeight(height);
+				variant.setFitMode(fitMode);
+				variant.setOutputFormat(THUMB_OUTPUT_FORMAT);
+				variant.setAlgorithmVersion(THUMB_ALGORITHM_VERSION);
+				variant.setCreatedAt(Time.now());
+				variant.setExpireAt(expireAt);
+				BufferedImage image = ImageIO.read(thumbFile);
+				if (image != null) {
+					ObjectNode metadata = jackson.createObjectNode();
+					metadata.put("width", image.getWidth());
+					metadata.put("height", image.getHeight());
+					variant.setMetadata(metadata);
+				}
+				try (InputStream inputStream = Files.newInputStream(thumbFile.toPath())) {
+					String mongoId = gridFsTemplate.store(inputStream, variant.getName()).toString();
+					GridFSFile gridFSFile = gridFsTemplate.findOne(new Query(Criteria.where("_id").is(mongoId)));
+					variant.setMongoId(mongoId);
+					variant.setSize(gridFSFile.getLength());
+					try (InputStream md5InputStream = gridFSBucket.openDownloadStream(gridFSFile.getObjectId())) {
+						variant.setMd5(IO.md5(md5InputStream));
+					}
+				}
+				try {
+					variantMapper.insert(variant);
+					variantInserted = true;
+				} catch (DuplicateKeyException e) {
+					destroyVariantFile(variant);
+					Attachment concurrent = variantMapper.selectValidAttachment(
+						source.getId(),
+						source.getMongoId(),
+						width,
+						height,
+						fitMode.toString(),
+						THUMB_OUTPUT_FORMAT,
+						THUMB_ALGORITHM_VERSION,
+						Time.now()
+					);
+					if (concurrent != null) {
+						return concurrent;
+					}
+					throw e;
+				}
+				return toThumbAttachment(source, variant);
+			} catch (Exception e) {
+				if (variant != null) {
+					destroyVariantFile(variant);
+					if (variantInserted) {
+						variantMapper.delete(variant.getId());
+					}
+				}
+				throw e;
+			} finally {
+				IO.destroy(thumbFile);
+			}
+		} catch (TimiException e) {
+			throw e;
+		} catch (Exception e) {
+			log.error("create thumbnail error", e);
+			throw new TimiException(TimiCode.ERROR, "exception.attachment.create.error", e);
+		} finally {
+			redisLocker.releaseLock(lockKey);
+		}
+	}
+
+	private String buildThumbLockKey(Attachment source, int width, int height, ThumbnailFitMode fitMode) {
+		return "%s%s:%s:%s:%s:%s".formatted(
+			THUMB_LOCK_KEY_PREFIX,
+			source.getId(),
+			source.getMongoId(),
+			width,
+			height,
+			fitMode
+		);
+	}
+
+	private File createThumbFile(
+		Attachment source,
+		Integer requestWidth,
+		Integer requestHeight,
+		ThumbnailFitMode fitMode,
+		boolean isImage
+	) throws Exception {
+		File thumbFile = Files.createTempFile("timi-thumb-", ".png").toFile();
+		try {
+			if (isImage) {
+				try (InputStream inputStream = source.openInputStream()) {
+					resize(inputStream, thumbFile, requestWidth, requestHeight, fitMode);
+				}
+				return thumbFile;
+			}
+
+			try (InputStream inputStream = source.openInputStream()) {
+				ByteArrayOutputStream frame = JavaCV.captureThumbnail(inputStream, THUMB_TARGET_SECONDS);
+				if (!(0 < frame.size())) {
+					throw new TimiException(TimiCode.ERROR_NOT_SUPPORT, "attachment.thumbnail.video.frame.empty");
+				}
+				try (InputStream frameInputStream = new ByteArrayInputStream(frame.toByteArray())) {
+					resize(frameInputStream, thumbFile, requestWidth, requestHeight, fitMode);
+				}
+				return thumbFile;
+			}
+		} catch (Exception e) {
+			IO.destroy(thumbFile);
+			throw e;
+		}
+	}
+
+	private void resize(
+		InputStream inputStream,
+		File outputFile,
+		Integer requestWidth,
+		Integer requestHeight,
+		ThumbnailFitMode fitMode
+	) throws IOException {
+		Thumbnails.Builder<? extends InputStream> builder = Thumbnails.of(inputStream)
+			.useExifOrientation(true)
+			.outputFormat(THUMB_OUTPUT_FORMAT);
+		if (requestWidth != null && requestHeight != null) {
+			switch (fitMode) {
+				case FIT -> builder.size(requestWidth, requestHeight).keepAspectRatio(true);
+				case COVER -> builder.size(requestWidth, requestHeight).keepAspectRatio(true).crop(Positions.CENTER);
+				case STRETCH -> builder.size(requestWidth, requestHeight).keepAspectRatio(false);
+			}
+		} else if (requestWidth != null) {
+			builder.width(requestWidth).keepAspectRatio(true);
+		} else {
+			builder.height(requestHeight).keepAspectRatio(true);
+		}
+		builder.toFile(outputFile);
+	}
+
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void deleteBySourceId(String sourceAttachmentId) {
+		for (AttachmentVariant variant : variantMapper.selectBySourceAttachmentId(sourceAttachmentId)) {
+			deleteVariant(variant);
+		}
+	}
+
+	private void deleteVariant(AttachmentVariant variant) {
+		destroyVariantFile(variant);
+		variantMapper.delete(variant.getId());
+	}
+
+	private void destroyVariantFile(AttachmentVariant variant) {
+		if (variant.getMongoId() != null) {
+			gridFsTemplate.delete(Query.query(Criteria.where("_id").is(variant.getMongoId())));
+		}
+	}
+
+	private Attachment toThumbAttachment(Attachment source, AttachmentVariant variant) {
+		Attachment thumb = new Attachment();
+		thumb.setId(variant.getId());
+		thumb.setBizType(source.getBizType());
+		thumb.setBizId(source.getId());
+		thumb.setAttachType(MediaAttach.Type.THUMB.toString());
+		thumb.setMongoId(variant.getMongoId());
+		thumb.setName(variant.getName());
+		thumb.setMimeType(variant.getMimeType());
+		thumb.setMetadata(variant.getMetadata());
+		thumb.setSize(variant.getSize());
+		thumb.setMd5(variant.getMd5());
+		thumb.setIsDestroyed(false);
+		thumb.setDestroyAt(variant.getExpireAt());
+		return thumb;
+	}
+
+	@Override
+	public void clearExpired() {
+		for (AttachmentVariant variant : variantMapper.selectExpired(Time.now())) {
+			try {
+				deleteVariant(variant);
+			} catch (Exception e) {
+				log.error("clear expired thumbnail variant error, id={}", variant.getId(), e);
+			}
+		}
+	}
+}

src/main/java/com/imyeyu/api/modules/common/service/implement/HTTPQueueServiceImplement.java

@@ -0,0 +1,59 @@
+package com.imyeyu.api.modules.common.service.implement;
+
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.imyeyu.api.modules.common.entity.HTTPQueue;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
+import com.imyeyu.api.modules.common.mapper.HTTPQueueMapper;
+import com.imyeyu.api.modules.common.service.HTTPQueueService;
+import com.imyeyu.java.bean.timi.TimiCode;
+import com.imyeyu.java.bean.timi.TimiException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.net.URI;
+
+/// HTTP 队列服务实现
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class HTTPQueueServiceImplement extends AbstractQueueService<HTTPQueue, NotifyQueueConfig.HTTP> implements HTTPQueueService {
+
+	private final NotifyQueueConfig config;
+
+	private final HTTPQueueMapper mapper;
+
+	@Override
+	protected NotifyQueueConfig.HTTP config() {
+		return config.getHttp();
+	}
+
+	@Override
+	protected BaseQueueMapper<HTTPQueue> mapper() {
+		return mapper;
+	}
+
+	@Override
+	protected void validateSendTo(String sendTo) {
+		try {
+			URI uri = URI.create(sendTo);
+			TimiException.requiredTrue(uri.isAbsolute(), "发送目标不是有效 URI");
+		} catch (IllegalArgumentException e) {
+			throw new TimiException(TimiCode.ARG_BAD, "发送目标不是有效 URI", e);
+		}
+	}
+
+	@Override
+	public void createQueue(NotifyDetail detail) {
+		mapper.insert(new HTTPQueue(detail));
+	}
+
+	@Override
+	protected void doSend(HTTPQueue queue) {
+		throw new TimiException(TimiCode.ERROR_NOT_SUPPORT, "HTTP 推送暂未实现");
+	}
+}

src/main/java/com/imyeyu/api/modules/common/service/implement/MailQueueServiceImplement.java

@@ -0,0 +1,67 @@
+package com.imyeyu.api.modules.common.service.implement;
+
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.imyeyu.api.modules.common.entity.MailQueue;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
+import com.imyeyu.api.modules.common.mapper.MailQueueMapper;
+import com.imyeyu.api.modules.common.service.MailQueueService;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiException;
+import com.imyeyu.utils.Regex;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+/// 邮件队列服务实现
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MailQueueServiceImplement extends AbstractQueueService<MailQueue, NotifyQueueConfig.Mail> implements MailQueueService {
+
+	private final NotifyQueueConfig config;
+	private final JavaMailSender mailSender;
+
+	private final MailQueueMapper mapper;
+
+	@Override
+	protected NotifyQueueConfig.Mail config() {
+		return config.getMail();
+	}
+
+	@Override
+	protected BaseQueueMapper<MailQueue> mapper() {
+		return mapper;
+	}
+
+	@Override
+	protected void validateSendTo(String sendTo) {
+		TimiException.requiredTrue(Regex.isMatch(Regex.EMAIL, sendTo), "发送目标不是有效邮箱");
+	}
+
+	@Override
+	public void createQueue(NotifyDetail detail) {
+		MailQueue queue = new MailQueue(detail);
+		queue.setSendFrom(TimiJava.defaultIfEmpty(queue.getSendFrom(), config.getMail().getDefaultFrom()));
+		mapper.insert(queue);
+	}
+
+	@Override
+	protected void doSend(MailQueue queue) {
+		TimiException.required(queue.getSendFrom(), "邮件发送来源不能为空");
+		TimiException.required(queue.getSubject(), "邮件标题不能为空");
+
+		SimpleMailMessage message = new SimpleMailMessage();
+		message.setFrom(queue.getSendFrom());
+		message.setTo(queue.getSendTo());
+		message.setSubject(queue.getSubject());
+		message.setText(queue.getData());
+		mailSender.send(message);
+		log.info("邮件发送成功，目标：{}", queue.getSendTo());
+	}
+}

src/main/java/com/imyeyu/api/modules/common/service/implement/MultilingualServiceImplement.java

@@ -3,6 +3,7 @@ package com.imyeyu.api.modules.common.service.implement;
 import com.imyeyu.api.modules.common.entity.Multilingual;
 import com.imyeyu.api.modules.common.mapper.MultilingualMapper;
 import com.imyeyu.api.modules.common.service.MultilingualService;
+import com.imyeyu.api.util.PinyinUtil;
 import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import com.imyeyu.spring.util.Redis;
@@ -34,6 +35,18 @@ public class MultilingualServiceImplement extends AbstractEntityService<Multilin
 		return mapper;
 	}
 
+	@Override
+	public void create(Multilingual multilingual) {
+		fillPinyin(multilingual);
+		super.create(multilingual);
+	}
+
+	@Override
+	public void update(Multilingual multilingual) {
+		fillPinyin(multilingual);
+		super.update(multilingual);
+	}
+
 	@Override
 	public Multilingual get(String id) {
 		Multilingual result = redisLanguage.get(getKey(id));
@@ -81,4 +94,14 @@ public class MultilingualServiceImplement extends AbstractEntityService<Multilin
 	private String getKey(String id) {
 		return "%s%s".formatted(KEY_PREFIX, id);
 	}
+
+	private void fillPinyin(Multilingual multilingual) {
+		if (multilingual == null) {
+			return;
+		}
+		String zhCN = multilingual.getZhCN();
+		multilingual.setZhCNPinyinFull(PinyinUtil.full(zhCN));
+		multilingual.setZhCNPinyinInitial(PinyinUtil.initial(zhCN));
+		multilingual.setZhCNPinyinMixed(PinyinUtil.mixed(zhCN));
+	}
 }

src/main/java/com/imyeyu/api/modules/common/service/implement/NotifyDetailServiceImplement.java

@@ -1,12 +1,24 @@
 package com.imyeyu.api.modules.common.service.implement;
 
+import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
 import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.entity.Notify;
 import com.imyeyu.api.modules.common.mapper.NotifyDetailMapper;
+import com.imyeyu.api.modules.common.mapper.NotifyMapper;
 import com.imyeyu.api.modules.common.service.NotifyDetailService;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiCode;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.mapper.BaseMapper;
+import com.imyeyu.spring.bean.Page;
+import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.service.AbstractEntityService;
+import com.imyeyu.utils.Time;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 通知详情服务实现
@@ -18,10 +30,174 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class NotifyDetailServiceImplement extends AbstractEntityService<NotifyDetail, String> implements NotifyDetailService {
 
+	private final NotifyMapper notifyMapper;
+
 	private final NotifyDetailMapper mapper;
 
 	@Override
 	protected BaseMapper<NotifyDetail, String> mapper() {
 		return mapper;
 	}
+
+	/// 创建通知详情，同时初始化投递状态和时间参数
+	///
+	/// @param detail 通知详情
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void create(NotifyDetail detail) {
+		TimiException.required(detail, "未找到通知详情");
+		TimiException.required(detail.getNotifyId(), "未找到通知 ID");
+		TimiException.required(detail.getMsgType(), "未找到消息类型");
+		Notify notify = notifyMapper.select(detail.getNotifyId());
+		TimiException.required(notify, "未找到通知");
+		if (detail.getMsgType() == NotifyDetail.MsgType.INTERNAL) {
+			TimiException.required(detail.getSendTo(), "未找到站内通知接收用户 ID");
+		}
+
+		detail.setRetry(TimiJava.defaultIfNull(detail.getRetry(), 1));
+		detail.setSendAt(TimiJava.defaultIfNull(detail.getSendAt(), Time.now()));
+		detail.setTimeoutAt(TimiJava.defaultIfNull(detail.getTimeoutAt(), detail.getSendAt() + Time.D));
+		detail.setStatus(detail.getMsgType() == NotifyDetail.MsgType.INTERNAL
+		? NotifyDetail.Status.REMINDED
+		: NotifyDetail.Status.WAITING);
+		detail.setReadAt(null);
+		super.create(detail);
+
+		if (detail.getMsgType().isQueue()) {
+			// 加入外部消息队列
+			detail.getMsgType().getService().createQueue(detail);
+		}
+	}
+
+	/// 查询通知下的全部详情
+	///
+	/// @param notifyId 通知 ID
+	/// @return 通知详情列表
+	@Override
+	public List<NotifyDetail> listByNotifyId(String notifyId) {
+		NotifyDetail example = new NotifyDetail();
+		example.setNotifyId(notifyId);
+		return mapper.selectAllByExample(example);
+	}
+
+	/// 删除通知详情
+	///
+	/// @param detailId 通知详情 ID
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void delete(String detailId) {
+		TimiException.required(detailId, "未找到通知详情 ID");
+		NotifyDetail detail = get(detailId);
+		TimiException.required(detail, "未找到通知详情");
+		if (detail.getMsgType().isQueue()) {
+			detail.getMsgType().getService().destroyQueue(detail);
+		}
+		super.delete(detailId);
+	}
+
+	/// 重新将通知详情放入消息队列
+	///
+	/// @param detailId 通知详情 ID
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void requeue(String detailId) {
+		NotifyDetail detail = get(detailId);
+		TimiException.required(detail, "未找到通知详情");
+		TimiException.required(detail.getMsgType(), "未找到消息类型");
+		TimiException.requiredTrue(detail.getMsgType().isQueue(), "站内通知不支持重新入队");
+		if (detail.getStatus() == NotifyDetail.Status.WAITING) {
+			throw new TimiException(TimiCode.RESULT_BAD, "通知详情已经在等待队列中");
+		}
+
+		detail.getMsgType().getService().destroyQueue(detail);
+		detail.setStatus(NotifyDetail.Status.WAITING);
+		detail.setResultDesc(null);
+		detail.setRetry(1);
+		detail.setSendAt(Time.now());
+		detail.setTimeoutAt(detail.getSendAt() + Time.D);
+		update(detail);
+
+		// 加入消息队列
+		detail.getMsgType().getService().createQueue(detail);
+	}
+
+	/// 分页查询用户的站内通知
+	///
+	/// @param page 分页参数
+	/// @param userId 用户 ID
+	/// @param unreadOnly true 为只查询未读通知
+	/// @return 站内通知分页结果
+	@Override
+	public PageResult<NotifyDetail> pageInternalByUserId(Page<NotifyDetail> page, String userId, boolean unreadOnly) {
+		TimiException.required(userId, "未找到用户 ID");
+		Page<NotifyDetail> validPage = TimiJava.defaultIfNull(page, new Page<>());
+		PageResult<NotifyDetail> result = new PageResult<>();
+		result.setTotal(unreadOnly
+			? mapper.countUnreadSiteByUserId(userId)
+			: mapper.countSiteByUserId(userId));
+		result.setList(unreadOnly
+			? mapper.selectUnreadSiteByUserId(userId, validPage.getOffset(), validPage.getLimit())
+			: mapper.selectSiteByUserId(userId, validPage.getOffset(), validPage.getLimit()));
+		return result;
+	}
+
+	/// 查询当前用户拥有的站内通知详情
+	///
+	/// @param detailId 通知详情 ID
+	/// @param userId 用户 ID
+	/// @return 通知详情
+	@Override
+	public NotifyDetail getInternalByUserId(String detailId, String userId) {
+		TimiException.required(detailId, "未找到通知详情 ID");
+		TimiException.required(userId, "未找到用户 ID");
+		NotifyDetail detail = mapper.selectSiteByIdAndUserId(detailId, userId);
+		TimiException.required(detail, "未找到站内通知");
+		return detail;
+	}
+
+	/// 删除当前用户拥有的站内通知详情
+	///
+	/// @param detailId 通知详情 ID
+	/// @param userId 用户 ID
+	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	public void deleteInternalByUserId(String detailId, String userId) {
+		TimiException.required(detailId, "未找到通知详情 ID");
+		TimiException.required(userId, "未找到用户 ID");
+		int affected = mapper.deleteSiteByIdAndUserId(detailId, userId);
+		TimiException.requiredTrue(0 < affected, "未找到站内通知");
+	}
+
+	/// 查询用户未读站内通知数量
+	///
+	/// @param userId 用户 ID
+	/// @return 未读数量
+	@Override
+	public long countUnreadSiteByUserId(String userId) {
+		TimiException.required(userId, "未找到用户 ID");
+		return mapper.countUnreadSiteByUserId(userId);
+	}
+
+	/// 标记站内通知已读
+	///
+	/// @param userId 用户 ID
+	/// @param detailId 通知详情 ID
+	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	public void markSiteRead(String userId, String detailId) {
+		TimiException.required(userId, "未找到用户 ID");
+		TimiException.required(detailId, "未找到通知详情 ID");
+		TimiException.required(mapper.selectSiteByIdAndUserId(detailId, userId), "未找到站内通知");
+		mapper.markSiteRead(detailId, userId, Time.now());
+	}
+
+	/// 标记用户全部站内通知已读
+	///
+	/// @param userId 用户 ID
+	@Override
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	public void markAllSiteRead(String userId) {
+		TimiException.required(userId, "未找到用户 ID");
+		mapper.markAllSiteRead(userId, Time.now());
+	}
 }

src/main/java/com/imyeyu/api/modules/common/service/implement/NotifyServiceImplement.java

@@ -1,12 +1,25 @@
 package com.imyeyu.api.modules.common.service.implement;
 
+import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
 import com.imyeyu.api.modules.common.entity.Notify;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
 import com.imyeyu.api.modules.common.mapper.NotifyMapper;
+import com.imyeyu.api.modules.common.service.NotifyDetailService;
 import com.imyeyu.api.modules.common.service.NotifyService;
+import com.imyeyu.api.modules.system.entity.Logger;
+import com.imyeyu.api.modules.system.service.LoggerService;
+import com.imyeyu.api.modules.user.service.UserLoginService;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiCode;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 通知服务实现
@@ -14,14 +27,118 @@ import org.springframework.stereotype.Service;
  * @author 夜雨
  * @since 2026-05-13 14:46
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class NotifyServiceImplement extends AbstractEntityService<Notify, String> implements NotifyService {
 
+	private final LoggerService loggerService;
+	private final UserLoginService userLoginService;
+	private final NotifyDetailService detailService;
+
 	private final NotifyMapper mapper;
 
 	@Override
 	protected BaseMapper<Notify, String> mapper() {
 		return mapper;
 	}
+
+	/// 创建通知并级联创建通知详情
+	///
+	/// @param notify 通知
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void create(Notify notify) {
+		Logger logger = new Logger(Logger.Module.COMMON, "COMMON_NOTIFY_CREATE");
+		try {
+			TimiException.required(notify, "未找到通知");
+			TimiException.required(notify.getDetailList(), "未找到通知详情列表");
+			super.create(notify);
+
+			String sendFrom = null;
+			if (userLoginService.isLogged()) {
+				sendFrom = userLoginService.getRequireLoginUserId();
+			}
+			for (NotifyDetail detail : notify.getDetailList()) {
+				detail.setNotifyId(notify.getId());
+				if (TimiJava.isNotEmpty(sendFrom)) {
+					detail.setSendFrom(sendFrom);
+				}
+				detailService.create(detail);
+			}
+			logger.setLevel(Logger.Level.INFO);
+			logger.setResult(notify.getId());
+		} catch (TimiException e) {
+			logger.setLevel(Logger.Level.WARN);
+			logger.setException(e.getMessage());
+			throw e;
+		} catch (Exception e) {
+			logger.setLevel(Logger.Level.ERROR);
+			logger.setException(TimiJava.serializeThrowable(e));
+			log.error("创建通知失败", e);
+			throw new TimiException(TimiCode.ERROR, "创建通知失败", e);
+		} finally {
+			loggerService.create(logger);
+		}
+	}
+
+	/// 删除通知并级联软删除通知详情
+	///
+	/// @param notifyId 通知 ID
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void delete(String notifyId) {
+		Logger logger = new Logger(Logger.Module.COMMON, "COMMON_NOTIFY_DELETE");
+		try {
+			TimiException.required(notifyId, "未找到通知 ID");
+			TimiException.required(get(notifyId), "未找到通知");
+			List<NotifyDetail> detailList = detailService.listByNotifyId(notifyId);
+			for (NotifyDetail detail : detailList) {
+				detailService.delete(detail.getId());
+			}
+			super.delete(notifyId);
+			logger.setLevel(Logger.Level.INFO);
+			logger.setResult(notifyId);
+		} catch (TimiException e) {
+			logger.setLevel(Logger.Level.WARN);
+			logger.setException(e.getMessage());
+			throw e;
+		} catch (Exception e) {
+			logger.setLevel(Logger.Level.ERROR);
+			logger.setException(TimiJava.serializeThrowable(e));
+			log.error("删除通知失败", e);
+			throw new TimiException(TimiCode.ERROR, "删除通知失败", e);
+		} finally {
+			loggerService.create(logger);
+		}
+	}
+
+	/// 取消通知中尚未成功发送的通知详情
+	///
+	/// @param notifyId 通知 ID
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void cancel(String notifyId) {
+		TimiException.required(notifyId, "未找到通知 ID");
+		TimiException.required(get(notifyId), "未找到通知");
+
+		boolean canceled = false;
+		for (NotifyDetail detail : detailService.listByNotifyId(notifyId)) {
+			if (detail.getStatus() == NotifyDetail.Status.REMINDED
+				|| detail.getStatus() == NotifyDetail.Status.CANCEL
+			) {
+				continue;
+			}
+			if (detail.getMsgType() != null && detail.getMsgType().isQueue()) {
+				detail.getMsgType().getService().destroyQueue(detail);
+			}
+			detail.setStatus(NotifyDetail.Status.CANCEL);
+			detail.setResultDesc("通知已取消");
+			detailService.update(detail);
+			canceled = true;
+		}
+		if (!canceled) {
+			throw new TimiException(TimiCode.RESULT_BAD, "通知没有可取消的通知详情");
+		}
+	}
 }

src/main/java/com/imyeyu/api/modules/common/service/implement/SmsQueueServiceImplement.java

@@ -0,0 +1,72 @@
+package com.imyeyu.api.modules.common.service.implement;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.entity.SmsQueue;
+import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
+import com.imyeyu.api.modules.common.mapper.SmsQueueMapper;
+import com.imyeyu.api.modules.common.service.SmsQueueService;
+import com.imyeyu.api.modules.common.util.QCloudSmsProxy;
+import com.imyeyu.java.bean.timi.TimiCode;
+import com.imyeyu.java.bean.timi.TimiException;
+import com.imyeyu.utils.Regex;
+import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
+import com.tencentcloudapi.sms.v20210111.models.SendStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/// 短信队列服务实现
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SmsQueueServiceImplement extends AbstractQueueService<SmsQueue, NotifyQueueConfig.Sms> implements SmsQueueService {
+
+	private final NotifyQueueConfig config;
+	private final ObjectMapper jackson;
+	private final QCloudSmsProxy smsProxy;
+
+	private final SmsQueueMapper mapper;
+
+	@Override
+	protected NotifyQueueConfig.Sms config() {
+		return config.getSms();
+	}
+
+	@Override
+	protected BaseQueueMapper<SmsQueue> mapper() {
+		return mapper;
+	}
+
+	@Override
+	protected void validateSendTo(String sendTo) {
+		TimiException.requiredTrue(Regex.isMatch(Regex.MOBILE_PHONE, sendTo), "发送目标不是手机号");
+	}
+
+	@Override
+	public void createQueue(NotifyDetail detail) {
+		mapper.insert(new SmsQueue(detail));
+	}
+
+	@Override
+	protected void doSend(SmsQueue queue) {
+		try {
+			String[] args = jackson.treeToValue(queue.getArgs(), String[].class);
+			SendSmsResponse response = smsProxy.send(queue.getSendTo(), queue.getTemplateId(), args);
+			TimiException.required(response, "未找到短信响应");
+			SendStatus[] statusSet = response.getSendStatusSet();
+			TimiException.requiredTrue(statusSet != null && 0 < statusSet.length, "短信响应为空");
+			if (!"ok".equalsIgnoreCase(statusSet[0].getCode())) {
+				throw new TimiException(TimiCode.ERROR, jackson.writeValueAsString(response));
+			}
+		} catch (TimiException e) {
+			throw e;
+		} catch (Exception e) {
+			throw new TimiException(TimiCode.ERROR, "短信发送失败", e);
+		}
+	}
+}

src/main/java/com/imyeyu/api/modules/common/service/implement/SmsServiceImplement.java

@@ -0,0 +1,85 @@
+package com.imyeyu.api.modules.common.service.implement;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.imyeyu.api.modules.common.entity.Notify;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.service.NotifyDetailService;
+import com.imyeyu.api.modules.common.service.NotifyService;
+import com.imyeyu.api.modules.common.service.SmsService;
+import com.imyeyu.java.bean.timi.TimiCode;
+import com.imyeyu.java.bean.timi.TimiException;
+import com.imyeyu.utils.Regex;
+import com.imyeyu.utils.Text;
+import com.imyeyu.utils.Time;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author 夜雨
+ * @since 2026-05-14 12:12
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SmsServiceImplement implements SmsService {
+
+	@Value("${spring.profiles.active}")
+	private String env;
+
+	private final NotifyQueueConfig config;
+	private final ObjectMapper jackson;
+
+	private final NotifyService notifyService;
+	private final NotifyDetailService notifyDetailService;
+
+	@Override
+	public String captchaCreate(Notify notify) {
+		NotifyQueueConfig.Sms.Captcha captchaConf = config.getSms().getCaptcha();
+
+		NotifyDetail detail = notify.getDetailList().getFirst();
+
+		TimiException.requiredTrue(Regex.isMatch(Regex.MOBILE_PHONE, detail.getSendTo()), "invalid mobilePhone");
+
+		String code = Text.randomString("0123456789", 6);
+		if (!env.equalsIgnoreCase("prod")) {
+			code = "123456";
+		}
+		detail.setMsgType(NotifyDetail.MsgType.SMS);
+		detail.setTemplateId(captchaConf.getTemplateId());
+		detail.setArgs(jackson.valueToTree(List.of(code, captchaConf.getTtlMinute())));
+
+		notifyService.create(notify);
+		return notifyDetailService.listByNotifyId(notify.getId()).getFirst().getId();
+	}
+
+	@Override
+	public NotifyDetail captchaVerify(String detailId, String captcha) {
+		NotifyQueueConfig.Sms.Captcha captchaConf = config.getSms().getCaptcha();
+
+		NotifyDetail detail = notifyDetailService.get(detailId);
+		TimiException.required(detail, "短信验证码无效");
+		TimiException.required(detail.getSendAt(), "短信验证码无效");
+		TimiException.requiredTrue(NotifyDetail.MsgType.SMS == detail.getMsgType(), "短信验证码无效");
+		if (Time.M * captchaConf.getTtlMinute() < Time.now() - detail.getSendAt()) {
+			throw new TimiException(TimiCode.ARG_EXPIRED, "验证码过期");
+		}
+		if (detail.getArgs() instanceof ArrayNode array) {
+			String dbCaptcha = array.get(captchaConf.getArgIndex()).asText();
+			if (!dbCaptcha.equalsIgnoreCase(captcha)) {
+				throw new TimiException(TimiCode.RESULT_BAD, "验证码错误");
+			}
+		} else {
+			throw new TimiException(TimiCode.ERROR, "not array args");
+		}
+		detail.setNotify(notifyService.get(detail.getNotifyId()));
+		return detail;
+	}
+}

src/main/java/com/imyeyu/api/modules/common/service/implement/TagServiceImplement.java

@@ -1,5 +1,6 @@
 package com.imyeyu.api.modules.common.service.implement;
 
+import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
 import com.imyeyu.api.modules.common.entity.Tag;
 import com.imyeyu.api.modules.common.entity.TagApply;
 import com.imyeyu.api.modules.common.mapper.TagApplyMapper;
@@ -7,11 +8,14 @@ import com.imyeyu.api.modules.common.mapper.TagMapper;
 import com.imyeyu.api.modules.common.service.MultilingualService;
 import com.imyeyu.api.modules.common.service.TagService;
 import com.imyeyu.java.bean.timi.TimiException;
+import com.imyeyu.spring.bean.Page;
+import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -70,6 +74,14 @@ public class TagServiceImplement extends AbstractEntityService<Tag, String> impl
 		return mapper.selectByIdList(new HashSet<>(idList));
 	}
 
+	@Override
+	public PageResult<Tag> pageByOwnerAndKeyword(Page<Tag> page, Tag.OwnerType ownerType, String ownerId, String keyword) {
+		PageResult<Tag> result = new PageResult<>();
+		result.setTotal(mapper.countByOwnerAndKeyword(ownerType, ownerId, keyword));
+		result.setList(mapper.selectByOwnerAndKeyword(ownerType, ownerId, keyword, page.getOffset(), page.getLimit()));
+		return result;
+	}
+
 	@Override
 	public List<Tag> listByBizType(TagApply.BizType bizType, String bizId) {
 		return listByIdList(listApply(bizType, bizId).stream().map(TagApply::getTagId).toList());
@@ -94,6 +106,19 @@ public class TagServiceImplement extends AbstractEntityService<Tag, String> impl
 		}
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void deleteByOwner(Tag.OwnerType ownerType, String ownerId) {
+		TimiException.required(ownerType, "not found ownerType");
+		TimiException.required(ownerId, "not found ownerId");
+		Tag example = new Tag();
+		example.setOwnerType(ownerType);
+		example.setOwnerId(ownerId);
+		for (Tag tag : mapper.selectAllByExample(example)) {
+			super.delete(tag.getId());
+		}
+	}
+
 	private List<TagApply> listApply(TagApply.BizType bizType, String bizId) {
 		TimiException.required(bizType, "not found bizType");
 		TimiException.required(bizId, "not found bizId");

src/main/java/com/imyeyu/api/modules/common/service/implement/WechatQueueServiceImplement.java

@@ -0,0 +1,52 @@
+package com.imyeyu.api.modules.common.service.implement;
+
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.entity.WechatQueue;
+import com.imyeyu.api.modules.common.mapper.BaseQueueMapper;
+import com.imyeyu.api.modules.common.mapper.WechatQueueMapper;
+import com.imyeyu.api.modules.common.service.WechatQueueService;
+import com.imyeyu.java.bean.timi.TimiCode;
+import com.imyeyu.java.bean.timi.TimiException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/// 微信队列服务实现
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class WechatQueueServiceImplement extends AbstractQueueService<WechatQueue, NotifyQueueConfig.Wechat> implements WechatQueueService {
+
+	private final NotifyQueueConfig config;
+
+	private final WechatQueueMapper mapper;
+
+	@Override
+	protected NotifyQueueConfig.Wechat config() {
+		return config.getWechat();
+	}
+
+	@Override
+	protected BaseQueueMapper<WechatQueue> mapper() {
+		return mapper;
+	}
+
+	@Override
+	protected void validateSendTo(String sendTo) {
+		TimiException.required(sendTo, "发送目标不能为空");
+	}
+
+	@Override
+	public void createQueue(NotifyDetail detail) {
+		mapper.insert(new WechatQueue(detail));
+	}
+
+	@Override
+	protected void doSend(WechatQueue queue) {
+		throw new TimiException(TimiCode.ERROR_NOT_SUPPORT, "微信推送暂未实现");
+	}
+}

src/main/java/com/imyeyu/api/modules/common/task/AttachmentClearTask.java

@@ -2,6 +2,7 @@ package com.imyeyu.api.modules.common.task;
 
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
+import com.imyeyu.api.modules.common.service.AttachmentVariantService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
@@ -23,6 +24,7 @@ import java.util.List;
 public class AttachmentClearTask {
 
 	private final AttachmentService attachmentService;
+	private final AttachmentVariantService attachmentVariantService;
 
 	@Scheduled(cron = "0 0 1 * * ?")
 	public void run() {
@@ -31,19 +33,20 @@ public class AttachmentClearTask {
 			List<Attachment> needDestroyList = attachmentService.listNeedDestroy();
 			if (needDestroyList.isEmpty()) {
 				log.info("nothing attachment need clear");
-				return;
+			} else {
-			}
+				for (Attachment attach : needDestroyList) {
-			for (Attachment attach : needDestroyList) {
+					try {
-				try {
+						attachmentService.destroy(attach.getId());
-					attachmentService.destroy(attach.getId());
+						log.info("clear attachment success: id[{}]", attach.getId());
-					log.info("clear attachment success: id[{}]", attach.getId());
+					} catch (Exception e) {
-				} catch (Exception e) {
+						log.error("clear attachment error: id[{}]", attach.getId(), e);
-					log.error("clear attachment error: id[{}]", attach.getId(), e);
+					}
 				}
 			}
+			attachmentVariantService.clearExpired();
 			log.info("end clear expired attachments");
 		} catch (Exception e) {
 			log.error("attachment clear task error", e);
 		}
 	}
-}
+}

src/main/java/com/imyeyu/api/modules/common/task/MailQueueTask.java

@@ -0,0 +1,46 @@
+package com.imyeyu.api.modules.common.task;
+
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.imyeyu.api.modules.common.service.MailQueueService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Service;
+
+/// 邮件队列定时任务
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MailQueueTask implements SchedulingConfigurer {
+
+	private final NotifyQueueConfig config;
+
+	private final MailQueueService service;
+
+	private boolean running;
+
+	@Override
+	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+		if (!config.getMail().isEnable()) {
+			log.warn("邮件队列任务已禁用");
+			return;
+		}
+		taskRegistrar.addTriggerTask(() -> {
+			if (running) {
+				log.info("邮件队列任务正在运行，跳过本次执行");
+				return;
+			}
+			running = true;
+			try {
+				service.invokeQueue();
+			} finally {
+				running = false;
+			}
+		}, triggerContext -> new CronTrigger(config.getMail().getCron()).nextExecution(triggerContext));
+	}
+}

src/main/java/com/imyeyu/api/modules/common/task/SmsQueueTask.java

@@ -0,0 +1,46 @@
+package com.imyeyu.api.modules.common.task;
+
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.imyeyu.api.modules.common.service.SmsQueueService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Service;
+
+/// 短信队列定时任务
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SmsQueueTask implements SchedulingConfigurer {
+
+	private final NotifyQueueConfig config;
+
+	private final SmsQueueService service;
+
+	private boolean running;
+
+	@Override
+	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+		if (!config.getSms().isEnable()) {
+			log.warn("短信队列任务已禁用");
+			return;
+		}
+		taskRegistrar.addTriggerTask(() -> {
+			if (running) {
+				log.info("短信队列任务正在运行，跳过本次执行");
+				return;
+			}
+			running = true;
+			try {
+				service.invokeQueue();
+			} finally {
+				running = false;
+			}
+		}, triggerContext -> new CronTrigger(config.getSms().getCron()).nextExecution(triggerContext));
+	}
+}

src/main/java/com/imyeyu/api/modules/common/task/WechatQueueTask.java

@@ -0,0 +1,8 @@
+package com.imyeyu.api.modules.common.task;
+
+/// 微信队列定时任务占位
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public class WechatQueueTask {
+}

src/main/java/com/imyeyu/api/modules/common/util/QCloudSmsProxy.java

@@ -0,0 +1,73 @@
+package com.imyeyu.api.modules.common.util;
+
+import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+import com.tencentcloudapi.common.Credential;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.tencentcloudapi.common.profile.ClientProfile;
+import com.tencentcloudapi.common.profile.HttpProfile;
+import com.tencentcloudapi.sms.v20210111.SmsClient;
+import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
+import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/// 腾讯云短信服务代理
+///
+/// @author 夜雨
+/// @since 2026-08-20
+@Component
+@RequiredArgsConstructor
+public class QCloudSmsProxy {
+
+	private final NotifyQueueConfig config;
+
+	/// 发送短信
+	///
+	/// @param mobilePhone 手机号
+	/// @param templateId 模板 ID
+	/// @param args 模板参数
+	/// @return 腾讯云短信响应
+	/// @throws TencentCloudSDKException 腾讯云 SDK 调用异常
+	public SendSmsResponse send(String mobilePhone, String templateId, String[] args) throws TencentCloudSDKException {
+		return send(List.of(mobilePhone), templateId, args);
+	}
+
+	/// 批量发送短信
+	///
+	/// @param mobilePhoneList 手机号列表
+	/// @param templateId 模板 ID
+	/// @param args 模板参数
+	/// @return 腾讯云短信响应
+	/// @throws TencentCloudSDKException 腾讯云 SDK 调用异常
+	public SendSmsResponse send(List<String> mobilePhoneList, String templateId, String[] args) throws TencentCloudSDKException {
+		SmsClient client = createSmsClient();
+		NotifyQueueConfig.Sms sms = config.getSms();
+
+		SendSmsRequest request = new SendSmsRequest();
+		request.setSmsSdkAppId(sms.getAppId().trim());
+		request.setSignName(sms.getSign().trim());
+		request.setTemplateId(templateId);
+		request.setTemplateParamSet(args);
+		request.setPhoneNumberSet(mobilePhoneList.toArray(new String[0]));
+		return client.SendSms(request);
+	}
+
+	private SmsClient createSmsClient() {
+		NotifyQueueConfig.Sms sms = config.getSms();
+		Credential credential = new Credential(sms.getSecretId().trim(), sms.getSecretKey().trim());
+
+		HttpProfile httpProfile = new HttpProfile();
+		httpProfile.setReqMethod("GET");
+		httpProfile.setConnTimeout(10);
+		httpProfile.setWriteTimeout(10);
+		httpProfile.setReadTimeout(10);
+		httpProfile.setEndpoint("sms.tencentcloudapi.com");
+
+		ClientProfile clientProfile = new ClientProfile();
+		clientProfile.setSignMethod("HmacSHA256");
+		clientProfile.setHttpProfile(httpProfile);
+		return new SmsClient(credential, "ap-guangzhou", clientProfile);
+	}
+}

src/main/java/com/imyeyu/api/modules/common/util/QueueSQLProvider.java

@@ -0,0 +1,35 @@
+package com.imyeyu.api.modules.common.util;
+
+import com.imyeyu.api.modules.common.entity.BaseQueueEntity;
+import com.imyeyu.spring.util.SQLProvider;
+import com.imyeyu.utils.Time;
+import org.apache.ibatis.builder.annotation.ProviderContext;
+
+/// 通知队列 SQL 提供器
+///
+/// @author 夜雨
+/// @since 2026-08-20
+public class QueueSQLProvider extends SQLProvider {
+
+	/// 查询已到发送时间的队列
+	///
+	/// @param context Mapper 上下文
+	/// @return 查询 SQL
+	public String listReadyQueue(ProviderContext context) {
+		EntityMeta meta = getEntityMeta(context);
+		StringBuilder sql = new StringBuilder("SELECT * FROM %s WHERE 1 = 1".formatted(meta.getTable()));
+		if (BaseQueueEntity.class.isAssignableFrom(meta.getEntityClass())) {
+			sql.append(" AND `send_at` < %d".formatted(Time.now()));
+		}
+		return sql.toString();
+	}
+
+	/// 根据通知详情 ID 物理删除队列
+	///
+	/// @param context Mapper 上下文
+	/// @return 删除 SQL
+	public String destroyByNotifyDetailId(ProviderContext context) {
+		EntityMeta meta = getEntityMeta(context);
+		return "DELETE FROM %s WHERE `notify_detail_id` = #{notifyDetailId}".formatted(meta.getTable());
+	}
+}

src/main/java/com/imyeyu/api/modules/common/vo/SmsCaptchaVerifyRequest.java

@@ -0,0 +1,15 @@
+package com.imyeyu.api.modules.common.vo;
+
+import lombok.Data;
+
+///
+///
+/// @author 夜雨
+/// @since 2026-08-21 17:59
+@Data
+public class SmsCaptchaVerifyRequest {
+
+	private String detailId;
+
+	private String captcha;
+}

src/main/java/com/imyeyu/api/modules/gao/controller/GaoCustomerChartController.java

@@ -3,9 +3,11 @@ package com.imyeyu.api.modules.gao.controller;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.service.GaoCustomerChartService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerChartReq;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import lombok.RequiredArgsConstructor;
@@ -26,6 +28,7 @@ import java.util.List;
 public class GaoCustomerChartController {
 
 	private final GaoCustomerChartService service;
+	private final GaoStoreScopeService storeScopeService;
 
 	/// 查询客户登记每日统计，可同时支撑登记趋势和登记事件结构图表
 	@AOPLog
@@ -33,6 +36,8 @@ public class GaoCustomerChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/daily")
 	public List<GaoEventRecordDailyStatView> eventRecordDaily(@RequestBody GaoCustomerChartReq req) {
+		TimiException.required(req, "not found req");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordDailyStat(req);
 	}
 
@@ -42,6 +47,8 @@ public class GaoCustomerChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/calendar")
 	public List<GaoEventRecordCalendarView> eventRecordCalendar(@RequestBody GaoCustomerChartReq req) {
+		TimiException.required(req, "not found req");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordCalendar(req);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoCustomerController.java

@@ -1,21 +1,17 @@
 package com.imyeyu.api.modules.gao.controller;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
-import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerPage;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
-import com.imyeyu.api.modules.user.service.RoleChecker;
-import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiException;
@@ -50,11 +46,9 @@ import java.util.Map;
 public class GaoCustomerController {
 
 	private final UserService userService;
-	private final RoleChecker roleChecker;
 	private final AttachmentService attachmentService;
 	private final GaoCustomerService service;
-	private final GaoStoreService gaoStoreService;
+	private final GaoStoreScopeService storeScopeService;
-	private final UserLoginService userLoginService;
 
 	@AOPLog
 	@RequestRateLimit
@@ -62,6 +56,8 @@ public class GaoCustomerController {
 	@PostMapping("/list")
 	@JsonView(ResponseView.Public.class)
 	public PageResult<GaoCustomer> list(@RequestBody GaoCustomerPage page) {
+		TimiException.required(page, "not found page");
+		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		PageResult<GaoCustomer> result = service.pageByQuery(page);
 
 		List<String> idList = result.getList().stream().map(GaoCustomer::getId).distinct().toList();
@@ -79,6 +75,8 @@ public class GaoCustomerController {
 	@JsonView(ResponseView.Public.class)
 	public GaoCustomer detail(@RequestParam String id) {
 		GaoCustomer customer = service.get(id);
+		TimiException.required(customer, "not found customer");
+		storeScopeService.checkStoreId(customer.getStoreId());
 		if (TimiJava.isNotEmpty(customer.getIntroducerCustomerId())) {
 			GaoCustomer introducerCustomer = service.get(customer.getIntroducerCustomerId());
 			introducerCustomer.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.GAO_CUSTOMER, introducerCustomer.getId()));
@@ -97,9 +95,7 @@ public class GaoCustomerController {
 	@PostMapping("/create")
 	@JsonView(ResponseView.Public.class)
 	public String create(@RequestBody GaoCustomer customer) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		customer.setStoreId(storeScopeService.resolveStoreId(customer.getStoreId()));
-			customer.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
-		}
 		service.create(customer);
 		return customer.getId();
 	}
@@ -109,9 +105,12 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoCustomer customer) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		TimiException.required(customer, "not found customer");
-			customer.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
+		TimiException.required(customer.getId(), "not found customer.id");
-		}
+		GaoCustomer dbCustomer = service.get(customer.getId());
+		TimiException.required(dbCustomer, "not found customer");
+		storeScopeService.checkStoreId(dbCustomer.getStoreId());
+		customer.setStoreId(dbCustomer.getStoreId());
 		service.updateWithAttachment(customer);
 	}
 
@@ -120,6 +119,9 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
+		GaoCustomer customer = service.get(id);
+		TimiException.required(customer, "not found customer");
+		storeScopeService.checkStoreId(customer.getStoreId());
 		service.delete(id);
 	}
 
@@ -131,6 +133,7 @@ public class GaoCustomerController {
 	public GaoCustomer findById(@RequestParam String id) {
 		GaoCustomer customer = service.get(id);
 		TimiException.required(customer, "not found customer");
+		storeScopeService.checkStoreId(customer.getStoreId());
 		customer.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.GAO_CUSTOMER, customer.getId()));
 		return customer;
 	}
@@ -141,7 +144,7 @@ public class GaoCustomerController {
 	@PostMapping("/find/code")
 	@JsonView(ResponseView.Public.class)
 	public GaoCustomer findByCode(@RequestParam String storeId, @RequestParam String code) {
-		GaoCustomer customer = service.getByCode(storeId, code);
+		GaoCustomer customer = service.getByCode(storeScopeService.resolveStoreId(storeId), code);
 		if (customer == null) {
 			return null;
 		}
@@ -155,7 +158,7 @@ public class GaoCustomerController {
 	@PostMapping("/find/name")
 	@JsonView(ResponseView.Public.class)
 	public GaoCustomer findByName(@RequestParam String storeId, @RequestParam String name) {
-		GaoCustomer customer = service.getByName(storeId, name);
+		GaoCustomer customer = service.getByName(storeScopeService.resolveStoreId(storeId), name);
 		if (customer == null) {
 			return null;
 		}
@@ -169,6 +172,12 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_EXPORT)
 	@PostMapping("/export")
 	public void export(@RequestBody Page<GaoCustomer> page) throws IOException {
+		TimiException.required(page, "not found page");
+		if (!storeScopeService.hasGlobalScope()) {
+			GaoCustomer example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoCustomer());
+			example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
+			page.setEqualsExample(example);
+		}
 		HttpServletResponse resp = TimiSpring.getResponse();
 		String contentDisposition = Network.getFileDownloadHeader("客户列表-%s.xlsx".formatted(Time.serialize.format(Time.now())));
 		resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -182,6 +191,9 @@ public class GaoCustomerController {
 	@PostMapping("/invited/list")
 	@JsonView(ResponseView.Public.class)
 	public List<GaoCustomer> listInvited(@RequestParam String introducerCustomerId) {
+		GaoCustomer introducerCustomer = service.get(introducerCustomerId);
+		TimiException.required(introducerCustomer, "not found introducerCustomer");
+		storeScopeService.checkStoreId(introducerCustomer.getStoreId());
 		List<GaoCustomer> result = service.listInvited(introducerCustomerId);
 		List<String> idList = result.stream().map(GaoCustomer::getId).distinct().toList();
 		Map<String, List<Attachment>> attachMap = attachmentService.mapByBizIdList(Attachment.BizType.GAO_CUSTOMER, idList);
@@ -196,6 +208,9 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_UPDATE)
 	@PostMapping("/invite/save")
 	public void saveInvite(@RequestParam String introducerCustomerId, @RequestParam String customerId) {
+		GaoCustomer customer = service.get(customerId);
+		TimiException.required(customer, "not found customer");
+		storeScopeService.checkStoreId(customer.getStoreId());
 		service.saveInviteRelation(introducerCustomerId, customerId);
 	}
 
@@ -204,6 +219,9 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_UPDATE)
 	@PostMapping("/invite/delete")
 	public void deleteInvite(@RequestParam String customerId) {
+		GaoCustomer customer = service.get(customerId);
+		TimiException.required(customer, "not found customer");
+		storeScopeService.checkStoreId(customer.getStoreId());
 		service.deleteInviteRelation(customerId);
 	}
 
@@ -213,6 +231,8 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_READ)
 	@PostMapping("/state/daily")
 	public List<GaoCustomerDailyStateView> dailyStat(@RequestBody GaoCustomerTrendStateReq req) {
+		TimiException.required(req, "not found req");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.stateDailyTrend(req);
 	}
 
@@ -222,6 +242,6 @@ public class GaoCustomerController {
 	@RequireGaoPermission(GaoPermissionCode.CUSTOMER_READ)
 	@PostMapping("/state/gender")
 	public List<GaoCustomerGenderStatView> genderStat(@RequestParam String storeId) {
-		return service.stateGender(storeId);
+		return service.stateGender(storeScopeService.resolveStoreId(storeId));
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventController.java

@@ -1,14 +1,12 @@
 package com.imyeyu.api.modules.gao.controller;
 
-import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoEvent;
 import com.imyeyu.api.modules.gao.service.GaoEventService;
-import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
-import com.imyeyu.api.modules.user.service.RoleChecker;
+import com.imyeyu.java.TimiJava;
-import com.imyeyu.api.modules.user.service.UserLoginService;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import com.imyeyu.spring.bean.Page;
@@ -33,15 +31,19 @@ import java.util.Map;
 public class GaoEventController {
 
 	private final GaoEventService service;
-	private final RoleChecker roleChecker;
+	private final GaoStoreScopeService storeScopeService;
-	private final GaoStoreService gaoStoreService;
-	private final UserLoginService userLoginService;
 
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.EVENT_READ)
 	@PostMapping("/list")
 	public PageResult<GaoEvent> list(@RequestBody Page<GaoEvent> page) {
+		TimiException.required(page, "not found page");
+		if (!storeScopeService.hasGlobalScope()) {
+			GaoEvent example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoEvent());
+			example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
+			page.setEqualsExample(example);
+		}
 		PageResult<GaoEvent> result = service.page(page);
 		Map<String, List<String>> roleMap = service.mapRoleCodeListByEventIdList(result.getList().stream().map(GaoEvent::getId).toList());
 		for (GaoEvent event : result.getList()) {
@@ -52,9 +54,10 @@ public class GaoEventController {
 
 	@AOPLog
 	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.EVENT_READ)
 	@PostMapping("/list/valid")
 	public List<GaoEvent> listValid(@RequestParam String storeId) {
-		return service.listValid(storeId);
+		return service.listValid(storeScopeService.resolveStoreId(storeId));
 	}
 
 	@AOPLog
@@ -63,6 +66,8 @@ public class GaoEventController {
 	@PostMapping("/detail")
 	public GaoEvent detail(@RequestParam String id) {
 		GaoEvent event = service.get(id);
+		TimiException.required(event, "not found event");
+		storeScopeService.checkStoreId(event.getStoreId());
 		event.setRoleCodeList(service.listRoleCode(event.getId()));
 		return event;
 	}
@@ -72,9 +77,7 @@ public class GaoEventController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_CREATE)
 	@PostMapping("/create")
 	public void create(@RequestBody GaoEvent event) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		event.setStoreId(storeScopeService.resolveStoreId(event.getStoreId()));
-			event.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
-		}
 		service.create(event);
 	}
 
@@ -83,9 +86,12 @@ public class GaoEventController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoEvent event) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		TimiException.required(event, "not found event");
-			event.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
+		TimiException.required(event.getId(), "not found event.id");
-		}
+		GaoEvent dbEvent = service.get(event.getId());
+		TimiException.required(dbEvent, "not found event");
+		storeScopeService.checkStoreId(dbEvent.getStoreId());
+		event.setStoreId(dbEvent.getStoreId());
 		service.update(event);
 	}
 
@@ -94,6 +100,11 @@ public class GaoEventController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_UPDATE)
 	@PostMapping("/sort")
 	public void sort(@RequestBody List<String> idList) {
+		for (String id : TimiJava.safeIterable(idList)) {
+			GaoEvent event = service.get(id);
+			TimiException.required(event, "not found event");
+			storeScopeService.checkStoreId(event.getStoreId());
+		}
 		service.sort(idList);
 	}
 
@@ -102,6 +113,9 @@ public class GaoEventController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
+		GaoEvent event = service.get(id);
+		TimiException.required(event, "not found event");
+		storeScopeService.checkStoreId(event.getStoreId());
 		service.delete(id);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventRecordController.java

@@ -1,27 +1,24 @@
 package com.imyeyu.api.modules.gao.controller;
 
 import com.fasterxml.jackson.annotation.JsonView;
-import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
 import com.imyeyu.api.modules.gao.entity.GaoEvent;
 import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
 import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
 import com.imyeyu.api.modules.gao.service.GaoEventService;
-import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerEventRankView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordPage;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordPageResult;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordRankPage;
-import com.imyeyu.api.modules.user.service.RoleChecker;
-import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.network.Network;
 import com.imyeyu.spring.TimiSpring;
 import com.imyeyu.spring.annotation.AOPLog;
@@ -52,13 +49,11 @@ import java.util.Map;
 public class GaoEventRecordController {
 
 	private final UserService userService;
-	private final RoleChecker roleChecker;
 	private final GaoEventService eventService;
 	private final AttachmentService attachmentService;
 	private final GaoCustomerService customerService;
-	private final GaoStoreService gaoStoreService;
+	private final GaoStoreScopeService storeScopeService;
 	private final GaoEventRecordService service;
-	private final UserLoginService userLoginService;
 
 	@AOPLog
 	@RequestRateLimit
@@ -66,6 +61,8 @@ public class GaoEventRecordController {
 	@PostMapping("/list")
 	@JsonView(ResponseView.Public.class)
 	public GaoEventRecordPageResult list(@RequestBody GaoEventRecordPage page) {
+		TimiException.required(page, "not found page");
+		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		PageResult<GaoEventRecord> pageResult = service.pageByRange(page);
 		GaoEventRecordPageResult result = new GaoEventRecordPageResult();
 		result.setTotal(pageResult.getTotal());
@@ -108,6 +105,8 @@ public class GaoEventRecordController {
 	@JsonView(ResponseView.Public.class)
 	public GaoEventRecord detail(@RequestParam String id) {
 		GaoEventRecord record = service.get(id);
+		TimiException.required(record, "not found event record");
+		storeScopeService.checkStoreId(record.getStoreId());
 		record.setCustomer(customerService.get(record.getCustomerId()));
 		record.getCustomer().setAttachmentList(attachmentService.listByBizId(Attachment.BizType.GAO_CUSTOMER, record.getCustomerId()));
 		record.setEvent(eventService.get(record.getEventId()));
@@ -121,9 +120,7 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_CREATE)
 	@PostMapping("/create")
 	public void create(@RequestBody GaoEventRecord record) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		resolveCreateRecordStore(record);
-			record.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
-		}
 		service.create(record);
 	}
 
@@ -132,11 +129,8 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_CREATE)
 	@PostMapping("/create/batch")
 	public void createBatch(@RequestBody List<GaoEventRecord> recordList) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		for (GaoEventRecord record : TimiJava.safeIterable(recordList)) {
-			String storeId = gaoStoreService.getBelongIdByRequiredLoginUserId();
+			resolveCreateRecordStore(record);
-			for (GaoEventRecord record : recordList) {
-				record.setStoreId(storeId);
-			}
 		}
 		service.createBatch(recordList);
 	}
@@ -146,11 +140,17 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_CREATE)
 	@PostMapping("/create/customer")
 	public void createWithCustomer(@RequestBody GaoCustomer customer) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		TimiException.required(customer, "not found customer");
-			String storeId = gaoStoreService.getBelongIdByRequiredLoginUserId();
+		if (TimiJava.isNotEmpty(customer.getId())) {
-			for (GaoEventRecord record : TimiJava.safeIterable(customer.getEventRecordList())) {
+			GaoCustomer dbCustomer = customerService.get(customer.getId());
-				record.setStoreId(storeId);
+			TimiException.required(dbCustomer, "not found customer");
-			}
+			storeScopeService.checkStoreId(dbCustomer.getStoreId());
+			customer.setStoreId(dbCustomer.getStoreId());
+		} else {
+			customer.setStoreId(storeScopeService.resolveStoreId(customer.getStoreId()));
+		}
+		for (GaoEventRecord record : TimiJava.safeIterable(customer.getEventRecordList())) {
+			resolveCreateRecordStore(record);
 		}
 		service.createWithCustomer(customer);
 	}
@@ -160,9 +160,12 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoEventRecord record) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		TimiException.required(record, "not found event record");
-			record.setStoreId(gaoStoreService.getBelongIdByRequiredLoginUserId());
+		TimiException.required(record.getId(), "not found event record.id");
-		}
+		GaoEventRecord dbRecord = service.get(record.getId());
+		TimiException.required(dbRecord, "not found event record");
+		storeScopeService.checkStoreId(dbRecord.getStoreId());
+		record.setStoreId(dbRecord.getStoreId());
 		service.update(record);
 	}
 
@@ -171,6 +174,9 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
+		GaoEventRecord record = service.get(id);
+		TimiException.required(record, "not found event record");
+		storeScopeService.checkStoreId(record.getStoreId());
 		service.delete(id);
 	}
 
@@ -180,6 +186,8 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.EVENT_RECORD_EXPORT)
 	@PostMapping("/export")
 	public void export(@RequestBody GaoEventRecordPage page) throws IOException {
+		TimiException.required(page, "not found page");
+		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		HttpServletResponse resp = TimiSpring.getResponse();
 		String contentDisposition = Network.getFileDownloadHeader("登记事件记录-%s.xlsx".formatted(Time.serialize.format(Time.now())));
 		resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -193,6 +201,8 @@ public class GaoEventRecordController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/rank")
 	public PageResult<GaoCustomerEventRankView> eventRank(@RequestBody GaoEventRecordRankPage page) {
+		TimiException.required(page, "not found page");
+		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		PageResult<GaoCustomerEventRankView> result = service.pageRankByRange(page);
 		List<String> customerIdList = result.getList().stream().map(GaoCustomerEventRankView::getCustomerId).distinct().toList();
 		if (customerIdList.isEmpty()) {
@@ -209,4 +219,12 @@ public class GaoEventRecordController {
 		}
 		return result;
 	}
+
+	private void resolveCreateRecordStore(GaoEventRecord record) {
+		TimiException.required(record, "not found event record");
+		GaoEvent event = eventService.get(record.getEventId());
+		TimiException.required(event, "not found event");
+		storeScopeService.checkStoreId(event.getStoreId());
+		record.setStoreId(event.getStoreId());
+	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoPointAccountController.java

@@ -1,17 +1,18 @@
 package com.imyeyu.api.modules.gao.controller;
 
-import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
 import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
-import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
-import com.imyeyu.api.modules.user.service.RoleChecker;
+import com.imyeyu.api.modules.gao.vo.GaoPointAccountPage;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
+import com.imyeyu.spring.bean.PageResult;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,23 +26,33 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/gao/customer/point")
 public class GaoPointAccountController {
 
-	private final RoleChecker roleChecker;
+	private final GaoStoreScopeService storeScopeService;
-	private final GaoStoreService storeService;
 	private final GaoPointAccountService accountService;
 
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.POINT_ACCOUNT_READ)
-	@PostMapping("/account/detail")
+	@PostMapping("/account/list")
+	public PageResult<GaoPointAccount> list(@RequestBody GaoPointAccountPage page) {
+		TimiException.required(page, "not found page");
+		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
+		return accountService.pageByQuery(page);
+	}
+
+	@AOPLog
+	@RequestRateLimit
+	@RequireGaoPermission(GaoPermissionCode.POINT_ACCOUNT_READ)
+	@PostMapping("/account/detail/customer")
 	public GaoPointAccount detail(@RequestParam String customerId, @RequestParam(required = false) String storeId) {
-		storeId = resolveStoreId(storeId);
+		storeId = storeScopeService.resolveStoreId(storeId);
 		return accountService.getByCustomerId(storeId, customerId);
 	}
 
-	private String resolveStoreId(String requestedStoreId) {
+	@AOPLog
-		if (roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+	@RequestRateLimit
-			return requestedStoreId;
+	@RequireGaoPermission(GaoPermissionCode.POINT_ACCOUNT_READ)
-		}
+	@PostMapping("/account/detail")
-		return storeService.getBelongIdByRequiredLoginUserId();
+	public GaoPointAccount detailById(@RequestParam String id, @RequestParam(required = false) String storeId) {
+		return accountService.getByIdAndStoreId(storeScopeService.resolveStoreId(storeId), id);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoPointLedgerController.java

@@ -1,16 +1,13 @@
 package com.imyeyu.api.modules.gao.controller;
 
-import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoPointLedger;
 import com.imyeyu.api.modules.gao.service.GaoPointLedgerService;
 import com.imyeyu.api.modules.gao.service.GaoPointTriggerService;
-import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoPointAdjustRequest;
 import com.imyeyu.api.modules.gao.vo.GaoPointLedgerPage;
-import com.imyeyu.api.modules.user.service.RoleChecker;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
@@ -30,8 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/gao/customer/point")
 public class GaoPointLedgerController {
 
-	private final RoleChecker roleChecker;
+	private final GaoStoreScopeService storeScopeService;
-	private final GaoStoreService storeService;
 	private final GaoPointLedgerService ledgerService;
 	private final GaoPointTriggerService triggerService;
 
@@ -41,7 +37,7 @@ public class GaoPointLedgerController {
 	@PostMapping("/ledger/list")
 	public PageResult<GaoPointLedger> list(@RequestBody GaoPointLedgerPage page) {
 		TimiException.required(page, "not found page");
-		page.setStoreId(resolveStoreId(page.getStoreId()));
+		page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
 		return ledgerService.pageByQuery(page);
 	}
 
@@ -50,14 +46,7 @@ public class GaoPointLedgerController {
 	@RequireGaoPermission(GaoPermissionCode.POINT_ADJUST)
 	@PostMapping("/adjust")
 	public void adjust(@RequestBody GaoPointAdjustRequest request) {
-		request.setStoreId(resolveStoreId(request.getStoreId()));
+		request.setStoreId(storeScopeService.resolveStoreId(request.getStoreId()));
 		triggerService.adjust(request);
 	}
-
-	private String resolveStoreId(String requestedStoreId) {
-		if (roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
-			return requestedStoreId;
-		}
-		return storeService.getBelongIdByRequiredLoginUserId();
-	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoPointRuleController.java

@@ -1,13 +1,10 @@
 package com.imyeyu.api.modules.gao.controller;
 
-import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoPointRule;
 import com.imyeyu.api.modules.gao.service.GaoPointRuleService;
-import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
-import com.imyeyu.api.modules.user.service.RoleChecker;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
@@ -32,8 +29,7 @@ import java.util.List;
 @RequestMapping("/gao/customer/point")
 public class GaoPointRuleController {
 
-	private final RoleChecker roleChecker;
+	private final GaoStoreScopeService storeScopeService;
-	private final GaoStoreService storeService;
 	private final GaoPointRuleService ruleService;
 
 	@AOPLog
@@ -42,9 +38,9 @@ public class GaoPointRuleController {
 	@PostMapping("/rule/list")
 	public PageResult<GaoPointRule> list(@RequestBody Page<GaoPointRule> page) {
 		TimiException.required(page, "not found page");
-		if (!isGlobalManager()) {
+		if (!storeScopeService.hasGlobalScope()) {
 			GaoPointRule example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoPointRule());
-			example.setStoreId(resolveStoreId(null));
+			example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
 			page.setEqualsExample(example);
 		}
 		return ruleService.page(page);
@@ -57,7 +53,7 @@ public class GaoPointRuleController {
 	public GaoPointRule detail(@RequestParam String id) {
 		GaoPointRule rule = ruleService.get(id);
 		TimiException.required(rule, "not found point rule");
-		checkStore(rule.getStoreId());
+		storeScopeService.checkStoreId(rule.getStoreId());
 		return rule;
 	}
 
@@ -66,7 +62,7 @@ public class GaoPointRuleController {
 	@RequireGaoPermission(GaoPermissionCode.POINT_RULE_CREATE)
 	@PostMapping("/rule/create")
 	public String create(@RequestBody GaoPointRule rule) {
-		rule.setStoreId(resolveStoreId(rule.getStoreId()));
+		rule.setStoreId(storeScopeService.resolveStoreId(rule.getStoreId()));
 		ruleService.create(rule);
 		return rule.getId();
 	}
@@ -76,7 +72,7 @@ public class GaoPointRuleController {
 	@RequireGaoPermission(GaoPermissionCode.POINT_RULE_UPDATE)
 	@PostMapping("/rule/update")
 	public void update(@RequestBody GaoPointRule rule) {
-		rule.setStoreId(resolveStoreId(rule.getStoreId()));
+		rule.setStoreId(storeScopeService.resolveStoreId(rule.getStoreId()));
 		ruleService.update(rule);
 	}
 
@@ -87,7 +83,7 @@ public class GaoPointRuleController {
 	public void sort(@RequestBody List<String> idList) {
 		if (idList != null) {
 			for (GaoPointRule rule : ruleService.listByIdList(idList)) {
-				checkStore(rule.getStoreId());
+				storeScopeService.checkStoreId(rule.getStoreId());
 			}
 		}
 		ruleService.sort(idList);
@@ -100,24 +96,7 @@ public class GaoPointRuleController {
 	public void delete(@RequestParam String id) {
 		GaoPointRule rule = ruleService.get(id);
 		TimiException.required(rule, "not found point rule");
-		checkStore(rule.getStoreId());
+		storeScopeService.checkStoreId(rule.getStoreId());
 		ruleService.delete(id);
 	}
-
-	private String resolveStoreId(String requestedStoreId) {
-		if (isGlobalManager()) {
-			return requestedStoreId;
-		}
-		return storeService.getBelongIdByRequiredLoginUserId();
-	}
-
-	private void checkStore(String storeId) {
-		if (!isGlobalManager()) {
-			TimiException.requiredTrue(resolveStoreId(null).equals(storeId), "无权操作其他门店数据");
-		}
-	}
-
-	private boolean isGlobalManager() {
-		return roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name());
-	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoStoreBusinessDayController.java

@@ -4,6 +4,9 @@ import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.entity.GaoStoreBusinessDay;
 import com.imyeyu.api.modules.gao.service.GaoStoreBusinessDayService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import com.imyeyu.spring.bean.Page;
@@ -27,12 +30,17 @@ import java.util.List;
 public class GaoStoreBusinessDayController {
 
 	private final GaoStoreBusinessDayService service;
+	private final GaoStoreScopeService storeScopeService;
 
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/list")
 	public PageResult<GaoStoreBusinessDay> list(@RequestBody Page<GaoStoreBusinessDay> page) {
+		TimiException.required(page, "not found page");
+		GaoStoreBusinessDay example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoStoreBusinessDay());
+		example.setStoreId(storeScopeService.resolveStoreId(example.getStoreId()));
+		page.setEqualsExample(example);
 		return service.page(page);
 	}
 
@@ -41,7 +49,7 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/calendar")
 	public List<GaoStoreBusinessDay> calendar(@RequestParam String storeId, @RequestParam Integer beginDateValue, @RequestParam Integer endDateValue) {
-		return service.listByDateRange(storeId, beginDateValue, endDateValue);
+		return service.listByDateRange(storeScopeService.resolveStoreId(storeId), beginDateValue, endDateValue);
 	}
 
 	@AOPLog
@@ -49,7 +57,10 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/detail")
 	public GaoStoreBusinessDay detail(@RequestParam String id) {
-		return service.get(id);
+		GaoStoreBusinessDay businessDay = service.get(id);
+		TimiException.required(businessDay, "not found businessDay");
+		storeScopeService.checkStoreId(businessDay.getStoreId());
+		return businessDay;
 	}
 
 	@AOPLog
@@ -57,6 +68,7 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
 	@PostMapping("/create")
 	public String create(@RequestBody GaoStoreBusinessDay businessDay) {
+		businessDay.setStoreId(storeScopeService.resolveStoreId(businessDay.getStoreId()));
 		service.create(businessDay);
 		return businessDay.getId();
 	}
@@ -66,6 +78,12 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoStoreBusinessDay businessDay) {
+		TimiException.required(businessDay, "not found businessDay");
+		TimiException.required(businessDay.getId(), "not found businessDay.id");
+		GaoStoreBusinessDay dbBusinessDay = service.get(businessDay.getId());
+		TimiException.required(dbBusinessDay, "not found businessDay");
+		storeScopeService.checkStoreId(dbBusinessDay.getStoreId());
+		businessDay.setStoreId(dbBusinessDay.getStoreId());
 		service.update(businessDay);
 	}
 
@@ -74,6 +92,9 @@ public class GaoStoreBusinessDayController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
+		GaoStoreBusinessDay businessDay = service.get(id);
+		TimiException.required(businessDay, "not found businessDay");
+		storeScopeService.checkStoreId(businessDay.getStoreId());
 		service.delete(id);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoStoreChartController.java

@@ -3,12 +3,14 @@ package com.imyeyu.api.modules.gao.controller;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.service.GaoStoreChartService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
 import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
 import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import lombok.RequiredArgsConstructor;
@@ -30,6 +32,7 @@ import java.util.List;
 public class GaoStoreChartController {
 
 	private final GaoStoreChartService service;
+	private final GaoStoreScopeService storeScopeService;
 
 	/// 查询客户增长趋势
 	@AOPLog
@@ -37,6 +40,8 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/customer/daily")
 	public List<GaoCustomerDailyStateView> customerDaily(@RequestBody GaoStoreChartReq req) {
+		TimiException.required(req, "not found req");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.customerDailyTrend(req);
 	}
 
@@ -46,7 +51,7 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/customer/gender")
 	public List<GaoCustomerGenderStatView> customerGender(@RequestParam String storeId) {
-		return service.customerGender(storeId);
+		return service.customerGender(storeScopeService.resolveStoreId(storeId));
 	}
 
 	/// 查询登记事件每日统计，可同时支撑登记趋势和事件结构图表
@@ -55,6 +60,8 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/daily")
 	public List<GaoEventRecordDailyStatView> eventRecordDaily(@RequestBody GaoStoreChartReq req) {
+		TimiException.required(req, "not found req");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordDailyStat(req);
 	}
 
@@ -64,6 +71,8 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/number-value/daily")
 	public List<GaoEventRecordNumberValueDailyStatView> eventRecordNumberValueDaily(@RequestBody GaoStoreChartReq req) {
+		TimiException.required(req, "not found req");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordNumberValueDailyStat(req);
 	}
 
@@ -73,6 +82,8 @@ public class GaoStoreChartController {
 	@RequireGaoPermission(GaoPermissionCode.STAT_READ)
 	@PostMapping("/event/record/calendar")
 	public List<GaoEventRecordCalendarView> eventRecordCalendar(@RequestBody GaoStoreChartReq req) {
+		TimiException.required(req, "not found req");
+		req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
 		return service.eventRecordCalendar(req);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/controller/GaoStoreController.java

@@ -1,13 +1,13 @@
 package com.imyeyu.api.modules.gao.controller;
 
-import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.entity.GaoStore;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.service.GaoStoreService;
-import com.imyeyu.api.modules.user.service.PermissionChecker;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.network.Network;
 import com.imyeyu.spring.TimiSpring;
 import com.imyeyu.spring.annotation.AOPLog;
@@ -37,14 +37,20 @@ import java.util.List;
 public class GaoStoreController {
 
 	private final GaoStoreService service;
+	private final GaoStoreScopeService storeScopeService;
 	private final UserLoginService userLoginService;
-	private final PermissionChecker permissionChecker;
 
 	@AOPLog
 	@RequestRateLimit
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/list")
 	public PageResult<GaoStore> list(@RequestBody Page<GaoStore> page) {
+		TimiException.required(page, "not found page");
+		if (!storeScopeService.hasGlobalScope()) {
+			GaoStore example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoStore());
+			example.setId(storeScopeService.resolveStoreId(example.getId()));
+			page.setEqualsExample(example);
+		}
 		return service.page(page);
 	}
 
@@ -53,7 +59,9 @@ public class GaoStoreController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_READ)
 	@PostMapping("/detail")
 	public GaoStore detail(@RequestParam String id) {
-		return service.get(id);
+		GaoStore store = service.get(id);
+		storeScopeService.checkStore(store);
+		return store;
 	}
 
 	@AOPLog
@@ -70,12 +78,13 @@ public class GaoStoreController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
 	@PostMapping("/update")
 	public void update(@RequestBody GaoStore store) {
-		if (permissionChecker.hasAny(ModuleCode.GAO, GaoPermissionCode.STORE_CREATE.getValue())) {
+		if (storeScopeService.hasGlobalScope()) {
 			// 门店管理
 			service.update(store);
 		} else {
 			// 店长
 			GaoStore dbStore = service.get(store.getId());
+			storeScopeService.checkStore(dbStore);
 			dbStore.setName(store.getName());
 			dbStore.setTelephone(store.getTelephone());
 			dbStore.setAddress(store.getAddress());
@@ -98,6 +107,11 @@ public class GaoStoreController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
 	@PostMapping("/sort")
 	public void sort(@RequestBody List<String> idList) {
+		if (!storeScopeService.hasGlobalScope()) {
+			for (String id : TimiJava.safeIterable(idList)) {
+				storeScopeService.checkStore(service.get(id));
+			}
+		}
 		service.sort(idList);
 	}
 
@@ -107,6 +121,12 @@ public class GaoStoreController {
 	@RequireGaoPermission(GaoPermissionCode.STORE_EXPORT)
 	@PostMapping("/export")
 	public void export(@RequestBody Page<GaoStore> page) throws IOException {
+		TimiException.required(page, "not found page");
+		if (!storeScopeService.hasGlobalScope()) {
+			GaoStore example = TimiJava.defaultIfNull(page.getEqualsExample(), new GaoStore());
+			example.setId(storeScopeService.resolveStoreId(example.getId()));
+			page.setEqualsExample(example);
+		}
 		HttpServletResponse resp = TimiSpring.getResponse();
 		String contentDisposition = Network.getFileDownloadHeader("门店列表-%s.xlsx".formatted(Time.serialize.format(Time.now())));
 		resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

src/main/java/com/imyeyu/api/modules/gao/controller/GaoTagController.java

@@ -50,10 +50,16 @@ public class GaoTagController {
 	@PostMapping("/list")
 	public PageResult<Tag> list(@RequestBody Page<Tag> page) {
 		TimiException.required(page, "未找到分页参数");
+		String ownerId = null;
 		page.setEqualsExample(TimiJava.defaultIfNull(page.getEqualsExample(), new Tag()));
 		page.getEqualsExample().setOwnerType(Tag.OwnerType.GAO_STORE);
 		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
-			page.getEqualsExample().setOwnerId(storeService.getBelongIdByRequiredLoginUserId());
+			ownerId = storeService.getBelongIdByRequiredLoginUserId();
+			page.getEqualsExample().setOwnerId(ownerId);
+		}
+		String keyword = page.getLikesExample() == null ? null : page.getLikesExample().getName();
+		if (TimiJava.isNotEmpty(keyword)) {
+			return service.pageByOwnerAndKeyword(page, Tag.OwnerType.GAO_STORE, ownerId, keyword.trim());
 		}
 		return service.page(page);
 	}

src/main/java/com/imyeyu/api/modules/gao/controller/GaoUserController.java

@@ -6,9 +6,8 @@ import com.imyeyu.api.modules.common.entity.Attachment;
 import com.imyeyu.api.modules.common.service.AttachmentService;
 import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
-import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
 import com.imyeyu.api.modules.gao.entity.GaoUser;
-import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
 import com.imyeyu.api.modules.gao.service.GaoUserInviteService;
 import com.imyeyu.api.modules.gao.service.GaoUserService;
 import com.imyeyu.api.modules.gao.vo.GaoUserInviteCreateRequest;
@@ -19,15 +18,14 @@ import com.imyeyu.api.modules.gao.vo.GaoUserInviteValidateRequest;
 import com.imyeyu.api.modules.gao.vo.GaoUserInviteValidateResponse;
 import com.imyeyu.api.modules.user.entity.Role;
 import com.imyeyu.api.modules.user.entity.User;
-import com.imyeyu.api.modules.user.service.RoleChecker;
+import com.imyeyu.api.modules.user.service.AuthorizationScopeService;
-import com.imyeyu.api.modules.user.service.RoleService;
 import com.imyeyu.api.modules.user.service.UserLoginService;
 import com.imyeyu.api.modules.user.service.UserRoleService;
 import com.imyeyu.api.modules.user.service.UserService;
 import com.imyeyu.api.modules.user.vo.LoginResponse;
 import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiException;
 import com.imyeyu.spring.annotation.AOPLog;
-import com.imyeyu.spring.annotation.CaptchaValid;
 import com.imyeyu.spring.annotation.RequestRateLimit;
 import com.imyeyu.spring.bean.Page;
 import com.imyeyu.spring.bean.PageResult;
@@ -54,12 +52,11 @@ import java.util.UUID;
 public class GaoUserController {
 
 	private final UserService userService;
-	private final RoleService roleService;
+	private final AuthorizationScopeService authorizationScopeService;
-	private final RoleChecker roleChecker;
 	private final GaoUserService service;
 	private final GaoUserInviteService inviteService;
 	private final UserRoleService userRoleService;
-	private final GaoStoreService gaoStoreService;
+	private final GaoStoreScopeService storeScopeService;
 	private final UserLoginService userLoginService;
 	private final AttachmentService attachmentService;
 
@@ -80,12 +77,11 @@ public class GaoUserController {
 
 	@AOPLog
 	@JsonView(ResponseView.Public.class)
-	@CaptchaValid
 	@RequestRateLimit(value = 5, inSeconds = 60)
 	@PostMapping("/invite/register")
 	public LoginResponse registerByInvite(@RequestBody @Valid GaoUserInviteRegisterRequest req) {
 		GaoUserInviteRegisterData data = req.getData();
-		String userId = inviteService.register(data);
+		String userId = inviteService.register(data, req.getDetailId(), req.getCaptcha());
 		return userLoginService.login(UUID.randomUUID().toString(), userId);
 	}
 
@@ -95,10 +91,11 @@ public class GaoUserController {
 	@PostMapping("/list")
 	@JsonView(ResponseView.Public.class)
 	public PageResult<GaoUser> list(@RequestBody Page<GaoUser> page) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		TimiException.required(page, "not found page");
+		if (!storeScopeService.hasGlobalScope()) {
 			// 非全局管理只能看所在店用户
 			page.setEqualsExample(TimiJava.defaultIfNull(page.getEqualsExample(), new GaoUser()));
-			page.getEqualsExample().setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
+			page.getEqualsExample().setStoreId(storeScopeService.resolveStoreId(page.getEqualsExample().getStoreId()));
 		}
 		PageResult<GaoUser> result = service.page(page);
 		{
@@ -120,6 +117,8 @@ public class GaoUserController {
 	@JsonView(ResponseView.Public.class)
 	public GaoUser detail(@RequestParam String id) {
 		GaoUser result = service.get(id);
+		TimiException.required(result, "not found gao user");
+		storeScopeService.checkStoreId(result.getStoreId());
 		{
 			User user = userService.get(result.getUserId());
 			user.setAttachmentList(attachmentService.listByBizId(Attachment.BizType.USER, user.getId()));
@@ -137,9 +136,7 @@ public class GaoUserController {
 	@PostMapping("/create")
 	@JsonView(ResponseView.Public.class)
 	public GaoUser create(@RequestBody GaoUser gaoUser) {
-		if (!roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		gaoUser.setStoreId(storeScopeService.resolveStoreId(gaoUser.getStoreId()));
-			gaoUser.setStoreId(gaoStoreService.getByUserId(userLoginService.getRequireLoginUserId()).getId());
-		}
 		service.create(gaoUser);
 		return service.get(gaoUser.getId());
 	}
@@ -150,6 +147,12 @@ public class GaoUserController {
 	@PostMapping("/update")
 	@JsonView(ResponseView.Public.class)
 	public GaoUser update(@RequestBody GaoUser gaoUser) {
+		TimiException.required(gaoUser, "not found gao user");
+		TimiException.required(gaoUser.getId(), "not found gao user.id");
+		GaoUser dbGaoUser = service.get(gaoUser.getId());
+		TimiException.required(dbGaoUser, "not found gao user");
+		storeScopeService.checkStoreId(dbGaoUser.getStoreId());
+		gaoUser.setStoreId(dbGaoUser.getStoreId());
 		service.update(gaoUser);
 		return service.get(gaoUser.getId());
 	}
@@ -160,6 +163,12 @@ public class GaoUserController {
 	@PostMapping("/transfer/store")
 	@JsonView(ResponseView.Public.class)
 	public GaoUser transferStore(@RequestBody GaoUser gaoUser) {
+		TimiException.required(gaoUser, "not found gao user");
+		TimiException.required(gaoUser.getId(), "not found gao user.id");
+		GaoUser dbGaoUser = service.get(gaoUser.getId());
+		TimiException.required(dbGaoUser, "not found gao user");
+		storeScopeService.checkStoreId(dbGaoUser.getStoreId());
+		gaoUser.setStoreId(storeScopeService.resolveStoreId(gaoUser.getStoreId()));
 		service.transferStore(gaoUser);
 		return service.get(gaoUser.getId());
 	}
@@ -169,6 +178,9 @@ public class GaoUserController {
 	@RequireGaoPermission(GaoPermissionCode.USER_DELETE)
 	@PostMapping("/delete")
 	public void delete(@RequestParam String id) {
+		GaoUser gaoUser = service.get(id);
+		TimiException.required(gaoUser, "not found gao user");
+		storeScopeService.checkStoreId(gaoUser.getStoreId());
 		service.delete(id);
 	}
 
@@ -177,7 +189,6 @@ public class GaoUserController {
 	@RequireGaoPermission(GaoPermissionCode.USER_READ)
 	@PostMapping("/role/list")
 	public List<Role> roleList() {
-		// TODO 此接口获取本模块所有角色，需要限制角色
+		return authorizationScopeService.listGrantableRole(userLoginService.getRequireLoginUserId(), ModuleCode.GAO);
-		return roleService.listByModuleCode(ModuleCode.GAO);
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/entity/GaoCustomer.java

@@ -3,9 +3,12 @@ package com.imyeyu.api.modules.gao.entity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.api.modules.common.entity.TagApply;
 import com.imyeyu.api.modules.user.bean.Gender;
 import com.imyeyu.api.modules.user.entity.User;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.imyeyu.java.TimiJava;
+import com.imyeyu.spring.annotation.table.Column;
 import com.imyeyu.spring.annotation.table.Transient;
 import com.imyeyu.spring.entity.UUIDEntity;
 import lombok.Data;
@@ -58,6 +61,18 @@ public class GaoCustomer extends UUIDEntity {
 	/// 姓名
 	private String name;
 
+	@Column("name_pinyin_full")
+	@JsonIgnore
+	private String namePinyinFull;
+
+	@Column("name_pinyin_initial")
+	@JsonIgnore
+	private String namePinyinInitial;
+
+	@Column("name_pinyin_mixed")
+	@JsonIgnore
+	private String namePinyinMixed;
+
 	/// 性别
 	private Gender gender;
 
@@ -109,6 +124,9 @@ public class GaoCustomer extends UUIDEntity {
 	@Transient
 	private List<GaoEventRecord> eventRecordList;
 
+	@Transient
+	private TagApply tagApply;
+
 	public boolean hasIntroducer() {
 		return TimiJava.isNotEmpty(introducerCustomerId);
 	}

src/main/java/com/imyeyu/api/modules/gao/entity/GaoPointAccount.java

@@ -1,5 +1,6 @@
 package com.imyeyu.api.modules.gao.entity;
 
+import com.imyeyu.spring.annotation.table.Transient;
 import com.imyeyu.spring.entity.UUIDEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +25,9 @@ public class GaoPointAccount extends UUIDEntity {
 	/// 累计获得积分
 	private Long totalEarned;
 
+	/// 累计消耗积分
+	private Long totalConsumed;
+
 	/// 累计撤销积分
 	private Long totalRevoked;
 
@@ -32,4 +36,8 @@ public class GaoPointAccount extends UUIDEntity {
 
 	/// 乐观锁版本
 	private Long version;
+
+	/// 客户信息
+	@Transient
+	private GaoCustomer customer;
 }

src/main/java/com/imyeyu/api/modules/gao/entity/GaoPointLedger.java

@@ -17,9 +17,12 @@ public class GaoPointLedger extends UUIDEntity {
 	/// 流水变化类型
 	public enum ChangeType {
 
-		/// 登记事件积分变化
+		/// 登记事件发放积分
 		EARN,
 
+		/// 登记事件消费积分
+		CONSUME,
+
 		/// 删除登记记录撤销积分
 		REVOKE,
 

src/main/java/com/imyeyu/api/modules/gao/mapper/GaoPointAccountMapper.java

@@ -1,9 +1,12 @@
 package com.imyeyu.api.modules.gao.mapper;
 
 import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
+import com.imyeyu.api.modules.gao.vo.GaoPointAccountPage;
 import com.imyeyu.spring.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /// GAO 客户积分账户 Mapper
 ///
 /// @author Codex
@@ -17,6 +20,25 @@ public interface GaoPointAccountMapper extends BaseMapper<GaoPointAccount, Strin
 	/// @return 积分账户
 	GaoPointAccount selectByStoreIdAndCustomerId(@Param("storeId") String storeId, @Param("customerId") String customerId);
 
+	/// 按账户 ID 和门店查询积分账户
+	///
+	/// @param storeId 门店 ID，可为空
+	/// @param id 账户 ID
+	/// @return 积分账户
+	GaoPointAccount selectByIdAndStoreId(@Param("storeId") String storeId, @Param("id") String id);
+
+	/// 统计积分账户数量
+	///
+	/// @param page 查询条件
+	/// @return 账户数量
+	long countByQuery(GaoPointAccountPage page);
+
+	/// 分页查询积分账户
+	///
+	/// @param page 查询条件
+	/// @return 账户列表
+	List<GaoPointAccount> selectByQuery(GaoPointAccountPage page);
+
 	/// 创建客户积分账户，已存在时保持原账户不变
 	///
 	/// @param account 积分账户
@@ -33,9 +55,10 @@ public interface GaoPointAccountMapper extends BaseMapper<GaoPointAccount, Strin
 	/// @param id 账户 ID
 	/// @param delta 本次余额变化
 	/// @param totalEarnedDelta 累计获得积分变化
+	/// @param totalConsumedDelta 累计消耗积分变化
 	/// @param totalRevokedDelta 累计撤销积分变化
 	/// @param totalAdjustedDelta 累计人工调整积分变化
 	/// @param updatedAt 更新时间
 	/// @return 更新行数
-	int updateBalance(@Param("id") String id, @Param("delta") long delta, @Param("totalEarnedDelta") long totalEarnedDelta, @Param("totalRevokedDelta") long totalRevokedDelta, @Param("totalAdjustedDelta") long totalAdjustedDelta, @Param("updatedAt") long updatedAt);
+	int updateBalance(@Param("id") String id, @Param("delta") long delta, @Param("totalEarnedDelta") long totalEarnedDelta, @Param("totalConsumedDelta") long totalConsumedDelta, @Param("totalRevokedDelta") long totalRevokedDelta, @Param("totalAdjustedDelta") long totalAdjustedDelta, @Param("updatedAt") long updatedAt);
 }

src/main/java/com/imyeyu/api/modules/gao/mapper/GaoPointLedgerMapper.java

@@ -19,11 +19,11 @@ public interface GaoPointLedgerMapper extends BaseMapper<GaoPointLedger, String>
 	/// @return 流水
 	GaoPointLedger selectByIdempotencyKey(@Param("idempotencyKey") String idempotencyKey);
 
-	/// 查询登记记录产生的原始获得积分流水
+	/// 查询登记记录产生的原始规则积分流水
 	///
 	/// @param eventRecordId 登记记录 ID
-	/// @return 获得积分流水
+	/// @return 原始规则积分流水
-	List<GaoPointLedger> selectEarnByEventRecordId(@Param("eventRecordId") String eventRecordId);
+	List<GaoPointLedger> selectRuleChangeByEventRecordId(@Param("eventRecordId") String eventRecordId);
 
 	/// 批量查询幂等键对应的流水
 	///

src/main/java/com/imyeyu/api/modules/gao/service/GaoCustomerService.java

@@ -45,6 +45,11 @@ public interface GaoCustomerService extends BaseService<GaoCustomer, String> {
 
 	List<GaoCustomer> listByIdList(Collection<String> idList);
 
+	/// 删除门店下的全部客户及其关联业务数据
+	///
+	/// @param storeId 门店 ID
+	void deleteByStoreId(String storeId);
+
 	default Map<String, GaoCustomer> mapByIdList(Collection<String> idList) {
 		return listByIdList(idList).stream().collect(Collectors.toMap(GaoCustomer::getId, item -> item));
 	}

src/main/java/com/imyeyu/api/modules/gao/service/GaoEventRecordService.java

@@ -18,6 +18,12 @@ import java.util.List;
 /// @since 2026-07-27 14:09
 public interface GaoEventRecordService extends BaseService<GaoEventRecord, String> {
 
+	/// 按客户查询登记事件记录
+	///
+	/// @param customerId 客户 ID
+	/// @return 登记事件记录列表
+	List<GaoEventRecord> listByCustomerId(String customerId);
+
 	default void createBatch(List<GaoEventRecord> recordList) {
 		for (GaoEventRecord record : TimiJava.safeIterable(recordList)) {
 			create(record);

src/main/java/com/imyeyu/api/modules/gao/service/GaoEventService.java

@@ -24,6 +24,11 @@ public interface GaoEventService extends BaseService<GaoEvent, String> {
 	/// @return 登记事件列表
 	List<GaoEvent> listValid(String storeId);
 
+	/// 删除门店下的全部登记事件及角色关联
+	///
+	/// @param storeId 门店 ID
+	void deleteByStoreId(String storeId);
+
 	/// 查询登记事件要求的角色
 	///
 	/// @param eventId 登记事件 ID

src/main/java/com/imyeyu/api/modules/gao/service/GaoPointAccountService.java

@@ -1,6 +1,8 @@
 package com.imyeyu.api.modules.gao.service;
 
 import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
+import com.imyeyu.api.modules.gao.vo.GaoPointAccountPage;
+import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.service.BaseService;
 
 /// GAO 客户积分账户服务
@@ -9,6 +11,12 @@ import com.imyeyu.spring.service.BaseService;
 /// @since 2026-08-11
 public interface GaoPointAccountService extends BaseService<GaoPointAccount, String> {
 
+	/// 分页查询积分账户
+	///
+	/// @param page 查询条件
+	/// @return 账户分页
+	PageResult<GaoPointAccount> pageByQuery(GaoPointAccountPage page);
+
 	/// 查询客户当前有效积分账户
 	///
 	/// @param storeId 门店 ID
@@ -16,6 +24,18 @@ public interface GaoPointAccountService extends BaseService<GaoPointAccount, Str
 	/// @return 积分账户，不存在时返回 null
 	GaoPointAccount getByCustomerId(String storeId, String customerId);
 
+	/// 按账户 ID 查询积分账户
+	///
+	/// @param storeId 门店 ID，可为空
+	/// @param id 账户 ID
+	/// @return 积分账户，不存在时返回 null
+	GaoPointAccount getByIdAndStoreId(String storeId, String id);
+
+	/// 删除门店下的全部积分账户
+	///
+	/// @param storeId 门店 ID
+	void deleteByStoreId(String storeId);
+
 	/// 获取并锁定客户积分账户，不存在时创建
 	///
 	/// @param storeId 门店 ID
@@ -28,8 +48,9 @@ public interface GaoPointAccountService extends BaseService<GaoPointAccount, Str
 	/// @param accountId 账户 ID
 	/// @param delta 本次余额变化
 	/// @param totalEarnedDelta 累计获得积分变化
+	/// @param totalConsumedDelta 累计消耗积分变化
 	/// @param totalRevokedDelta 累计撤销积分变化
 	/// @param totalAdjustedDelta 累计人工调整积分变化
 	/// @return 更新行数
-	int updateBalance(String accountId, long delta, long totalEarnedDelta, long totalRevokedDelta, long totalAdjustedDelta);
+	int updateBalance(String accountId, long delta, long totalEarnedDelta, long totalConsumedDelta, long totalRevokedDelta, long totalAdjustedDelta);
 }

src/main/java/com/imyeyu/api/modules/gao/service/GaoPointLedgerService.java

@@ -15,18 +15,18 @@ import com.imyeyu.spring.service.BaseService;
 /// @since 2026-08-11
 public interface GaoPointLedgerService extends BaseService<GaoPointLedger, String> {
 
-	/// 写入登记获得积分流水
+	/// 写入登记规则积分流水
 	///
 	/// @param record 登记记录
 	/// @param rule 命中规则
 	/// @param pointDelta 积分变化
 	/// @param sourcePayload 来源快照
 	/// @return 积分流水
-	GaoPointLedger earn(GaoEventRecord record, GaoPointRule rule, long pointDelta, JsonNode sourcePayload);
+	GaoPointLedger applyRule(GaoEventRecord record, GaoPointRule rule, long pointDelta, JsonNode sourcePayload);
 
 	/// 写入删除登记记录的撤销流水
 	///
-	/// @param originLedger 原始获得积分流水
+	/// @param originLedger 原始规则积分流水
 	/// @param record 登记记录
 	/// @return 撤销流水
 	GaoPointLedger revoke(GaoPointLedger originLedger, GaoEventRecord record);

src/main/java/com/imyeyu/api/modules/gao/service/GaoPointRuleService.java

@@ -25,6 +25,11 @@ public interface GaoPointRuleService extends BaseService<GaoPointRule, String> {
 	/// @return 规则列表
 	List<GaoPointRule> listByIdList(List<String> idList);
 
+	/// 删除门店下的全部积分规则
+	///
+	/// @param storeId 门店 ID
+	void deleteByStoreId(String storeId);
+
 	/// 按客户端提交的顺序更新启用规则优先级
 	///
 	/// @param idList 规则 ID 列表

src/main/java/com/imyeyu/api/modules/gao/service/GaoStoreBusinessDayService.java

@@ -36,4 +36,9 @@ public interface GaoStoreBusinessDayService extends BaseService<GaoStoreBusiness
 	/// @param endDateValue 结束日期值，格式为 yyyyMMdd
 	/// @return 营业日列表
 	java.util.List<GaoStoreBusinessDay> listByDateRange(String storeId, Integer beginDateValue, Integer endDateValue);
+
+	/// 删除门店下的全部营业日
+	///
+	/// @param storeId 门店 ID
+	void deleteByStoreId(String storeId);
 }

src/main/java/com/imyeyu/api/modules/gao/service/GaoStoreScopeService.java

@@ -0,0 +1,33 @@
+package com.imyeyu.api.modules.gao.service;
+
+import com.imyeyu.api.modules.gao.entity.GaoStore;
+
+/// GAO 门店资源范围服务
+///
+/// 同时拥有门店管理和店长角色时，按门店管理角色使用全局范围
+///
+/// @author Codex
+/// @since 2026-08-23
+public interface GaoStoreScopeService {
+
+	/// 判断当前用户是否拥有 GAO 全局范围
+	///
+	/// @return `true` 为允许访问全部门店
+	boolean hasGlobalScope();
+
+	/// 将请求门店 ID 解析为当前可用门店 ID
+	///
+	/// @param requestedStoreId 请求中的门店 ID，可为空
+	/// @return 门店 ID，全局范围可为空
+	String resolveStoreId(String requestedStoreId);
+
+	/// 检查门店是否在当前用户可管理范围内
+	///
+	/// @param storeId 门店 ID
+	void checkStoreId(String storeId);
+
+	/// 检查门店实体是否在当前用户可管理范围内
+	///
+	/// @param store 门店
+	void checkStore(GaoStore store);
+}

src/main/java/com/imyeyu/api/modules/gao/service/GaoUserInviteService.java

@@ -26,6 +26,8 @@ public interface GaoUserInviteService {
 	/// 使用邀请注册 GAO 用户
 	///
 	/// @param data 注册数据
+	/// @param smsDetailId 短信通知详情 ID
+	/// @param smsCaptcha 短信验证码
 	/// @return 注册成功的用户 ID
-	String register(GaoUserInviteRegisterData data);
+	String register(GaoUserInviteRegisterData data, String smsDetailId, String smsCaptcha);
 }

src/main/java/com/imyeyu/api/modules/gao/service/GaoUserService.java

@@ -10,6 +10,11 @@ import com.imyeyu.spring.service.BaseService;
 /// @since 2026-07-30
 public interface GaoUserService extends BaseService<GaoUser, String> {
 
+	/// 删除门店下的全部 GAO 用户关系，不删除核心用户
+	///
+	/// @param storeId 门店 ID
+	void deleteByStoreId(String storeId);
+
 	/// 调整 GAO 用户所属门店
 	///
 	/// @param gaoUser GAO 用户，必须包含 ID 和目标门店 ID

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java

@@ -3,10 +3,16 @@ package com.imyeyu.api.modules.gao.service.implement;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
 import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.api.modules.common.entity.TagApply;
 import com.imyeyu.api.modules.common.service.AttachmentService;
+import com.imyeyu.api.modules.common.service.TagService;
 import com.imyeyu.api.modules.gao.entity.GaoCustomer;
+import com.imyeyu.api.modules.gao.entity.GaoEventRecord;
+import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
 import com.imyeyu.api.modules.gao.mapper.GaoCustomerMapper;
 import com.imyeyu.api.modules.gao.service.GaoCustomerService;
+import com.imyeyu.api.modules.gao.service.GaoEventRecordService;
+import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
 import com.imyeyu.api.modules.gao.util.CustomerXSSFBuilder;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerDailyStateView;
 import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
@@ -15,6 +21,7 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerTrendStateReq;
 import com.imyeyu.api.modules.system.entity.Logger;
 import com.imyeyu.api.modules.system.service.LoggerService;
 import com.imyeyu.api.modules.user.service.UserLoginService;
+import com.imyeyu.api.util.PinyinUtil;
 import com.imyeyu.java.TimiJava;
 import com.imyeyu.java.bean.timi.TimiCode;
 import com.imyeyu.java.bean.timi.TimiException;
@@ -24,6 +31,7 @@ import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,9 +62,12 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 
 	private final ObjectMapper jackson;
 
+	private final TagService tagService;
 	private final LoggerService loggerService;
 	private final UserLoginService userLoginService;
 	private final AttachmentService attachmentService;
+	private final GaoPointAccountService pointAccountService;
+	private final ObjectProvider<GaoEventRecordService> eventRecordServiceProvider;
 
 	private final GaoCustomerMapper mapper;
 
@@ -81,6 +92,7 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 	public void create(GaoCustomer customer) {
 		TimiException.required(customer.getName(), "not found customer.name");
 		TimiException.required(customer.getStoreId(), "not found customer.storeId");
+		fillPinyin(customer);
 
 		Logger logger = new Logger(Logger.Module.GAO, "GAO_CUSTOMER_CREATE");
 		try {
@@ -111,6 +123,10 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 			customer.setCreatorUserId(userLoginService.getRequireLoginUserId());
 
 			super.create(customer);
+			// 标签
+			if (customer.getTagApply() != null) {
+				tagService.apply(TagApply.BizType.GAO_CUSTOMER, customer.getId(), customer.getTagApply().getTagIdList());
+			}
 			// 附件
 			attachmentService.updateByBizId(Attachment.BizType.GAO_CUSTOMER, customer.getId(), customer.getAttachmentList());
 
@@ -155,6 +171,7 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 				}
 			}
 			dbCustomer.setName(customer.getName());
+			fillPinyin(dbCustomer);
 			dbCustomer.setGender(customer.getGender());
 			dbCustomer.setAge(customer.getAge());
 			dbCustomer.setBirthdateCalendar(customer.getBirthdateCalendar());
@@ -168,6 +185,11 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 			dbCustomer.setConditioningPart(customer.getConditioningPart());
 			mapper.update(dbCustomer);
 
+			// 标签
+			if (customer.getTagApply() != null) {
+				tagService.apply(TagApply.BizType.GAO_CUSTOMER, customer.getId(), customer.getTagApply().getTagIdList());
+			}
+
 			logger.setLevel(Logger.Level.INFO);
 			logger.setResult(customer.getId());
 		} catch (TimiException e) {
@@ -191,7 +213,28 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 		try {
 			logger.setContent(id);
 			GaoCustomer customer = get(id);
+			TimiException.required(customer, "not found customer");
+			// 登记事件
+			GaoEventRecordService eventRecordService = eventRecordServiceProvider.getObject();
+			for (GaoEventRecord record : eventRecordService.listByCustomerId(customer.getId())) {
+				eventRecordService.delete(record.getId());
+			}
+			// 积分账户
+			GaoPointAccount account = pointAccountService.getByCustomerId(customer.getStoreId(), customer.getId());
+			if (account != null) {
+				pointAccountService.delete(account.getId());
+			}
+			// 邀请人
+			for (GaoCustomer invitedCustomer : listInvited(customer.getId())) {
+				invitedCustomer.setIntroducerCustomerId(null);
+				mapper.update(invitedCustomer);
+			}
+			// 标签
+			tagService.apply(TagApply.BizType.GAO_CUSTOMER, customer.getId(), List.of());
+			// 附件
+			attachmentService.deleteByBizId(Attachment.BizType.GAO_CUSTOMER, customer.getId());
 			super.delete(id);
+			// 邀请来源计数
 			changeInvitedCount(customer.getIntroducerCustomerId(), -1);
 			logger.setLevel(Logger.Level.INFO);
 			logger.setResult(id);
@@ -209,6 +252,17 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 		}
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void deleteByStoreId(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		GaoCustomer example = new GaoCustomer();
+		example.setStoreId(storeId);
+		for (GaoCustomer customer : mapper.selectAllByExample(example)) {
+			delete(customer.getId());
+		}
+	}
+
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void updateWithAttachment(GaoCustomer customer) {
@@ -384,4 +438,11 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 		customer.setInvitedCount(customer.getInvitedCount() + delta);
 		mapper.update(customer);
 	}
+
+	private void fillPinyin(GaoCustomer customer) {
+		String name = customer.getName();
+		customer.setNamePinyinFull(PinyinUtil.full(name));
+		customer.setNamePinyinInitial(PinyinUtil.initial(name));
+		customer.setNamePinyinMixed(PinyinUtil.mixed(name));
+	}
 }

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventRecordServiceImplement.java

@@ -63,8 +63,8 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
 	private final UserLoginService userLoginService;
 	private final AttachmentService attachmentService;
 	private final GaoCustomerService customerService;
-	private final GaoStoreBusinessDayService businessDayService;
 	private final GaoPointTriggerService pointTriggerService;
+	private final GaoStoreBusinessDayService businessDayService;
 
 	private final GaoEventRecordMapper mapper;
 
@@ -75,6 +75,14 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
 		return mapper;
 	}
 
+	@Override
+	public List<GaoEventRecord> listByCustomerId(String customerId) {
+		TimiException.required(customerId, "not found customerId");
+		GaoEventRecord example = new GaoEventRecord();
+		example.setCustomerId(customerId);
+		return mapper.selectAllByExample(example);
+	}
+
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void create(GaoEventRecord record) {
@@ -212,6 +220,7 @@ public class GaoEventRecordServiceImplement extends AbstractEntityService<GaoEve
 			GaoEventRecord record = get(id);
 			TimiException.required(record, "not found event record");
 			pointTriggerService.revokeByEventRecord(record);
+			attachmentService.deleteByBizId(Attachment.BizType.GAO_EVENT_RECORD, record.getId());
 			super.delete(id);
 			logger.setLevel(Logger.Level.INFO);
 			logger.setResult(id);

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventServiceImplement.java

@@ -172,6 +172,20 @@ public class GaoEventServiceImplement extends AbstractEntityService<GaoEvent, St
 		}
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void deleteByStoreId(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		GaoEvent example = new GaoEvent();
+		example.setStoreId(storeId);
+		for (GaoEvent event : mapper.selectAllByExample(example)) {
+			GaoEventRoleRelation relationExample = new GaoEventRoleRelation();
+			relationExample.setEventId(event.getId());
+			roleRelationMapper.deleteAllByExample(relationExample);
+			delete(event.getId());
+		}
+	}
+
 	@Override
 	public Map<String, GaoEvent> mapByIdList(Collection<String> idList) {
 		return mapper.selectByIdList(new HashSet<>(idList)).stream().collect(Collectors.toMap(GaoEvent::getId, Function.identity()));

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoPointAccountServiceImplement.java

@@ -1,10 +1,16 @@
 package com.imyeyu.api.modules.gao.service.implement;
 
 import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
+import com.imyeyu.api.modules.common.entity.Attachment;
+import com.imyeyu.api.modules.common.service.AttachmentService;
+import com.imyeyu.api.modules.gao.entity.GaoCustomer;
 import com.imyeyu.api.modules.gao.entity.GaoPointAccount;
+import com.imyeyu.api.modules.gao.mapper.GaoCustomerMapper;
 import com.imyeyu.api.modules.gao.mapper.GaoPointAccountMapper;
 import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
+import com.imyeyu.api.modules.gao.vo.GaoPointAccountPage;
 import com.imyeyu.java.bean.timi.TimiException;
+import com.imyeyu.spring.bean.PageResult;
 import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import com.imyeyu.utils.Time;
@@ -12,7 +18,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /// GAO 客户积分账户服务实现
 ///
@@ -23,12 +32,24 @@ import java.util.UUID;
 public class GaoPointAccountServiceImplement extends AbstractEntityService<GaoPointAccount, String> implements GaoPointAccountService {
 
 	private final GaoPointAccountMapper mapper;
+	private final GaoCustomerMapper customerMapper;
+	private final AttachmentService attachmentService;
 
 	@Override
 	protected BaseMapper<GaoPointAccount, String> mapper() {
 		return mapper;
 	}
 
+	@Override
+	public PageResult<GaoPointAccount> pageByQuery(GaoPointAccountPage page) {
+		TimiException.required(page, "not found page");
+		PageResult<GaoPointAccount> result = new PageResult<>();
+		result.setTotal(mapper.countByQuery(page));
+		result.setList(mapper.selectByQuery(page));
+		fillCustomer(result.getList());
+		return result;
+	}
+
 	@Override
 	public GaoPointAccount getByCustomerId(String storeId, String customerId) {
 		TimiException.required(storeId, "not found storeId");
@@ -36,6 +57,50 @@ public class GaoPointAccountServiceImplement extends AbstractEntityService<GaoPo
 		return mapper.selectByStoreIdAndCustomerId(storeId, customerId);
 	}
 
+	@Override
+	public GaoPointAccount getByIdAndStoreId(String storeId, String id) {
+		TimiException.required(id, "not found accountId");
+		GaoPointAccount account = mapper.selectByIdAndStoreId(storeId, id);
+		if (account != null) {
+			fillCustomer(List.of(account));
+		}
+		return account;
+	}
+
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void deleteByStoreId(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		GaoPointAccount example = new GaoPointAccount();
+		example.setStoreId(storeId);
+		for (GaoPointAccount account : mapper.selectAllByExample(example)) {
+			super.delete(account.getId());
+		}
+	}
+
+	private void fillCustomer(List<GaoPointAccount> accountList) {
+		List<String> customerIdList = accountList.stream()
+			.map(GaoPointAccount::getCustomerId)
+			.filter(id -> id != null && !id.isBlank())
+			.distinct()
+			.toList();
+		if (customerIdList.isEmpty()) {
+			return;
+		}
+
+		Map<String, GaoCustomer> customerMap = customerMapper.selectByIdList(customerIdList).stream()
+			.collect(Collectors.toMap(GaoCustomer::getId, item -> item));
+		Map<String, List<Attachment>> attachmentMap = attachmentService.mapByBizIdList(Attachment.BizType.GAO_CUSTOMER, customerIdList);
+		for (GaoPointAccount account : accountList) {
+			GaoCustomer customer = customerMap.get(account.getCustomerId());
+			if (customer == null) {
+				continue;
+			}
+			customer.setAttachmentList(attachmentMap.get(customer.getId()));
+			account.setCustomer(customer);
+		}
+	}
+
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoPointAccount getOrCreateForUpdate(String storeId, String customerId) {
@@ -50,6 +115,7 @@ public class GaoPointAccountServiceImplement extends AbstractEntityService<GaoPo
 			account.setCustomerId(customerId);
 			account.setBalance(0L);
 			account.setTotalEarned(0L);
+			account.setTotalConsumed(0L);
 			account.setTotalRevoked(0L);
 			account.setTotalAdjusted(0L);
 			account.setVersion(0L);
@@ -64,8 +130,8 @@ public class GaoPointAccountServiceImplement extends AbstractEntityService<GaoPo
 	}
 
 	@Override
-	public int updateBalance(String accountId, long delta, long totalEarnedDelta, long totalRevokedDelta, long totalAdjustedDelta) {
+	public int updateBalance(String accountId, long delta, long totalEarnedDelta, long totalConsumedDelta, long totalRevokedDelta, long totalAdjustedDelta) {
 		TimiException.required(accountId, "not found accountId");
-		return mapper.updateBalance(accountId, delta, totalEarnedDelta, totalRevokedDelta, totalAdjustedDelta, Time.now());
+		return mapper.updateBalance(accountId, delta, totalEarnedDelta, totalConsumedDelta, totalRevokedDelta, totalAdjustedDelta, Time.now());
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoPointLedgerServiceImplement.java

@@ -71,12 +71,13 @@ public class GaoPointLedgerServiceImplement extends AbstractEntityService<GaoPoi
 
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
-	public GaoPointLedger earn(GaoEventRecord record, GaoPointRule rule, long pointDelta, JsonNode sourcePayload) {
+	public GaoPointLedger applyRule(GaoEventRecord record, GaoPointRule rule, long pointDelta, JsonNode sourcePayload) {
 		TimiException.required(record, "not found event record");
 		TimiException.required(rule, "not found point rule");
 		TimiException.requiredTrue(pointDelta != 0, "pointDelta invalid");
 		String idempotencyKey = "GAO_EVENT_RECORD:%s:RULE:%s:EARN".formatted(record.getId(), rule.getId());
-		return apply(record.getStoreId(), record.getCustomerId(), GaoPointLedger.ChangeType.EARN, pointDelta, rule.getId(), record.getEventId(), record.getId(), sourcePayload, idempotencyKey, rule.getRemark(), record.getOperatorUserId(), record.getRegisteredAt());
+		GaoPointLedger.ChangeType changeType = pointDelta < 0 ? GaoPointLedger.ChangeType.CONSUME : GaoPointLedger.ChangeType.EARN;
+		return apply(record.getStoreId(), record.getCustomerId(), changeType, pointDelta, rule.getId(), record.getEventId(), record.getId(), sourcePayload, idempotencyKey, rule.getRemark(), record.getOperatorUserId(), record.getRegisteredAt());
 	}
 
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
@@ -154,6 +155,7 @@ public class GaoPointLedgerServiceImplement extends AbstractEntityService<GaoPoi
 			long balanceBefore = account.getBalance();
 			long balanceAfter = Math.addExact(balanceBefore, pointDelta);
 			long totalEarnedDelta = changeType == GaoPointLedger.ChangeType.EARN ? pointDelta : 0L;
+			long totalConsumedDelta = changeType == GaoPointLedger.ChangeType.CONSUME ? -pointDelta : 0L;
 			long totalRevokedDelta = changeType == GaoPointLedger.ChangeType.REVOKE ? -pointDelta : 0L;
 			long totalAdjustedDelta = changeType == GaoPointLedger.ChangeType.ADJUST ? pointDelta : 0L;
 
@@ -175,7 +177,7 @@ public class GaoPointLedgerServiceImplement extends AbstractEntityService<GaoPoi
 			ledger.setOperatorUserId(operatorUserId);
 			ledger.setOccurredAt(occurredAt);
 			create(ledger);
-			int updated = accountService.updateBalance(account.getId(), pointDelta, totalEarnedDelta, totalRevokedDelta, totalAdjustedDelta);
+			int updated = accountService.updateBalance(account.getId(), pointDelta, totalEarnedDelta, totalConsumedDelta, totalRevokedDelta, totalAdjustedDelta);
 			TimiException.requiredTrue(0 < updated, "积分余额不足");
 			logger.setLevel(Logger.Level.INFO);
 			logger.setResult(ledger.getId());

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoPointRuleServiceImplement.java

@@ -55,6 +55,17 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
 		return mapper.selectByIdList(new LinkedHashSet<>(idList));
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void deleteByStoreId(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		GaoPointRule example = new GaoPointRule();
+		example.setStoreId(storeId);
+		for (GaoPointRule rule : mapper.selectAllByExample(example)) {
+			delete(rule.getId());
+		}
+	}
+
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void sort(List<String> idList) {
@@ -204,10 +215,8 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
 			JsonNode minNode = tier.get("min");
 			TimiException.requiredTrue(minNode != null && minNode.isIntegralNumber() && 0 <= minNode.longValue(), "TIER.tiers[%d].min invalid".formatted(i));
 			long min = minNode.longValue();
-			if (i == 0) {
+			if (0 < i) {
-				TimiException.requiredTrue(min == 0, "TIER 第一档 min 必须为 0");
+				TimiException.requiredTrue(previousMax != null && min == previousMax + 1, "TIER 分档必须连续且不能重叠");
-			} else {
-				TimiException.requiredTrue(previousMax != null && previousMax < Long.MAX_VALUE && min == previousMax + 1, "TIER 分档必须连续且不能重叠");
 			}
 
 			JsonNode maxNode = tier.get("max");

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoPointTriggerServiceImplement.java

@@ -73,7 +73,7 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
 			}
 			long pointDelta = resolution.pointDelta();
 			if (pointDelta != 0) {
-				ledgerService.earn(record, rule, pointDelta, resolution.sourcePayload());
+				ledgerService.applyRule(record, rule, pointDelta, resolution.sourcePayload());
 				pointDeltaTotal = Math.addExact(pointDeltaTotal, pointDelta);
 			}
 			if (Boolean.TRUE.equals(rule.getExclusive())) {
@@ -88,7 +88,7 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
 	@Override
 	public void revokeByEventRecord(GaoEventRecord record) {
 		TimiException.required(record, "not found event record");
-		List<GaoPointLedger> originLedgerList = ledgerMapper.selectEarnByEventRecordId(record.getId());
+		List<GaoPointLedger> originLedgerList = ledgerMapper.selectRuleChangeByEventRecordId(record.getId());
 		if (originLedgerList.isEmpty()) {
 			return;
 		}
@@ -173,7 +173,9 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
 				break;
 			}
 		}
-		TimiException.required(matchedTier, "TIER 没有匹配的分档");
+		if (matchedTier == null) {
+			return null;
+		}
 		long pointDelta = matchedTier.get("pointValue").longValue();
 		ObjectNode payload = jackson.createObjectNode();
 		payload.put("triggerType", GaoPointRule.TriggerType.CUSTOMER_EVENT_VALUE_TIER.name());

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoStoreBusinessDayServiceImplement.java

@@ -71,6 +71,16 @@ public class GaoStoreBusinessDayServiceImplement extends AbstractEntityService<G
 		rebuildBusinessDayNo(businessDay.getStoreId(), businessDay.getDateValue());
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void deleteByStoreId(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		GaoStoreBusinessDay example = new GaoStoreBusinessDay();
+		example.setStoreId(storeId);
+		// 门店整体删除后不再需要重算营业日序号
+		mapper.deleteAllByExample(example);
+	}
+
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public GaoStoreBusinessDay resolveOpenBusinessDay(String storeId, Integer dateValue) {

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoStoreScopeServiceImplement.java

@@ -0,0 +1,58 @@
+package com.imyeyu.api.modules.gao.service.implement;
+
+import com.imyeyu.api.bean.CoreRoleCode;
+import com.imyeyu.api.bean.ModuleCode;
+import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
+import com.imyeyu.api.modules.gao.entity.GaoStore;
+import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
+import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.user.service.RoleChecker;
+import com.imyeyu.java.TimiJava;
+import com.imyeyu.java.bean.timi.TimiException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/// GAO 门店资源范围服务实现
+///
+/// @author Codex
+/// @since 2026-08-23
+@Service
+@RequiredArgsConstructor
+public class GaoStoreScopeServiceImplement implements GaoStoreScopeService {
+
+	private final RoleChecker roleChecker;
+	private final GaoStoreService gaoStoreService;
+
+	@Override
+	public boolean hasGlobalScope() {
+		return roleChecker.hasAny(ModuleCode.CORE, CoreRoleCode.SYSTEM.name(), CoreRoleCode.ADMIN.name())
+			|| roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name());
+	}
+
+	@Override
+	public String resolveStoreId(String requestedStoreId) {
+		if (hasGlobalScope()) {
+			return requestedStoreId;
+		}
+		String currentStoreId = gaoStoreService.getBelongIdByRequiredLoginUserId();
+		if (TimiJava.isNotEmpty(requestedStoreId)) {
+			TimiException.requiredTrue(currentStoreId.equals(requestedStoreId), "无权操作其他门店");
+		}
+		return currentStoreId;
+	}
+
+	@Override
+	public void checkStoreId(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		if (!hasGlobalScope()) {
+			String currentStoreId = gaoStoreService.getBelongIdByRequiredLoginUserId();
+			TimiException.requiredTrue(currentStoreId.equals(storeId), "无权操作其他门店");
+		}
+	}
+
+	@Override
+	public void checkStore(GaoStore store) {
+		TimiException.required(store, "not found store");
+		checkStoreId(store.getId());
+	}
+}

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoStoreServiceImplement.java

@@ -2,9 +2,17 @@ package com.imyeyu.api.modules.gao.service.implement;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
+import com.imyeyu.api.modules.common.entity.Tag;
+import com.imyeyu.api.modules.common.service.TagService;
 import com.imyeyu.api.modules.gao.entity.GaoStore;
 import com.imyeyu.api.modules.gao.mapper.GaoStoreMapper;
+import com.imyeyu.api.modules.gao.service.GaoCustomerService;
+import com.imyeyu.api.modules.gao.service.GaoEventService;
+import com.imyeyu.api.modules.gao.service.GaoPointAccountService;
+import com.imyeyu.api.modules.gao.service.GaoPointRuleService;
+import com.imyeyu.api.modules.gao.service.GaoStoreBusinessDayService;
 import com.imyeyu.api.modules.gao.service.GaoStoreService;
+import com.imyeyu.api.modules.gao.service.GaoUserService;
 import com.imyeyu.api.modules.gao.util.StoreXSSFBuilder;
 import com.imyeyu.api.modules.system.entity.Logger;
 import com.imyeyu.api.modules.system.service.LoggerService;
@@ -17,6 +25,7 @@ import com.imyeyu.spring.mapper.BaseMapper;
 import com.imyeyu.spring.service.AbstractEntityService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -41,6 +50,13 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
 
 	private final LoggerService loggerService;
 	private final UserLoginService userLoginService;
+	private final GaoCustomerService customerService;
+	private final GaoEventService eventService;
+	private final GaoPointAccountService pointAccountService;
+	private final GaoPointRuleService pointRuleService;
+	private final GaoStoreBusinessDayService businessDayService;
+	private final ObjectProvider<GaoUserService> gaoUserServiceProvider;
+	private final TagService tagService;
 
 	private final GaoStoreMapper mapper;
 	private final StoreXSSFBuilder storeXSSFBuilder;
@@ -116,6 +132,14 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
 		try {
 			logger.setContent(id);
 			GaoStore store = get(id);
+			TimiException.required(store, "not found store");
+			deleteCustomers(store.getId());
+			deletePointRules(store.getId());
+			deleteEvents(store.getId());
+			deleteBusinessDays(store.getId());
+			deleteGaoUsers(store.getId());
+			deletePointAccounts(store.getId());
+			deleteStoreTags(store.getId());
 			store.setStatus(GaoStore.Status.DELETED);
 			super.update(store);
 			super.delete(id);
@@ -135,6 +159,55 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
 		}
 	}
 
+	/// 删除门店客户及其登记、积分账户、客户标签和附件
+	///
+	/// @param storeId 门店 ID
+	private void deleteCustomers(String storeId) {
+		customerService.deleteByStoreId(storeId);
+	}
+
+	/// 删除门店积分规则
+	///
+	/// @param storeId 门店 ID
+	private void deletePointRules(String storeId) {
+		pointRuleService.deleteByStoreId(storeId);
+	}
+
+	/// 删除门店登记事件及角色关联
+	///
+	/// @param storeId 门店 ID
+	private void deleteEvents(String storeId) {
+		eventService.deleteByStoreId(storeId);
+	}
+
+	/// 删除门店营业日
+	///
+	/// @param storeId 门店 ID
+	private void deleteBusinessDays(String storeId) {
+		businessDayService.deleteByStoreId(storeId);
+	}
+
+	/// 删除门店用户关系，不删除核心用户
+	///
+	/// @param storeId 门店 ID
+	private void deleteGaoUsers(String storeId) {
+		gaoUserServiceProvider.getObject().deleteByStoreId(storeId);
+	}
+
+	/// 清理门店下未被客户删除逻辑覆盖的积分账户
+	///
+	/// @param storeId 门店 ID
+	private void deletePointAccounts(String storeId) {
+		pointAccountService.deleteByStoreId(storeId);
+	}
+
+	/// 删除门店自有标签，客户标签应用由客户删除逻辑处理
+	///
+	/// @param storeId 门店 ID
+	private void deleteStoreTags(String storeId) {
+		tagService.deleteByOwner(Tag.OwnerType.GAO_STORE, storeId);
+	}
+
 	@Override
 	public GaoStore getByUserId(String userId) {
 		TimiException.required(userId, "not found userId");

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoUserInviteServiceImplement.java

@@ -3,6 +3,8 @@ package com.imyeyu.api.modules.gao.service.implement;
 import com.imyeyu.api.bean.CoreRoleCode;
 import com.imyeyu.api.bean.ModuleCode;
 import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
+import com.imyeyu.api.modules.common.entity.NotifyDetail;
+import com.imyeyu.api.modules.common.service.SmsService;
 import com.imyeyu.api.modules.gao.bean.GaoUserInviteCache;
 import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
 import com.imyeyu.api.modules.gao.bean.GaoRoleCode;
@@ -64,11 +66,13 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
 	private static final long REGISTER_RATE_LIMIT_TTL = Time.M * 10;
 	private static final int CODE_RATE_LIMIT = 30;
 	private static final int REGISTER_VALUE_RATE_LIMIT = 10;
+	private static final String INVALID_INVITE_MESSAGE = "邀请码无效或已过期";
 
 	private static final SecureRandom SECURE_RANDOM = new SecureRandom();
 
 	private final GaoStoreService gaoStoreService;
 	private final GaoUserService gaoUserService;
+	private final SmsService smsService;
 	private final UserLoginService userLoginService;
 	private final UserRoleService userRoleService;
 	private final UserService userService;
@@ -98,9 +102,11 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
 			logger.setUserId(inviterUserId);
 			permissionChecker.checkAny(ModuleCode.GAO, GaoPermissionCode.USER_CREATE.getValue());
 			Role requestedRole = roleService.get(req.getRoleId());
-			boolean adminInviteGlobalManager = roleChecker.hasAny(ModuleCode.CORE, CoreRoleCode.ADMIN.name())
+			boolean coreAdmin = isCoreAdmin();
+			boolean adminInviteGlobalManager = coreAdmin
 				&& isGlobalManagerRole(requestedRole);
 			boolean globalManager = authorizationScopeService.isSystemAdmin(inviterUserId)
+				|| coreAdmin
 				|| roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name());
 			boolean storeManager = !globalManager;
 			GaoStore loginStore = storeManager ? gaoStoreService.getByUserId(inviterUserId) : null;
@@ -147,14 +153,21 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
 	public GaoUserInviteValidateResponse validate(String code) {
 		TimiException.required(code, "not found code");
 		checkCodeRateLimit(code);
-		GaoUserInviteCache cache = requireValidInvite(code);
+		try {
-		validateInviteTarget(cache);
+			GaoUserInviteCache cache = requireValidInvite(code);
-		return new GaoUserInviteValidateResponse(true, cache.getExpireAt());
+			validateInviteTarget(cache);
+			return new GaoUserInviteValidateResponse(true, cache.getExpireAt());
+		} catch (TimiException e) {
+			if (TimiCode.ARG_BAD == e.getCode() && INVALID_INVITE_MESSAGE.equals(e.getMessage())) {
+				return new GaoUserInviteValidateResponse(false, -1L);
+			}
+			throw e;
+		}
 	}
 
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
-	public String register(GaoUserInviteRegisterData data) {
+	public String register(GaoUserInviteRegisterData data, String smsDetailId, String smsCaptcha) {
 		TimiException.required(data, "not found register data");
 		String code = data.getCode();
 		TimiException.required(code, "not found code");
@@ -170,6 +183,9 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
 			cache = requireValidInvite(code);
 			logger.setContent(buildLogContent(cache));
 			validateInviteTarget(cache);
+			NotifyDetail smsDetail = smsService.captchaVerify(smsDetailId, smsCaptcha);
+			TimiException.requiredTrue(NotifyDetail.MsgType.SMS == smsDetail.getMsgType()
+				&& data.getPhoneNo().equals(smsDetail.getSendTo()), "短信验证码与手机号不匹配");
 			TimiException.requiredNull(userService.getByName(data.getName()), "existed user name");
 			TimiException.requiredNull(userService.getByPhoneNo(data.getPhoneNo()), "existed phone number");
 			if (!redisInvite.destroy(getInviteKey(code))) {
@@ -260,14 +276,10 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
 
 	private Role requireInvitableRole(String inviterUserId, String roleId, String storeId) {
 		Role role = requireValidRole(roleId, storeId);
-		List<String> directRoleIdList = userRoleService.listRoleByUserId(ModuleCode.GAO, inviterUserId)
+		boolean adminInviteGlobalManager = isCoreAdmin() && isGlobalManagerRole(role);
+		boolean descendant = adminInviteGlobalManager || authorizationScopeService.listManageableRole(inviterUserId, ModuleCode.GAO)
 			.stream()
-			.map(Role::getId)
+			.anyMatch(item -> role.getId().equals(item.getId()));
-			.toList();
-		boolean descendant = authorizationScopeService.listManageableRole(inviterUserId, ModuleCode.GAO)
-			.stream()
-			.anyMatch(item -> role.getId().equals(item.getId()))
-			&& !directRoleIdList.contains(role.getId());
 		if (!descendant) {
 			throw new TimiException(TimiCode.PERMISSION_ERROR, "角色不在可邀请范围内");
 		}
@@ -302,7 +314,8 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
 	}
 
 	private void checkStoreScope(String userId, String storeId) {
-		if (authorizationScopeService.isSystemAdmin(userId) || roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
+		if (authorizationScopeService.isSystemAdmin(userId) || isCoreAdmin()
+			|| roleChecker.hasAny(ModuleCode.GAO, GaoRoleCode.GLOBAL_MANAGER.name())) {
 			return;
 		}
 		GaoStore userStore = gaoStoreService.getByUserId(userId);
@@ -344,6 +357,10 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
 	}
 
 	private TimiException invalidInvite() {
-		return new TimiException(TimiCode.ARG_BAD, "邀请码无效或已过期");
+		return new TimiException(TimiCode.ARG_BAD, INVALID_INVITE_MESSAGE);
+	}
+
+	private boolean isCoreAdmin() {
+		return roleChecker.hasAny(ModuleCode.CORE, CoreRoleCode.ADMIN.name());
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoUserServiceImplement.java

@@ -40,6 +40,17 @@ public class GaoUserServiceImplement extends AbstractEntityService<GaoUser, Stri
 		return mapper;
 	}
 
+	@Transactional(TimiServerDBConfig.ROLLBACKER)
+	@Override
+	public void deleteByStoreId(String storeId) {
+		TimiException.required(storeId, "not found storeId");
+		GaoUser example = new GaoUser();
+		example.setStoreId(storeId);
+		for (GaoUser gaoUser : mapper.selectAllByExample(example)) {
+			super.delete(gaoUser.getId());
+		}
+	}
+
 	@Transactional(TimiServerDBConfig.ROLLBACKER)
 	@Override
 	public void create(GaoUser gaoUser) {

src/main/java/com/imyeyu/api/modules/gao/vo/GaoPointAccountPage.java

@@ -0,0 +1,20 @@
+package com.imyeyu.api.modules.gao.vo;
+
+import com.imyeyu.java.bean.BasePage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/// GAO 客户积分账户分页查询请求
+///
+/// @author Codex
+/// @since 2026-08-22
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GaoPointAccountPage extends BasePage {
+
+	/// 门店 ID
+	private String storeId;
+
+	/// 客户编码、姓名、电话或拼音关键词
+	private String keyword;
+}

src/main/java/com/imyeyu/api/modules/gao/vo/GaoUserInviteRegisterRequest.java

@@ -1,20 +1,33 @@
 package com.imyeyu.api.modules.gao.vo;
 
-import com.imyeyu.spring.bean.CaptchaData;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
 
 /// GAO 用户邀请注册请求
 ///
 /// @author Codex
 /// @since 2026-08-13
-public class GaoUserInviteRegisterRequest extends CaptchaData<GaoUserInviteRegisterData> {
+@Data
+public class GaoUserInviteRegisterRequest {
+
+	/// 短信通知详情 ID
+	@NotBlank
+	private String detailId;
+
+	/// 短信验证码
+	@NotBlank
+	@Pattern(regexp = "\\d{6}")
+	private String captcha;
+
+	private GaoUserInviteRegisterData data;
 
 	/// 级联校验注册数据
-	@Override
 	@NotNull
 	@Valid
 	public GaoUserInviteRegisterData getData() {
-		return super.getData();
+		return data;
 	}
 }

src/main/java/com/imyeyu/api/modules/gao/vo/GaoUserInviteValidateResponse.java

@@ -14,6 +14,6 @@ public class GaoUserInviteValidateResponse {
 	/// true 为邀请码可用
 	private boolean valid;
 
-	/// 邀请过期时间，毫秒时间戳
+	/// 邀请过期时间，毫秒时间戳；valid 为 false 时为 0
 	private Long expireAt;
 }