diff --git a/app/en/personal-data-collection-overview/index.md b/app/en/personal-data-collection-overview/index.md
index b379a93aef969b378ea330a24f107000f4bb58ff..79bb93f13f13bddc1a3bc36df4f5715a726e5a83 100644
--- a/app/en/personal-data-collection-overview/index.md
+++ b/app/en/personal-data-collection-overview/index.md
@@ -17,7 +17,7 @@ This website involves the following personal data collection scenarios:
- **Purpose**: Verify identity during login and registration on this website and maintain your personal data.
- **Personal data type**: data you voluntarily submit
- **Collection method**: user input or shared by third-party accounts
-- **Personal data fields**: **user name**, **company**, **email address**, **phone number**, **password**, **email or phone verification code**, avatar, nickname and Gitee account details (**UUID**, **ID**, nickname, and **email address**).
+- **Personal data fields**: **user name**, **company**, **email address**, **phone number**, **password**, **email or phone verification code**, avatar, nickname and **Gitee UUID**, **Gitee ID**, Gitee nickname, **Gitee email address**, **GitCode UUID**, **GitCode ID**, GitCode nickname, **GitCode email address**.
## 2. Mailing List Service
@@ -35,15 +35,7 @@ This website involves the following personal data collection scenarios:
## 4. Contributor License Agreement (CLA) Signing
-- **Purpose**: Verify your CLA signing status for code contributions and perform statistical analysis to assess community operations.
-- **Personal data type**: data you voluntarily submit
-- **Collection method**: user input
-- **Personal data fields**: We collect personal data based on the scenario:
- - For corporate CLA signing: **name of the authorized representative**, **position**, **company name**, **email address**, **email verification code**, **phone number (optional)**, **address (optional)**, **fax number (optional)**, and the **signed CLA document**
- - For corporate contributor registration: **name**, **email address**, corporation, and **email verification code**
- - For individual CLA signing: **name**, **email address**, and **email verification code**
- - For enterprise administrator login: **account**, **password**, and **email address**
- - For community administrator login: **account**, **password**, **email address** and **email authorization code**
+Regarding the purpose of collecting personal data, the types of personal data, the methods of collection, and the specific personal data fields, refer to the [Personal Data Collection Overview](https://clasign.osinfra.cn/information-list/corp/gitee_opengauss-1614047760000855378?lang=en).
@@ -57,14 +49,14 @@ This website involves the following personal data collection scenarios:
- **Purpose**: Configure meeting permissions and send meeting invitation emails.
- **Personal data type**: data you voluntarily submit
- **Collection method**: user input
-- **Personal data fields**: **Gitee ID** and **email address**
+- **Personal data fields**: **user name** and **email address**
## 6. Content Release
- **Purpose**: Help developers better understand and connect with the community, enabling faster engagement.
- **Personal data type**: data you voluntarily submit
- **Collection method**: user input
-- **Personal data fields**: **photo**, **name**, **email address**, **company name**, **position**, **school**, **profile**, and **Gitee ID**
+- **Personal data fields**: **photo**, **name**, **email address**, **company name**, **position**, **school**, **profile**, and **GitCode ID**
## 7. Meetup Application
diff --git a/app/en/privacyPolicy/index.md b/app/en/privacyPolicy/index.md
index 5c6dbcabb085c11af98e8bfed88876feba7d56b6..5595429c44d9d443aa050b0d25edcc46c7b71ae9 100644
--- a/app/en/privacyPolicy/index.md
+++ b/app/en/privacyPolicy/index.md
@@ -14,7 +14,8 @@ The openGauss Community understands the importance of your privacy and fully res
Please carefully review the following updates to this privacy policy:
-1. Updated the description in the "How We Share Your Personal Data" section.
+1. Added the description about GitCode account login.
+2. Changed the code hosting platform to GitCode.
## 1. How We Collect and Process Your Personal Data
@@ -24,21 +25,21 @@ Please carefully review the following updates to this privacy policy:
1. When you register for an openGauss community account, we will collect your user name, company, **email address**, **phone number**, **password**, and **email/phone verification code**. A unique account identifier will be automatically generated. Refusal to provide this information will prevent account creation.
2. When you log in to the openGauss community using your user name, **email address**, or **phone number**, we will collect user name, **email address**, **phone number**,**password** and **verification code** for authentication. Refusal to provide this information will prevent login.
- 3. When you log in using a third-party account (Gitee), we will collect your **UUID**, **ID**, nickname, and **email address** from that platform for authentication and code repository access management. When you log in using a third-party account that is not bound to any openGauss account, a new openGauss account with a unique identifier will be automatically generated, deriving from **Gitee ID**. Refusal to provide this information will prevent login via third-party accounts.
- 4. After logging in, you can optionally provide your avatar, nickname, and company. This information is not required for using openGauss community features.
- 5. After logging in, you can modify your **email address**, **phone number**, and **password**. We will collect **email address**, **phone number**, **password** and **verification code** for authentication.
- 6. After logging in, you can bind your openGauss account to a third-party account (Gitee). We will collect your **UUID**, **ID**, nickname, and **email address** from the bound platform. Refusal to provide this information will prevent third-party account binding for login purposes.
+ 3. When you log in using a third-party account (Gitee or GitCode), we will collect your **Gitee UUID**, **Gitee ID**, Gitee nickname, **Gitee email address**, **GitCode UUID**, **GitCode ID**, GitCode nickname, **GitCode email address** from that platform for authentication and code repository access management. When you log in using a third-party account that is not bound to any openGauss account, a new openGauss account with a unique identifier will be automatically generated, deriving from your **Gitee ID** or **GitCode ID**. Refusal to provide this information will prevent login via third-party accounts.
+ 4. After logging in, you can optionally provide your avatar, nickname, and company in User Center. This information is not required for using openGauss community features.
+ 5. After logging in, you can modify your **email address**, **phone number**, and **password** in User Center. We will collect **email address**, **phone number**, **password** and **verification code** for authentication.
+ 6. After logging in, you can bind your openGauss account to a third-party account (Gitee or GitCode) in User Center. We will collect your **Gitee UUID**, **Gitee ID**, Gitee nickname, **Gitee email address**, **GitCode UUID**, **GitCode ID**, GitCode nickname, **GitCode email address** from the bound platform. Refusal to provide this information will prevent third-party account binding for login purposes.
**b) Mail List Service**. When you use our mail list service, we will collect your **email address** and **name (optional)**. We will provide you with the email subscription service to facilitate your participation in discussions in the community.
**c) Service Optimization**. To ensure service quality and operations, we automatically collect and store necessary log data, including access timestamps, **IP address**, request details, access status, resource size, access origin, and user agent information. In addition, we will collect your device information (device name, device type, device vendor, operating system, operating system version, screen width, screen height), application information (application ID, SDK version , browser, browser version, browser viewport width, browser viewport height), application usage information (event name, event attributes, reporting time, client anonymous ID). This data is collected for the purposes of community operations and O&M security.
**d) Contributor License Agreement(CLA) Signing**. When you participate in code contribution through the CLA
-signing system (click [here](https://clasign.osinfra.cn/sign/gitee_opengauss-1614047760000855378) to learn more), you need to submit your [relevant personal data](https://clasign.osinfra.cn/privacy/gitee_opengauss-1614047760000855378) to the CLA signing system. We will obtain such personal data to verify whether you have signed the CLA, and to conduct relevant statistical analysis to understand how the Community is operating.
+signing system (click [here](https://clasign.osinfra.cn/sign/gitee_opengauss-1614047760000855378?lang=en) to learn more), you need to submit your [relevant personal data](https://clasign.osinfra.cn/privacy/corp/gitee_opengauss-1614047760000855378?lang=en) to the CLA signing system. We will obtain such personal data to verify whether you have signed the CLA, and to conduct relevant statistical analysis to understand how the Community is operating.
-**e) Meeting Service**. When you use our meeting service, we will collect your **Gitee ID** for configuring related permissions. If you have meeting scheduling permission, we will collect your **email address** used when you edit the meeting details for the purpose of sending meeting invitations. If you enable automatically screen recording when you schedule a meeting, the recording will be uploaded to the third-party platform [Bilibili](https://www.bilibili.com/) after the meeting so that more interested individuals and organizations can review your meeting.
+**e) Meeting Service**. When you use our meeting service, we will collect your **user name** for configuring related permissions. If you have meeting scheduling permission, we will collect your **email address** used when you edit the meeting details for the purpose of sending meeting invitations. If you enable automatically screen recording when you schedule a meeting, the recording will be uploaded to the third-party platform [Bilibili](https://www.bilibili.com/) after the meeting so that more interested individuals and organizations can review your meeting.
-**f) Content Release**. When you participate in Community meetings, Community activities, contribution in the open source Community, blogs, newsgroups, or Community organization, you may submit your **photo**, **name**, **email address**, **company name**, **position**, **school**, **profile** and **Gitee ID** for posting on our website so that developers can better understand the community, quickly make contact, and participate in the community.
+**f) Content Release**. When you participate in Community meetings, Community activities, contribution in the open source Community, blogs, newsgroups, or Community organization, you may submit your **photo**, **name**, **email address**, **company name**, **position**, **school**, **profile** and **GitCode ID** for posting on our website so that developers can better understand the community, quickly make contact, and participate in the community.
**g) Meetups**. When you apply organize an openGauss meetup, the community will collect your **name**, **phone number**, **email address**, **company**, and meetup details (including organization, agenda, date, duration, city, event scale, event form, event support, and topics) from the application form you fill in. The collected data will be used to contact you for the purpose of confirming your application and related matters, as well as arranging for relevant affairs, including sign-ins and nameplates.
@@ -168,8 +169,8 @@ Email: ****
Hotline: **+86 18628259905**
-Last updated: **March 29, 2025**
+Last updated: **April 25, 2025**
-Privacy policy version: **v20250329**
+Privacy policy version: **v20250425**
diff --git a/app/zh/personal-data-collection-overview/index.md b/app/zh/personal-data-collection-overview/index.md
index b94bb326d9e624dbef238f088c2cc687d2ba7616..da8d042095d4fc7f500ef59ddbc58623a0da86b3 100644
--- a/app/zh/personal-data-collection-overview/index.md
+++ b/app/zh/personal-data-collection-overview/index.md
@@ -17,7 +17,7 @@ openGauss社区(以下简称我们)会严格遵从国家的法律法规要
- **收集目的**:用于登录、注册openGauss社区的身份校验,以及维护您的个人信息
- **个人信息类型**:您主动提交的数据
- **收集的方式**:用户输入/第三方账号共享
-- **个人信息字段**:**用户名**、**公司**、**邮箱**、**手机号**、**密码**、**邮箱或手机验证码**、头像、昵称、第三方Gitee账号(**UUID**、**ID**、昵称、**邮箱**)
+- **个人信息字段**:**用户名**、**公司**、**邮箱**、**手机号**、**密码**、**邮箱或手机验证码**、头像、昵称、第三方: **Gitee UUID**、**Gitee ID**、Gitee昵称、**Gitee邮箱**、**GitCode UUID**、**GitCode ID**、GitCode昵称、**GitCode邮箱**
## 2. 邮件列表
@@ -35,36 +35,21 @@ openGauss社区(以下简称我们)会严格遵从国家的法律法规要
## 4. 贡献者许可协议签署
-- **收集目的**:用于校验您是否已经签署CLA,以便参与代码贡献,并进行相关统计分析,用于了解社区的运营状况
-- **个人信息类型**:您主动提交的数据
-- **收集的方式**:用户输入
-- **个人信息字段**:我们按照不同的类型收集不同的信息
- - 当您进行签署法人CLA,收集您的**授权代表(姓名)**、**职位**、**公司名称**、**邮箱**、**邮箱验证码**、**电话(可选)**、**地址(可选)**、**传真号(可选)**、**CLA签署文件**
- - 当您进行法人贡献者登记,收集您的**姓名**、**邮箱**、法人、**邮箱验证码**
- - 当您签署个人CLA,收集您的**姓名**、**邮箱**、**邮箱验证码**
- - 当您进行企业管理员登录,收集您的**账号**、**密码**、**邮箱**
- - 当您作为社区管理员登录,收集您的**账号**、**密码**、**邮箱**、**邮箱授权码**
-
-
-
-- **收集目的**:保证服务质量以及业务运营
-- **个人信息类型**:应用信息/设备信息
-- **收集的方式**:系统收集
-- **个人信息字段**:访问时间戳、**IP地址**、请求详情、访问状态、访问资源大小、访问来源、请求用户代理信息
+相关个人信息收集目的、个人信息类型、收集的方式、个人信息字段,请参见:[贡献者许可协议签署个人信息收集清单](https://clasign.osinfra.cn/information-list/corp/gitee_opengauss-1614047760000855378?lang=zh)。
## 5. 会议服务
- **收集目的**:配置会议相关权限、发送会议邀请邮件
- **个人信息类型**:您主动提交的数据
- **收集的方式**:用户输入
-- **个人信息字段**:**Gitee ID**、**邮箱**
+- **个人信息字段**:**用户名**、**邮箱**
## 6. 内容发布
- **收集目的**:以便开发者更好地了解和认识社区,从而更快地建立链接并参与到我们社区
- **个人信息类型**:您主动提交的数据
- **收集的方式**:用户输入
-- **个人信息字段**:**照片**、**姓名**、**邮箱**、**公司名称**、**职位**、**学校**、**个人简介**、**Gitee ID**
+- **个人信息字段**:**照片**、**姓名**、**邮箱**、**公司名称**、**职位**、**学校**、**个人简介**、**GitCode ID**
## 7. Meetup申请
diff --git a/app/zh/privacyPolicy/index.md b/app/zh/privacyPolicy/index.md
index 8acdf524596877c5e91348997b5dae64e5bbba53..94d6ecfb62cd39d9408605dce67ab59d674e0d38 100644
--- a/app/zh/privacyPolicy/index.md
+++ b/app/zh/privacyPolicy/index.md
@@ -14,7 +14,8 @@ title: '隐私政策'
请您仔细阅读此次隐私政策的更新内容:
-1. 刷新“我们如何共享您的个人信息”章节相关描述。
+1. 新增GitCode三方登录方式;
+2. 代码托管平台变更为GitCode。
## 1. 我们如何收集和处理您的个人信息
@@ -24,20 +25,20 @@ title: '隐私政策'
1. 当您注册openGauss社区账号的时候,我们将收集您的**用户名**、**公司**、**邮箱**、**手机号**、**密码**、**邮箱或手机号的验证码**,并自动生成唯一的账户标识符,如您拒绝提供上述信息,您将无法完成账户注册;
2. 当您使用用户名、**邮箱**或**手机号**登录openGauss社区时,我们将收集您提供的用户名、**邮箱**、**手机号**、**密码**、**邮箱或手机号的验证码**用于身份校验,如您拒绝提供上述信息,您将无法完成登录;
- 3. 当您使用第三方账号(Gitee)登录时,我们将收集您的第三方账号的**UUID**、**ID**、昵称、**邮箱**,用于身份校验和社区代码托管平台的权限管理。若是使用第三方账号登录,且没有绑定到任何的openGauss社区账号,会自动生成新的openGauss社区账号和唯一的账户标识符,openGauss社区账号的用户名由**Gitee ID**衍生而成。如您拒绝提供上述信息,您将无法通过第三方账号进行登录;
- 4. 当您登录openGauss社区后,完善您的个人信息时,可以设置您的头像、昵称、**公司**,如您拒绝提供上述信息,不影响您的功能使用。
- 5. 当您登录openGauss社区后,可以对**邮箱**、**手机号**或**密码**进行修改,我们将收集您提供的**手机号**、**邮箱**、**密码**、**邮箱或手机号的验证码**用于身份校验。
- 6. 当您登录openGauss社区后,绑定第三方账号(Gitee),我们将收集您的第三方账号的**UUID**、**ID**、昵称、**邮箱**,如您拒绝提供上述信息,您将无法绑定第三方账号用于登录。
+ 3. 当您使用第三方账号(Gitee或GitCode)登录时,我们将收集您的第三方账号的**Gitee UUID**、**Gitee ID**、Gitee昵称、**Gitee邮箱**、**GitCode UUID**、**GitCode ID**、GitCode昵称、**GitCode邮箱**,用于身份校验和社区代码托管平台的权限管理。若是使用第三方账号登录,且没有绑定到任何的openGauss社区账号,会自动生成新的openGauss社区账号和唯一的账户标识符,openGauss社区账号的用户名由**Gitee ID**或**GitCode ID**衍生而成。如您拒绝提供上述信息,您将无法通过第三方账号进行登录;
+ 4. 当您登录openGauss社区后,可以在个人中心设置您的头像、昵称、**公司**,完善您的个人信息,如您拒绝提供上述信息,不影响您的功能使用。
+ 5. 当您登录openGauss社区后,可以在个人中心对**邮箱**、**手机号**或**密码**进行修改,我们将收集您提供的**手机号**、**邮箱**、**密码**、**邮箱或手机号的验证码**用于身份校验。
+ 6. 当您登录openGauss社区后,可以在个人中心绑定第三方账号(Gitee或GitCode),我们将收集您的第三方账号的**Gitee UUID**、**Gitee ID**、Gitee昵称、**Gitee邮箱**、**GitCode UUID**、**GitCode ID**、GitCode昵称、**GitCode邮箱**,如您拒绝提供上述信息,您将无法绑定第三方账号用于登录。
**b) 邮件列表服务**。当您使用我们的邮件列表服务时,我们将收集您的**邮箱**以及**您的姓名(可选)**,用于为您提供邮件订阅服务,便于您参与社区中的讨论。
**c) 服务优化**。为了保证服务质量以及业务运营,我们会自动收集并存储必要的日志信息,包括访问时间戳、**IP地址**、请求详情、访问状态、访问资源大小、访问来源、请求用户代理信息,同时,我们会采集您的设备信息(设备名称、设备类型、设备供应商、操作系统、操作系统版本、屏幕宽度、屏幕高度)、应用信息(应用ID、使用的SDK版本号、浏览器、浏览器版本、浏览器视口宽度、浏览器视口高度)、应用使用信息(事件名称、事件属性、上报时间、客户端匿名ID),用于社区运营及运维安全。
-**d) 贡献者许可协议签署**。当您通过贡献者许可协议(简称“CLA”)签署系统(点击[此处](https://clasign.osinfra.cn/sign/gitee_opengauss-1614047760000855378)了解)参与代码贡献时,您需要向CLA签署系统提交您的[相关个人信息](https://clasign.osinfra.cn/privacy/gitee_opengauss-1614047760000855378),我们会取得这些个人信息用于校验您是否已经签署CLA,并进行相关统计分析,用于了解社区的运营状况。
+**d) 贡献者许可协议签署**。当您通过贡献者许可协议(简称“CLA”)签署系统(点击[此处](https://clasign.osinfra.cn/sign/gitee_opengauss-1614047760000855378?lang=zh)了解)参与代码贡献时,您需要向CLA签署系统提交您的[相关个人信息](https://clasign.osinfra.cn/privacy/corp/gitee_opengauss-1614047760000855378?lang=zh),我们会取得这些个人信息用于校验您是否已经签署CLA,并进行相关统计分析,用于了解社区的运营状况。
-**e) 会议服务**。当您使用openGauss社区提供的会议服务时,我们会收集您的**Gitee ID**,用于配置相关权限。如果您有预定会议权限,在预定会议时,我们会收集您编辑的**邮箱**,用于发送会议邀请邮件。在预定会议时,如果您选择了会议自动录屏,在会议结束后,我们会将会议录像上传至第三方平台[哔哩哔哩](https://www.bilibili.com/),以便于更多感兴趣的个人或组织回顾您组织的会议。
+**e) 会议服务**。当您使用openGauss社区提供的会议服务时,我们会收集您的**用户名**,用于配置相关权限。如果您有预定会议权限,在预定会议时,我们会收集您编辑的**邮箱**,用于发送会议邀请邮件。在预定会议时,如果您选择了会议自动录屏,在会议结束后,我们会将会议录像上传至第三方平台[哔哩哔哩](https://www.bilibili.com/),以便于更多感兴趣的个人或组织回顾您组织的会议。
-**f) 内容发布**。当您参加社区会议、社区活动、开发者开源社区贡献、博客、新闻组或参与社区组织,您可以提交**照片**、**姓名**、**邮箱**、**公司名称**、**职位**、**学校**、**个人简介**、**Gitee ID**,并在我们网站上发布上述信息,以便开发者更好地了解和认识社区,从而更快地建立链接并参与到我们社区。
+**f) 内容发布**。当您参加社区会议、社区活动、开发者开源社区贡献、博客、新闻组或参与社区组织,您可以提交**照片**、**姓名**、**邮箱**、**公司名称**、**职位**、**学校**、**个人简介**、**GitCode ID**,并在我们网站上发布上述信息,以便开发者更好地了解和认识社区,从而更快地建立链接并参与到我们社区。
**g) Meetup申请**。当您申请组织openGauss Meetup活动时,通过您主动填写的申请表,社区将会收集您的**姓名**、**手机号**、**邮箱**、**公司**、Meetup信息(组织、主题、日期、时长、城市、规模、活动形式、活动支持、环节议题),用于与您取得联系,确认您的申请及相关事项,并为您安排相关活动事宜,包括签到、活动名牌等。
@@ -117,9 +118,9 @@ title: '隐私政策'
您可以在openGauss社区账号登录个人中心:
1. 进入“个人中心”修改头像;
-2. 进入“个人中心” -> “基本信息”查看、更正您的基本信息(昵称、**公司**);
-3. 进入“个人中心” -> “账号绑定”查看、更正您的**邮箱**、**手机号**、**Gitee账号**;
-4. 进入“个人中心” -> “账号安全”重置您的登录密码。
+2. 进入“个人中心” > “基本信息”查看、更正您的基本信息(昵称、**公司**);
+3. 进入“个人中心” > “账号绑定”查看、更正您的**邮箱**、**手机号**、**Gitee账号**;
+4. 进入“个人中心” > “账号安全”重置您的登录密码。
当您需要更新您的个人信息,或发现我们处理您的个人信息有误时,您有权作出更正或更新。
@@ -127,19 +128,19 @@ title: '隐私政策'
您可以在openGauss社区账号登录个人中心:
-1. 进入“个人中心” -> “基本信息”删除您的openGauss社区账号基本信息(昵称、**公司**);
-2. 进入“个人中心” -> “账号绑定”解绑**Gitee账号**。
+1. 进入“个人中心” > “基本信息”删除您的openGauss社区账号基本信息(昵称、**公司**);
+2. 进入“个人中心” > “账号绑定”解绑**Gitee账号**。
### 6.4 撤销同意
1. 反对我们对您的个人信息进行处理的权利,您可以通过“联系邮箱”联系我们处理;
2. 限制我们对您的个人信息进行处理的权利,您可以通过“联系邮箱”联系我们处理;
3. 您可以在邮件列表服务中选择退订邮件:进入需要退订的邮件,在退订区域输入邮箱,该邮箱会收到一封退订通知邮件,点击对应的确认链接,即可完成退订;
-4. 您可以通过以下途径撤销隐私政策:“个人中心” -> “账号安全” -> “取消签署”;**当您取消签署隐私政策后,我们无法继续为您提供对应的服务,但是您的账号依然存在**。
+4. 您可以通过以下途径撤销隐私政策:“个人中心” > “账号安全” > “取消签署”;**当您取消签署隐私政策后,我们无法继续为您提供对应的服务,但是您的账号依然存在**。
### 6.5 注销服务
-您可以在openGauss社区登录,进入“个人中心” -> “账号安全” -> “账号删除”注销您的openGauss社区账号,您在openGauss社区的个人信息也将一并删除,请您谨慎操作。
+您可以在openGauss社区登录,进入“个人中心” > “账号安全” > “账号删除”注销您的openGauss社区账号,您在openGauss社区的个人信息也将一并删除,请您谨慎操作。
## 7. 个人信息存储地点
@@ -167,8 +168,8 @@ title: '隐私政策'
联系电话:**+86 18628259905**
-最近更新时间:**2025**年**03**月**29**日
+最近更新时间:**2025**年**04**月**25**日
-隐私政策版本:**v20250329**
+隐私政策版本:**v20250425**