jingrow/jcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gite_username改为git_username

Browse Source
This commit is contained in:
jingrow 2025-08-22 01:20:03 +08:00
parent 9892c569ac
commit 05ea0e3dc0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jcloud/jcloud/pagetype/app_source/app_source.py
View File

@ -272,10 +272,10 @@ class AppSource(Document):
git_service_type = settings.get("git_service_type") or "gitea" git_service_type = settings.get("git_service_type") or "gitea"
if git_service_type.lower() == "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") git_access_token = settings.get_password("git_access_token")
if gite_username and git_access_token: if git_username and git_access_token:
return f"http://{gite_username}:{git_access_token}@git.jingrow.com/{self.repository_owner}/{self.repository}" 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: if git_service_type.lower() == "github" and self.github_installation_id:
token = get_access_token(self.github_installation_id) token = get_access_token(self.github_installation_id)

14
jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.json
View File

@ -204,7 +204,7 @@
"infrastructure_tab", "infrastructure_tab",
"git_section", "git_section",
"git_service_type", "git_service_type",
"gite_username", "git_username",
"column_break_jhbn", "column_break_jhbn",
"git_url", "git_url",
"git_access_token", "git_access_token",
@ -1600,20 +1600,20 @@
"fieldtype": "Password", "fieldtype": "Password",
"label": "West Api Password" "label": "West Api Password"
}, },
{
"fieldname": "gite_username",
"fieldtype": "Data",
"label": "Gite Username"
},
{ {
"fieldname": "git_access_token", "fieldname": "git_access_token",
"fieldtype": "Password", "fieldtype": "Password",
"label": "Git Access Token" "label": "Git Access Token"
},
{
"fieldname": "git_username",
"fieldtype": "Data",
"label": "Git Username"
} }
], ],
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2025-08-21 23:47:53.416916", "modified": "2025-08-22 01:17:48.550460",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Jcloud", "module": "Jcloud",
"name": "Jcloud Settings", "name": "Jcloud Settings",

2
jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py
View File

@ -83,7 +83,7 @@ class JcloudSettings(Document):
git_access_token: DF.Password | None git_access_token: DF.Password | None
git_service_type: DF.Literal["gitea", "github"] git_service_type: DF.Literal["gitea", "github"]
git_url: DF.Data | None git_url: DF.Data | None
gite_username: DF.Data | None git_username: DF.Data | None
github_access_token: DF.Data | None github_access_token: DF.Data | None
github_app_client_id: DF.Data | None github_app_client_id: DF.Data | None
github_app_client_secret: DF.Data | None github_app_client_secret: DF.Data | None