diff --git a/package.json b/package.json index 0b43c319..434db7e3 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,8 @@ "vue-meta": "2.4.0", "vue-router": "3.4.9", "vuedraggable": "2.24.3", - "vuex": "3.6.0" + "vuex": "3.6.0", + "webstomp-client": "^1.2.6" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.6", diff --git a/src/App.vue b/src/App.vue index 97626af5..e8b1f8b7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,6 +9,7 @@ import ThemePicker from "@/components/ThemePicker"; import { mapActions } from 'vuex' import { get } from '@/utils/config' +// import AlertNotification from "@/views/warning/AlertNotification.vue"; export default { name: "App", diff --git a/src/api/system/log.js b/src/api/system/log.js index 80d6e06a..37abfb25 100644 --- a/src/api/system/log.js +++ b/src/api/system/log.js @@ -30,7 +30,7 @@ export function getSysLogs(data) { //备份系统日志列表 export function downloadSysLogs(data) { return request({ - url: '/sys/sysLog/downloadSysLogs', + url: '/system/sys/sysLog/downloadSysLogs', method: 'get', params: data, responseType: 'blob' @@ -92,6 +92,12 @@ export function getLogSize(data) { }) } +export function handleNoWarningLog(data) { + return request({ + url: '/system/sys/sysLog/logWarn', + method: 'get' + }) +} diff --git a/src/layout/index.vue b/src/layout/index.vue index 26f9ebf7..e3c246a1 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -25,10 +25,6 @@ -
确 定 @@ -46,6 +42,8 @@ import { mapState } from 'vuex' import variables from '@/assets/styles/variables.scss' import { validateNewPassword } from '@/utils/validate' import { updateUserPwd, checkPasswordStatus } from '@/api/system/user' +import { handleNoWarningLog } from '@/api/system/log' +import {MessageBox} from "element-ui"; export default { name: 'Layout', @@ -78,7 +76,12 @@ export default { { required: true, message: '确认密码不能为空', trigger: 'blur' }, { required: true, validator: equalToPassword, trigger: 'blur' } ] - } + }, + socket: null, + wsUrl: JSON.parse(localStorage.getItem('systemConfig')).webSocketurl,//'ws://localhost:18082/ws', // WebSocket 端点 + isConnected: false, // 连接状态 + reconnectInterval: 5000 // 自动重连时间间隔（毫秒 + } }, components: { @@ -97,7 +100,8 @@ export default { sidebar: state => state.app.sidebar, device: state => state.app.device, needTagsView: state => state.settings.tagsView, - fixedHeader: state => state.settings.fixedHeader + fixedHeader: state => state.settings.fixedHeader, + roles: state => state.user.roles, }), classObj() { return { @@ -113,6 +117,10 @@ export default { }, created() { this.checkPasswordStatus() + if (this.roles.includes("audit") || this.roles.includes("systemAdmin")) { + this.connectWebSocket(); + } + this.handleNoWarningLog() }, methods: { checkPasswordStatus() { @@ -123,6 +131,13 @@ export default { } }) }, + + handleNoWarningLog(){ + handleNoWarningLog().then(response => { + + }) + }, + handleClickOutside() { this.$store.dispatch('app/closeSideBar', { withoutAnimation: false }) }, @@ -140,7 +155,112 @@ export default { this.$store.dispatch('LogOut').then(() => { location.href = '/index'; }) + }, + + // 连接 WebSocket + connectWebSocket() { + if (this.socket) { + console.log("WebSocket 已连接"); + return; + } + console.log("WebSocket URL:{}",this.wsUrl) + this.socket = new WebSocket(this.wsUrl); + + // 监听 WebSocket 连接成功事件 + this.socket.onopen = () => { + console.log("WebSocket 连接成功"); + this.isConnected = true; + }; + + // 接收消息 + this.socket.onmessage = (event) => { + console.log("收到消息:", event.data); + const warning = JSON.parse(event.data); + this.handleWarning(warning); + }; + + // 监听连接关闭事件 + this.socket.onclose = () => { + console.log("WebSocket 连接已关闭"); + this.isConnected = false; + this.socket = null; + // 自动重连 + this.reconnectWebSocket(); + }; + + // 监听连接错误事件 + this.socket.onerror = (error) => { + console.error("WebSocket 错误:", error); + this.isConnected = false; + this.socket = null; + // 自动重连 + this.reconnectWebSocket(); + }; + }, + + // 自动重连 WebSocket + reconnectWebSocket() { + console.log("尝试重新连接 WebSocket..."); + setTimeout(() => { + this.connectWebSocket(); + }, this.reconnectInterval); + }, + + // 处理告警信息并显示弹窗 + handleWarning(warning) { + console.log(warning) + let warningContent = ''; + + if (warning.operaUserName) { + warningContent += `

操作人：${warning.operaUserName}

`; + } + + if (warning.warningEvent) { + warningContent += `

事件：${warning.warningEvent}

`; + } + + if (warning.warningIp) { + warningContent += `

IP：${warning.warningIp}

`; + } + + if (warning.operaTime) { + warningContent += `

时间：${warning.operaTime}

`; + } + + if (warningContent) { + MessageBox.alert( + warningContent, + '告警通知', + { + dangerouslyUseHTMLString: true, + confirmButtonText: '确认', + customClass: 'custom-message-box', + callback: () => { + this.notifyBackend(warning.warningId); + } + } + ); + } + + }, + + // 通知后端告警已处理 + notifyBackend(warningId) { + if (this.socket && this.socket.readyState === WebSocket.OPEN) { + const message = { + warningId, + }; + this.socket.send(warningId); + console.log(`已通知后端处理告警: ${warningId}`); + } } + }, + beforeDestroy() { + // 页面销毁时关闭 WebSocket 连接 + if (this.socket) { + this.socket.close(); + } + } } diff --git a/src/utils/request.js b/src/utils/request.js index f9b15ada..e9204891 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,9 +6,8 @@ import errorCode from '@/utils/errorCode' import { tansParams, blobValidate } from '@/utils/bonus' import cache from '@/plugins/cache' import { saveAs } from 'file-saver' -import { encryptCBC, decryptCBC } from '@/utils/aescbc' import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' -const systemConfig = { +const systemConfig = JSON.parse(localStorage.getItem('systemConfig')) || { requestConfig: { encryptRequest: false, checkIntegrity: false, encryptResponse: false } }; @@ -66,6 +65,8 @@ service.interceptors.request.use(config => { if (contentType.includes('application/json') && typeof data !== 'undefined') { // 加密数据 if (systemConfig.requestConfig.encryptRequest && encryptRequest) { + console.log(data); + console.log(hashWithSM3AndSalt(data)); config.data = encryptWithSM4(data+"|"+hashWithSM3AndSalt(data)) } } diff --git a/src/utils/sm.js b/src/utils/sm.js index 9d8c15c4..8ed7008b 100644 --- a/src/utils/sm.js +++ b/src/utils/sm.js @@ -36,8 +36,7 @@ export function decryptWithSM2(encryptedText) { * @returns {string} 加密后的密文（Hex 编码格式） */ export function encryptWithSM4(plainText) { - const salt =SM_CONFIG.SM4_SALT - return sm4.encrypt(plainText, SM_CONFIG.SM4_KEY,{ mode: 'cbc', padding: 'pkcs#5',iv:salt})+salt; + return sm4.encrypt(plainText, SM_CONFIG.SM4_KEY,{ mode: 'cbc', padding: 'pkcs#5',iv:SM_CONFIG.SM4_SALT}); } /** @@ -46,9 +45,6 @@ export function encryptWithSM4(plainText) { * @returns {string} 解密后的明文 */ export function decryptWithSM4(cipherText){ - const length = cipherText.length; - const salt = length > 32 ? cipherText.substring(length - 32) : cipherText; - const originalHex = length > 32 ? cipherText.substring(0, length - 32) : ''; - return SM4.decrypt(originalHex, SM_CONFIG.SM4_KEY,{ mode: 'cbc', padding: 'pkcs#5' ,iv:salt}); + return SM4.decrypt(cipherText, SM_CONFIG.SM4_KEY,{ mode: 'cbc', padding: 'pkcs#5' ,iv:SM_CONFIG.SM4_SALT}); } diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index 3ab81fc2..19a6d9e4 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -151,16 +151,16 @@ - + - + - + { if (valid) { + if (this.form.configKey === "sys.visit.tokentime" && (this.form.configValue <=0 || this.form.configValue > 30 )) + { + this.$modal.msgError("系统访问token有效期必须在0-30分钟之间"); + return; + } if (this.form.configId != undefined) { updateConfig(this.form).then(response => { this.$modal.msgSuccess("修改成功"); diff --git a/src/views/system/log/abnormalLog/index.vue b/src/views/system/log/abnormalLog/index.vue index 0756171e..518fd7c2 100644 --- a/src/views/system/log/abnormalLog/index.vue +++ b/src/views/system/log/abnormalLog/index.vue @@ -39,9 +39,9 @@ 重置 - +
重置 - + 日志类型 操作类型 + 操作人 查询 diff --git a/src/views/system/log/logCapacity/index.vue b/src/views/system/log/logCapacity/index.vue index 5829b1b9..36df825f 100644 --- a/src/views/system/log/logCapacity/index.vue +++ b/src/views/system/log/logCapacity/index.vue @@ -12,7 +12,7 @@ clearable style="width: 240px" /> - MB + GB diff --git a/src/views/system/log/systemLog/index.vue b/src/views/system/log/systemLog/index.vue index caccb27e..b99a7783 100644 --- a/src/views/system/log/systemLog/index.vue +++ b/src/views/system/log/systemLog/index.vue @@ -42,9 +42,9 @@ 重置 - + - + @@ -123,7 +123,7 @@ -