From f3562e091ff165086de4731341c5eaf8511b5ebd Mon Sep 17 00:00:00 2001 From: pengzhisheng Date: Mon, 24 Mar 2025 20:03:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=8C=E4=BC=98=E5=8C=96=20model=20=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E4=B8=BB=E9=94=AE=E7=94=9F=E6=88=90=E7=AD=96?= =?UTF-8?q?=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/model/controller/ModelController.java | 10 +++++++++- .../modules/model/entity/ModelConfigEntity.java | 5 ++++- .../modules/model/entity/ModelProviderEntity.java | 5 ++++- .../manager-api/src/main/resources/application-dev.yml | 5 ----- main/manager-api/src/main/resources/application.yml | 7 ------- .../src/main/resources/db/changelog/data.sql | 3 --- 6 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 main/manager-api/src/main/resources/db/changelog/data.sql diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/controller/ModelController.java b/main/manager-api/src/main/java/xiaozhi/modules/model/controller/ModelController.java index 6cbfe1df..f743a795 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/controller/ModelController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/controller/ModelController.java @@ -3,6 +3,7 @@ package xiaozhi.modules.model.controller; 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; @@ -24,9 +25,9 @@ public class ModelController { private final ModelConfigService modelConfigService; - @GetMapping("/models/names") @Operation(summary = "获取所有模型名称") + @RequiresPermissions("sys:role:superAdmin") public Result> getModelNames(@RequestParam String modelType, @RequestParam(required = false) String modelName) { List modelNameList = modelConfigService.getModelCodeList(modelType, modelName); @@ -35,6 +36,7 @@ public class ModelController { @GetMapping("/{modelType}/provideTypes") @Operation(summary = "获取模型供应器列表") + @RequiresPermissions("sys:role:superAdmin") public Result> getModelProviderList(@PathVariable String modelType) { List modelProviderDTOS = modelProviderService.getListByModelType(modelType); return new Result>().ok(modelProviderDTOS); @@ -42,6 +44,7 @@ public class ModelController { @GetMapping("/{modelType}/{provideCode}/fields") @Operation(summary = "获取模型供应器字段") + @RequiresPermissions("sys:role:superAdmin") public Result> getModelProviderFields(@PathVariable String modelType, @PathVariable String provideCode) { List fieldList = modelProviderService.getFieldList(modelType, provideCode); return new Result>().ok(fieldList); @@ -50,6 +53,7 @@ public class ModelController { @GetMapping("/models/list") @Operation(summary = "获取模型配置列表") + @RequiresPermissions("sys:role:superAdmin") public Result> getModelConfigList(@RequestParam String modelType, @RequestParam(required = false) String modelName, @RequestParam(required = false, defaultValue = "0") Integer page, @@ -61,6 +65,7 @@ public class ModelController { @PostMapping("/models/{modelType}/{provideCode}") @Operation(summary = "新增模型配置") + @RequiresPermissions("sys:role:superAdmin") public Result addModelConfig(@PathVariable String modelType, @PathVariable String provideCode, @RequestBody ModelConfigBodyDTO modelConfigBodyDTO) { @@ -71,6 +76,7 @@ public class ModelController { @PutMapping("/models/{modelType}/{provideCode}/{id}") @Operation(summary = "编辑模型配置") + @RequiresPermissions("sys:role:superAdmin") public Result editModelConfig(@PathVariable String modelType, @PathVariable String provideCode, @PathVariable String id, @@ -82,6 +88,7 @@ public class ModelController { @DeleteMapping("/models/{modelType}/{provideCode}/{id}") @Operation(summary = "删除模型配置") + @RequiresPermissions("sys:role:superAdmin") public Result deleteModelConfig(@PathVariable String modelType, @PathVariable String provideCode, @PathVariable String id) { modelConfigService.delete(modelType, provideCode, id); return new Result<>(); @@ -89,6 +96,7 @@ public class ModelController { @GetMapping("/models/{modelName}/voices") @Operation(summary = "获取模型音色") + @RequiresPermissions("sys:role:normal") public Result> getVoiceList(@PathVariable String modelName, @RequestParam(required = false) String voiceName) { diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java index de60993e..c98705f3 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java @@ -1,6 +1,8 @@ package xiaozhi.modules.model.entity; +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; @@ -14,8 +16,9 @@ import java.util.Date; @Schema(description = "模型配置表") public class ModelConfigEntity { + @TableId(type = IdType.ASSIGN_UUID) @Schema(description = "主键") - private Long id; + private String id; @Schema(description = "模型类型(Memory/ASR/VAD/LLM/TTS)") private String modelType; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java index b91ef99b..0c526b88 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java @@ -1,6 +1,8 @@ package xiaozhi.modules.model.entity; +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; @@ -13,8 +15,9 @@ import java.util.Date; @Schema(description = "模型供应器表") public class ModelProviderEntity { + @TableId(type = IdType.ASSIGN_UUID) @Schema(description = "主键") - private Long id; + private String id; @Schema(description = "模型类型(Memory/ASR/VAD/LLM/TTS)") private String modelType; diff --git a/main/manager-api/src/main/resources/application-dev.yml b/main/manager-api/src/main/resources/application-dev.yml index b093c3b2..a8fdf21f 100644 --- a/main/manager-api/src/main/resources/application-dev.yml +++ b/main/manager-api/src/main/resources/application-dev.yml @@ -11,11 +11,6 @@ jasypt: encryptor: password: P9Hx718z8L spring: - sql: - init: - #初始化数据库默认数据，对应sql文件必须存在 - data-locations: - - classpath:db/changelog/data.sql datasource: druid: #MySQL diff --git a/main/manager-api/src/main/resources/application.yml b/main/manager-api/src/main/resources/application.yml index 54959519..03f6a044 100644 --- a/main/manager-api/src/main/resources/application.yml +++ b/main/manager-api/src/main/resources/application.yml @@ -39,13 +39,6 @@ spring: min-idle: 5 # 连接池中的最小空闲连接 main: allow-bean-definition-overriding: true - sql: - init: - mode: always - # 启动时自动执行创建表的sql，对应sql文件必须存在 - schema-locations: - - classpath:db/changelog/202503141335.sql - - classpath:db/changelog/202503141346.sql knife4j: enable: true basic: diff --git a/main/manager-api/src/main/resources/db/changelog/data.sql b/main/manager-api/src/main/resources/db/changelog/data.sql deleted file mode 100644 index 2bf5b65c..00000000 --- a/main/manager-api/src/main/resources/db/changelog/data.sql +++ /dev/null @@ -1,3 +0,0 @@ --- password: Admin123456. -INSERT INTO xiaozhi_esp32_server.sys_user (id, username, password, super_admin, status, create_date, updater, creator, update_date) -VALUES (1903735517485289473, 'admin', '$2a$10$VY1sr9hJc9pMVNACVSvA9eadivi.WcWBRLsPzGdLduv3LqOkxz98u', 1, 1, '2025-03-23 17:08:12', null, null, '2025-03-23 17:08:12');