From 7fed53183543d9c5ddf48152844f215e424c5196 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 1 Apr 2024 10:33:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/utils/SecurityUtils.java | 4 +- .../org/nl/common/utils/dto/CurrentUser.java | 8 + .../controller/user/UserController.java | 8 - lms/nladmin-ui/public/config.js | 4 +- .../src/components/DateRangePicker/index.vue | 5 +- lms/nladmin-ui/src/i18n/langs/chinese.js | 12 +- lms/nladmin-ui/src/i18n/langs/dept/en.js | 34 +++++ lms/nladmin-ui/src/i18n/langs/dept/in.js | 34 +++++ lms/nladmin-ui/src/i18n/langs/dept/zh.js | 34 +++++ lms/nladmin-ui/src/i18n/langs/dict/en.js | 36 +++++ lms/nladmin-ui/src/i18n/langs/dict/in.js | 36 +++++ lms/nladmin-ui/src/i18n/langs/dict/zh.js | 36 +++++ lms/nladmin-ui/src/i18n/langs/en.js | 1 + lms/nladmin-ui/src/i18n/langs/english.js | 12 +- lms/nladmin-ui/src/i18n/langs/in.js | 1 + lms/nladmin-ui/src/i18n/langs/indonesian.js | 12 +- lms/nladmin-ui/src/i18n/langs/menu/en.js | 2 +- lms/nladmin-ui/src/i18n/langs/param/en.js | 13 -- lms/nladmin-ui/src/i18n/langs/param/in.js | 13 -- lms/nladmin-ui/src/i18n/langs/param/zh.js | 13 -- .../src/i18n/langs/scheduling/en.js | 62 ++++++++ .../src/i18n/langs/scheduling/in.js | 62 ++++++++ .../src/i18n/langs/scheduling/zh.js | 62 ++++++++ lms/nladmin-ui/src/i18n/langs/user/en.js | 42 ++++++ lms/nladmin-ui/src/i18n/langs/user/in.js | 42 ++++++ lms/nladmin-ui/src/i18n/langs/user/zh.js | 42 ++++++ lms/nladmin-ui/src/i18n/langs/zh-CN.js | 1 + .../src/views/system/dept/index.vue | 99 +++++++----- .../src/views/system/dict/dictDetail.vue | 131 ++++++++++++---- .../src/views/system/dict/index.vue | 50 +++--- .../src/views/system/menu/index.vue | 50 ++++-- .../src/views/system/timing/index.vue | 142 +++++++++++------- .../src/views/system/timing/log.vue | 45 +++--- .../src/views/system/user/index.vue | 113 ++++++++------ 34 files changed, 981 insertions(+), 280 deletions(-) create mode 100644 lms/nladmin-ui/src/i18n/langs/dept/en.js create mode 100644 lms/nladmin-ui/src/i18n/langs/dept/in.js create mode 100644 lms/nladmin-ui/src/i18n/langs/dept/zh.js create mode 100644 lms/nladmin-ui/src/i18n/langs/dict/en.js create mode 100644 lms/nladmin-ui/src/i18n/langs/dict/in.js create mode 100644 lms/nladmin-ui/src/i18n/langs/dict/zh.js delete mode 100644 lms/nladmin-ui/src/i18n/langs/param/en.js delete mode 100644 lms/nladmin-ui/src/i18n/langs/param/in.js delete mode 100644 lms/nladmin-ui/src/i18n/langs/param/zh.js create mode 100644 lms/nladmin-ui/src/i18n/langs/scheduling/en.js create mode 100644 lms/nladmin-ui/src/i18n/langs/scheduling/in.js create mode 100644 lms/nladmin-ui/src/i18n/langs/scheduling/zh.js create mode 100644 lms/nladmin-ui/src/i18n/langs/user/en.js create mode 100644 lms/nladmin-ui/src/i18n/langs/user/in.js create mode 100644 lms/nladmin-ui/src/i18n/langs/user/zh.js diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java index d5389e0..7d3f673 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java @@ -29,9 +29,9 @@ public class SecurityUtils { return json.toBean(CurrentUser.class); } } catch (Exception e) { - return new CurrentUser(); + return CurrentUser.getDefaultUser(); } - return null; + return CurrentUser.getDefaultUser(); } /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java index ddaa4a4..ad9827e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java @@ -35,4 +35,12 @@ public class CurrentUser implements Serializable { private SysUser user; private List permissions = new ArrayList<>(); + + public static CurrentUser getDefaultUser() { + CurrentUser def = new CurrentUser(); + def.setId("2"); + def.setUsername("default"); + def.setPresonName("外部系统用户"); + return def; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index 364088b..6fb8bef 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -56,15 +56,12 @@ public class UserController { @Autowired private ISysUserService userService; - - @GetMapping public ResponseEntity query(UserQuery query, PageQuery page){ return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)),HttpStatus.OK); } @Log("新增用户") - @PostMapping public ResponseEntity create(@RequestBody Map user){ userService.create(user); @@ -72,7 +69,6 @@ public class UserController { } @Log("修改用户") - @PutMapping public ResponseEntity update( @RequestBody Map resources) throws Exception { userService.update(resources); @@ -80,7 +76,6 @@ public class UserController { } @Log("修改用户:个人中心") - public ResponseEntity center(@RequestBody SysUser resources){ if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){ throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); @@ -90,14 +85,12 @@ public class UserController { } @Log("删除用户") - @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { userService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } - @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody JSONObject passVo) throws Exception { // 解密,得到字符密码 @@ -122,7 +115,6 @@ public class UserController { } @Log("修改邮箱") - @PostMapping(value = "/updateEmail/{code}") public ResponseEntity updateEmail(@PathVariable String code,@RequestBody SysUser user) throws Exception { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); diff --git a/lms/nladmin-ui/public/config.js b/lms/nladmin-ui/public/config.js index 6d6e117..441302a 100644 --- a/lms/nladmin-ui/public/config.js +++ b/lms/nladmin-ui/public/config.js @@ -1,9 +1,9 @@ window.g = { dev: { - VUE_APP_BASE_API: 'http://10.93.41.201:8010' + VUE_APP_BASE_API: 'http://127.0.0.1:8010' }, prod: { - VUE_APP_BASE_API: 'http://10.93.41.201:8010' + VUE_APP_BASE_API: 'http://127.0.0.1:8010' } } diff --git a/lms/nladmin-ui/src/components/DateRangePicker/index.vue b/lms/nladmin-ui/src/components/DateRangePicker/index.vue index 749ced3..9c2713d 100644 --- a/lms/nladmin-ui/src/components/DateRangePicker/index.vue +++ b/lms/nladmin-ui/src/components/DateRangePicker/index.vue @@ -1,6 +1,7 @@ diff --git a/lms/nladmin-ui/src/views/system/dict/index.vue b/lms/nladmin-ui/src/views/system/dict/index.vue index 8bb0ac4..3a647a0 100644 --- a/lms/nladmin-ui/src/views/system/dict/index.vue +++ b/lms/nladmin-ui/src/views/system/dict/index.vue @@ -7,19 +7,19 @@ :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" - width="500px" + :width="computedLabelWidth" > - - - + + + - - + + @@ -34,7 +34,7 @@ v-model="query.blurry" clearable size="mini" - placeholder="输入名称或者描述搜索" + :placeholder="$t('Dict.placeholder.blurry')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -54,12 +54,11 @@ @current-change="handleCurrentChange" > - - + + @@ -79,7 +78,7 @@
- 字典详情 + {{ $t('Dict.table.dict_detail') }} 新增 + >{{ $t('common.Create') }}
@@ -108,6 +107,7 @@ import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' import rrOperation from '@crud/RR.operation' import udOperation from '@crud/UD.operation' +import i18n from '@/i18n' const defaultForm = { dict_id: null, @@ -127,7 +127,7 @@ export default { components: { crudOperation, pagination, rrOperation, udOperation, dictDetail }, cruds() { return [ - CRUD({ title: '字典', url: 'api/dict', idField: 'dict_id', crudMethod: { ...crudDict }}) + CRUD({ title: i18n.t('Dict.title'), url: 'api/dict', idField: 'dict_id', crudMethod: { ...crudDict }}) ] }, mixins: [presenter(), header(), form(defaultForm)], @@ -139,7 +139,7 @@ export default { ], rules: { code: [ - { required: true, message: '请输入编码', trigger: 'blur' } + { required: true, message: i18n.t('Dict.rules.r1'), trigger: 'blur' } ] }, permission: { @@ -149,6 +149,22 @@ export default { } } }, + computed: { + computedLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'zh') { + return `380px` + } + return `450px` + }, + computedFormLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'zh') { + return `80px` + } + return `160px` + } + }, methods: { checkPermission, // 获取数据前设置好接口地址 diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue index 3f04e07..8e51712 100644 --- a/lms/nladmin-ui/src/views/system/menu/index.vue +++ b/lms/nladmin-ui/src/views/system/menu/index.vue @@ -36,9 +36,9 @@ :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" - width="650px" + :width="computedLabelWidth" > - + {{ $t('menu.dialog.system') }} @@ -69,20 +69,20 @@ - - + {{ $t('common.Yes') }} + {{ $t('common.No') }} - - + {{ $t('common.Yes') }} + {{ $t('common.No') }} - - + {{ $t('common.Yes') }} + {{ $t('common.No') }} @@ -190,20 +190,20 @@ @@ -299,6 +299,28 @@ export default { } } }, + computed: { + computedLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'en') { + return `800px` + } + if (item === 'in') { + return `800px` + } + return `650px` + }, + computedFormLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'en') { + return `140px` + } + if (item === 'in') { + return `150px` + } + return `100px` + } + }, methods: { normalizer(node) { return { diff --git a/lms/nladmin-ui/src/views/system/timing/index.vue b/lms/nladmin-ui/src/views/system/timing/index.vue index fd7f430..c57bbcf 100644 --- a/lms/nladmin-ui/src/views/system/timing/index.vue +++ b/lms/nladmin-ui/src/views/system/timing/index.vue @@ -8,7 +8,7 @@ v-model="query.job_name" clearable size="mini" - placeholder="输入任务名称搜索" + :placeholder="$t('Scheduling.placeholder.search')" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" @@ -24,7 +24,8 @@ type="info" icon="el-icon-tickets" @click="doLog" - >日志 + > + {{ $t('Scheduling.placeholder.log') }} @@ -36,60 +37,67 @@ :visible.sync="crud.status.cu > 0" :title="crud.status.title" append-to-body - width="730px" + :width="computedLabelWidth" > - - + + - + - + - + - + - + - - + + - + - - + + - + - - + {{ $t('common.Yes') }} + {{ $t('common.No') }} - + - 启用 - 暂停 + {{ $t('Scheduling.dialog.start') }} + {{ $t('Scheduling.dialog.stop') }} - + @@ -101,35 +109,35 @@ @selection-change="crud.selectionChangeHandler" > - - - - - + + + + + - + - - + + 编辑 + > + {{ $t('common.Editors') }} 执行 + > + {{ $t('Scheduling.table.execute') }} - {{ scope.row.is_pause ? '恢复' : '暂停' }} + {{ scope.row.is_pause ? $t('Scheduling.table.recover') : $t('Scheduling.table.pause') }} -

确定停止并删除该任务吗?

+

{{ $t('Scheduling.msg.tip1') }}

- 取消 - 确定 + + {{ $t('common.Cancel') }} + + + {{ $t('common.Confirm') }}
- 删除 + + {{ $t('common.Delete') }} +
- + @@ -193,6 +208,7 @@ import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' import Crontab from './components/crontab' +import i18n from '@/i18n' const defaultForm = { job_id: null, @@ -212,7 +228,7 @@ export default { name: 'Timing', components: { Log, pagination, crudOperation, rrOperation, Crontab }, cruds() { - return CRUD({ title: '定时任务', idField: 'job_id', url: 'api/jobs', crudMethod: { ...crudJob }}) + return CRUD({ title: i18n.t('Scheduling.title'), idField: 'job_id', url: 'api/jobs', crudMethod: { ...crudJob }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { @@ -225,22 +241,22 @@ export default { }, rules: { job_name: [ - { required: true, message: '请输入任务名称', trigger: 'blur' } + { required: true, message: i18n.t('Scheduling.rules.r1'), trigger: 'blur' } ], description: [ - { required: true, message: '请输入任务描述', trigger: 'blur' } + { required: true, message: i18n.t('Scheduling.rules.r2'), trigger: 'blur' } ], bean_name: [ - { required: true, message: '请输入Bean名称', trigger: 'blur' } + { required: true, message: i18n.t('Scheduling.rules.r3'), trigger: 'blur' } ], method_name: [ - { required: true, message: '请输入方法名称', trigger: 'blur' } + { required: true, message: i18n.t('Scheduling.rules.r4'), trigger: 'blur' } ], cron_expression: [ - { required: true, message: '请输入Cron表达式', trigger: 'blur' } + { required: true, message: i18n.t('Scheduling.rules.r5'), trigger: 'blur' } ], person_in_charge: [ - { required: true, message: '请输入负责人名称', trigger: 'blur' } + { required: true, message: i18n.t('Scheduling.rules.r6'), trigger: 'blur' } ] }, // 是否显示Cron表达式弹出层 @@ -249,6 +265,28 @@ export default { expression: '' } }, + computed: { + computedLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'en') { + return `800px` + } + if (item === 'in') { + return `860px` + } + return `730px` + }, + computedFormLabelWidth() { + const item = localStorage.getItem('lang') + if (item === 'en') { + return `140px` + } + if (item === 'in') { + return `170px` + } + return `100px` + } + }, methods: { // 执行 execute(id) { diff --git a/lms/nladmin-ui/src/views/system/timing/log.vue b/lms/nladmin-ui/src/views/system/timing/log.vue index e3fc9f4..cd9f8ba 100644 --- a/lms/nladmin-ui/src/views/system/timing/log.vue +++ b/lms/nladmin-ui/src/views/system/timing/log.vue @@ -1,39 +1,45 @@