From 61d8d9c6e1ecd2c734ab15d801a882cd0b3fe8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 22 Nov 2018 00:30:05 +0800 Subject: [PATCH] :lipstick: Updating the UI and style files. code api --- .../pigx/admin/controller/UserController.java | 5 +- .../pigx/admin/service/SysUserService.java | 6 +- .../service/impl/SysUserServiceImpl.java | 12 +- .../src/main/resources/template/index.vue.vm | 35 +- pigx-visual/pigx-monitor/package-lock.json | 44 +- pigx-visual/pigx-monitor/package.json | 1 + .../pigx-monitor/src/main/frontend/index.js | 3 + .../frontend/views/applications/handle.vue | 2 +- .../frontend/views/applications/index.vue | 10 +- .../src/main/frontend/views/journal/index.vue | 24 +- .../src/main/frontend/views/turbine/index.vue | 53 ++- .../main/frontend/views/wallboard/index.vue | 2 +- .../src/main/resources/report.html | 2 +- .../resources/templates/hystrix/index.ftl | 108 +++-- .../resources/templates/hystrix/monitor.ftl | 29 +- .../ui/assets/css/sba-core.16e99150.css | 399 ------------------ .../ui/assets/js/chunk-vendors.1df687d0.js | 59 --- .../assets/js/chunk-vendors.1df687d0.js.map | 1 - .../ui/assets/js/sba-core.57ec87a2.js | 2 - .../ui/assets/js/sba-core.57ec87a2.js.map | 1 - .../src/main/resources/ui/index.html | 4 +- .../src/main/resources/ui/login.html | 2 +- 22 files changed, 211 insertions(+), 593 deletions(-) delete mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/css/sba-core.16e99150.css delete mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/js/chunk-vendors.1df687d0.js delete mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/js/chunk-vendors.1df687d0.js.map delete mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/js/sba-core.57ec87a2.js delete mode 100644 pigx-visual/pigx-monitor/src/main/resources/ui/assets/js/sba-core.57ec87a2.js.map diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java index 6d52482d1..3c1a010f6 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java @@ -163,8 +163,7 @@ public class UserController { @PutMapping @PreAuthorize("@pms.hasPermission('sys_user_edit')") public R userUpdate(@Valid @RequestBody UserDTO userDto) { - SysUser user = userService.selectById(userDto.getUserId()); - return new R<>(userService.updateUser(userDto, user.getUsername())); + return new R<>(userService.updateUser(userDto)); } /** @@ -187,7 +186,7 @@ public class UserController { @SysLog("修改个人信息") @PutMapping("/edit") public R editInfo(@Valid @RequestBody UserDTO userDto) { - return userService.updateUserInfo(userDto, SecurityUtils.getUser().getUsername()); + return userService.updateUserInfo(userDto); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java index f8110da01..40c33380e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java @@ -64,19 +64,17 @@ public interface SysUserService extends IService { * 更新当前用户基本信息 * * @param userDto 用户信息 - * @param username 用户名 * @return Boolean */ - R updateUserInfo(UserDTO userDto, String username); + R updateUserInfo(UserDTO userDto); /** * 更新指定用户信息 * * @param userDto 用户信息 - * @param username 用户信息 * @return */ - Boolean updateUser(UserDTO userDto, String username); + Boolean updateUser(UserDTO userDto); /** * 通过ID查询用户信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index ce6726cbd..f1edfbe1a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -141,16 +141,16 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - @CacheEvict(value = "user_details", key = "#username") - public R updateUserInfo(UserDTO userDto, String username) { - UserVO userVO = baseMapper.selectUserVoByUsername(username); + @CacheEvict(value = "user_details", key = "#userDto.username") + public R updateUserInfo(UserDTO userDto) { + UserVO userVO = baseMapper.selectUserVoByUsername(userDto.getUsername()); SysUser sysUser = new SysUser(); if (StrUtil.isNotBlank(userDto.getPassword()) && StrUtil.isNotBlank(userDto.getNewpassword1())) { if (ENCODER.matches(userDto.getPassword(), userVO.getPassword())) { sysUser.setPassword(ENCODER.encode(userDto.getNewpassword1())); } else { - log.warn("原密码错误，修改密码失败:{}", username); + log.warn("原密码错误，修改密码失败:{}", userDto.getUsername()); return new R<>(Boolean.FALSE, "原密码错误，修改失败"); } } @@ -161,8 +161,8 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - @CacheEvict(value = "user_details", key = "#username") - public Boolean updateUser(UserDTO userDto, String username) { + @CacheEvict(value = "user_details", key = "#userDto.username") + public Boolean updateUser(UserDTO userDto) { SysUser sysUser = new SysUser(); BeanUtils.copyProperties(userDto, sysUser); sysUser.setUpdateTime(LocalDateTime.now()); diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm index 70455f61f..06f9cd878 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm @@ -117,11 +117,12 @@ }) .then(data => { _this.tableData.splice(index, 1) - _this.$message({ - showClose: true, - message: '删除成功', - type: 'success' - }) + _this.$message({ + showClose: true, + message: '删除成功', + type: 'success' + }) + this.getList(this.page) }) .catch(function(err) { }) }, @@ -135,11 +136,11 @@ handleUpdate: function(row, index, done) { putObj(row).then(data => { this.tableData.splice(index, 1, Object.assign({}, row)) - this.$message({ - showClose: true, - message: '修改成功', - type: 'success' - }) + this.$message({ + showClose: true, + message: '修改成功', + type: 'success' + }) done() this.getList(this.page) }) @@ -153,13 +154,13 @@ handleSave: function(row, done) { addObj(row).then(data => { this.tableData.push(Object.assign({}, row)) - this.$message({ - showClose: true, - message: '添加成功', - type: 'success' - }) - done() - this.getList(this.page) + this.$message({ + showClose: true, + message: '添加成功', + type: 'success' + }) + done() + this.getList(this.page) }) }, /** diff --git a/pigx-visual/pigx-monitor/package-lock.json b/pigx-visual/pigx-monitor/package-lock.json index eff38f317..1fdb00a92 100644 --- a/pigx-visual/pigx-monitor/package-lock.json +++ b/pigx-visual/pigx-monitor/package-lock.json @@ -2124,6 +2124,14 @@ "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", "dev": true }, + "async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "requires": { + "babel-runtime": "6.x" + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -2311,8 +2319,7 @@ "babel-helper-vue-jsx-merge-props": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", - "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==", - "dev": true + "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==" }, "babel-helpers": { "version": "6.24.1", @@ -2486,7 +2493,6 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" @@ -3820,8 +3826,7 @@ "core-js": { "version": "2.5.7", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", - "dev": true + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==" }, "core-util-is": { "version": "1.0.2", @@ -4433,8 +4438,7 @@ "deepmerge": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", - "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==", - "dev": true + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" }, "default-gateway": { "version": "2.7.2", @@ -4870,6 +4874,19 @@ "integrity": "sha512-DqJoDarxq50dcHsOOlMLNoy+qQitlMNbYb6wwbE0oUw2veHdRkpNrhmngiUYKMErdJ8SJ48rpJsZTQgy5SoEAA==", "dev": true }, + "element-ui": { + "version": "2.4.10", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.4.10.tgz", + "integrity": "sha512-yvcU6DpeZlAtCDyCI0rXi/nfDDhiO9IvoCzoXka95j+0F6S+KCw2dZksSxO5+00rGYSmIYVZ93oNkJNEQgDHOA==", + "requires": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + } + }, "elliptic": { "version": "6.4.1", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", @@ -10494,6 +10511,11 @@ "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", "dev": true }, + "normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -12446,8 +12468,7 @@ "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regenerator-transform": { "version": "0.13.3", @@ -14451,6 +14472,11 @@ "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=", "dev": true }, + "throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" + }, "through": { "version": "2.3.8", "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", diff --git a/pigx-visual/pigx-monitor/package.json b/pigx-visual/pigx-monitor/package.json index e168fbb51..227f3b4c5 100644 --- a/pigx-visual/pigx-monitor/package.json +++ b/pigx-visual/pigx-monitor/package.json @@ -26,6 +26,7 @@ "d3-selection": "^1.3.2", "d3-shape": "^1.2.2", "d3-time": "^1.0.10", + "element-ui": "^2.4.10", "event-source-polyfill": "^1.0.3", "lodash": "^4.17.11", "moment": "^2.22.2", diff --git a/pigx-visual/pigx-monitor/src/main/frontend/index.js b/pigx-visual/pigx-monitor/src/main/frontend/index.js index 54f6472eb..ecd702362 100644 --- a/pigx-visual/pigx-monitor/src/main/frontend/index.js +++ b/pigx-visual/pigx-monitor/src/main/frontend/index.js @@ -23,11 +23,14 @@ import Notifications from './notifications'; import sbaShell from './shell'; import Store from './store'; import ViewRegistry from './viewRegistry'; +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' import views from './views'; moment.locale(window.navigator.language); Vue.use(VueRouter); Vue.use(components); +Vue.use(ElementUI) const applicationStore = new Store(); const viewRegistry = new ViewRegistry(); diff --git a/pigx-visual/pigx-monitor/src/main/frontend/views/applications/handle.vue b/pigx-visual/pigx-monitor/src/main/frontend/views/applications/handle.vue index 10524d50d..c15714057 100644 --- a/pigx-visual/pigx-monitor/src/main/frontend/views/applications/handle.vue +++ b/pigx-visual/pigx-monitor/src/main/frontend/views/applications/handle.vue @@ -20,7 +20,7 @@ - Applications + 应用 diff --git a/pigx-visual/pigx-monitor/src/main/frontend/views/applications/index.vue b/pigx-visual/pigx-monitor/src/main/frontend/views/applications/index.vue index 29080ca62..d1a5138ef 100644 --- a/pigx-visual/pigx-monitor/src/main/frontend/views/applications/index.vue +++ b/pigx-visual/pigx-monitor/src/main/frontend/views/applications/index.vue @@ -29,23 +29,23 @@
-

Applications

+

应用

1

-

Instances

+

实例

1

-

Status

+

状态

all up

-

instances down

+

下线

@@ -110,7 +110,7 @@ path: '/applications/:selected?', props: true, name: 'applications', - label: 'Applications', + label: '应用', handle, order: 0, component: this diff --git a/pigx-visual/pigx-monitor/src/main/frontend/views/journal/index.vue b/pigx-visual/pigx-monitor/src/main/frontend/views/journal/index.vue index 71afcc7c1..b1dfcb5bd 100644 --- a/pigx-visual/pigx-monitor/src/main/frontend/views/journal/index.vue +++ b/pigx-visual/pigx-monitor/src/main/frontend/views/journal/index.vue @@ -17,7 +17,6 @@