diff --git a/config/dev/mysql.yml b/config/dev/mysql.yml index c8f06a3..9238c9f 100644 --- a/config/dev/mysql.yml +++ b/config/dev/mysql.yml @@ -3,7 +3,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:13306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Yanfa2023@ + password: 123456 hikari: #连接池名 pool-name: HikariCP diff --git a/config/local/mysql.yml b/config/local/mysql.yml index e0bf6bc..3f603b3 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:3306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:13306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/config/preview/mysql.yml b/config/preview/mysql.yml index c8f06a3..9238c9f 100644 --- a/config/preview/mysql.yml +++ b/config/preview/mysql.yml @@ -3,7 +3,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:13306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Yanfa2023@ + password: 123456 hikari: #连接池名 pool-name: HikariCP diff --git a/config/prod/mysql.yml b/config/prod/mysql.yml index c8f06a3..9238c9f 100644 --- a/config/prod/mysql.yml +++ b/config/prod/mysql.yml @@ -3,7 +3,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:13306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Yanfa2023@ + password: 123456 hikari: #连接池名 pool-name: HikariCP 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 2f204fd..c808adc 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 @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; * @author xq * @date 2026/1/29 11:32 */ -@Table("ry_model_content") +@Table("ry_canvas_cfg") @Schema(description = "画布配置数据对象") @Data @Builder 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 75e98ff..502b9ce 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/libeay32.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll index 23a2ed8..cfd726e 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