diff --git a/doc/部署说明/部署过程描述.md b/doc/部署说明/部署过程描述.md index 4ad33434..b71bd6b1 100644 --- a/doc/部署说明/部署过程描述.md +++ b/doc/部署说明/部署过程描述.md @@ -38,7 +38,7 @@ Nginx 是源码编译安装的,安装在 `/usr/local/nginx/`,可执行文件 * 备份数据库 * 备份1期库(排除市监表) ```bash - mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd.sszt_jbxx110497_new --ignore-table=zfjd.sszt_jbxx110497 zfjd > /efcode20/dbv1/zfjd_2026_07_06_ex_sszt_jbxx_utf8.sql + mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd.sszt_jbxx110497_new --ignore-table=zfjd.sszt_jbxx110497 zfjd > /efcode20/dbv1/zfjd_2026_07_08_ex_sszt_jbxx_utf8.sql ``` * 单独备份市监表 ```bash @@ -46,7 +46,7 @@ Nginx 是源码编译安装的,安装在 `/usr/local/nginx/`,可执行文件 mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd sszt_jbxx110497_new > /efcode20/dbv1/sszt_jbxx110497_new_20.sql ``` * 压缩备份文件 - zip -e -P 'xj.sdeweqwew222qwe.12345' /efcode20/dbv1/zfjdfile1.zip /efcode20/dbv1/zfjd_2026_07_06_ex_sszt_jbxx_utf8.sql + zip -e -P 'xj.sdeweqwew222qwe.12345' /efcode20/dbv1/zfjdfile1.zip /efcode20/dbv1/zfjd_2026_07_08_ex_sszt_jbxx_utf8.sql * 导入1期库(排除市监表) ``` mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv1/zfjd_2026_06_15_ex_sszt_jbxx_utf8.sql @@ -85,14 +85,14 @@ Nginx 是源码编译安装的,安装在 `/usr/local/nginx/`,可执行文件 * 备份1期库(排除市监表) ```bash mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd_ef20_1.sszt_jbxx110497_new --ignore-table=zfjd_ef20_1.sszt_jbxx110497 zfjd_ef20_1 > /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8.sql - mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_1 > /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8.sql + mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_1 > /efcode20/dbv2/zfjd_ef20_1_2026_07_08_utf8.sql ``` * 单独备份市监表 ```bash mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_1 sszt_jbxx110497_new > /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8_sszt_jbxx110497_new.sql ``` * 压缩备份文件 - zip -e -P 'xj.sdeweqwew222qwe.12345' /efcode20/dbv2/zfjd_ef20_1.zip /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8.sql + zip -e -P 'xj.sdeweqwew222qwe.12345' /efcode20/dbv2/zfjd_ef20_07_08.zip /efcode20/dbv2/zfjd_ef20_1_2026_07_08_utf8.sql * sql客户端 * mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' ### DATAX diff --git a/script/sql/zfjd-refactoring-v1/005-2-重新整理二期菜单结构.sql b/script/sql/zfjd-refactoring-v1/005-2-重新整理二期菜单结构.sql index 5d527f33..ea0ba824 100644 --- a/script/sql/zfjd-refactoring-v1/005-2-重新整理二期菜单结构.sql +++ b/script/sql/zfjd-refactoring-v1/005-2-重新整理二期菜单结构.sql @@ -17,7 +17,7 @@ INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (40, '系统工具', 0, 4, 'tool', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'tool', 103, 1, '2026-03-31 20:14:46', null, null, '系统工具目录', 'authService', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (2, '系统监控', 0, 5, 'monitor', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'monitor', 103, 1, '2026-03-31 20:14:46', null, null, '系统监控目录', 'authService', null); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (60, '系统对接', 0, 6, 'integration', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'international', 103, 1, '2026-03-31 20:14:46', null, null, '系统对接目录', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (70, '系统集成模拟', 0, 7, 'system-integration-mock', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'redis', 103, 1, '2026-03-31 20:14:46', null, null, '系统集成模拟目录', 'authService', null); +-- INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (70, '系统集成模拟', 0, 7, 'system-integration-mock', null, '', 1, 0, '#', '', 'M', '0', '0', '', 'redis', 103, 1, '2026-03-31 20:14:46', null, null, '系统集成模拟目录', 'authService', null); -- ============================================= -- 系统设置 子菜单 (parent_id = 10, menu_type = 'C') @@ -87,8 +87,8 @@ INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, -- 系统集成模拟 子菜单 (parent_id = 70, menu_type = 'C') -- ============================================= -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (7001, '深i企模拟集成', 70, 1, 'integrationmock-siq', 'efcode/integrationmock/siq/index', '', 1, 0, '#', '', 'C', '0', '0', 'integration:siq:list', '#', 103, 1, '2026-03-31 20:14:46', null, null, '深i企模拟集成', 'authService', null); -INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (7002, '深政易模拟集成', 70, 2, 'integrationmock-szy', 'efcode/integrationmock/szy/index', '', 1, 0, '#', '', 'C', '0', '0', 'integration:szy:list', '#', 103, 1, '2026-03-31 20:14:46', null, null, '深政易模拟集成', 'authService', null); +-- INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (7001, '深i企模拟集成', 70, 1, 'integrationmock-siq', 'efcode/integrationmock/siq/index', '', 1, 0, '#', '', 'C', '0', '0', 'integration:siq:list', '#', 103, 1, '2026-03-31 20:14:46', null, null, '深i企模拟集成', 'authService', null); +-- INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, url, target, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark, system_code, type) VALUES (7002, '深政易模拟集成', 70, 2, 'integrationmock-szy', 'efcode/integrationmock/szy/index', '', 1, 0, '#', '', 'C', '0', '0', 'integration:szy:list', '#', 103, 1, '2026-03-31 20:14:46', null, null, '深政易模拟集成', 'authService', null); -- ... existing code ... diff --git a/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/domain/bo/UnitUserResetPwdBo.java b/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/domain/bo/UnitUserResetPwdBo.java new file mode 100644 index 00000000..2aae0461 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code-common/src/main/java/com/zdxt/enforcementcode/domain/bo/UnitUserResetPwdBo.java @@ -0,0 +1,30 @@ +package com.zdxt.enforcementcode.domain.bo; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 执法人员重置密码BO + */ +@Data +public class UnitUserResetPwdBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @NotNull(message = "用户ID不能为空") + private Long userId; + + /** + * 新密码 + */ + @NotBlank(message = "新密码不能为空") + private String password; +} diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-cust-zrb.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-cust-zrb.yml index a1094758..f72b6320 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-cust-zrb.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-cust-zrb.yml @@ -21,7 +21,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://127.0.0.1:3309/efcode-v2-0706?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3309/zfjd_ef20_07_08?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: root diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml index faeb2db0..521e7697 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml @@ -56,7 +56,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://10.76.108.1:15144/zfjd_ef20_1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://10.76.108.1:15144/zfjd_ef20_07_08?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: zfjd password: szsf@zfjd # # 从库数据源