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/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) 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 } 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') } ] }, 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'),