From b734ba7beed1adcba1b6631c0ecd8a59ef8ed97f Mon Sep 17 00:00:00 2001 From: jack ning Date: Sun, 3 Aug 2025 18:39:43 +0800 Subject: [PATCH] update --- deploy/docker/docker-compose-ollama.yaml | 4 +- deploy/docker/docker-compose.yaml | 4 +- jmeter/en/01_login.jmx | 4 +- jmeter/quick_test.jmx | 4 +- jmeter/zh_cn/01_login.jmx | 405 +++++++----------- jmeter/zh_cn/02_agent_multiple_visitors.jmx | 20 +- jmeter/zh_cn/03_agent_single_visitor.jmx | 14 +- .../zh_cn/04_workgroup_multiple_visitors.jmx | 24 +- jmeter/zh_cn/05_workgroup_single_visitor.jmx | 8 +- 9 files changed, 194 insertions(+), 293 deletions(-) diff --git a/deploy/docker/docker-compose-ollama.yaml b/deploy/docker/docker-compose-ollama.yaml index 7a92aa6c46..44e3b2d280 100644 --- a/deploy/docker/docker-compose-ollama.yaml +++ b/deploy/docker/docker-compose-ollama.yaml @@ -214,8 +214,8 @@ services: # BYTEDESK_TESTING_ACCOUNT_COUNT: 300 # BYTEDESK_TESTING_ACCOUNT_USERNAME: test # BYTEDESK_TESTING_ACCOUNT_PASSWORD: password - # BYTEDESK_TESTING_DISABLE_CAPTCHA: "true" - BYTEDESK_TESTING_DISABLE_IP_FILTER: "true" + BYTEDESK_TESTING_DISABLE_CAPTCHA: "false" + BYTEDESK_TESTING_DISABLE_IP_FILTER: "false" # Organization config BYTEDESK_ORGANIZATION_NAME: MyCompany BYTEDESK_ORGANIZATION_CODE: bytedesk diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml index b432c77f5a..75dd72d45a 100644 --- a/deploy/docker/docker-compose.yaml +++ b/deploy/docker/docker-compose.yaml @@ -195,8 +195,8 @@ services: # BYTEDESK_TESTING_ACCOUNT_COUNT: 300 # BYTEDESK_TESTING_ACCOUNT_USERNAME: test # BYTEDESK_TESTING_ACCOUNT_PASSWORD: password - # BYTEDESK_TESTING_DISABLE_CAPTCHA: "true" - BYTEDESK_TESTING_DISABLE_IP_FILTER: "true" + BYTEDESK_TESTING_DISABLE_CAPTCHA: "false" + BYTEDESK_TESTING_DISABLE_IP_FILTER: "false" # Organization config BYTEDESK_ORGANIZATION_NAME: MyCompany BYTEDESK_ORGANIZATION_CODE: bytedesk diff --git a/jmeter/en/01_login.jmx b/jmeter/en/01_login.jmx index 7c55872b30..72ca2d33b0 100644 --- a/jmeter/en/01_login.jmx +++ b/jmeter/en/01_login.jmx @@ -1,5 +1,5 @@ - + Bytedesk Login Performance Test Plan @@ -62,7 +62,7 @@ User-Agent - JMeter/5.5 + JMeter/5.6.3 diff --git a/jmeter/quick_test.jmx b/jmeter/quick_test.jmx index d1b76470a7..b580c63d80 100644 --- a/jmeter/quick_test.jmx +++ b/jmeter/quick_test.jmx @@ -1,5 +1,5 @@ - + Bytedesk快速登录功能验证测试 @@ -57,7 +57,7 @@ User-Agent - JMeter/5.5 + JMeter/5.6.3 diff --git a/jmeter/zh_cn/01_login.jmx b/jmeter/zh_cn/01_login.jmx index 1a41875c44..56c36a0721 100644 --- a/jmeter/zh_cn/01_login.jmx +++ b/jmeter/zh_cn/01_login.jmx @@ -1,8 +1,8 @@ - + - - Bytedesk登录性能测试计划 + + 微语登录性能测试计划 false true false @@ -33,24 +33,20 @@ - - - - - + + 5000 + 30000 ${host} ${port} ${protocol} UTF-8 - - 6 - 5000 - 30000 + + + + - - - + Content-Type @@ -62,75 +58,55 @@ User-Agent - JMeter/5.5 + JMeter/5.6.3 - - - continue - - false - 1 - - 100 - 10 - false - - + 100 + 10 true + continue + + 1 + false + - - + /kaptcha/api/v1/get + true + GET + true + false + - - - - - /kaptcha/api/v1/get - GET - true - false - true - false - - - - captchaUid,captchaImage $.data.captchaUid,$.data.captchaImage - - false - - - continue - - false - 1 - - 500 - 30 - true - 600 - 0 + 500 + 30 + 600 + 0 true + true + continue + + 1 + false + - , UTF-8 @@ -143,172 +119,140 @@ username,password,email,mobile - - - + /auth/v1/login + true + POST + true + false + - + false { - "username": "${username}", - "password": "${password}", - "captchaUid": "${captchaUid}", - "captchaCode": "1234", - "platform": "BYTEDESK", - "channel": "WEB", - "device": "JMeter Test" + "username": "${username}", + "password": "${password}", + "captchaUid": "${captchaUid}", + "captchaCode": "1234", + "platform": "BYTEDESK", + "channel": "WEB", + "device": "JMeter Test" } = true - + body - - - - - /auth/v1/login - POST - true - false - true - false - - - - accessToken,refreshToken $.data.accessToken,$.data.refreshToken - - false - - - continue - - false - 1 - - 200 - 20 - true - 300 - 0 + 200 + 20 + 300 + 0 true + true + continue + + 1 + false + - - - - - false - { - "mobile": "${mobile}", - "captchaUid": "${captchaUid}", - "captchaCode": "1234", - "platform": "BYTEDESK", - "channel": "WEB", - "type": "mobile" -} - = - true - - - - - - - - /auth/v1/send/mobile - POST true - false + POST true - false - - - + false + + + + false + { + "mobile": "${mobile}", + "captchaUid": "${captchaUid}", + "captchaCode": "1234", + "platform": "BYTEDESK", + "channel": "WEB", + "type": "mobile" +} + = + true + body + + + - - - - - - false - { - "mobile": "${mobile}", - "code": "123456", - "captchaUid": "${captchaUid}", - "captchaCode": "1234", - "platform": "BYTEDESK", - "channel": "WEB", - "device": "JMeter Test" -} - = - true - - - - - - - - /auth/v1/login/mobile - POST true - false + POST true - false - - - + false + + + + false + { + "mobile": "${mobile}", + "code": "123456", + "captchaUid": "${captchaUid}", + "captchaCode": "1234", + "platform": "BYTEDESK", + "channel": "WEB", + "device": "JMeter Test" +} + = + true + + + + - - - continue - - false - 1 - - 100 - 10 - true - 300 - 0 + 100 + 10 + 300 + 0 true + true + continue + + 1 + false + - - + /auth/v1/send/email + true + POST + true + false + false { - "email": "${email}", - "captchaUid": "${captchaUid}", - "captchaCode": "1234", - "platform": "BYTEDESK", - "channel": "WEB", - "type": "email" + "email": "${email}", + "captchaUid": "${captchaUid}", + "captchaCode": "1234", + "platform": "BYTEDESK", + "channel": "WEB", + "type": "email" } = true @@ -316,34 +260,24 @@ - - - - - /auth/v1/send/email - POST - true - false - true - false - - - - - - + /auth/v1/login/email + true + POST + true + false + false { - "email": "${email}", - "code": "123456", - "platform": "BYTEDESK", - "channel": "WEB", - "device": "JMeter Test" + "email": "${email}", + "code": "123456", + "platform": "BYTEDESK", + "channel": "WEB", + "device": "JMeter Test" } = true @@ -351,48 +285,37 @@ - - - - - /auth/v1/login/email - POST - true - false - true - false - - - - - - continue - - false - 1 - - 300 - 15 - true - 300 - 0 + 300 + 15 + 300 + 0 true + true + continue + + 1 + false + - - + /auth/v1/login/accessToken + true + POST + true + false + false { - "accessToken": "${accessToken}", - "platform": "BYTEDESK", - "channel": "WEB" + "accessToken": "${accessToken}", + "platform": "BYTEDESK", + "channel": "WEB" } = true @@ -400,24 +323,9 @@ - - - - - /auth/v1/login/accessToken - POST - true - false - true - false - - - - - false @@ -455,7 +363,6 @@ - false @@ -493,7 +400,6 @@ - false @@ -531,8 +437,6 @@ - - 200 @@ -543,8 +447,6 @@ 8 - - $.success true @@ -554,7 +456,6 @@ false - diff --git a/jmeter/zh_cn/02_agent_multiple_visitors.jmx b/jmeter/zh_cn/02_agent_multiple_visitors.jmx index 86d85e4a6e..964815ed49 100644 --- a/jmeter/zh_cn/02_agent_multiple_visitors.jmx +++ b/jmeter/zh_cn/02_agent_multiple_visitors.jmx @@ -29,7 +29,7 @@ - + 1 10 1 @@ -38,7 +38,7 @@ - + ${HOST} ${PORT} http @@ -68,7 +68,7 @@ - + Content-Type @@ -81,7 +81,7 @@ - + visitorUid;visitorNickname;visitorAvatar $.data.uid;$.data.nickname;$.data.avatar @@ -89,7 +89,7 @@ - + ${HOST} ${PORT} http @@ -116,7 +116,7 @@ - + Content-Type @@ -130,7 +130,7 @@ - + false saveConfig @@ -167,7 +167,7 @@ ./report/multiple_visitors_results.jtl - + false saveConfig @@ -204,7 +204,7 @@ ./report/multiple_visitors_aggregate.jtl - + false saveConfig @@ -244,4 +244,4 @@ - \ No newline at end of file + diff --git a/jmeter/zh_cn/03_agent_single_visitor.jmx b/jmeter/zh_cn/03_agent_single_visitor.jmx index 48b555d413..ecb1ec1c5b 100644 --- a/jmeter/zh_cn/03_agent_single_visitor.jmx +++ b/jmeter/zh_cn/03_agent_single_visitor.jmx @@ -7,15 +7,15 @@ HOST 127.0.0.1 + = PORT 9003 + = - false - false @@ -29,7 +29,7 @@ - + ${HOST} ${PORT} http @@ -88,7 +88,7 @@ - + ${HOST} ${PORT} http @@ -167,7 +167,7 @@ ./report/visitor_flow_results.jtl - + false saveConfig @@ -204,7 +204,7 @@ ./report/visitor_flow_aggregate.jtl - + false saveConfig @@ -243,4 +243,4 @@ - \ No newline at end of file + diff --git a/jmeter/zh_cn/04_workgroup_multiple_visitors.jmx b/jmeter/zh_cn/04_workgroup_multiple_visitors.jmx index e2de9591cd..edeb24aa43 100644 --- a/jmeter/zh_cn/04_workgroup_multiple_visitors.jmx +++ b/jmeter/zh_cn/04_workgroup_multiple_visitors.jmx @@ -2,20 +2,20 @@ - + HOST 127.0.0.1 + = PORT 9003 + = - false - false @@ -38,7 +38,7 @@ - + ${HOST} ${PORT} http @@ -68,7 +68,7 @@ - + Content-Type @@ -81,7 +81,7 @@ - + visitorUid;visitorNickname;visitorAvatar $.data.uid;$.data.nickname;$.data.avatar @@ -89,7 +89,7 @@ - + ${HOST} ${PORT} http @@ -116,7 +116,7 @@ - + Content-Type @@ -130,7 +130,7 @@ - + false saveConfig @@ -167,7 +167,7 @@ ./report/multiple_visitors_results.jtl - + false saveConfig @@ -204,7 +204,7 @@ ./report/multiple_visitors_aggregate.jtl - + false saveConfig @@ -244,4 +244,4 @@ - \ No newline at end of file + diff --git a/jmeter/zh_cn/05_workgroup_single_visitor.jmx b/jmeter/zh_cn/05_workgroup_single_visitor.jmx index ac74222788..08cce5d88b 100644 --- a/jmeter/zh_cn/05_workgroup_single_visitor.jmx +++ b/jmeter/zh_cn/05_workgroup_single_visitor.jmx @@ -7,15 +7,15 @@ HOST 127.0.0.1 + = PORT 9003 + = - false - false @@ -130,7 +130,7 @@ - + false saveConfig @@ -243,4 +243,4 @@ - \ No newline at end of file +