From 05ea0e3dc041bb6efc4a2a4674daa70043ec8390 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Fri, 22 Aug 2025 01:20:03 +0800
Subject: [PATCH] =?UTF-8?q?gite=5Fusername=E6=94=B9=E4=B8=BAgit=5Fusername?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jcloud/jcloud/pagetype/app_source/app_source.py    |  6 +++---
 .../pagetype/jcloud_settings/jcloud_settings.json  | 14 +++++++-------
 .../pagetype/jcloud_settings/jcloud_settings.py    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jcloud/jcloud/pagetype/app_source/app_source.py b/jcloud/jcloud/pagetype/app_source/app_source.py
index 06a4e95..b672315 100644
--- a/jcloud/jcloud/pagetype/app_source/app_source.py
+++ b/jcloud/jcloud/pagetype/app_source/app_source.py
@@ -272,10 +272,10 @@ class AppSource(Document):
 		git_service_type = settings.get("git_service_type") or "gitea"
 		
 		if git_service_type.lower() == "gitea":
-			gite_username = settings.get("gite_username")
+			git_username = settings.get("git_username")
 			git_access_token = settings.get_password("git_access_token")
-			if gite_username and git_access_token:
-				return f"http://{gite_username}:{git_access_token}@git.jingrow.com/{self.repository_owner}/{self.repository}"
+			if git_username and git_access_token:
+				return f"http://{git_username}:{git_access_token}@git.jingrow.com/{self.repository_owner}/{self.repository}"
 		
 		if git_service_type.lower() == "github" and self.github_installation_id:
 			token = get_access_token(self.github_installation_id)
diff --git a/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.json b/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.json
index d351346..e1a8bed 100644
--- a/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.json
+++ b/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.json
@@ -204,7 +204,7 @@
   "infrastructure_tab",
   "git_section",
   "git_service_type",
-  "gite_username",
+  "git_username",
   "column_break_jhbn",
   "git_url",
   "git_access_token",
@@ -1600,20 +1600,20 @@
    "fieldtype": "Password",
    "label": "West Api Password"
   },
-  {
-   "fieldname": "gite_username",
-   "fieldtype": "Data",
-   "label": "Gite Username"
-  },
   {
    "fieldname": "git_access_token",
    "fieldtype": "Password",
    "label": "Git Access Token"
+  },
+  {
+   "fieldname": "git_username",
+   "fieldtype": "Data",
+   "label": "Git Username"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2025-08-21 23:47:53.416916",
+ "modified": "2025-08-22 01:17:48.550460",
  "modified_by": "Administrator",
  "module": "Jcloud",
  "name": "Jcloud Settings",
diff --git a/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py b/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py
index a300d3c..cbae513 100644
--- a/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py
+++ b/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py
@@ -83,7 +83,7 @@ class JcloudSettings(Document):
 		git_access_token: DF.Password | None
 		git_service_type: DF.Literal["gitea", "github"]
 		git_url: DF.Data | None
-		gite_username: DF.Data | None
+		git_username: DF.Data | None
 		github_access_token: DF.Data | None
 		github_app_client_id: DF.Data | None
 		github_app_client_secret: DF.Data | None