From bf8d485a6274f2f2c606f3266f008d465385c16a Mon Sep 17 00:00:00 2001 From: jack ning Date: Sun, 3 Aug 2025 19:38:57 +0800 Subject: [PATCH] update --- jmeter/validate_fix.py | 41 ------------ jmeter/zh_cn/01_login.jmx | 62 ++++--------------- .../core/rbac/auth/AuthController.java | 15 +---- 3 files changed, 12 insertions(+), 106 deletions(-) delete mode 100644 jmeter/validate_fix.py diff --git a/jmeter/validate_fix.py b/jmeter/validate_fix.py deleted file mode 100644 index 2e33f86a94..0000000000 --- a/jmeter/validate_fix.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python3 -import xml.etree.ElementTree as ET -import sys - -def validate_jmx(file_path): - try: - tree = ET.parse(file_path) - root = tree.getroot() - - # 检查TestPlan - test_plan = root.find('.//TestPlan') - if test_plan is None: - print("❌ 找不到TestPlan元素") - return False - - # 检查用户定义变量 - user_vars = test_plan.find('.//elementProp[@name="TestPlan.user_defined_variables"]') - if user_vars is None: - print("❌ 找不到用户定义变量配置") - return False - - # 检查是否有空的name属性 - empty_names = root.findall('.//elementProp[@name=""]') - if empty_names: - print(f"❌ 找到 {len(empty_names)} 个空的name属性") - return False - - print("✅ 文件验证通过") - return True - - except Exception as e: - print(f"❌ 验证失败: {e}") - return False - -if __name__ == "__main__": - if len(sys.argv) != 2: - print("用法: python validate_fix.py ") - sys.exit(1) - - success = validate_jmx(sys.argv[1]) - sys.exit(0 if success else 1) \ No newline at end of file diff --git a/jmeter/zh_cn/01_login.jmx b/jmeter/zh_cn/01_login.jmx index 1d6ec9f589..0998f5d4d2 100644 --- a/jmeter/zh_cn/01_login.jmx +++ b/jmeter/zh_cn/01_login.jmx @@ -3,9 +3,7 @@ 微语登录性能测试计划 - false true - false @@ -30,7 +28,6 @@ - @@ -40,13 +37,13 @@ ${port} ${protocol} UTF-8 - + - + Content-Type @@ -63,36 +60,7 @@ - - 100 - 10 - true - continue - - 1 - false - - - - - /kaptcha/api/v1/get - true - GET - true - false - - - - - - - captchaUid,captchaImage - $.data.captchaUid,$.data.captchaImage - - - - - + 500 30 @@ -125,15 +93,13 @@ POST true false - + false { "username": "${username}", "password": "${password}", - "captchaUid": "${captchaUid}", - "captchaCode": "1234", "platform": "BYTEDESK", "channel": "WEB", "device": "JMeter Test" @@ -174,14 +140,12 @@ POST true false - + false { "mobile": "${mobile}", - "captchaUid": "${captchaUid}", - "captchaCode": "1234", "platform": "BYTEDESK", "channel": "WEB", "type": "mobile" @@ -200,15 +164,13 @@ POST true false - + false { "mobile": "${mobile}", "code": "123456", - "captchaUid": "${captchaUid}", - "captchaCode": "1234", "platform": "BYTEDESK", "channel": "WEB", "device": "JMeter Test" @@ -242,14 +204,12 @@ POST true false - + false { "email": "${email}", - "captchaUid": "${captchaUid}", - "captchaCode": "1234", "platform": "BYTEDESK", "channel": "WEB", "type": "email" @@ -268,7 +228,7 @@ POST true false - + false @@ -308,7 +268,7 @@ POST true false - + false @@ -326,7 +286,7 @@ - + false saveConfig @@ -363,7 +323,7 @@ - + false saveConfig diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthController.java b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthController.java index c963d00e5a..0024768e57 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthController.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/auth/AuthController.java @@ -2,20 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:21:24 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-08-03 18:41:49 - * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk - * Please be aware of the BSL license restrictions before installing Bytedesk IM – - * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. - * Business Source License 1.1: https://github.com/Bytedesk/bytedesk/blob/main/LICENSE - * contact: 270580156@qq.com - * - * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. - */ -/* - * @Author: jackning 270580156@qq.com - * @Date: 2024-01-29 16:21:24 - * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-07-17 12:16:23 + * @LastEditTime: 2025-08-03 19:23:26 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.