diff --git a/apps/metersphere/3.0.0-beta/data.yml b/apps/metersphere/3.0.0-beta/data.yml index fb2a0f46..4872350e 100644 --- a/apps/metersphere/3.0.0-beta/data.yml +++ b/apps/metersphere/3.0.0-beta/data.yml @@ -7,4 +7,10 @@ additionalProperties: required: true rule: paramPort type: number - + - default: 15 + envKey: JAVA_MAX_HEAP_RATIO + labelEn: Java Max Heap Ratio + labelZh: Java 最大堆内存比例 + required: true + rule: paramPort + type: number diff --git a/apps/metersphere/3.0.0-beta/mount/conf/kafka/config/server.properties b/apps/metersphere/3.0.0-beta/data/conf/kafka/config/server.properties similarity index 100% rename from apps/metersphere/3.0.0-beta/mount/conf/kafka/config/server.properties rename to apps/metersphere/3.0.0-beta/data/conf/kafka/config/server.properties diff --git a/apps/metersphere/3.0.0-beta/mount/conf/metersphere.properties b/apps/metersphere/3.0.0-beta/data/conf/metersphere.properties similarity index 100% rename from apps/metersphere/3.0.0-beta/mount/conf/metersphere.properties rename to apps/metersphere/3.0.0-beta/data/conf/metersphere.properties diff --git a/apps/metersphere/3.0.0-beta/mount/conf/mysql/my.cnf b/apps/metersphere/3.0.0-beta/data/conf/mysql/my.cnf similarity index 100% rename from apps/metersphere/3.0.0-beta/mount/conf/mysql/my.cnf rename to apps/metersphere/3.0.0-beta/data/conf/mysql/my.cnf diff --git a/apps/metersphere/3.0.0-beta/mount/conf/redis/redis.conf b/apps/metersphere/3.0.0-beta/data/conf/redis/redis.conf similarity index 100% rename from apps/metersphere/3.0.0-beta/mount/conf/redis/redis.conf rename to apps/metersphere/3.0.0-beta/data/conf/redis/redis.conf diff --git a/apps/metersphere/3.0.0-beta/mount/conf/redisson.yml b/apps/metersphere/3.0.0-beta/data/conf/redisson.yml similarity index 100% rename from apps/metersphere/3.0.0-beta/mount/conf/redisson.yml rename to apps/metersphere/3.0.0-beta/data/conf/redisson.yml diff --git a/apps/metersphere/3.0.0-beta/mount/data/.gitkeep b/apps/metersphere/3.0.0-beta/data/data/.gitkeep similarity index 100% rename from apps/metersphere/3.0.0-beta/mount/data/.gitkeep rename to apps/metersphere/3.0.0-beta/data/data/.gitkeep diff --git a/apps/metersphere/3.0.0-beta/mount/logs/.gitkeep b/apps/metersphere/3.0.0-beta/data/logs/.gitkeep similarity index 100% rename from apps/metersphere/3.0.0-beta/mount/logs/.gitkeep rename to apps/metersphere/3.0.0-beta/data/logs/.gitkeep diff --git a/apps/metersphere/3.0.0-beta/docker-compose.yml b/apps/metersphere/3.0.0-beta/docker-compose.yml index f97dc523..49f352bb 100644 --- a/apps/metersphere/3.0.0-beta/docker-compose.yml +++ b/apps/metersphere/3.0.0-beta/docker-compose.yml @@ -1,22 +1,21 @@ -version: '3' services: metersphere: image: metersphere/metersphere-ce-allinone:v3.0.0-beta container_name: ${CONTAINER_NAME} - privileged: true restart: always - labels: - createdBy: "Apps" - environment: - JAVA_MAX_HEAP_RATIO: 15 ports: - ${PANEL_APP_PORT_HTTP}:8081 - volumes: - - ./mount/logs:/opt/metersphere/logs - - ./mount/data:/opt/metersphere/data - - ./mount/conf:/opt/metersphere/conf networks: - 1panel-network + privileged: true + environment: + JAVA_MAX_HEAP_RATIO: ${JAVA_MAX_HEAP_RATIO} + volumes: + - ./data/logs:/opt/metersphere/logs + - ./data/data:/opt/metersphere/data + - ./data/conf:/opt/metersphere/conf + labels: + createdBy: "Apps" networks: 1panel-network: external: true \ No newline at end of file diff --git a/apps/metersphere/3.0.0-beta/scripts/init.sh b/apps/metersphere/3.0.0-beta/scripts/init.sh index 1a5fed6e..cc9e3f8a 100644 --- a/apps/metersphere/3.0.0-beta/scripts/init.sh +++ b/apps/metersphere/3.0.0-beta/scripts/init.sh @@ -1,4 +1,3 @@ #!/bin/bash - -chmod 777 mount/logs \ No newline at end of file +chmod 777 data/logs \ No newline at end of file diff --git a/apps/metersphere/README.md b/apps/metersphere/README.md index 745a9464..85a0a435 100644 --- a/apps/metersphere/README.md +++ b/apps/metersphere/README.md @@ -1,10 +1,15 @@ +# 默认账户密码 + +``` +username:admin +password:metersphere +``` + # MeterSphere -MeterSphere 是新一代的测试管理和接口测试工具,让测试工作更简单、更高效,不再成为持续交付的瓶颈。 - - +**MeterSphere** 是新一代的测试管理和接口测试工具,让测试工作更简单、更高效,不再成为持续交付的瓶颈。 ## 主要功能: -- 测试管理: 从测试用例管理,到测试计划执行、缺陷管理、测试报告生成,具有远超禅道和 TestLink 的使用体验; -- 接口测试: 集 Postman 的易用与 JMeter 的灵活于一体,接口定义、接口调试、接口 Mock、场景自动化、接口报告,你想要的都有。 \ No newline at end of file +- **测试管理**: 从测试用例管理,到测试计划执行、缺陷管理、测试报告生成,具有远超禅道和 TestLink 的使用体验; +- **接口测试**: 集 Postman 的易用与 JMeter 的灵活于一体,接口定义、接口调试、接口 Mock、场景自动化、接口报告,你想要的都有。 \ No newline at end of file diff --git a/apps/metersphere/data.yml b/apps/metersphere/data.yml index b6cca1fd..db97226f 100644 --- a/apps/metersphere/data.yml +++ b/apps/metersphere/data.yml @@ -1,20 +1,19 @@ name: MeterSphere tags: - - 实用工具 -title: MeterSphere 新一代的测试管理和接口测试工具 -type: 实用工具 -description: MeterSphere 新一代的测试管理和接口测试工具 + - DevOps +title: 新一代的测试管理和接口测试工具 +description: 新一代的测试管理和接口测试工具 additionalProperties: key: metersphere name: MeterSphere tags: - - Tool + - DevOps shortDescZh: 新一代的测试管理和接口测试工具 - shortDescEn: Open-source Continuous Testing Platform + shortDescEn: The next-gen test management and interface testing tools type: tool - crossVersionUpdate: true + crossVersionUpdate: false limit: 1 - recommend: 9 + recommend: 11 website: https://www.metersphere.io github: https://github.com/metersphere/metersphere document: https://metersphere.io/docs \ No newline at end of file diff --git a/apps/metersphere/logo.png b/apps/metersphere/logo.png index 15fb97a6..f6fb2abc 100644 Binary files a/apps/metersphere/logo.png and b/apps/metersphere/logo.png differ