diff --git a/config/local/mysql.yml b/config/local/mysql.yml index 3f603b3..e0bf6bc 100644 --- a/config/local/mysql.yml +++ b/config/local/mysql.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:13306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:3306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java index c83878f..c2ebd42 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; * @author xq * @date 2026/1/29 11:32 */ -@Table("model_content") +@Table("ry_model_content") @Schema(description = "画布配置数据对象") @Data @Builder diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/FileStorageDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/FileStorageDO.java index 25c28a6..51bc3ce 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/FileStorageDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/FileStorageDO.java @@ -16,7 +16,7 @@ import java.util.Date; * @description:文件存储数据对象 * @date 2026/2/2 22:18 */ -@Table("file_storage") +@Table("ry_file_storage") @Schema(description = "文件存储数据对象") @Data @Builder diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java index f8e1135..a98d300 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; * @author xq * @date 2026/1/29 11:35 */ -@Table("grid_cfg") +@Table("ry_grid_cfg") @Schema(description = "存储网格的基本配置信息") @Data @Builder diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java index 3c3c31a..6866130 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java @@ -19,7 +19,7 @@ import java.util.HashMap; * @author xq * @version 1.0 */ -@Table("model_content") +@Table("ry_model_content") @Schema(description = "存储模型的基本信息和配置") @Data @NoArgsConstructor diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java index eae82f5..e0e0f28 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java @@ -14,7 +14,7 @@ import java.io.Serializable; * @author xq * @version 1.0 */ -@Table("user_model_content") +@Table("ry_user_model_content") @Schema(description = "用户模型中间表") @Data @Builder diff --git a/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql b/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql index 2561ad7..254623b 100644 --- a/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql +++ b/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql @@ -1,4 +1,4 @@ -create table user_model_content +create table ry_user_model_content ( id varchar(32) null comment '表id', user_id varchar(32) null comment '用户id', @@ -7,7 +7,7 @@ create table user_model_content ) comment '用户模型关系'; -create table model_content +create table ry_model_content ( id varchar(32) not null comment '模型id' primary key, @@ -24,7 +24,7 @@ create table model_content events varchar(128) null comment '事件' ) comment '模型内容'; -create table canvas_cfg +create table ry_canvas_cfg ( id varchar(32) not null comment '面板id' primary key, user_id varchar(32) null comment '用户id', @@ -40,7 +40,7 @@ create table canvas_cfg drag_offset text null comment '拖拽(json)' ) comment '面板'; -create table grid_cfg +create table ry_grid_cfg ( id varchar(32) not null primary key, @@ -51,7 +51,7 @@ create table grid_cfg ) comment '网格'; -- auto-generated definition -create table file_storage +create table ry_file_storage ( id varchar(32) not null primary key, diff --git a/sz-service/sz-service-admin/src/main/resources/lib/linux/libPlayCtrl.so b/sz-service/sz-service-admin/src/main/resources/lib/linux/libPlayCtrl.so index 35f0917..b331576 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/linux/libPlayCtrl.so and b/sz-service/sz-service-admin/src/main/resources/lib/linux/libPlayCtrl.so differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll index ec40bf8..75e98ff 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/PlayCtrl.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/PlayCtrl.dll index e2f09ce..377fd66 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/PlayCtrl.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/PlayCtrl.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll index a1ad17c..23a2ed8 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll differ