diff --git a/resources/cherry-studio/license.html b/resources/cherry-studio/license.html index 74003d87f..a5415c807 100644 --- a/resources/cherry-studio/license.html +++ b/resources/cherry-studio/license.html @@ -14,35 +14,76 @@

许可协议

-

采用 Apache License 2.0 修改版许可,并附加以下条件:

+

本项目采用区分用户的双重许可 (User-Segmented Dual Licensing) 模式。

-

一. 商用许可

-

在以下任何一种情况下,您需要联系我们并获得明确的书面商业授权后,方可继续使用 Cherry Studio 材料:

-
    -
  1. 修改与衍生: 您对 Cherry Studio 材料进行修改或基于其进行衍生开发(包括但不限于修改应用名称、Logo、代码、功能、界面,数据等)。
  2. -
  3. 企业服务: 在您的企业内部,或为企业客户提供基于 Cherry Studio 的服务,且该服务支持 10 人及以上累计用户使用。
  4. -
  5. 硬件捆绑销售: 您将 Cherry Studio 预装或集成到硬件设备或产品中进行捆绑销售。
  6. -
  7. 政府或教育机构大规模采购: 您的使用场景属于政府或教育机构的大规模采购项目,特别是涉及安全、数据隐私等敏感需求时。
  8. -
  9. 面向公众的公有云服务:基于 Cherry Studio,提供面向公众的公有云服务。
  10. -
+

核心原则

+
-

二. 贡献者协议

-

作为 Cherry Studio 的贡献者,您应当同意以下条款:

-
    -
  1. 许可调整:生产者有权根据需要对开源协议进行调整,使其更加严格或宽松。
  2. -
  3. 商业用途:您贡献的代码可能会被用于商业用途,包括但不限于云业务运营。
  4. -
+

定义:"10人及以下"

+

+ 指在您的组织(包括公司、非营利组织、政府机构、教育机构等任何实体)中,能够访问、使用或以任何方式直接或间接受益于本软件(Cherry + Studio)功能的个人总数不超过10人。这包括但不限于开发者、测试人员、运营人员、最终用户、通过集成系统间接使用者等。 +

-

三. 其他条款

-
    -
  1. 本协议条款的解释权归 Cherry Studio 开发者所有。
  2. -
  3. 本协议可能根据实际情况进行更新,更新时将通过本软件通知用户。
  4. -
+

1. 开源许可证 (Open Source License): AGPLv3 - 适用于个人及10人及以下组织 +

+ +
+ +
+

2. 商业许可证 (Commercial License) - 适用于超过10人的组织,或希望规避 AGPLv3 + 义务的用户

+ +
+ +
+

3. 贡献 (Contributions)

+ +
+ +
+

4. 其他条款 (Other Terms)

+
@@ -50,58 +91,107 @@
-

License Agreement

+

Licensing

-

This software is licensed under a modified version of the Apache License 2.0, with - the following additional conditions.

+

This project employs a User-Segmented Dual Licensing model.

-

I. Commercial Licensing

-

You must contact us and obtain explicit written commercial authorization to - continue using Cherry Studio materials under any of the following circumstances:

-
    -
  1. Modifications and Derivatives: You modify Cherry Studio materials or perform derivative - development based on them (including but not limited to changing the application's name, logo, code, - functionality, user interface, data, etc.).
  2. -
  3. Enterprise Services: You use Cherry Studio internally within your enterprise, or you - provide Cherry Studio-based services for enterprise customers, and such services support cumulative usage by - 10 or more users.
  4. -
  5. Hardware Bundling and Sales: You pre-install or integrate Cherry Studio into hardware - devices or products for bundled sale.
  6. -
  7. Large-scale Procurement by Government or Educational Institutions: Your usage scenario - involves large-scale procurement projects by government or educational institutions, especially in cases - involving sensitive requirements such as security and data privacy.
  8. -
  9. Public Cloud Services: You provide public cloud-based product services utilizing Cherry +

    Core Principle

    +
      +
    • Individual Users and Organizations with 10 or Fewer Individuals: Governed by default + under the GNU Affero General Public License v3.0 (AGPLv3).
    • +
    • Organizations with More Than 10 Individuals: Must obtain a + Commercial License. +
    • +
    +
+ +
+

Definition: "10 or Fewer Individuals"

+

+ Refers to any organization (including companies, non-profits, government agencies, educational institutions, + etc.) where the total number of individuals who can access, use, or in any way directly or indirectly benefit + from the functionality of this software (Cherry Studio) does not exceed 10. This includes, but is not limited + to, developers, testers, operations staff, end-users, and indirect users via integrated systems. +

+
+ +
+

1. Open Source License: AGPLv3 - For Individuals and + Organizations of 10 or Fewer

+ +
+ +
+

2. Commercial License - For Organizations with More Than 10 + Individuals, or Users Needing to Avoid AGPLv3 Obligations

+
-

II. Contributor Agreement

-

As a contributor to Cherry Studio, you must agree to the following terms:

-
    -
  1. License Adjustments: The producer reserves the right to adjust the open-source license as - necessary, making it more strict or permissive.
  2. -
  3. Commercial Usage: Your contributed code may be used commercially, including but not - limited to cloud business operations.
  4. -
+

3. Contributions

+
-

III. Other Terms

-
    -
  1. Cherry Studio developers reserve the right of final interpretation of these agreement terms.
  2. -
  3. This agreement may be updated according to practical circumstances, and users will be notified of updates - through this software.
  4. -
+

4. Other Terms

+
- -

- Other than these specific conditions, all remaining rights and restrictions follow the Apache License 2.0. For - more detailed information regarding Apache License 2.0, please visit - http://www.apache.org/licenses/LICENSE-2.0. -

diff --git a/src/renderer/src/components/Popups/MinAppsPopover.tsx b/src/renderer/src/components/Popups/MinAppsPopover.tsx index 78e70093c..28a9621bc 100644 --- a/src/renderer/src/components/Popups/MinAppsPopover.tsx +++ b/src/renderer/src/components/Popups/MinAppsPopover.tsx @@ -48,7 +48,7 @@ const MinAppsPopover: FC = ({ children }) => { ))} {isEmpty(minapps) && (
- +
)} diff --git a/src/renderer/src/pages/files/FilesPage.tsx b/src/renderer/src/pages/files/FilesPage.tsx index 49cfb4425..e78f693ba 100644 --- a/src/renderer/src/pages/files/FilesPage.tsx +++ b/src/renderer/src/pages/files/FilesPage.tsx @@ -183,7 +183,7 @@ const FilesPage: FC = () => { {dataSource && dataSource?.length > 0 ? ( ) : ( - + )} diff --git a/src/renderer/src/pages/history/components/TopicMessages.tsx b/src/renderer/src/pages/history/components/TopicMessages.tsx index d106e2454..6e8095037 100644 --- a/src/renderer/src/pages/history/components/TopicMessages.tsx +++ b/src/renderer/src/pages/history/components/TopicMessages.tsx @@ -54,7 +54,7 @@ const TopicMessages: FC = ({ topic, ...props }) => { ))} - {isEmpty && } + {isEmpty && } {!isEmpty && (