update:格式化代码

main/manager-api/src/main/java/xiaozhi/common/annotation/DataFilter.java

@@ -1,6 +1,10 @@
 package xiaozhi.common.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * 数据过滤注解

main/manager-api/src/main/java/xiaozhi/common/annotation/LogOperation.java

@@ -1,6 +1,10 @@
 package xiaozhi.common.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * 操作日志注解

main/manager-api/src/main/java/xiaozhi/common/aspect/RedisAspect.java

@@ -1,14 +1,15 @@
 package xiaozhi.common.aspect;
 
-import xiaozhi.common.exception.ErrorCode;
-import xiaozhi.common.exception.RenException;
-import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import lombok.extern.slf4j.Slf4j;
+import xiaozhi.common.exception.ErrorCode;
+import xiaozhi.common.exception.RenException;
+
 /**
  * Redis切面处理类
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/config/MybatisPlusConfig.java

@@ -1,12 +1,14 @@
 package xiaozhi.common.config;
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+
 import xiaozhi.common.interceptor.DataFilterInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * mybatis-plus配置

main/manager-api/src/main/java/xiaozhi/common/config/SwaggerConfig.java

@@ -1,11 +1,12 @@
 package xiaozhi.common.config;
 
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Info;
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+
 /**
  * Swagger配置
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/entity/BaseEntity.java

@@ -1,12 +1,13 @@
 package xiaozhi.common.entity;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
 
-import java.io.Serializable;
+import lombok.Data;
-import java.util.Date;
 
 /**
  * 基础实体类，所有实体都需要继承

main/manager-api/src/main/java/xiaozhi/common/exception/RenException.java

@@ -1,6 +1,5 @@
 package xiaozhi.common.exception;
 
-
 import xiaozhi.common.utils.MessageUtils;
 
 /**
@@ -10,7 +9,6 @@ import xiaozhi.common.utils.MessageUtils;
  */
 public class RenException extends RuntimeException {
 
-
     private int code;
     private String msg;
 

main/manager-api/src/main/java/xiaozhi/common/page/PageData.java

@@ -1,11 +1,11 @@
 package xiaozhi.common.page;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.List;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
 /**
  * 分页工具类
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/page/TokenDTO.java

@@ -1,10 +1,10 @@
 package xiaozhi.common.page;
 
+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * 令牌信息
  *
@@ -14,7 +14,6 @@ import java.io.Serializable;
 @Schema(description = "令牌信息")
 public class TokenDTO implements Serializable {
 
-
     @Schema(description = "密码")
     private String token;
 

main/manager-api/src/main/java/xiaozhi/common/redis/RedisConfig.java

@@ -1,6 +1,5 @@
 package xiaozhi.common.redis;
 
-import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -8,6 +7,8 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import jakarta.annotation.Resource;
+
 /**
  * Redis配置
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/redis/RedisUtils.java

@@ -1,14 +1,15 @@
 package xiaozhi.common.redis;
 
-import jakarta.annotation.Resource;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import jakarta.annotation.Resource;
+
 /**
  * Redis工具类
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/service/BaseService.java

@@ -1,10 +1,10 @@
 package xiaozhi.common.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-
 import java.io.Serializable;
 import java.util.Collection;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+
 /**
  * 基础服务接口，所有Service接口都要继承
  * Copyright (c) 人人开源 All rights reserved.
@@ -56,7 +56,8 @@ public interface BaseService<T> {
      * </p>
      *
      * @param entity        实体对象
-     * @param updateWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper}
+     * @param updateWrapper 实体对象封装操作类
+     *                      {@link com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper}
      */
     boolean update(T entity, Wrapper<T> updateWrapper);
 

main/manager-api/src/main/java/xiaozhi/common/service/CrudService.java

@@ -1,11 +1,11 @@
 package xiaozhi.common.service;
 
-import xiaozhi.common.page.PageData;
-
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
+import xiaozhi.common.page.PageData;
+
 /**
  * CRUD基础服务接口
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/user/UserDetail.java

@@ -1,9 +1,9 @@
 package xiaozhi.common.user;
 
-import lombok.Data;
-
 import java.io.Serializable;
 
+import lombok.Data;
+
 /**
  * 登录用户信息
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/utils/HttpContextUtils.java

@@ -1,20 +1,21 @@
 package xiaozhi.common.utils;
 
-import jakarta.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+
+import jakarta.servlet.http.HttpServletRequest;
 import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.exception.RenException;
 
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Http
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/utils/IpUtils.java

@@ -1,8 +1,9 @@
 package xiaozhi.common.utils;
 
+import org.apache.commons.lang3.StringUtils;
+
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * IP地址

main/manager-api/src/main/java/xiaozhi/common/utils/JsonUtils.java

@@ -1,13 +1,14 @@
 package xiaozhi.common.utils;
 
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+
 /**
  * JSON 工具类
  * Copyright (c) 人人开源 All rights reserved.
@@ -59,7 +60,8 @@ public class JsonUtils {
             return new ArrayList<>();
         }
         try {
-            return objectMapper.readValue(text, objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
+            return objectMapper.readValue(text,
+                    objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

main/manager-api/src/main/java/xiaozhi/common/utils/Result.java

@@ -1,11 +1,11 @@
 package xiaozhi.common.utils;
 
+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import xiaozhi.common.exception.ErrorCode;
 
-import java.io.Serializable;
-
 /**
  * 响应数据
  * Copyright (c) 人人开源 All rights reserved.
@@ -36,7 +36,6 @@ public class Result<T> implements Serializable {
         return this;
     }
 
-
     public Result<T> error() {
         this.code = ErrorCode.INTERNAL_SERVER_ERROR;
         this.msg = MessageUtils.getMessage(this.code);

main/manager-api/src/main/java/xiaozhi/common/utils/TreeNode.java

@@ -1,11 +1,11 @@
 package xiaozhi.common.utils;
 
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.Data;
+
 /**
  * 树节点，所有需要实现树节点的，都需要继承该类
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/validator/ValidatorUtils.java

@@ -1,16 +1,17 @@
 package xiaozhi.common.validator;
 
-import xiaozhi.common.exception.RenException;
+import java.util.Locale;
-import jakarta.validation.ConstraintViolation;
+import java.util.Set;
-import jakarta.validation.Validation;
+
-import jakarta.validation.Validator;
 import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.validation.beanvalidation.MessageSourceResourceBundleLocator;
 
-import java.util.Locale;
+import jakarta.validation.ConstraintViolation;
-import java.util.Set;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import xiaozhi.common.exception.RenException;
 
 /**
  * hibernate-validator校验工具类

main/manager-api/src/main/java/xiaozhi/common/xss/SqlFilter.java

@@ -1,8 +1,9 @@
 package xiaozhi.common.xss;
 
+import org.apache.commons.lang3.StringUtils;
+
 import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.exception.RenException;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * SQL过滤
@@ -30,7 +31,8 @@ public class SqlFilter {
         str = str.toLowerCase();
 
         // 非法字符
-        String[] keywords = {"master", "truncate", "insert", "select", "delete", "update", "declare", "alter", "drop"};
+        String[] keywords = { "master", "truncate", "insert", "select", "delete", "update", "declare", "alter",
+                "drop" };
 
         // 判断是否包含非法字符
         for (String keyword : keywords) {

main/manager-api/src/main/java/xiaozhi/common/xss/XssConfig.java

@@ -1,6 +1,5 @@
 package xiaozhi.common.xss;
 
-import jakarta.servlet.DispatcherType;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -8,6 +7,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.PathMatcher;
 
+import jakarta.servlet.DispatcherType;
+
 /**
  * XSS 配置文件
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/xss/XssFilter.java

@@ -1,11 +1,17 @@
 package xiaozhi.common.xss;
 
-import jakarta.servlet.*;
+import java.io.IOException;
-import jakarta.servlet.http.HttpServletRequest;
+
-import lombok.AllArgsConstructor;
 import org.springframework.util.PathMatcher;
 
-import java.io.IOException;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.AllArgsConstructor;
 
 /**
  * XSS过滤
@@ -38,7 +44,8 @@ public class XssFilter implements Filter {
 
     private boolean shouldNotFilter(HttpServletRequest request) {
         // 放行不过滤的URL
-        return properties.getExcludeUrls().stream().anyMatch(excludeUrl -> pathMatcher.match(excludeUrl, request.getServletPath()));
+        return properties.getExcludeUrls().stream()
+                .anyMatch(excludeUrl -> pathMatcher.match(excludeUrl, request.getServletPath()));
     }
 
     @Override

main/manager-api/src/main/java/xiaozhi/common/xss/XssHttpServletRequestWrapper.java

@@ -1,20 +1,20 @@
 package xiaozhi.common.xss;
 
-import cn.hutool.core.io.IoUtil;
-import jakarta.servlet.ReadListener;
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+
+import cn.hutool.core.io.IoUtil;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 /**
  * XSS过滤处理

main/manager-api/src/main/java/xiaozhi/common/xss/XssProperties.java

@@ -1,11 +1,12 @@
 package xiaozhi.common.xss;
 
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.util.Collections;
 import java.util.List;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import lombok.Data;
+
 /**
  * XSS 配置项
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/common/xss/XssUtils.java

@@ -24,8 +24,10 @@ public class XssUtils extends Safelist {
         return new Safelist()
                 // 支持的标签
                 .addTags("a", "b", "blockquote", "br", "caption", "cite", "code", "col", "colgroup", "dd", "div", "dl",
-                        "dt", "em", "h1", "h2", "h3", "h4", "h5", "h6", "i", "img", "li", "ol", "p", "pre", "q", "small",
+                        "dt", "em", "h1", "h2", "h3", "h4", "h5", "h6", "i", "img", "li", "ol", "p", "pre", "q",
-                        "strike", "strong", "sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "u", "ul",
+                        "small",
+                        "strike", "strong", "sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "u",
+                        "ul",
                         "embed", "object", "param", "span")
 
                 // 支持的标签属性
@@ -44,9 +46,12 @@ public class XssUtils extends Safelist {
                 .addAttributes("ul", "type", "style")
                 .addAttributes("pre", "class", "style")
                 .addAttributes("div", "class", "id", "style")
-                .addAttributes("embed", "src", "wmode", "flashvars", "pluginspage", "allowFullScreen", "allowfullscreen",
+                .addAttributes("embed", "src", "wmode", "flashvars", "pluginspage", "allowFullScreen",
-                        "quality", "width", "height", "align", "allowScriptAccess", "allowscriptaccess", "allownetworking", "type")
+                        "allowfullscreen",
-                .addAttributes("object", "type", "id", "name", "data", "width", "height", "style", "classid", "codebase")
+                        "quality", "width", "height", "align", "allowScriptAccess", "allowscriptaccess",
+                        "allownetworking", "type")
+                .addAttributes("object", "type", "id", "name", "data", "width", "height", "style", "classid",
+                        "codebase")
                 .addAttributes("param", "name", "value")
                 .addAttributes("span", "class", "style")
 

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentDao.java

@@ -1,6 +1,7 @@
 package xiaozhi.modules.agent.dao;
 
 import org.apache.ibatis.annotations.Mapper;
+
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.agent.entity.AgentEntity;
 

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentTemplateDao.java

@@ -1,6 +1,7 @@
 package xiaozhi.modules.agent.dao;
 
 import org.apache.ibatis.annotations.Mapper;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import xiaozhi.modules.agent.entity.AgentTemplateEntity;
@@ -14,7 +15,3 @@ import xiaozhi.modules.agent.entity.AgentTemplateEntity;
 public interface AgentTemplateDao extends BaseMapper<AgentTemplateEntity> {
 
 }
-
-
-
-

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentCreateDTO.java

@@ -1,11 +1,11 @@
 package xiaozhi.modules.agent.dto;
 
+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * 智能体创建DTO
  * 专用于新增智能体，不包含id、agentCode和sort字段，这些字段由系统自动生成/设置默认值

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentUpdateDTO.java

@@ -1,11 +1,11 @@
 package xiaozhi.modules.agent.dto;
 
+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * 智能体更新DTO
  * 专用于更新智能体，id字段是必需的，用于标识要更新的智能体

main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentEntity.java

@@ -1,11 +1,12 @@
 package xiaozhi.modules.agent.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 @TableName("ai_agent")
 @Schema(description = "智能体信息")

main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentTemplateEntity.java

@@ -1,14 +1,17 @@
 package xiaozhi.modules.agent.entity;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
+
-import java.util.Date;
 import lombok.Data;
 
 /**
  * 智能体配置模板表
+ * 
  * @TableName ai_agent_template
  */
 @TableName(value = "ai_agent_template")

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java

@@ -1,12 +1,12 @@
 package xiaozhi.modules.agent.service;
 
+import java.util.List;
+import java.util.Map;
+
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.agent.entity.AgentEntity;
 
-import java.util.List;
-import java.util.Map;
-
 public interface AgentService extends BaseService<AgentEntity> {
     /**
      * 根据用户ID获取智能体列表

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentTemplateService.java

@@ -1,9 +1,9 @@
 package xiaozhi.modules.agent.service;
 
-import xiaozhi.modules.agent.entity.AgentTemplateEntity;
-
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import xiaozhi.modules.agent.entity.AgentTemplateEntity;
+
 /**
  * @author chenerlei
  * @description 针对表【ai_agent_template(智能体配置模板表)】的数据库操作Service

main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java

@@ -1,31 +1,38 @@
 package xiaozhi.modules.device.controller;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.device.dto.DeviceReportReqDTO;
 import xiaozhi.modules.device.dto.DeviceReportRespDTO;
 import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.device.utils.NetworkUtil;
 
-import java.nio.charset.StandardCharsets;
-
 @Tag(name = "设备管理", description = "OTA 相关接口")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/ota")
-public class OTAController
+public class OTAController {
-{
     private final DeviceService deviceService;
 
     @Operation(summary = "检查 OTA 版本和设备激活状态")
@@ -33,14 +40,9 @@ public class OTAController
     public ResponseEntity<String> checkOTAVersion(
             @RequestBody DeviceReportReqDTO deviceReportReqDTO,
 
-            @Parameter(name = "Device-Id", description = "设备唯一标识", required = true, in = ParameterIn.HEADER)
+            @Parameter(name = "Device-Id", description = "设备唯一标识", required = true, in = ParameterIn.HEADER) @RequestHeader("Device-Id") String deviceId,
-            @RequestHeader("Device-Id")
-            String deviceId,
 
-            @Parameter(name = "Client-Id", description = "客户端标识", required = true, in = ParameterIn.HEADER)
+            @Parameter(name = "Client-Id", description = "客户端标识", required = true, in = ParameterIn.HEADER) @RequestHeader("Client-Id") String clientId) {
-            @RequestHeader("Client-Id")
-            String clientId
-    ) {
         if (StringUtils.isAnyBlank(deviceId, clientId)) {
             return createResponse(DeviceReportRespDTO.createError("Device ID is required"));
         }

main/manager-api/src/main/java/xiaozhi/modules/device/dao/DeviceDao.java

@@ -1,7 +1,9 @@
 package xiaozhi.modules.device.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import xiaozhi.modules.device.entity.DeviceEntity;
 
 @Mapper

main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceReportReqDTO.java

@@ -8,7 +8,6 @@ import lombok.Setter;
 import java.io.Serializable;
 import java.util.List;
 
-
 @Setter
 @Getter
 @Schema(description = "设备固件信息上报求请求体")

main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceReportRespDTO.java

@@ -7,8 +7,7 @@ import lombok.Setter;
 
 @Data
 @Schema(description = "设备OTA检测版本返回体，包含激活码要求")
-public class DeviceReportRespDTO
+public class DeviceReportRespDTO {
-{
     @Schema(description = "服务器时间")
     private ServerTime serverTime;
 
@@ -38,8 +37,7 @@ public class DeviceReportRespDTO
 
     @Setter
     @Getter
-    public static class Activation
+    public static class Activation {
-    {
         @Schema(description = "激活码")
         private String code;
 
@@ -50,8 +48,7 @@ public class DeviceReportRespDTO
 
     @Getter
     @Setter
-    public static class ServerTime
+    public static class ServerTime {
-    {
         @Schema(description = "时间戳")
         private Long timestamp;
 

main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceUnBindDTO.java

@@ -1,10 +1,11 @@
 package xiaozhi.modules.device.dto;
+
+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * 设备解绑表单
  */

main/manager-api/src/main/java/xiaozhi/modules/device/entity/DeviceEntity.java

@@ -1,11 +1,12 @@
 package xiaozhi.modules.device.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 @TableName("ai_device")
 @Schema(description = "设备信息")

main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java

@@ -1,13 +1,23 @@
 package xiaozhi.modules.device.service.impl;
 
-import cn.hutool.core.util.RandomUtil;
+import java.time.Instant;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.HashMap;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import cn.hutool.core.util.RandomUtil;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
@@ -20,10 +30,6 @@ import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.security.user.SecurityUser;
 
-import java.time.Instant;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
 @Service
 public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity> implements DeviceService {
 
@@ -104,7 +110,8 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
     }
 
     @Override
-    public DeviceReportRespDTO checkDeviceActive(String macAddress, String deviceId, String clientId, DeviceReportReqDTO deviceReport) {
+    public DeviceReportRespDTO checkDeviceActive(String macAddress, String deviceId, String clientId,
+            DeviceReportReqDTO deviceReport) {
         DeviceReportRespDTO response = new DeviceReportRespDTO();
         response.setServerTime(buildServerTime());
         // todo: 此处是固件信息，目前是针对固件上传上来的版本号再返回回去
@@ -161,8 +168,6 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         return response;
     }
 
-
-
     @Override
     public DeviceEntity bindDevice(Long userId, DeviceHeaderDTO deviceHeader) {
         DeviceEntity device = new DeviceEntity();
@@ -189,13 +194,11 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
     public PageData<DeviceEntity> adminDeviceList(Map<String, Object> params) {
         IPage<DeviceEntity> page = deviceDao.selectPage(
                 getPage(params, "sort", true),
-                new QueryWrapper<>()
+                new QueryWrapper<>());
-        );
         return new PageData<>(page.getRecords(), page.getTotal());
     }
 
-    private DeviceReportRespDTO.ServerTime buildServerTime()
+    private DeviceReportRespDTO.ServerTime buildServerTime() {
-    {
         DeviceReportRespDTO.ServerTime serverTime = new DeviceReportRespDTO.ServerTime();
         TimeZone tz = TimeZone.getDefault();
         serverTime.setTimestamp(Instant.now().toEpochMilli());

main/manager-api/src/main/java/xiaozhi/modules/device/utils/NetworkUtil.java

@@ -1,14 +1,13 @@
 package xiaozhi.modules.device.utils;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * 网络工具类
  */
-public class NetworkUtil
+public class NetworkUtil {
-{
     /**
      * MAC地址正则表达式
      */

main/manager-api/src/main/java/xiaozhi/modules/device/vo/DeviceOtaVO.java

@@ -17,6 +17,7 @@ public class DeviceOtaVO {
 
         public Activation() {
         }
+
         public Activation(String code, String message) {
             this.code = code;
             this.message = message;
@@ -35,6 +36,7 @@ public class DeviceOtaVO {
 
         public ServerTime() {
         }
+
         public ServerTime(Long timestamp, Integer timezone_offset) {
             this.timestamp = timestamp;
             this.timezone_offset = timezone_offset;
@@ -45,8 +47,10 @@ public class DeviceOtaVO {
     public static class Firmware {
         private String version;
         private String url;
+
         public Firmware() {
         }
+
         public Firmware(String version, String url) {
             this.version = version;
             this.url = url;

main/manager-api/src/main/java/xiaozhi/modules/model/controller/ModelController.java

@@ -1,10 +1,21 @@
 package xiaozhi.modules.model.controller;
 
+import java.util.List;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+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 io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.web.bind.annotation.*;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.model.dto.ModelConfigBodyDTO;
@@ -13,8 +24,6 @@ import xiaozhi.modules.model.dto.ModelProviderDTO;
 import xiaozhi.modules.model.service.ModelConfigService;
 import xiaozhi.modules.model.service.ModelProviderService;
 
-import java.util.List;
-
 @AllArgsConstructor
 @RestController
 @RequestMapping("/models")
@@ -45,12 +54,12 @@ public class ModelController {
     @GetMapping("/{modelType}/{provideCode}/fields")
     @Operation(summary = "获取模型供应器字段")
     @RequiresPermissions("sys:role:superAdmin")
-    public Result<List<String>> getModelProviderFields(@PathVariable String modelType, @PathVariable String provideCode) {
+    public Result<List<String>> getModelProviderFields(@PathVariable String modelType,
+            @PathVariable String provideCode) {
         List<String> fieldList = modelProviderService.getFieldList(modelType, provideCode);
         return new Result<List<String>>().ok(fieldList);
     }
 
-
     @GetMapping("/models/list")
     @Operation(summary = "获取模型配置列表")
     @RequiresPermissions("sys:role:superAdmin")
@@ -62,7 +71,6 @@ public class ModelController {
         return new Result<PageData<ModelConfigDTO>>().ok(pageList);
     }
 
-
     @PostMapping("/models/{modelType}/{provideCode}")
     @Operation(summary = "新增模型配置")
     @RequiresPermissions("sys:role:superAdmin")
@@ -73,7 +81,6 @@ public class ModelController {
         return new Result<ModelConfigDTO>().ok(modelConfigDTO);
     }
 
-
     @PutMapping("/models/{modelType}/{provideCode}/{id}")
     @Operation(summary = "编辑模型配置")
     @RequiresPermissions("sys:role:superAdmin")
@@ -85,11 +92,11 @@ public class ModelController {
         return new Result<ModelConfigDTO>().ok(modelConfigDTO);
     }
 
-
     @DeleteMapping("/models/{modelType}/{provideCode}/{id}")
     @Operation(summary = "删除模型配置")
     @RequiresPermissions("sys:role:superAdmin")
-    public Result<Void> deleteModelConfig(@PathVariable String modelType, @PathVariable String provideCode, @PathVariable String id) {
+    public Result<Void> deleteModelConfig(@PathVariable String modelType, @PathVariable String provideCode,
+            @PathVariable String id) {
         modelConfigService.delete(modelType, provideCode, id);
         return new Result<>();
     }

main/manager-api/src/main/java/xiaozhi/modules/model/dao/ModelConfigDao.java

@@ -1,12 +1,13 @@
 package xiaozhi.modules.model.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.model.entity.ModelConfigEntity;
 
-import java.util.List;
-
 @Mapper
 public interface ModelConfigDao extends BaseDao<ModelConfigEntity> {
 

main/manager-api/src/main/java/xiaozhi/modules/model/dao/ModelProviderDao.java

@@ -1,12 +1,13 @@
 package xiaozhi.modules.model.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.model.entity.ModelProviderEntity;
 
-import java.util.List;
-
 @Mapper
 public interface ModelProviderDao extends BaseDao<ModelProviderEntity> {
 

main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java

@@ -1,10 +1,10 @@
 package xiaozhi.modules.model.dto;
 
+import java.io.Serial;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.io.Serial;
-
 @Data
 @Schema(description = "模型供应器/商")
 public class ModelConfigBodyDTO {

main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigDTO.java

@@ -1,11 +1,11 @@
 package xiaozhi.modules.model.dto;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
 import java.io.Serial;
 import java.io.Serializable;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
 @Data
 @Schema(description = "模型供应器/商")
 public class ModelConfigDTO implements Serializable {

main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelProviderDTO.java

@@ -1,13 +1,14 @@
 package xiaozhi.modules.model.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
 @Data
 @Schema(description = "模型供应器/商")
 public class ModelProviderDTO implements Serializable {

main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java

@@ -1,16 +1,16 @@
 package xiaozhi.modules.model.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.Date;
-
-
 @Data
 @TableName("ai_model_config")
 @Schema(description = "模型配置表")

main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java

@@ -1,15 +1,16 @@
 package xiaozhi.modules.model.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 @TableName("ai_model_provider")
 @Schema(description = "模型供应器表")

main/manager-api/src/main/java/xiaozhi/modules/model/service/ModelConfigService.java

@@ -1,11 +1,11 @@
 package xiaozhi.modules.model.service;
 
+import java.util.List;
+
 import xiaozhi.common.page.PageData;
 import xiaozhi.modules.model.dto.ModelConfigBodyDTO;
 import xiaozhi.modules.model.dto.ModelConfigDTO;
 
-import java.util.List;
-
 public interface ModelConfigService {
 
     List<String> getModelCodeList(String modelType, String modelName);

main/manager-api/src/main/java/xiaozhi/modules/model/service/ModelProviderService.java

@@ -1,10 +1,10 @@
 package xiaozhi.modules.model.service;
 
+import java.util.List;
+
 import xiaozhi.modules.model.dto.ModelProviderDTO;
 import xiaozhi.modules.model.entity.ModelProviderEntity;
 
-import java.util.List;
-
 public interface ModelProviderService {
 
     // List<String> getModelNames(String modelType, String modelName);

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java

@@ -1,13 +1,19 @@
 package xiaozhi.modules.model.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.util.HashMap;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.List;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.Map;
-import lombok.AllArgsConstructor;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import cn.hutool.core.collection.CollectionUtil;
+import lombok.AllArgsConstructor;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
@@ -22,13 +28,10 @@ import xiaozhi.modules.model.service.ModelConfigService;
 import xiaozhi.modules.model.service.ModelProviderService;
 import xiaozhi.modules.timbre.service.TimbreService;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @Service
 @AllArgsConstructor
-public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, ModelConfigEntity> implements ModelConfigService {
+public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, ModelConfigEntity>
+        implements ModelConfigService {
 
     private final ModelConfigDao modelConfigDao;
     private final ModelProviderService modelProviderService;
@@ -50,8 +53,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                 getPage(params, "sort", true),
                 new QueryWrapper<ModelConfigEntity>()
                         .eq("model_type", modelType)
-                        .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
+                        .like(StringUtils.isNotBlank(modelName), "model_name", modelName));
-        );
         return getPageData(modelConfigEntityIPage, ModelConfigDTO.class);
     }
 

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java

@@ -1,9 +1,13 @@
 package xiaozhi.modules.model.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.List;
-import lombok.AllArgsConstructor;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import lombok.AllArgsConstructor;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.modules.model.dao.ModelProviderDao;
@@ -11,11 +15,10 @@ import xiaozhi.modules.model.dto.ModelProviderDTO;
 import xiaozhi.modules.model.entity.ModelProviderEntity;
 import xiaozhi.modules.model.service.ModelProviderService;
 
-import java.util.List;
-
 @Service
 @AllArgsConstructor
-public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao, ModelProviderEntity> implements ModelProviderService {
+public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao, ModelProviderEntity>
+        implements ModelProviderService {
 
     private final ModelProviderDao modelProviderDao;
 

main/manager-api/src/main/java/xiaozhi/modules/security/config/FilterConfig.java

@@ -5,7 +5,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.DelegatingFilterProxy;
 
-
 /**
  * Filter配置
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/modules/security/config/WebMvcConfig.java

@@ -1,9 +1,8 @@
 package xiaozhi.modules.security.config;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
+import java.util.List;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.TimeZone;
-import com.fasterxml.jackson.databind.module.SimpleModule;
+
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
@@ -15,8 +14,10 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import java.util.List;
+import com.fasterxml.jackson.databind.DeserializationFeature;
-import java.util.TimeZone;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

main/manager-api/src/main/java/xiaozhi/modules/security/dao/SysUserTokenDao.java

@@ -1,12 +1,13 @@
 package xiaozhi.modules.security.dao;
 
+import java.util.Date;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.security.entity.SysUserTokenEntity;
 
-import java.util.Date;
-
 /**
  * 系统用户Token
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/modules/security/dto/LoginDTO.java

@@ -1,11 +1,11 @@
 package xiaozhi.modules.security.dto;
 
+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * 登录表单
  */

main/manager-api/src/main/java/xiaozhi/modules/security/entity/SysUserTokenEntity.java

@@ -1,13 +1,14 @@
 package xiaozhi.modules.security.entity;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
-import java.io.Serializable;
+import lombok.Data;
-import java.util.Date;
 
 /**
  * 系统用户Token

main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java

@@ -1,7 +1,15 @@
 package xiaozhi.modules.security.oauth2;
 
-import jakarta.annotation.Resource;
+import java.util.HashSet;
-import org.apache.shiro.authc.*;
+import java.util.Set;
+
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.DisabledAccountException;
+import org.apache.shiro.authc.IncorrectCredentialsException;
+import org.apache.shiro.authc.LockedAccountException;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.apache.shiro.realm.AuthorizingRealm;
@@ -10,6 +18,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
+
+import jakarta.annotation.Resource;
 import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
@@ -19,9 +29,6 @@ import xiaozhi.modules.security.service.ShiroService;
 import xiaozhi.modules.sys.entity.SysUserEntity;
 import xiaozhi.modules.sys.enums.SuperAdminEnum;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * 认证
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/TokenGenerator.java

@@ -1,10 +1,10 @@
 package xiaozhi.modules.security.oauth2;
 
-import xiaozhi.common.exception.RenException;
-
 import java.security.MessageDigest;
 import java.util.UUID;
 
+import xiaozhi.common.exception.RenException;
+
 /**
  * 生成token
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/modules/security/password/BCrypt.java

@@ -5,22 +5,28 @@ import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
 
 /**
- * BCrypt implements OpenBSD-style Blowfish password hashing using the scheme described in
+ * BCrypt implements OpenBSD-style Blowfish password hashing using the scheme
+ * described in
  * "A Future-Adaptable Password Scheme" by Niels Provos and David Mazieres.
  * <p>
- * This password hashing system tries to thwart off-line password cracking using a
+ * This password hashing system tries to thwart off-line password cracking using
- * computationally-intensive hashing algorithm, based on Bruce Schneier's Blowfish cipher.
+ * a
- * The work factor of the algorithm is parameterised, so it can be increased as computers
+ * computationally-intensive hashing algorithm, based on Bruce Schneier's
+ * Blowfish cipher.
+ * The work factor of the algorithm is parameterised, so it can be increased as
+ * computers
  * get faster.
  * <p>
- * Usage is really simple. To hash a password for the first time, call the hashpw method
+ * Usage is really simple. To hash a password for the first time, call the
+ * hashpw method
  * with a random salt, like this:
  * <p>
  * <code>
  * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br>
  * </code>
  * <p>
- * To check whether a plaintext password matches one that has been hashed previously, use
+ * To check whether a plaintext password matches one that has been hashed
+ * previously, use
  * the checkpw method:
  * <p>
  * <code>
@@ -30,7 +36,8 @@ import java.security.SecureRandom;
  * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br>
  * </code>
  * <p>
- * The gensalt() method takes an optional parameter (log_rounds) that determines the
+ * The gensalt() method takes an optional parameter (log_rounds) that determines
+ * the
  * computational complexity of the hashing:
  * <p>
  * <code>
@@ -38,7 +45,8 @@ import java.security.SecureRandom;
  * String stronger_salt = BCrypt.gensalt(12)<br>
  * </code>
  * <p>
- * The amount of work increases exponentially (2**log_rounds), so each increment is twice
+ * The amount of work increases exponentially (2**log_rounds), so each increment
+ * is twice
  * as much work. The default log_rounds is 10, and the valid range is 4 to 31.
  *
  * @author Damien Miller
@@ -250,7 +258,8 @@ public class BCrypt {
     private int S[];
 
     /**
-     * Encode a byte array using bcrypt's slightly-modified base64 encoding scheme. Note
+     * Encode a byte array using bcrypt's slightly-modified base64 encoding scheme.
+     * Note
      * that this is <strong>not</strong> compatible with the standard MIME-base64
      * encoding.
      *
@@ -306,7 +315,8 @@ public class BCrypt {
     }
 
     /**
-     * Decode a string encoded using bcrypt's base64 scheme to a byte array. Note that
+     * Decode a string encoded using bcrypt's base64 scheme to a byte array. Note
+     * that
      * this is *not* compatible with the standard MIME-base64 encoding.
      *
      * @param s       the string to decode
@@ -388,7 +398,8 @@ public class BCrypt {
      * Cycically extract a word of key material
      *
      * @param data the string to extract the data from
-     * @param offp a "pointer" (as a one-entry array) to the current offset into data
+     * @param offp a "pointer" (as a one-entry array) to the current offset into
+     *             data
      * @return the next word of material from data
      */
     private static int streamtoword(byte data[], int offp[]) {
@@ -443,7 +454,8 @@ public class BCrypt {
 
     /**
      * Perform the "enhanced key schedule" step described by Provos and Mazieres in
-     * "A Future-Adaptable Password Scheme" http://www.openbsd.org/papers/bcrypt-paper.ps
+     * "A Future-Adaptable Password Scheme"
+     * http://www.openbsd.org/papers/bcrypt-paper.ps
      *
      * @param data salt information
      * @param key  password information
@@ -487,7 +499,8 @@ public class BCrypt {
      *
      * @param password   the password to hash
      * @param salt       the binary salt to hash with the password
-     * @param log_rounds the binary logarithm of the number of rounds of hashing to apply
+     * @param log_rounds the binary logarithm of the number of rounds of hashing to
+     *                   apply
      * @return an array containing the binary hashed password
      */
     private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) {
@@ -524,7 +537,8 @@ public class BCrypt {
      * Hash a password using the OpenBSD bcrypt scheme
      *
      * @param password the password to hash
-     * @param salt     the salt to hash with (perhaps generated using BCrypt.gensalt)
+     * @param salt     the salt to hash with (perhaps generated using
+     *                 BCrypt.gensalt)
      * @return the hashed password
      * @throws IllegalArgumentException if invalid salt is passed
      */
@@ -599,8 +613,10 @@ public class BCrypt {
     /**
      * Generate a salt for use with the BCrypt.hashpw() method
      *
-     * @param log_rounds the log2 of the number of rounds of hashing to apply - the work
+     * @param log_rounds the log2 of the number of rounds of hashing to apply - the
-     *                   factor therefore increases as 2**log_rounds. Minimum 4, maximum 31.
+     *                   work
+     *                   factor therefore increases as 2**log_rounds. Minimum 4,
+     *                   maximum 31.
      * @param random     an instance of SecureRandom to use
      * @return an encoded salt value
      */
@@ -626,8 +642,10 @@ public class BCrypt {
     /**
      * Generate a salt for use with the BCrypt.hashpw() method
      *
-     * @param log_rounds the log2 of the number of rounds of hashing to apply - the work
+     * @param log_rounds the log2 of the number of rounds of hashing to apply - the
-     *                   factor therefore increases as 2**log_rounds. Minimum 4, maximum 31.
+     *                   work
+     *                   factor therefore increases as 2**log_rounds. Minimum 4,
+     *                   maximum 31.
      * @return an encoded salt value
      */
     public static String gensalt(int log_rounds) {
@@ -635,7 +653,8 @@ public class BCrypt {
     }
 
     /**
-     * Generate a salt for use with the BCrypt.hashpw() method, selecting a reasonable
+     * Generate a salt for use with the BCrypt.hashpw() method, selecting a
+     * reasonable
      * default for the number of hashing rounds to apply
      *
      * @return an encoded salt value

main/manager-api/src/main/java/xiaozhi/modules/security/password/BCryptPasswordEncoder.java

@@ -1,15 +1,18 @@
 package xiaozhi.modules.security.password;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import java.security.SecureRandom;
 import java.util.regex.Pattern;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
- * Implementation of PasswordEncoder that uses the BCrypt strong hashing function. Clients
+ * Implementation of PasswordEncoder that uses the BCrypt strong hashing
- * can optionally supply a "strength" (a.k.a. log rounds in BCrypt) and a SecureRandom
+ * function. Clients
- * instance. The larger the strength parameter the more work will have to be done
+ * can optionally supply a "strength" (a.k.a. log rounds in BCrypt) and a
+ * SecureRandom
+ * instance. The larger the strength parameter the more work will have to be
+ * done
  * (exponentially) to hash the passwords. The default value is 10.
  *
  * @author Dave Syer

main/manager-api/src/main/java/xiaozhi/modules/security/password/PasswordEncoder.java

@@ -10,19 +10,22 @@ package xiaozhi.modules.security.password;
 public interface PasswordEncoder {
 
     /**
-     * Encode the raw password. Generally, a good encoding algorithm applies a SHA-1 or
+     * Encode the raw password. Generally, a good encoding algorithm applies a SHA-1
+     * or
      * greater hash combined with an 8-byte or greater randomly generated salt.
      */
     String encode(CharSequence rawPassword);
 
     /**
      * Verify the encoded password obtained from storage matches the submitted raw
-     * password after it too is encoded. Returns true if the passwords match, false if
+     * password after it too is encoded. Returns true if the passwords match, false
+     * if
      * they do not. The stored password itself is never decoded.
      *
      * @param rawPassword     the raw password to encode and match
      * @param encodedPassword the encoded password from storage to compare with
-     * @return true if the raw password, after encoding, matches the encoded password from
+     * @return true if the raw password, after encoding, matches the encoded
+     *         password from
      *         storage
      */
     boolean matches(CharSequence rawPassword, String encodedPassword);

main/manager-api/src/main/java/xiaozhi/modules/security/password/PasswordUtils.java

@@ -18,7 +18,6 @@ public class PasswordUtils {
         return passwordEncoder.encode(str);
     }
 
-
     /**
      * 比较密码是否相等
      *
@@ -30,7 +29,6 @@ public class PasswordUtils {
         return passwordEncoder.matches(str, password);
     }
 
-
     public static void main(String[] args) {
         String str = "admin";
         String password = encode(str);

main/manager-api/src/main/java/xiaozhi/modules/security/service/CaptchaService.java

@@ -1,9 +1,9 @@
 package xiaozhi.modules.security.service;
 
-import jakarta.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * 验证码
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/modules/security/user/SecurityUser.java

@@ -1,9 +1,10 @@
 package xiaozhi.modules.security.user;
 
-import xiaozhi.common.user.UserDetail;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 
+import xiaozhi.common.user.UserDetail;
+
 /**
  * Shiro工具类
  * Copyright (c) 人人开源 All rights reserved.

main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysUserController.java

@@ -1,9 +1,10 @@
 package xiaozhi.modules.sys.controller;
 
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 用户管理

main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java

@@ -1,12 +1,13 @@
 package xiaozhi.modules.sys.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.sys.dto.SysDictDataDTO;
 import xiaozhi.modules.sys.entity.DictData;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
 
 /**
  * 字典数据

main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictTypeDao.java

@@ -1,11 +1,12 @@
 package xiaozhi.modules.sys.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.sys.entity.DictType;
 import xiaozhi.modules.sys.entity.SysDictTypeEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
 
 /**
  * 字典类型

main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysParamsDao.java

@@ -1,11 +1,12 @@
 package xiaozhi.modules.sys.dao;
 
-import xiaozhi.common.dao.BaseDao;
+import java.util.List;
-import xiaozhi.modules.sys.entity.SysParamsEntity;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import xiaozhi.common.dao.BaseDao;
+import xiaozhi.modules.sys.entity.SysParamsEntity;
 
 /**
  * 参数管理

main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysUserDao.java

@@ -1,6 +1,7 @@
 package xiaozhi.modules.sys.dao;
 
 import org.apache.ibatis.annotations.Mapper;
+
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.sys.entity.SysUserEntity;
 

main/manager-api/src/main/java/xiaozhi/modules/sys/dto/PasswordDTO.java

@@ -1,11 +1,11 @@
 package xiaozhi.modules.sys.dto;
 
+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * 修改密码
  */

main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysDictDataDTO.java

@@ -1,20 +1,21 @@
 package xiaozhi.modules.sys.dto;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import xiaozhi.common.utils.DateUtils;
+
-import xiaozhi.common.validator.group.AddGroup;
-import xiaozhi.common.validator.group.DefaultGroup;
-import xiaozhi.common.validator.group.UpdateGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Null;
 import lombok.Data;
-
+import xiaozhi.common.utils.DateUtils;
-import java.io.Serializable;
+import xiaozhi.common.validator.group.AddGroup;
-import java.util.Date;
+import xiaozhi.common.validator.group.DefaultGroup;
+import xiaozhi.common.validator.group.UpdateGroup;
 
 /**
  * 字典数据
@@ -23,7 +24,6 @@ import java.util.Date;
 @Schema(description = "字典数据")
 public class SysDictDataDTO implements Serializable {
 
-
     @Schema(description = "id")
     @Null(message = "{id.null}", groups = AddGroup.class)
     @NotNull(message = "{id.require}", groups = UpdateGroup.class)

main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysDictTypeDTO.java

@@ -1,20 +1,21 @@
 package xiaozhi.modules.sys.dto;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import xiaozhi.common.utils.DateUtils;
+
-import xiaozhi.common.validator.group.AddGroup;
-import xiaozhi.common.validator.group.DefaultGroup;
-import xiaozhi.common.validator.group.UpdateGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Null;
 import lombok.Data;
-
+import xiaozhi.common.utils.DateUtils;
-import java.io.Serializable;
+import xiaozhi.common.validator.group.AddGroup;
-import java.util.Date;
+import xiaozhi.common.validator.group.DefaultGroup;
+import xiaozhi.common.validator.group.UpdateGroup;
 
 /**
  * 字典类型
@@ -23,7 +24,6 @@ import java.util.Date;
 @Schema(description = "字典类型")
 public class SysDictTypeDTO implements Serializable {
 
-
     @Schema(description = "id")
     @Null(message = "{id.null}", groups = AddGroup.class)
     @NotNull(message = "{id.require}", groups = UpdateGroup.class)

main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysParamsDTO.java

@@ -1,19 +1,20 @@
 package xiaozhi.modules.sys.dto;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import xiaozhi.common.utils.DateUtils;
+
-import xiaozhi.common.validator.group.AddGroup;
-import xiaozhi.common.validator.group.DefaultGroup;
-import xiaozhi.common.validator.group.UpdateGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Null;
 import lombok.Data;
-
+import xiaozhi.common.utils.DateUtils;
-import java.io.Serializable;
+import xiaozhi.common.validator.group.AddGroup;
-import java.util.Date;
+import xiaozhi.common.validator.group.DefaultGroup;
+import xiaozhi.common.validator.group.UpdateGroup;
 
 /**
  * 参数管理
@@ -22,7 +23,6 @@ import java.util.Date;
 @Schema(description = "参数管理")
 public class SysParamsDTO implements Serializable {
 
-
     @Schema(description = "id")
     @Null(message = "{id.null}", groups = AddGroup.class)
     @NotNull(message = "{id.require}", groups = UpdateGroup.class)

main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysUserDTO.java

@@ -1,22 +1,24 @@
 package xiaozhi.modules.sys.dto;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.validator.constraints.Range;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import xiaozhi.common.utils.DateUtils;
+
-import xiaozhi.common.validator.group.AddGroup;
-import xiaozhi.common.validator.group.DefaultGroup;
-import xiaozhi.common.validator.group.UpdateGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Null;
 import lombok.Data;
-import org.hibernate.validator.constraints.Range;
+import xiaozhi.common.utils.DateUtils;
-
+import xiaozhi.common.validator.group.AddGroup;
-import java.io.Serializable;
+import xiaozhi.common.validator.group.DefaultGroup;
-import java.util.Date;
+import xiaozhi.common.validator.group.UpdateGroup;
-import java.util.List;
 
 /**
  * 用户管理

main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictData.java

@@ -1,6 +1,7 @@
 package xiaozhi.modules.sys.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import lombok.Data;
 
 /**

main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictType.java

@@ -1,11 +1,12 @@
 package xiaozhi.modules.sys.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import lombok.Data;
+
 /**
  * 字典类型
  */

main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysDictDataEntity.java

@@ -1,13 +1,14 @@
 package xiaozhi.modules.sys.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import xiaozhi.common.entity.BaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import xiaozhi.common.entity.BaseEntity;
-import java.util.Date;
 
 /**
  * 数据字典

main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysDictTypeEntity.java

@@ -1,13 +1,14 @@
 package xiaozhi.modules.sys.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import xiaozhi.common.entity.BaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import xiaozhi.common.entity.BaseEntity;
-import java.util.Date;
 
 /**
  * 字典类型

main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysParamsEntity.java

@@ -1,13 +1,14 @@
 package xiaozhi.modules.sys.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import xiaozhi.common.entity.BaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import xiaozhi.common.entity.BaseEntity;
-import java.util.Date;
 
 /**
  * 参数管理

main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysUserEntity.java

@@ -1,14 +1,15 @@
 package xiaozhi.modules.sys.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import xiaozhi.common.entity.BaseEntity;
 
-import java.util.Date;
-
 /**
  * 系统用户
  */

main/manager-api/src/main/java/xiaozhi/modules/sys/redis/SysParamsRedis.java

@@ -1,9 +1,10 @@
 package xiaozhi.modules.sys.redis;
 
+import org.springframework.stereotype.Component;
+
+import lombok.AllArgsConstructor;
 import xiaozhi.common.redis.RedisKeys;
 import xiaozhi.common.redis.RedisUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Component;
 
 /**
  * 参数管理

main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java

@@ -1,12 +1,12 @@
 package xiaozhi.modules.sys.service;
 
+import java.util.Map;
+
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.sys.dto.SysDictDataDTO;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
 
-import java.util.Map;
-
 /**
  * 数据字典
  */

main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictTypeService.java

@@ -1,14 +1,14 @@
 package xiaozhi.modules.sys.service;
 
+import java.util.List;
+import java.util.Map;
+
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.sys.dto.SysDictTypeDTO;
 import xiaozhi.modules.sys.entity.DictType;
 import xiaozhi.modules.sys.entity.SysDictTypeEntity;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 数据字典
  */

main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysParamsService.java

@@ -1,14 +1,13 @@
 package xiaozhi.modules.sys.service;
 
+import java.util.List;
+import java.util.Map;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.sys.dto.SysParamsDTO;
 import xiaozhi.modules.sys.entity.SysParamsEntity;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 参数管理
  */

main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java

@@ -8,7 +8,6 @@ import xiaozhi.modules.sys.dto.SysUserDTO;
 import xiaozhi.modules.sys.entity.SysUserEntity;
 import xiaozhi.modules.sys.vo.AdminPageUserVO;
 
-
 /**
  * 系统用户
  */
@@ -24,6 +23,7 @@ public interface SysUserService extends BaseService<SysUserEntity> {
 
     /**
      * 验证是否允许修改密码更改
+     * 
      * @param userId      用户id
      * @param passwordDTO 验证密码的参数
      */
@@ -31,6 +31,7 @@ public interface SysUserService extends BaseService<SysUserEntity> {
 
     /**
      * 直接修改密码，不需要验证
+     * 
      * @param userId   用户id
      * @param password 密码
      */
@@ -38,12 +39,15 @@ public interface SysUserService extends BaseService<SysUserEntity> {
 
     /**
      * 重置密码
+     * 
      * @param userId 用户id
      * @return 随机生成符合规范的密码
      */
     String resetPassword(Long userId);
+
     /**
      * 管理员分页用户信息
+     * 
      * @param dto 分页查找参数
      * @return 用户列表分页数据
      */

main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java

@@ -1,10 +1,15 @@
 package xiaozhi.modules.sys.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.Arrays;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
@@ -13,21 +18,18 @@ import xiaozhi.modules.sys.dto.SysDictDataDTO;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
 import xiaozhi.modules.sys.service.SysDictDataService;
 
-import java.util.Arrays;
-import java.util.Map;
-
 /**
  * 字典类型
  */
 @Service
-public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysDictDataEntity> implements SysDictDataService {
+public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysDictDataEntity>
+        implements SysDictDataService {
 
     @Override
     public PageData<SysDictDataDTO> page(Map<String, Object> params) {
         IPage<SysDictDataEntity> page = baseDao.selectPage(
                 getPage(params, "sort", true),
-                getWrapper(params)
+                getWrapper(params));
-        );
 
         return getPageData(page, SysDictDataDTO.class);
     }

main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java

@@ -1,11 +1,17 @@
 package xiaozhi.modules.sys.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.Arrays;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
-import lombok.AllArgsConstructor;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import lombok.AllArgsConstructor;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
@@ -17,24 +23,20 @@ import xiaozhi.modules.sys.entity.DictType;
 import xiaozhi.modules.sys.entity.SysDictTypeEntity;
 import xiaozhi.modules.sys.service.SysDictTypeService;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 字典类型
  */
 @AllArgsConstructor
 @Service
-public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysDictTypeEntity> implements SysDictTypeService {
+public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysDictTypeEntity>
+        implements SysDictTypeService {
     private final SysDictDataDao sysDictDataDao;
 
     @Override
     public PageData<SysDictTypeDTO> page(Map<String, Object> params) {
         IPage<SysDictTypeEntity> page = baseDao.selectPage(
                 getPage(params, "sort", true),
-                getWrapper(params)
+                getWrapper(params));
-        );
 
         return getPageData(page, SysDictTypeDTO.class);
     }

main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 /**
  * 管理员分页展示用户的VO
  * @ zjy
+ * 
  * @since 2025-3-25
  */
 @Data

main/manager-api/src/main/java/xiaozhi/modules/timbre/controller/TimbreController.java

@@ -1,12 +1,23 @@
 package xiaozhi.modules.timbre.controller;
 
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+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 io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.web.bind.annotation.*;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.utils.Result;
@@ -16,8 +27,6 @@ import xiaozhi.modules.timbre.dto.TimbrePageDTO;
 import xiaozhi.modules.timbre.service.TimbreService;
 import xiaozhi.modules.timbre.vo.TimbreDetailsVO;
 
-import java.util.Map;
-
 /**
  * 音色控制层
  *
@@ -81,5 +90,4 @@ public class TimbreController {
         return new Result<>();
     }
 
-
 }

main/manager-api/src/main/java/xiaozhi/modules/timbre/dao/TimbreDao.java

@@ -1,11 +1,14 @@
 package xiaozhi.modules.timbre.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import xiaozhi.modules.timbre.entity.TimbreEntity;
 
 /**
  * 音色持久层定义
+ * 
  * @author zjy
  * @since 2025-3-21
  */

main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java

@@ -5,9 +5,9 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-
 /**
  * 音色表数据DTO
+ * 
  * @author zjy
  * @since 2025-3-21
  */

main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbrePageDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 /**
  * 音色分页参数DTO
+ * 
  * @author zjy
  * @since 2025-3-21
  */

main/manager-api/src/main/java/xiaozhi/modules/timbre/entity/TimbreEntity.java

@@ -1,15 +1,17 @@
 package xiaozhi.modules.timbre.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import xiaozhi.common.entity.BaseEntity;
 
-import java.util.Date;
-
 /**
  * 音色表实体类
+ * 
  * @author zjy
  * @since 2025-3-21
  */

main/manager-api/src/main/java/xiaozhi/modules/timbre/service/TimbreService.java

@@ -1,5 +1,7 @@
 package xiaozhi.modules.timbre.service;
 
+import java.util.List;
+
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.timbre.dto.TimbreDataDTO;
@@ -7,17 +9,16 @@ import xiaozhi.modules.timbre.dto.TimbrePageDTO;
 import xiaozhi.modules.timbre.entity.TimbreEntity;
 import xiaozhi.modules.timbre.vo.TimbreDetailsVO;
 
-import java.util.List;
-
-
 /**
  * 音色的业务层的定义
+ * 
  * @author zjy
  * @since 2025-3-21
  */
 public interface TimbreService extends BaseService<TimbreEntity> {
     /**
      * 分页获取音色指定tts的下的音色
+     * 
      * @param dto 分页查找参数
      * @return 音色列表分页数据
      */
@@ -25,6 +26,7 @@ public interface TimbreService extends BaseService<TimbreEntity> {
 
     /**
      * 获取音色指定id的详情信息
+     * 
      * @param timbreId 音色表id
      * @return 音色信息
      */
@@ -32,12 +34,14 @@ public interface TimbreService extends BaseService<TimbreEntity> {
 
     /**
      * 保存音色信息
+     * 
      * @param dto 需要保存数据
      */
     void save(TimbreDataDTO dto);
 
     /**
      * 保存音色信息
+     * 
      * @param timbreId 需要修改的id
      * @param dto      需要修改的数据
      */
@@ -45,6 +49,7 @@ public interface TimbreService extends BaseService<TimbreEntity> {
 
     /**
      * 批量删除音色
+     * 
      * @param ids 需要被删除的音色id列表
      */
     void delete(Long[] ids);

main/manager-api/src/main/java/xiaozhi/modules/timbre/service/impl/TimbreServiceImpl.java

@@ -1,12 +1,19 @@
 package xiaozhi.modules.timbre.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.util.Arrays;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.HashMap;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
-import lombok.AllArgsConstructor;
+import java.util.Map;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import cn.hutool.core.collection.CollectionUtil;
+import lombok.AllArgsConstructor;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
@@ -18,13 +25,9 @@ import xiaozhi.modules.timbre.entity.TimbreEntity;
 import xiaozhi.modules.timbre.service.TimbreService;
 import xiaozhi.modules.timbre.vo.TimbreDetailsVO;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 音色的业务层的实现
+ * 
  * @author zjy
  * @since 2025-3-21
  */
@@ -46,8 +49,7 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
                         // 必须按照ttsID查找
                         .eq("tts_model_id", dto.getTtsModelId())
                         // 如果有音色名字，按照音色名模糊查找
-                        .like(StringUtils.isNotBlank(dto.getName()),"name",dto.getName())
+                        .like(StringUtils.isNotBlank(dto.getName()), "name", dto.getName()));
-        );
 
         return getPageData(page, TimbreDetailsVO.class);
     }

main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java

@@ -1,12 +1,13 @@
 package xiaozhi.modules.timbre.vo;
 
+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * 音色详情展示VO
+ * 
  * @author zjy
  * @since 2025-3-21
  */