- {{ hotpatch ? '是' : '否' }}
-
-@@ -199,7 +202,8 @@ export default {
- key: 'repo',
- title: 'CVE REPO',
- filteredValue: filters.repo || [],
-- filters: this.repoList
-+ filters: this.repoList,
-+ scopedSlots: {customRender: 'repo'}
- },
- {
- dataIndex: 'cve_num',
-@@ -243,7 +247,8 @@ export default {
- key: 'repo',
- title: 'CVE REPO',
- filteredValue: filters.repo || null,
-- filters: this.standalone ? this.repoList : this.repoFilterList
-+ filters: this.standalone ? this.repoList : this.repoFilterList,
-+ scopedSlots: {customRender: 'repo'}
- },
- {
- dataIndex: 'hotpatch',
---
-Gitee
-
-
-From 0faf5b381a1d84f3a152ffa887207af138255f5b Mon Sep 17 00:00:00 2001
-From: wkl505997900 <505997900@qq.com>
-Date: Sun, 23 Apr 2023 18:46:51 +0800
-Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- .../components/GlobalHeader/AvatarDropdown.vue | 1 +
- src/vendor/ant-design-pro/permission.js | 13 ++++++++++++-
- src/vendor/ant-design-pro/store/modules/user.js | 15 +++------------
- src/vendor/ant-design-pro/utils/request.js | 2 +-
- src/views/user/Login.vue | 1 +
- vue.config.js | 3 +++
- 6 files changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/vendor/ant-design-pro/components/GlobalHeader/AvatarDropdown.vue b/src/vendor/ant-design-pro/components/GlobalHeader/AvatarDropdown.vue
-index a30ed66..ae97aed 100644
---- a/src/vendor/ant-design-pro/components/GlobalHeader/AvatarDropdown.vue
-+++ b/src/vendor/ant-design-pro/components/GlobalHeader/AvatarDropdown.vue
-@@ -67,6 +67,7 @@ export default {
- content: this.$t('layouts.usermenu.dialog.content'),
- onOk: () => {
- return this.$store.dispatch('Logout').then(() => {
-+ this.$message.info('退出登陆!')
- this.$router.push({name: 'login'});
- });
- },
-diff --git a/src/vendor/ant-design-pro/permission.js b/src/vendor/ant-design-pro/permission.js
-index 41ffbfb..7d85dbd 100644
---- a/src/vendor/ant-design-pro/permission.js
-+++ b/src/vendor/ant-design-pro/permission.js
-@@ -64,7 +64,18 @@ router.beforeEach((to, from, next) => {
- });
- });
- } else {
-- next();
-+ // 路由跳转前判断token是否过期
-+ if (localStorage.getItem('is_tokenvalid')) {
-+ var interval = setInterval(function() {
-+ if (!localStorage.getItem('is_tokenvalid')) {
-+ clearInterval(interval);
-+ // 执行某些操作
-+ next()
-+ }
-+ }, 1000); // 每隔1秒钟执行一次判断操作
-+ } else {
-+ next();
-+ }
- }
- }
- } else {
-diff --git a/src/vendor/ant-design-pro/store/modules/user.js b/src/vendor/ant-design-pro/store/modules/user.js
-index 4f185e3..505ce1c 100644
---- a/src/vendor/ant-design-pro/store/modules/user.js
-+++ b/src/vendor/ant-design-pro/store/modules/user.js
-@@ -4,7 +4,7 @@
-
- import storage from 'store';
- import cookie from 'js-cookie';
--import { login, logout, refreshTokenFn } from '@/api/login';
-+import { login, refreshTokenFn } from '@/api/login';
- import { ACCESS_TOKEN, REFRESH_TOKIN } from '@/vendor/ant-design-pro/store/mutation-types';
-
- const user = {
-@@ -130,26 +130,17 @@ const user = {
- cookie.remove('aops_token');
- cookie.remove('user_name');
- cookie.remove('refreshtoken');
--
-- return new Promise(resolve => {
-- logout(state.token)
-- .then(() => {
-- resolve();
-- })
-- .catch(() => {
-- resolve();
-- })
-- .finally(() => { });
-- });
- },
-
- // 刷新token
- RefreshToken({ commit, state }) {
-+ storage.set('is_tokenvalid', true, 7 * 24 * 60 * 60 * 1000);
- return new Promise((resolve, reject) => {
- const refreshToken = localStorage.getItem('Refresh-Token').substring(1, localStorage.getItem('Refresh-Token').length - 1)
- refreshTokenFn(refreshToken).then((res) => {
- if (res.code === '200') {
- const in20Minutes = 1 / 72;
-+ storage.remove('is_tokenvalid');
- storage.set(ACCESS_TOKEN, res.data.token, 7 * 24 * 60 * 60 * 1000);
- storage.set(REFRESH_TOKIN, res.data.refresh_token, 7 * 24 * 60 * 60 * 1000)
- cookie.set('aops_token', res.data.token, {
-diff --git a/src/vendor/ant-design-pro/utils/request.js b/src/vendor/ant-design-pro/utils/request.js
-index e6f49ce..4a2383f 100644
---- a/src/vendor/ant-design-pro/utils/request.js
-+++ b/src/vendor/ant-design-pro/utils/request.js
-@@ -96,7 +96,7 @@ request.interceptors.response.use(response => {
- // token过期后，调接口，刷新token
- store.dispatch('RefreshToken').then(() => {
- // 再发请求
-- return request(response.config)
-+ return request(response.config);
- }).catch((err) => {
- this.$message.error(err.response.message)
- })
-diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
-index 0026155..fae311a 100644
---- a/src/views/user/Login.vue
-+++ b/src/views/user/Login.vue
-@@ -30,6 +30,7 @@
- validateTrigger: 'blur'
- }
- ]"
-+ autocomplete
- >
-
-
-diff --git a/vue.config.js b/vue.config.js
-index 4c6dec4..e38f377 100644
---- a/vue.config.js
-+++ b/vue.config.js
-@@ -53,6 +53,9 @@ const vueConfig = {
- },
-
- chainWebpack: config => {
-+ config.plugins.delete('prefetch')
-+ config.plugins.delete('preload')
-+
- config.resolve.alias.set('@$', resolve('src'));
-
- const svgRule = config.module.rule('svg');
---
-Gitee
-
diff --git a/0002-fix-verify-the-host-name-field-issue.patch b/0002-fix-verify-the-host-name-field-issue.patch
deleted file mode 100644
index 5586c17..0000000
--- a/0002-fix-verify-the-host-name-field-issue.patch
+++ /dev/null
@@ -1,567 +0,0 @@
-From 4ab8ff449fd0ae87de58a64509f1218eaf0a1efd Mon Sep 17 00:00:00 2001
-From: wkl505997900 <505997900@qq.com>
-Date: Mon, 24 Apr 2023 16:11:22 +0800
-Subject: [PATCH] Verify the host name field before and after adding a host
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- .../ant-design-pro/layouts/UserLayout.vue | 3 +-
- src/views/assests/HostEdition.vue | 80 ++++++++++---------
- src/views/assests/HostManagement.vue | 24 +++---
- src/views/assests/components/EditableCell.vue | 48 ++++++++---
- src/views/assests/components/addMoreHost.vue | 54 ++++++++++---
- src/views/leaks/components/UploadFile.vue | 4 +-
- src/views/user/Login.vue | 2 +-
- src/views/user/Register.vue | 6 +-
- 8 files changed, 145 insertions(+), 76 deletions(-)
-
-diff --git a/src/vendor/ant-design-pro/layouts/UserLayout.vue b/src/vendor/ant-design-pro/layouts/UserLayout.vue
-index 72dc176..b054097 100644
---- a/src/vendor/ant-design-pro/layouts/UserLayout.vue
-+++ b/src/vendor/ant-design-pro/layouts/UserLayout.vue
-@@ -158,7 +158,8 @@ export default {
- }
-
- .footer {
-- width: 100%;
-+ position: absolute;
-+ width: 98%;
- bottom: 0;
- padding: 0 16px;
- margin: 155px 0 24px;
-diff --git a/src/views/assests/HostEdition.vue b/src/views/assests/HostEdition.vue
-index fac76fc..a945a68 100644
---- a/src/views/assests/HostEdition.vue
-+++ b/src/views/assests/HostEdition.vue
-@@ -12,10 +12,10 @@
- :maxLength="50"
- v-decorator="[
- 'host_name',
-- {rules: [{ required: true, message: '请输入主机名称'}, {validator: checkNameInput}]}
-+ {rules: [{ required: true, message: '请输入主机名称'}, {validator: checkNameInput, validateTrigger: 'blur'}]},
- ]"
- placeholder="请输入主机名称,50个字符以内">
--
-+
-
-
-
-@@ -64,6 +64,7 @@
-
-
-+ :placeholder="pageType === 'create' ? '请设置主机登录密码' : '请输入主机登陆密码, 若未修改主机用户名或端口可以为空'">
-
--
--
-
- 取消
- state.host.hostInfo
- })
-@@ -200,6 +193,16 @@ export default {
- }
- },
- methods: {
-+ handleUserChange(value) {
-+ if (this.pageType === 'edit') {
-+ value.target.value === this.basicHostInfo.ssh_user ? this.UserRequired = false : this.UserRequired = true
-+ }
-+ },
-+ handlePortChange(value) {
-+ if (this.pageType === 'edit') {
-+ value === this.basicHostInfo.ssh_port ? this.PortRequired = false : this.PortRequired = true
-+ }
-+ },
- // 获取主机组列表数据
- getHostGroupList() {
- const _this = this;
-@@ -240,18 +243,23 @@ export default {
- }
- }
- }
-- editHost(tableParams, this.hostId)
-- .then(function (res) {
-- _this.$message.success(res.message);
-- store.dispatch('resetHostInfo');
-- router.push('/assests/hosts-management');
-- })
-- .catch(function (err) {
-- _this.$message.error(err.response.message);
-- })
-- .finally(function () {
-- _this.submitLoading = false;
-- });
-+ if (JSON.stringify(tableParams) === '{}') {
-+ this.$message.info('未存在修改数据!')
-+ this.submitLoading = false;
-+ } else {
-+ editHost(tableParams, this.hostId)
-+ .then(function (res) {
-+ _this.$message.success(res.message);
-+ store.dispatch('resetHostInfo');
-+ router.push('/assests/hosts-management');
-+ })
-+ .catch(function (err) {
-+ _this.$message.error(err.response.message);
-+ })
-+ .finally(function () {
-+ _this.submitLoading = false;
-+ });
-+ }
- } else {
- addHost(values)
- .then(function (res) {
-@@ -278,15 +286,15 @@ export default {
- router.go(-1);
- },
- checkNameInput(rule, value, cb) {
-- if (/[^0-9a-z_.]/.test(value)) {
-+ if (!/^\S.*\S$/.test(value)) {
- /* eslint-disable */
-- cb('只能输入数字、小写字母和英文.和_');
-+ cb('首尾不允许空格');
- /* eslint-enable */
- return;
- }
-- if (/[_]$/.test(value)) {
-+ if (!/^(?!\s*$).+/.test(value)) {
- /* eslint-disable */
-- cb('结尾不能是英文下划线');
-+ cb('不允许全空格');
- /* eslint-enable */
- return;
- }
-diff --git a/src/views/assests/HostManagement.vue b/src/views/assests/HostManagement.vue
-index 81c25eb..080c145 100644
---- a/src/views/assests/HostManagement.vue
-+++ b/src/views/assests/HostManagement.vue
-@@ -58,7 +58,7 @@
- slot="hostName"
- slot-scope="hostName, record">{{ hostName }}
- {{ isMana ? '是' : '否' }}
-- {{ statusMap(status) }}
-+ {{ hostStatusMap[status] }}
- {{ scene ? ( scene === 'normal' ? '通用' : scene ) : '暂无' }}
-
-
-+
-+
-
-
-
-- ******
-+ {{ countStar(form[formkey]) }}
- {{ value || ' ' }}
-
-
-@@ -58,15 +60,15 @@ export default {
- }
- };
- const checkNameInput = (rule, value, callback) => {
-- if (/[^0-9a-z_.]/.test(value)) {
-+ if (!/^\S.*\S$/.test(value)) {
- /* eslint-disable */
-- callback(new Error('只能输入数字、小写字母和英文.和_'));
-+ callback(new Error('首尾不允许空格'));
- /* eslint-enable */
- return;
- }
-- if (/[_]$/.test(value)) {
-+ if (!/^(?!\s*$).+/.test(value)) {
- /* eslint-disable */
-- callback(new Error('结尾不能是英文下划线'));
-+ callback(new Error('不允许全空格'));
- /* eslint-enable */
- return;
- }
-@@ -102,6 +104,13 @@ export default {
- };
- },
- methods: {
-+ countStar(num) {
-+ let str = ''
-+ for (let i = 0; i < num.length; i++) {
-+ str += '*'
-+ }
-+ return str
-+ },
- handleChange(e) {
- const value = e.target.value;
- this.value = value;
-@@ -113,22 +122,39 @@ export default {
- check() {
- this.$refs.ruleForm.validate(valid => {
- if (valid) {
-- this.editable = false;
-- this.$emit('change', this.value);
-+ if (this.editable) {
-+ // 判断当前状态，只对处于修改状态的组件执行此操作，节省性能
-+ this.editable = false;
-+ this.$emit('allowSub')
-+ this.$emit('change', this.value);
-+ }
- } else {
- return false;
- }
- });
- },
- edit() {
-+ this.$emit('unSubmit')
- this.editable = true;
-+ },
-+ handleClickOutside(event) {
-+ // 鼠标监听事件
-+ const target = event.target
-+ const wrapper = this.$refs.childitem
-+ // 判断点击的区域是否是当前组件的区域
-+ if (!wrapper.contains(target)) {
-+ // 当点击组件之外时 执行校验操作
-+ this.check()
-+ }
- }
- },
- created() {
- },
-+ beforeDestroy() {
-+ document.removeEventListener('mouseup', this.handleClickOutside)
-+ },
- mounted() {
-- // this.edit()
-- // this.check()
-+ document.addEventListener('mouseup', this.handleClickOutside)
- },
- computed: {
- form () {
-diff --git a/src/views/assests/components/addMoreHost.vue b/src/views/assests/components/addMoreHost.vue
-index 830bf03..4cd9a65 100644
---- a/src/views/assests/components/addMoreHost.vue
-+++ b/src/views/assests/components/addMoreHost.vue
-@@ -32,7 +32,8 @@
- ref="host_ip"
- formkey="host_ip"
- :text="String(text)"
-- @uploadstatus="uploadstatus($event)"
-+ @unSubmit="unSubmit()"
-+ @allowSub="allowSub()"
- @change="onCellChange(record.key, 'host_ip', $event)" />
-
-
-@@ -40,7 +41,8 @@
- ref="ssh_port"
- formkey="ssh_port"
- :text="String(text)"
-- @uploadstatus="uploadstatus($event)"
-+ @unSubmit="unSubmit()"
-+ @allowSub="allowSub()"
- @change="onCellChange(record.key, 'ssh_port', $event)" />
-
-
-@@ -48,7 +50,8 @@
- ref="ssh_user"
- formkey="ssh_user"
- :text="String(text)"
-- @uploadstatus="uploadstatus($event)"
-+ @unSubmit="unSubmit()"
-+ @allowSub="allowSub()"
- @change="onCellChange(record.key, 'ssh_user', $event)" />
-
-
-@@ -56,7 +59,8 @@
- ref="password"
- formkey="password"
- :text="String(text)"
-- @uploadstatus="uploadstatus($event)"
-+ @unSubmit="unSubmit()"
-+ @allowSub="allowSub()"
- @change="onCellChange(record.key, 'password', $event)" />
-
-
-@@ -64,7 +68,8 @@
- ref="host_name"
- formkey="host_name"
- :text="String(text)"
-- @uploadstatus="uploadstatus($event)"
-+ @unSubmit="unSubmit()"
-+ @allowSub="allowSub()"
- @change="onCellChange(record.key, 'host_name', $event)" />
-
-
-@@ -72,7 +77,8 @@
- ref="host_group_name"
- formkey="host_group_name"
- :text="String(text)"
-- @uploadstatus="uploadstatus($event)"
-+ @unSubmit="unSubmit()"
-+ @allowSub="allowSub()"
- @change="onCellChange(record.key, 'host_group_name', $event)" />
-
-
-@@ -80,7 +86,8 @@
- ref="management"
- formkey="management"
- :text="String(text)"
-- @uploadstatus="uploadstatus($event)"
-+ @unSubmit="unSubmit()"
-+ @allowSub="allowSub()"
- @change="onCellChange(record.key, 'management', $event)" />
-
-
-@@ -108,7 +115,7 @@
-
-
-@@ -133,6 +140,7 @@ export default {
- props: {},
- data() {
- return {
-+ editNum: 0,
- dataAllow: true,
- count: '',
- rowKey: 'ip',
-@@ -156,6 +164,13 @@ export default {
- };
- },
- computed: {
-+ isSubDisable() {
-+ if (this.editNum > 0) {
-+ return true
-+ } else {
-+ return false
-+ }
-+ },
- columns() {
- return [
- {
-@@ -224,7 +239,12 @@ export default {
- }
- },
- methods: {
-- uploadstatus(value) {},
-+ unSubmit() {
-+ this.editNum++;
-+ },
-+ allowSub() {
-+ this.editNum--;
-+ },
- onCellChange(key, dataIndex, value) {
- const dataSource = [...this.tableData];
- const target = dataSource.find((item) => item.key === key);
-@@ -413,6 +433,22 @@ export default {
- })
- _this.$message.error('全部主机添加失败!')
- } else {
-+ if (err.response.code === '1000') {
-+ const errorList = [];
-+ const errorData = {};
-+ err.response.data.forEach((item) => {
-+ errorList.push(item.host_ip);
-+ errorData[item.host_ip] = item.reason
-+ });
-+ _this.tableData.forEach((item) => {
-+ if (errorList.includes(item.host_ip)) {
-+ item.result = '添加失败'
-+ }
-+ if (Object.keys(errorData).includes(item.host_ip)) {
-+ item.reason = errorData[item.host_ip]
-+ }
-+ })
-+ }
- _this.$message.error(err.response.message || err.response.data.detail);
- }
- })
-diff --git a/src/views/leaks/components/UploadFile.vue b/src/views/leaks/components/UploadFile.vue
-index c4e072a..fc2c8a6 100644
---- a/src/views/leaks/components/UploadFile.vue
-+++ b/src/views/leaks/components/UploadFile.vue
-@@ -17,7 +17,7 @@
-
-
--
-+
-
- 不受影响
-
-@@ -43,7 +43,7 @@ export default {
- props: {},
- data() {
- return {
-- value: 1,
-+ value: 2,
- fileDataList: [],
- visible: false,
- uploading: false
-diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
-index fae311a..a956fe0 100644
---- a/src/views/user/Login.vue
-+++ b/src/views/user/Login.vue
-@@ -162,7 +162,7 @@ export default {
- }
-
- .jump_registar {
-- margin-left: 245px;
-+ text-align: right;
- margin-top: -20px;
- .spin_top_jump {
- color:#005980;
-diff --git a/src/views/user/Register.vue b/src/views/user/Register.vue
-index 1b2c170..08205b4 100644
---- a/src/views/user/Register.vue
-+++ b/src/views/user/Register.vue
-@@ -63,7 +63,7 @@
-
--
-+
-
-
-
-@@ -233,7 +233,7 @@ export default {
- }
-
- .jump_login {
-- margin-left: 245px;
-+ text-align: right;
- margin-top: -20px;
- .spin_top_jump {
- color:#005980;
---
-Gitee
-
diff --git a/0003-add-token-exit-interface-and-optimize-Gitee-authorization.patch b/0003-add-token-exit-interface-and-optimize-Gitee-authorization.patch
deleted file mode 100644
index ec17b36..0000000
--- a/0003-add-token-exit-interface-and-optimize-Gitee-authorization.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From f4d44578c8ba9a0b54f37da416469eb73b68f7a6 Mon Sep 17 00:00:00 2001
-From: wkl505997900 <505997900@qq.com>
-Date: Fri, 28 Apr 2023 10:22:34 +0800
-Subject: [PATCH] add token exit interface and optimize Gitee authorization
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- src/api/login.js | 7 ++---
- .../ant-design-pro/store/modules/user.js | 28 +++++++++++++------
- src/views/leaks/HostLeakDetail.vue | 5 ++++
- src/views/leaks/components/CvesTable.vue | 1 -
- src/views/user/Account.vue | 9 +++++-
- 5 files changed, 35 insertions(+), 15 deletions(-)
-
-diff --git a/src/api/login.js b/src/api/login.js
-index 4bb4a2c..57d72f0 100644
---- a/src/api/login.js
-+++ b/src/api/login.js
-@@ -7,7 +7,7 @@ const userApi = {
- LoginInGitee: '/manage/account/authredirecturl',
- register: '/manage/account/add',
- Login: '/manage/account/login',
-- Logout: '/manage/logout',
-+ Logout: '/manage/account/logout',
- changePassword: '/manage/account/change',
- certificateKey: '/manage/account/certificate'
- };
-@@ -101,10 +101,9 @@ export function certificateKey(parameter) {
- });
- }
-
--export function logout(parameter) {
-+export function logout() {
- return request({
- url: userApi.Logout,
-- method: 'post',
-- data: parameter
-+ method: 'post'
- });
- }
-diff --git a/src/vendor/ant-design-pro/store/modules/user.js b/src/vendor/ant-design-pro/store/modules/user.js
-index 505ce1c..908d1ef 100644
---- a/src/vendor/ant-design-pro/store/modules/user.js
-+++ b/src/vendor/ant-design-pro/store/modules/user.js
-@@ -4,7 +4,7 @@
-
- import storage from 'store';
- import cookie from 'js-cookie';
--import { login, refreshTokenFn } from '@/api/login';
-+import { login, logout, refreshTokenFn } from '@/api/login';
- import { ACCESS_TOKEN, REFRESH_TOKIN } from '@/vendor/ant-design-pro/store/mutation-types';
-
- const user = {
-@@ -122,14 +122,24 @@ const user = {
-
- // 登出
- Logout({ commit, state }) {
-- commit('SET_TOKEN', '');
-- commit('SET_ROLES', []);
-- commit('SET_RETOKEN', []);
-- storage.remove(ACCESS_TOKEN);
-- storage.remove(REFRESH_TOKIN);
-- cookie.remove('aops_token');
-- cookie.remove('user_name');
-- cookie.remove('refreshtoken');
-+ return new Promise(resolve => {
-+ logout()
-+ .then(() => {
-+ commit('SET_TOKEN', '');
-+ commit('SET_ROLES', []);
-+ commit('SET_RETOKEN', '');
-+ storage.remove(ACCESS_TOKEN);
-+ storage.remove(REFRESH_TOKIN);
-+ cookie.remove('aops_token');
-+ cookie.remove('user_name');
-+ cookie.remove('refreshtoken');
-+ resolve();
-+ })
-+ .catch(() => {
-+ resolve();
-+ })
-+ .finally(() => { });
-+ });
- },
-
- // 刷新token
-diff --git a/src/views/leaks/HostLeakDetail.vue b/src/views/leaks/HostLeakDetail.vue
-index 334f559..b0accc2 100644
---- a/src/views/leaks/HostLeakDetail.vue
-+++ b/src/views/leaks/HostLeakDetail.vue
-@@ -45,6 +45,7 @@
-
- CVEs
- {
-+ _this.$refs.cve_table.getCvesAll();
-+ }, 500);
- _this.getScanStatue();
- })
- .catch(function (err) {
-diff --git a/src/views/leaks/components/CvesTable.vue b/src/views/leaks/components/CvesTable.vue
-index 1431cb6..35823d3 100644
---- a/src/views/leaks/components/CvesTable.vue
-+++ b/src/views/leaks/components/CvesTable.vue
-@@ -514,7 +514,6 @@ export default {
- mounted() {
- setTimeout(() => {
- this.getCvesAll();
-- console.log(11111)
- }, 500);
- this.getCves();
- }
-diff --git a/src/views/user/Account.vue b/src/views/user/Account.vue
-index a1a2ea7..039bfbf 100644
---- a/src/views/user/Account.vue
-+++ b/src/views/user/Account.vue
-@@ -82,7 +82,14 @@ export default {
- },
- created() {
- this.code = (window.location.search).split('=')[1];
-- this.getConnection(this.code)
-+ if (this.code === 'access_denied&error_description') {
-+ // 拒绝授权，跳转登陆页
-+ this.$message.info('拒绝授权!')
-+ this.$router.push('/user/login')
-+ } else {
-+ // 同意授权，跳转首页
-+ this.getConnection(this.code)
-+ }
- },
- methods: {
- ...mapActions(['LoginInGitee']),
---
-Gitee
-
diff --git a/aops-hermes-v1.2.0.tar.gz b/aops-hermes-v1.2.0.tar.gz
deleted file mode 100644
index 36bef95..0000000
Binary files a/aops-hermes-v1.2.0.tar.gz and /dev/null differ
diff --git a/aops-hermes-v1.2.1.tar.gz b/aops-hermes-v1.2.1.tar.gz
new file mode 100644
index 0000000..c5c63e4
Binary files /dev/null and b/aops-hermes-v1.2.1.tar.gz differ
diff --git a/aops-hermes.spec b/aops-hermes.spec
index 6d37b74..aa88a56 100644
--- a/aops-hermes.spec
+++ b/aops-hermes.spec
@@ -1,16 +1,14 @@
%define debug_package %{nil}
Name: aops-hermes
-Version: v1.2.0
+Version: v1.2.1
Release: 2
Summary: Web for an intelligent diagnose frame
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
Source0: %{name}-%{version}.tar.gz
Source1: node-modules.tar.gz
-Patch0001: 0001-optimize-page-loading-and-routing.patch
-Patch0002: 0002-fix-verify-the-host-name-field-issue.patch
-Patch0003: 0003-add-token-exit-interface-and-optimize-Gitee-authorization.patch
+Patch0001: 0001-Resolve-issues-such-as-abnormal-display.patch
BuildRequires: nodejs node-gyp nodejs-yarn
@@ -46,6 +44,15 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
%changelog
+* Thu Jun 1 2023 wangkunlong<505997900@qq.com> - v1.2.1-2
+- Resolve the issue of abnormal page display when switching host details
+- Resolve the issue of host details and hot patch support column filtering failure
+- Resolve the issue of incorrect filtering conditions in the "Rollback Status" column of the CVE list for task details
+- Resolve the issue of incorrect display of the latest status of the host on the task details pag
+
+* Tue May 23 2023 wangkunlong<505997900@qq.com> - v1.2.1-1
+- Vulnerability Management Part Code Hot Update Function Update
+
* Fri Apr 28 2023 wangkunlong<505997900@qq.com> - v1.2.0-2
- Optimize page loading speed
- Optimize routing