feat(tkdata-country): 新增国家英文名字段

为公告模块增加 category 字段，支持按类型筛选与展示，满足多场景公告分类需求。

.gitignore

@@ -62,3 +62,5 @@ application-my.yaml
 /.claude/agents/backend-architect.md
 /tkdata-model-server-issues.md
 /CLAUDE.md
+/.omc/
+/AGENTS.md

tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/countryInfo/vo/CountryInfoRespVO.java

@@ -44,4 +44,7 @@ public class CountryInfoRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "国家英文名")
+    @ExcelProperty("国家英文名")
+    private String countryNameEnglish;
 }

tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/countryinfo/CountryInfoDO.java

@@ -47,5 +47,5 @@ public class CountryInfoDO {
      */
     private String languageName;
 
-
+    private String countryNameEnglish;
 }

yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/LogRecordServiceImpl.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.framework.operatelog.core.service;
 
 import cn.iocoder.yudao.framework.common.biz.system.logger.OperateLogCommonApi;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO;
 import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
 import com.mzt.logapi.beans.LogRecord;
 import com.mzt.logapi.service.ILogRecordService;
 import lombok.extern.slf4j.Slf4j;
@@ -50,11 +52,16 @@ public class LogRecordServiceImpl implements ILogRecordService {
     private static void fillUserFields(OperateLogCreateReqDTO reqDTO) {
         // 使用 SecurityFrameworkUtils。因为要考虑，rpc、mq、job，它其实不是 web；
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        if (loginUser == null) {
+        if (loginUser != null) {
-            return;
-        }
             reqDTO.setUserId(loginUser.getId());
             reqDTO.setUserType(loginUser.getUserType());
+            return;
+        }
+        // 匿名请求场景（例如注册），尝试从 Request Attribute 获取用户信息
+        Long loginUserId = WebFrameworkUtils.getLoginUserId();
+        Integer loginUserType = WebFrameworkUtils.getLoginUserType();
+        reqDTO.setUserId(loginUserId != null ? loginUserId : 0L);
+        reqDTO.setUserType(loginUserType != null ? loginUserType : UserTypeEnum.ADMIN.getValue());
     }
 
     public static void fillModuleFields(OperateLogCreateReqDTO reqDTO, LogRecord logRecord) {

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticePageReqVO.java

@@ -16,4 +16,6 @@ public class NoticePageReqVO extends PageParam {
     @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
 
+    @Schema(description = "公告类型")
+    private String category;
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeRespVO.java

@@ -27,4 +27,6 @@ public class NoticeRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
+    @Schema(description = "公告类型")
+    private String category;
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeSaveReqVO.java

@@ -29,4 +29,6 @@ public class NoticeSaveReqVO {
     @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
 
+    @Schema(description = "公告类型")
+    private String category;
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java

@@ -77,6 +77,14 @@ public class TenantController {
         return success(tenantService.createTenant(createReqVO));
     }
 
+    @PostMapping("/register")
+    @PermitAll
+    @TenantIgnore
+    @Operation(summary = "注册租户")
+    public CommonResult<Long> registerTenant(@Valid @RequestBody TenantRegisterReqVO registerReqVO) {
+        return success(tenantService.registerTenant(registerReqVO));
+    }
+
     @PutMapping("/update")
     @Operation(summary = "更新租户")
     @PreAuthorize("@ss.hasPermission('system:tenant:update')")

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java

@@ -45,6 +45,10 @@ public class TenantPageReqVO extends PageParam {
     @Schema(description = "爬大哥到期时间")
     private LocalDateTime[] brotherExpireTime;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @Schema(description = "爬主播到期时间")
+    private LocalDateTime[] crawlExpireTime;
+
     @Schema
     private String remark;
 

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantRegisterReqVO.java

@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import javax.validation.constraints.NotEmpty;
+
+@Schema(description = "管理后台 - 租户注册 Request VO")
+@Data
+public class TenantRegisterReqVO {
+
+    @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @NotNull(message = "租户名不能为空")
+    private String name;
+
+    @Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotNull(message = "联系人不能为空")
+    private String contactName;
+
+    @Schema(description = "联系手机", example = "15601691300")
+    private String contactMobile;
+
+    @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao")
+    @NotNull(message = "用户账号不能为空")
+    @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "用户账号由 数字、字母 组成")
+    @Size(min = 4, max = 30, message = "用户账号长度为 4-30 个字符")
+    private String username;
+
+    @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    @NotNull(message = "密码不能为空")
+    @Length(min = 6, max = 16, message = "密码长度为 6-16 位")
+    private String password;
+
+    @Schema(description = "Turnstile 令牌", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "Turnstile 令牌不能为空")
+    private String turnstileToken;
+
+//    @Schema(description = "是否允许登录爬虫客户端", example = "0不允许，1允许")
+//    private Byte crawl;
+//
+//    @Schema(description = "是否允许登录大哥客户端", example = "0不允许，1允许")
+//    private Byte bigBrother;
+//
+//    @Schema(description = "能否登录 AI 聊天工具", example = "0不允许，1允许")
+//    private Byte aiChat;
+//
+//    @Schema(description = "备注", example = "备注")
+//    private String remark;
+//
+//    @Schema(description = "租户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "代理/客户")
+//    @NotNull(message = "租户类型不能为空")
+//    private String tenantType;
+
+}

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java

@@ -7,10 +7,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Schema(description = "管理后台 - 租户 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -53,6 +56,8 @@ public class TenantRespVO {
     @Schema(description = "大哥过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime brotherExpireTime;
 
+    @Schema(description = "爬主播到期时间")
+    private LocalDateTime crawlExpireTime;
 
     @Schema(description = "账号数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Integer accountCount;

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.AssertTrue;
 import javax.validation.constraints.NotNull;
@@ -12,6 +13,8 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Schema(description = "管理后台 - 租户创建/修改 Request VO")
 @Data
 public class TenantSaveReqVO {
@@ -51,6 +54,8 @@ public class TenantSaveReqVO {
     @Schema(description = "大哥过期时间")
     private LocalDateTime brotherExpireTime;
 
+    @Schema(description = "爬主播到期时间")
+    private LocalDateTime crawlExpireTime;
 
     @Schema(description = "账号数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     @NotNull(message = "账号数量不能为空")

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notice/NoticeDO.java

@@ -44,4 +44,5 @@ public class NoticeDO extends BaseDO {
      */
     private Integer status;
 
+    private String category;
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java

@@ -84,6 +84,12 @@ public class TenantDO extends BaseDO {
      * 大哥过期时间
      */
     private LocalDateTime brotherExpireTime;
+
+    /**
+     * 爬虫到期时间
+     */
+    private LocalDateTime crawlExpireTime;
+
     /**
      * 账号数量
      */

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/job/DisableCrawlExpiredAccount.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.system.job;
 
-import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
@@ -13,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -64,25 +62,39 @@ public class DisableCrawlExpiredAccount implements JobHandler{
     public String execute(String param) throws Exception {
         Long tenantId = TenantContextHolder.getTenantId();
         TenantDO tenant = tenantMapper.selectById(tenantId);
-        if (tenant.getExpireTime()!=null) {
+
-            Duration brotherDuration = LocalDateTimeUtil.between(tenant.getExpireTime(), LocalDateTime.now());
+        // 检查租户是否配置了爬虫过期时间
-            long minutes = brotherDuration.toMinutes();
+        if (tenant.getCrawlExpireTime() == null) {
-            LambdaQueryWrapper<AdminUserDO> aiUserQueryWrapper = new LambdaQueryWrapper<>();
+            return "租户未配置爬虫过期时间";
-            aiUserQueryWrapper.eq(AdminUserDO::getTenantId, tenantId);
-            aiUserQueryWrapper.eq(AdminUserDO::getCrawl, 1);
-            List<AdminUserDO> aiUserList = userMapper.selectList(aiUserQueryWrapper);
-            int aiAccountNum = 0 ;
-            if (minutes >= 0) {
-                for (AdminUserDO adminUserDO : aiUserList) {
-                    adminUserDO.setCrawl((byte) 0);
-                    userMapper.updateById(adminUserDO);
-                    aiAccountNum++;
-                    log.info("禁用过期爬虫账号，账号ID：{}", adminUserDO.getId());
         }
+
+        // 判断是否已过期（当前时间 >= 过期时间）
+        if (LocalDateTime.now().isBefore(tenant.getCrawlExpireTime())) {
+            return "爬虫权限未过期，无需处理";
         }
-            // 返回操作结果：包含禁用的AI账号和大哥账号数量统计
+
-            return "禁用过期账号成功，禁用了 " + aiAccountNum + " 个 爬虫 账号。";
+        // 查询当前租户下所有启用爬虫权限的用户ID
+        LambdaQueryWrapper<AdminUserDO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AdminUserDO::getTenantId, tenantId)
+                    .eq(AdminUserDO::getCrawl, 1)
+                    .select(AdminUserDO::getId);
+        List<AdminUserDO> crawlUserList = userMapper.selectList(queryWrapper);
+
+        if (crawlUserList.isEmpty()) {
+            return "无需禁用的爬虫账号";
         }
-        return "租户未配置过期时间";
+
+        // 批量更新：禁用爬虫权限
+        AdminUserDO updateEntity = new AdminUserDO();
+        updateEntity.setCrawl((byte) 0);
+        LambdaQueryWrapper<AdminUserDO> updateWrapper = new LambdaQueryWrapper<>();
+        updateWrapper.eq(AdminUserDO::getTenantId, tenantId)
+                     .eq(AdminUserDO::getCrawl, 1);
+        int updatedCount = userMapper.update(updateEntity, updateWrapper);
+
+        // 记录被禁用的账号ID
+        crawlUserList.forEach(user -> log.info("禁用过期爬虫账号，账号ID：{}", user.getId()));
+
+        return "禁用过期爬虫账号成功，共禁用 " + updatedCount + " 个账号";
     }
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/job/DisableWebAIExpiredAccount.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.system.job;
 
-import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
@@ -13,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;/*
  * @author: ziin
@@ -43,26 +41,40 @@ public class DisableWebAIExpiredAccount implements JobHandler{
     public String execute(String param) throws Exception {
         Long tenantId = TenantContextHolder.getTenantId();
         TenantDO tenant = tenantMapper.selectById(tenantId);
-        if (tenant.getAiExpireTime()!=null) {
+
-            Duration brotherDuration = LocalDateTimeUtil.between(tenant.getAiExpireTime(), LocalDateTime.now());
+        // 检查租户是否配置了AI过期时间
-            long minutes = brotherDuration.toMinutes();
+        if (tenant.getAiExpireTime() == null) {
-            LambdaQueryWrapper<AdminUserDO> aiUserQueryWrapper = new LambdaQueryWrapper<>();
+            return "租户未配置AI过期时间";
-            aiUserQueryWrapper.eq(AdminUserDO::getTenantId, tenantId);
-            aiUserQueryWrapper.eq(AdminUserDO::getWebAi, 1);
-            List<AdminUserDO> aiUserList = userMapper.selectList(aiUserQueryWrapper);
-            int aiAccountNum = 0 ;
-            if (minutes >= 0) {
-                for (AdminUserDO adminUserDO : aiUserList) {
-                    adminUserDO.setWebAi((byte) 0);
-                    userMapper.updateById(adminUserDO);
-                    aiAccountNum++;
-                    log.info("禁用过期WebAI账号，账号ID：{}", adminUserDO.getId());
         }
+
+        // 判断是否已过期（当前时间 >= 过期时间）
+        if (LocalDateTime.now().isBefore(tenant.getAiExpireTime())) {
+            return "WebAI权限未过期，无需处理";
         }
-            // 返回操作结果：包含禁用的AI账号和大哥账号数量统计
+
-            return "禁用过期账号成功，禁用了 " + aiAccountNum + " 个 WebAI 账号。";
+        // 查询当前租户下所有启用WebAI权限的用户ID
+        LambdaQueryWrapper<AdminUserDO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AdminUserDO::getTenantId, tenantId)
+                    .eq(AdminUserDO::getWebAi, 1)
+                    .select(AdminUserDO::getId);
+        List<AdminUserDO> webAiUserList = userMapper.selectList(queryWrapper);
+
+        if (webAiUserList.isEmpty()) {
+            return "无需禁用的WebAI账号";
         }
-        return "租户未配置过期时间";
+
+        // 批量更新：禁用WebAI权限
+        AdminUserDO updateEntity = new AdminUserDO();
+        updateEntity.setWebAi((byte) 0);
+        LambdaQueryWrapper<AdminUserDO> updateWrapper = new LambdaQueryWrapper<>();
+        updateWrapper.eq(AdminUserDO::getTenantId, tenantId)
+                     .eq(AdminUserDO::getWebAi, 1);
+        int updatedCount = userMapper.update(updateEntity, updateWrapper);
+
+        // 记录被禁用的账号ID
+        webAiUserList.forEach(user -> log.info("禁用过期WebAI账号，账号ID：{}", user.getId()));
+
+        return "禁用过期WebAI账号成功，共禁用 " + updatedCount + " 个账号";
     }
 }
 

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.service.tenant;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantRegisterReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantRenewalReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
@@ -28,6 +29,14 @@ public interface TenantService {
      */
     Long createTenant(@Valid TenantSaveReqVO createReqVO);
 
+    /**
+     * 注册租户（固定默认值）
+     *
+     * @param registerReqVO 注册信息
+     * @return 编号
+     */
+    Long registerTenant(@Valid TenantRegisterReqVO registerReqVO);
+
     /**
      * 更新租户
      *

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java

@@ -7,18 +7,24 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.yudao.framework.tenant.config.TenantProperties;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
+import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantRegisterReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantRenewalReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantSaveReqVO;
 import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert;
@@ -48,17 +54,22 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
@@ -74,6 +85,12 @@ import static java.util.Collections.singleton;
 @Slf4j
 public class TenantServiceImpl implements TenantService {
 
+    private static final Long REGISTER_PACKAGE_ID = 999L;
+    private static final Integer REGISTER_ACCOUNT_COUNT = 99;
+    private static final LocalDateTime REGISTER_EXPIRE_TIME = LocalDateTime.of(2099, 12, 31, 23, 59, 59);
+    private static final String TenantType = "用户";
+    private static final String TURNSTILE_VERIFY_FAILED_REASON = "Turnstile 校验失败";
+
     @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection")
     @Autowired(required = false) // 由于 yudao.tenant.enable 配置项，可以关闭多租户的功能，所以这里只能不强制注入
     private TenantProperties tenantProperties;
@@ -103,6 +120,18 @@ public class TenantServiceImpl implements TenantService {
     @Autowired
     private TenantBalanceService tenantBalanceService;
 
+    @Value("${yudao.turnstile.enable:false}")
+    private Boolean turnstileEnable;
+
+    @Value("${yudao.turnstile.secret-key:}")
+    private String turnstileSecretKey;
+
+    @Value("${yudao.turnstile.verify-url:https://challenges.cloudflare.com/turnstile/v0/siteverify}")
+    private String turnstileVerifyUrl;
+
+    @Value("${yudao.turnstile.timeout-millis:3000}")
+    private Integer turnstileTimeoutMillis;
+
     @Override
     public List<Long> getTenantIdList() {
         List<TenantDO> tenants = tenantMapper.selectList();
@@ -170,12 +199,12 @@ public class TenantServiceImpl implements TenantService {
             log.info("代理: {} 续费租户:{} 成功,套餐 Id:{}", currentTenantId,targetTenant.getId(),updateReqVO.getPackageId());
         }
 
-        if (targetTenant.getExpireTime().isBefore(LocalDateTime.now())){
+        if (targetTenant.getCrawlExpireTime().isBefore(LocalDateTime.now())){
-            targetTenant.setExpireTime(LocalDateTime.now().plusDays(tenantAgencyPackage.getDays()));
+            targetTenant.setCrawlExpireTime(LocalDateTime.now().plusDays(tenantAgencyPackage.getDays()));
             targetTenant.setStatus(CommonStatusEnum.ENABLE.getStatus());
             targetTenantUser.setCrawl((byte) 1);
         }else {
-            targetTenant.setExpireTime(targetTenant.getExpireTime().plusDays(tenantAgencyPackage.getDays()));
+            targetTenant.setCrawlExpireTime(targetTenant.getCrawlExpireTime().plusDays(tenantAgencyPackage.getDays()));
         }
 
         if (tenantAgencyPackage.getAiClient()==1){
@@ -208,6 +237,65 @@ public class TenantServiceImpl implements TenantService {
 
     }
 
+    @Override
+    @DSTransactional
+    @DataPermission(enable = false)
+    public Long registerTenant(TenantRegisterReqVO registerReqVO) {
+        verifyTurnstile(registerReqVO.getTurnstileToken());
+        // 注册接口为匿名访问，需要补充操作人，避免 creator/updater 为空
+        fillSystemOperatorIfAbsent();
+        TenantSaveReqVO createReqVO = BeanUtils.toBean(registerReqVO, TenantSaveReqVO.class);
+        createReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+        createReqVO.setTenantType(TenantType);
+        createReqVO.setWebsite(registerReqVO.getContactMobile()+ ".yolozs.com");
+        createReqVO.setAccountCount(REGISTER_ACCOUNT_COUNT);
+        createReqVO.setPackageId(REGISTER_PACKAGE_ID);
+        createReqVO.setExpireTime(REGISTER_EXPIRE_TIME);
+        AtomicReference<Long> tenantIdRef = new AtomicReference<>();
+        TenantUtils.execute(1L, () -> tenantIdRef.set(createTenant(createReqVO)));
+        return tenantIdRef.get();
+    }
+
+    private void fillSystemOperatorIfAbsent() {
+        HttpServletRequest request = WebFrameworkUtils.getRequest();
+        if (request == null || WebFrameworkUtils.getLoginUserId(request) != null) {
+            return;
+        }
+        WebFrameworkUtils.setLoginUserId(request, 1L);
+        WebFrameworkUtils.setLoginUserType(request, UserTypeEnum.ADMIN.getValue());
+    }
+
+    private void verifyTurnstile(String turnstileToken) {
+        if (!Boolean.TRUE.equals(turnstileEnable)) {
+            return;
+        }
+        if (StrUtil.isBlank(turnstileSecretKey)) {
+            throw exception(AUTH_REGISTER_CAPTCHA_CODE_ERROR, TURNSTILE_VERIFY_FAILED_REASON + "：secret-key 未配置");
+        }
+        Map<String, Object> verifyResp;
+        try (HttpResponse response = HttpRequest.post(turnstileVerifyUrl)
+                .timeout(turnstileTimeoutMillis)
+                .form(buildTurnstileForm(turnstileToken))
+                .execute()) {
+            verifyResp = JsonUtils.parseObject(response.body(), Map.class);
+        } catch (Exception ex) {
+            log.error("[verifyTurnstile][Turnstile 请求失败]", ex);
+            throw exception(AUTH_REGISTER_CAPTCHA_CODE_ERROR, TURNSTILE_VERIFY_FAILED_REASON + "：request failed");
+        }
+        if (verifyResp == null || !Boolean.TRUE.equals(verifyResp.get("success"))) {
+            Object errorCodes = verifyResp == null ? null : verifyResp.get("error-codes");
+            throw exception(AUTH_REGISTER_CAPTCHA_CODE_ERROR,
+                    TURNSTILE_VERIFY_FAILED_REASON + "：" + StrUtil.blankToDefault(StrUtil.toString(errorCodes), "unknown"));
+        }
+    }
+
+    private Map<String, Object> buildTurnstileForm(String turnstileToken) {
+        Map<String, Object> form = new HashMap<>();
+        form.put("secret", turnstileSecretKey);
+        form.put("response", turnstileToken);
+        return form;
+    }
+
     @Override
     @DSTransactional // 多数据源，使用 @DSTransactional 保证本地事务，以及数据源的切换
     @DataPermission(enable = false) // 参见 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1154 说明

yudao-server/src/main/resources/application.yaml

@@ -98,7 +98,7 @@ aj:
     cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存
     timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
     type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
-    water-mark: 芋道源码 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
+    water-mark:  # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
     interference-options: 0 # 滑动干扰项(0/1/2)
     req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
     req-get-lock-limit: 5 # 验证失败 5 次，get接口锁定
@@ -212,6 +212,11 @@ yudao:
     send-maximum-quantity-per-day: 10
     begin-code: 9999 # 这里配置 9999 的原因是，测试方便。
     end-code: 9999 # 这里配置 9999 的原因是，测试方便。
+  turnstile: # Cloudflare Turnstile 服务端校验配置
+    enable: true # 生产开启后，必须配置 secret-key
+    secret-key: "0x4AAAAAACYSAQ2xlao9D8LlyDRhB3n1BmM"
+    verify-url: https://challenges.cloudflare.com/turnstile/v0/siteverify
+    timeout-millis: 3000
 
 debug: false
 # 插件配置 TODO 芋艿：【IOT】需要处理下