From ae89fb5ec745da4bfe96e614e59673e336c15a5c Mon Sep 17 00:00:00 2001 From: zyxucp <286513187@qq.com> Date: Tue, 18 Feb 2025 15:40:09 +0800 Subject: [PATCH 1/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5df4f04..b92c439 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ version: '3.8' services: antsk: container_name: antsk - image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.5.0 + image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.6.0 ports: - 5000:5000 networks: From a8f48929e7dc1d6a5995f6d350aee4821426dc9e Mon Sep 17 00:00:00 2001 From: zyxucp <286513187@qq.com> Date: Tue, 18 Feb 2025 15:40:45 +0800 Subject: [PATCH 2/7] Update README.zh.md --- README.zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.zh.md b/README.zh.md index 869831b..d5dcafa 100644 --- a/README.zh.md +++ b/README.zh.md @@ -100,7 +100,7 @@ version: '3.8' services: antsk: container_name: antsk - image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.3.1 + image: registry.cn-hangzhou.aliyuncs.com/AIDotNet/antsk:v0.6.0 ports: - 5000:5000 networks: From 52e20396ad4c1972756a5944a56fe4d91d6cb6f1 Mon Sep 17 00:00:00 2001 From: zyxucp <286513187@qq.com> Date: Tue, 18 Feb 2025 15:41:28 +0800 Subject: [PATCH 3/7] Update README.zh.md --- README.zh.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.zh.md b/README.zh.md index d5dcafa..dce7ca4 100644 --- a/README.zh.md +++ b/README.zh.md @@ -215,13 +215,14 @@ DB我使用的是CodeFirst模式，只要配置好数据库链接，表结构是 除以下附加条款外，该项目遵循Apache 2.0协议 -1. 本项目可以用于商业目的，但如果违反以下规定，它有权禁止您使用 +1. **免费商用**：用户在不修改代码的情况下，可以免费用于商业目的。 +2. **商业授权**：如果您满足以下任意条件之一，需取得商业授权： + 1. 对本软件进行二次修改、开发（包括但不限于修改应用名称、logo、代码以及功能）。 + 2. 为企业客户提供多租户服务，且该服务支持 10 人或以上的使用。 + 3. 预装或集成到硬件设备或产品中进行捆绑销售。 + 4. 政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。 -2. 未经授权，您不允许修改AntSK的徽标和标题信息 - -3. 未经授权，您不能修改页面底部的版权信息 - -4. 如果您需要授权，可以联系微信：xuzeyu91 +3. 如果您需要授权，可以联系微信：xuzeyu91 如果您打算在商业项目中使用AntSK，您需要确保遵守以下步骤： From dd6e1a6d540e0c1540e7560559f57a4eb05aefb4 Mon Sep 17 00:00:00 2001 From: zyxucp <286513187@qq.com> Date: Tue, 18 Feb 2025 15:42:19 +0800 Subject: [PATCH 4/7] Update README.md --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b92c439..f0210f2 100644 --- a/README.md +++ b/README.md @@ -204,13 +204,14 @@ This warehouse follows the [AntSK License](https://github.com/AIDotNet/AntSK?tab This project follows the Apache 2.0 agreement, in addition to the following additional terms -1. This project can be used for commercial purposes, but it has the right to prohibit you from using it if it violates the following provisions - -2. Without authorization, you are not allowed to modify AntSK's logo and title information +1. **Free Commercial Use**: Users can use the software for commercial purposes without modifying the code. +2. **Commercial License Required**: A commercial license is required if any of the following conditions are met: + 1. You modify, develop, or alter the software, including but not limited to changes to the application name, logo, code, or functionality. + 2. You provide multi-tenant services to enterprise customers with 10 or more users. + 3. You pre-install or integrate the software into hardware devices or products and bundle it for sale. + 4. You are engaging in large-scale procurement for government or educational institutions, especially involving security, data privacy, or other sensitive requirements. -4. Without authorization, you are not allowed to modify the copyright information at the bottom of the page - -6. If you need authorization, you can contact WeChat: **xuzeyu91** +3. If you need authorization, you can contact WeChat: **xuzeyu91** If you plan to use AntSK in commercial projects, you need to ensure that you follow the following steps: From 5a4f038da1b63da06715f2a4d6f9dca6c64ac988 Mon Sep 17 00:00:00 2001 From: zyxucp <286513187@qq.com> Date: Tue, 18 Feb 2025 15:42:38 +0800 Subject: [PATCH 5/7] Update docker-compose.simple.yml --- docker-compose.simple.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.simple.yml b/docker-compose.simple.yml index 2e9b41e..1df176a 100644 --- a/docker-compose.simple.yml +++ b/docker-compose.simple.yml @@ -3,9 +3,9 @@ version: '3.8' services: antsk: container_name: antsk - image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.5.5 + image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.6.0 # 如果需要pytorch环境需要使用下面这个镜像，镜像比较大 - # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.5.5 + # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.6.0 ports: - 5000:5000 networks: From 01063f2d49b54039a752c7c0a5e96c91b4a89d6f Mon Sep 17 00:00:00 2001 From: zyxucp <286513187@qq.com> Date: Tue, 18 Feb 2025 15:42:53 +0800 Subject: [PATCH 6/7] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 259c604..e153559 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: - 18889:18889 restart: unless-stopped antskpg: - image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/pg:v0.5.0 + image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/pg:v0.6.0 container_name: antskpg restart: always ports: # 生产环境建议不要暴露 From bd27048237b0e62befcb1feae00a07c62b08f6ad Mon Sep 17 00:00:00 2001 From: zyxucp <286513187@qq.com> Date: Thu, 20 Feb 2025 13:19:48 +0800 Subject: [PATCH 7/7] Update docker-compose.yml --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e153559..fbd4cfc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: - 18889:18889 restart: unless-stopped antskpg: - image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/pg:v0.6.0 + image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/pg:v0.5.0 container_name: antskpg restart: always ports: # 生产环境建议不要暴露 @@ -32,9 +32,9 @@ services: - ./pg/data:/var/lib/postgresql/data antsk: container_name: antsk - image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.5.5 + image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.6.0 # 如果需要pytorch环境需要使用下面这个镜像，镜像比较大 - # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.5.5 + # image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:p0.6.0 ports: - 5000:5000 networks: