main #2

Merged
jingrow merged 250 commits from main into v1 2026-01-13 22:45:50 +08:00
3 changed files with 11 additions and 11 deletions
Showing only changes of commit 05ea0e3dc0 - Show all commits

View File

@ -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)

View File

@ -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",

View File

@ -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