From 286e9894c0c57ab7c15a4189daf5e2acc5f44e40 Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Tue, 13 Sep 2022 10:27:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?perf:=20=E5=B1=8F=E8=94=BD--secure=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E7=9B=AE=E5=89=8Dredis-cli=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=BA6.0=EF=BC=8C=E6=9A=82=E6=97=B6=E7=94=A8=E4=B8=8D?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/applications/DatabaseApp/const.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/applications/DatabaseApp/const.js b/src/views/applications/DatabaseApp/const.js index aa723aa25..f9dbd99b0 100644 --- a/src/views/applications/DatabaseApp/const.js +++ b/src/views/applications/DatabaseApp/const.js @@ -2,14 +2,14 @@ import { ORACLE, MONGODB, REDIS } from '../const' export function getDatabaseTypeFieldsMap(type) { const baseParams = ['host', 'port', 'database'] - const tlsParams = ['use_ssl', 'allow_invalid_cert', 'ca_cert'] + const tlsParams = ['use_ssl', 'ca_cert'] switch (type) { case ORACLE: return baseParams.concat(['version']) case REDIS: return baseParams.concat(tlsParams.concat(['client_cert', 'cert_key'])) case MONGODB: - return baseParams.concat(tlsParams.concat(['cert_key'])) + return baseParams.concat(tlsParams.concat(['cert_key', 'allow_invalid_cert'])) default: return baseParams } From f82257edb8787c341bb1b08b00c6316cee6121f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Tue, 13 Sep 2022 14:54:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E5=90=8E=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=82=80=E8=AF=B7=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?404=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/users/User/components/InviteUsersDialog.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/users/User/components/InviteUsersDialog.vue b/src/views/users/User/components/InviteUsersDialog.vue index 7225e224d..42a2bfd6b 100644 --- a/src/views/users/User/components/InviteUsersDialog.vue +++ b/src/views/users/User/components/InviteUsersDialog.vue @@ -42,7 +42,8 @@ export default { InviteLoading: false, formConfig: { url: '/api/v1/users/users/invite/', - method: 'post', + getUrl: () => '/api/v1/users/users/invite/', + submitMethod: () => 'post', hasReset: false, hasSaveContinue: false, createSuccessMsg: this.$t('users.InviteSuccess'), From f51924bf1da3af70d2b99486bda1078ef45c782f Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 13 Sep 2022 11:36:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=8A=A0=E5=AF=86=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89key=E5=B0=B1=E4=B8=8D=E5=8A=A0=E5=AF=86=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/crypto.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/utils/crypto.js b/src/utils/crypto.js index 74d3f474f..a267f621b 100644 --- a/src/utils/crypto.js +++ b/src/utils/crypto.js @@ -37,10 +37,13 @@ export function encryptPassword(password) { if (!password) { return '' } + let rsaPublicKeyText = getCookie('jms_public_key') + if (!rsaPublicKeyText) { + return password + } const aesKey = (Math.random() + 1).toString(36).substring(2) // public key 是 base64 存储的 - const rsaPublicKeyText = getCookie('jms_public_key') - .replaceAll('"', '') + rsaPublicKeyText = rsaPublicKeyText.replaceAll('"', '') const rsaPublicKey = atob(rsaPublicKeyText) const keyCipher = rsaEncrypt(aesKey, rsaPublicKey) const passwordCipher = aesEncrypt(password, aesKey) From 24931a9f5a6ed96ea8a0b5a5e478af4766715822 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Fri, 9 Sep 2022 15:38:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?perf:=20=E5=B7=A5=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9B=B8=E5=85=B3=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en.json | 4 ++++ src/i18n/langs/ja.json | 4 ++++ src/i18n/langs/zh.json | 4 ++++ src/views/tickets/BaseTicketList.vue | 26 +++++++++++++++++++++++++- 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index e029aa0b2..6dbfb08a8 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -1150,6 +1150,10 @@ "reply": "Reply", "status": "Status", "title": "Title", + "RelevantApp": "App", + "RelevantAsset": "Asset", + "RelevantCommand": "Command", + "RelevantSystemUser": "System user", "type": "Type", "user": "User", "Status": "Status", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index cb1a25815..34ef1fb39 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -1182,6 +1182,10 @@ "reply": "返信", "status": "ステータス", "title": "タイトル", + "RelevantApp": "するアプリケーション", + "RelevantAsset": "する資産", + "RelevantCommand": "するコマンド", + "RelevantSystemUser": "するシステムユーザー", "action": "アクション", "type": "タイプ", "user": "ユーザー", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index ed385b041..9d0f6bc20 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -1183,6 +1183,10 @@ "reply": "回复", "status": "状态", "title": "标题", + "RelevantApp": "应用", + "RelevantAsset": "资产", + "RelevantCommand": "命令", + "RelevantSystemUser": "系统用户", "action": "动作", "type": "类型", "user": "用户", diff --git a/src/views/tickets/BaseTicketList.vue b/src/views/tickets/BaseTicketList.vue index 7770f619f..cac30f824 100644 --- a/src/views/tickets/BaseTicketList.vue +++ b/src/views/tickets/BaseTicketList.vue @@ -141,7 +141,7 @@ export default { valueLabel: this.$t('tickets.Pending') } }, - exclude: ['state'], + exclude: ['state', 'id', 'title'], options: [ { value: 'state', @@ -162,6 +162,30 @@ export default { label: this.$t('tickets.Rejected') } ] + }, + { + value: 'id', + label: 'ID' + }, + { + value: 'title', + label: this.$t('tickets.title') + }, + { + value: 'relevant_app', + label: this.$t('tickets.RelevantApp') + }, + { + value: 'relevant_asset', + label: this.$t('tickets.RelevantAsset') + }, + { + value: 'relevant_system_user', + label: this.$t('tickets.RelevantCommand') + }, + { + value: 'relevant_command', + label: this.$t('tickets.RelevantSystemUser') } ] },