diff options
3 files changed, 29 insertions, 29 deletions
diff --git a/src/main/java/net/geedge/asw/module/sys/controller/SysI18nController.java b/src/main/java/net/geedge/asw/module/sys/controller/SysI18nController.java index 88f4887..83274f1 100644 --- a/src/main/java/net/geedge/asw/module/sys/controller/SysI18nController.java +++ b/src/main/java/net/geedge/asw/module/sys/controller/SysI18nController.java @@ -33,7 +33,7 @@ public class SysI18nController { public R detail(@PathVariable("id") String id) { SysI18nEntity entity = sysI18nService.getById(id); if (T.ObjectUtil.isNotNull(entity)) { - SysUserEntity user = userService.getById(entity.getUid()); + SysUserEntity user = userService.getById(entity.getUpdateUserId()); user.setPwd(null); entity.setUpdateUser(user); } @@ -79,8 +79,8 @@ public class SysI18nController { if (T.ObjectUtil.isEmpty(entity.getName())) { entity.setName(entity.getCode()); } - entity.setUts(System.currentTimeMillis()); - entity.setUid(StpUtil.getLoginIdAsString()); + entity.setUpdateTimestamp(System.currentTimeMillis()); + entity.setUpdateUserId(StpUtil.getLoginIdAsString()); sysI18nService.save(entity); return R.ok().putData("id", entity.getId()); } @@ -102,8 +102,8 @@ public class SysI18nController { if (T.ObjectUtil.isEmpty(entity.getName())) { entity.setName(entity.getCode()); } - entity.setUts(System.currentTimeMillis()); - entity.setUid(StpUtil.getLoginIdAsString()); + entity.setUpdateTimestamp(System.currentTimeMillis()); + entity.setUpdateUserId(StpUtil.getLoginIdAsString()); sysI18nService.updateById(entity); return R.ok().putData("id", entity.getId()); } diff --git a/src/main/java/net/geedge/asw/module/sys/entity/SysI18nEntity.java b/src/main/java/net/geedge/asw/module/sys/entity/SysI18nEntity.java index a99ef00..725a819 100644 --- a/src/main/java/net/geedge/asw/module/sys/entity/SysI18nEntity.java +++ b/src/main/java/net/geedge/asw/module/sys/entity/SysI18nEntity.java @@ -41,11 +41,11 @@ public class SysI18nEntity implements Serializable { /** * 操作人 */ - private String uid; + private String updateUserId; /** * 操作时间 */ - private Long uts; + private Long updateTimestamp; @TableField(exist = false) private SysUserEntity updateUser; diff --git a/src/main/resources/db/migration/R__AZ_sys_i18n.sql b/src/main/resources/db/migration/R__AZ_sys_i18n.sql index dd5d3b0..1243b1a 100644 --- a/src/main/resources/db/migration/R__AZ_sys_i18n.sql +++ b/src/main/resources/db/migration/R__AZ_sys_i18n.sql @@ -12,33 +12,33 @@ CREATE TABLE `sys_i18n` ( `value` longtext NOT NULL COMMENT '翻译值', `lang` varchar(64) NOT NULL COMMENT '语言', `remark` varchar(512) NOT NULL DEFAULT '' COMMENT '备注', - `uid` varchar(64) NOT NULL COMMENT '更新人', - `uts` bigint(20) NOT NULL COMMENT '更新时间', + `update_user_id` varchar(64) NOT NULL COMMENT '更新人', + `update_timestamp` bigint(20) NOT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, INDEX `idx_lang_code`(`lang`, `code`) USING BTREE ) ENGINE=InnoDB ROW_FORMAT=Dynamic DEFAULT CHARSET=utf8mb4; -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (1, '999', 'ERROR', 'error', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (3, '999', 'ERROR', '错误', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (5, '100001', 'SYS_USER_PWD_ERROR', 'username or password error', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (7, '100001', 'SYS_USER_PWD_ERROR', '用户名或密码错误', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (9, '100002', 'SYS_DUPLICATE_RECORD', 'duplicate record', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (11, '100002', 'SYS_DUPLICATE_RECORD', '重复记录', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (13, '100003', 'SYS_NO_AUTH', 'Permission denied', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (15, '100003', 'SYS_NO_AUTH', '没有权限', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (17, '100004', 'ID_CANNOT_EMPTY', 'id cannot be empty', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (19, '100004', 'ID_CANNOT_EMPTY', 'id不能为空', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (21, '100005', 'NAME_CANNOT_EMPTY', 'name cannot be empty', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (23, '100005', 'NAME_CANNOT_EMPTY', '名称不能为空', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (25, '100006', 'PARAM_CANNOT_EMPTY', 'parameter cannot be empty', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (27, '100006', 'PARAM_CANNOT_EMPTY', '参数不能为空', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (29, '100007', 'USER_NO_LOGIN', 'user not login', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (31, '100007', 'USER_NO_LOGIN', '用户未登录', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (33, '100008', 'SYS_RECORD_NOT_FOUND', 'record not found', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (35, '100008', 'SYS_RECORD_NOT_FOUND', '找不到记录', 'zh', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (37, '200', 'SUCCESS', 'success', 'en', '', 'admin', 1719280800000); -INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `uid`, `uts`) VALUES (39, '200', 'SUCCESS', '成功', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (1, '999', 'ERROR', 'error', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (3, '999', 'ERROR', '错误', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (5, '100001', 'SYS_USER_PWD_ERROR', 'username or password error', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (7, '100001', 'SYS_USER_PWD_ERROR', '用户名或密码错误', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (9, '100002', 'SYS_DUPLICATE_RECORD', 'duplicate record', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (11, '100002', 'SYS_DUPLICATE_RECORD', '重复记录', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (13, '100003', 'SYS_NO_AUTH', 'Permission denied', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (15, '100003', 'SYS_NO_AUTH', '没有权限', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (17, '100004', 'ID_CANNOT_EMPTY', 'id cannot be empty', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (19, '100004', 'ID_CANNOT_EMPTY', 'id不能为空', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (21, '100005', 'NAME_CANNOT_EMPTY', 'name cannot be empty', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (23, '100005', 'NAME_CANNOT_EMPTY', '名称不能为空', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (25, '100006', 'PARAM_CANNOT_EMPTY', 'parameter cannot be empty', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (27, '100006', 'PARAM_CANNOT_EMPTY', '参数不能为空', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (29, '100007', 'USER_NO_LOGIN', 'user not login', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (31, '100007', 'USER_NO_LOGIN', '用户未登录', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (33, '100008', 'SYS_RECORD_NOT_FOUND', 'record not found', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (35, '100008', 'SYS_RECORD_NOT_FOUND', '找不到记录', 'zh', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (37, '200', 'SUCCESS', 'success', 'en', '', 'admin', 1719280800000); +INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (39, '200', 'SUCCESS', '成功', 'zh', '', 'admin', 1719280800000); SET FOREIGN_KEY_CHECKS = 1; |