From 5fc2b0323c7371f51d4630e22f80c8fbbe0d340b Mon Sep 17 00:00:00 2001 From: xiang <27800734@qq.com> Date: Tue, 6 May 2025 23:35:57 +0800 Subject: [PATCH 1/5] 1 --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77b232b..e478891 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,13 +21,12 @@ build_develop: script: - Version=$(sed -n 's/.*\([^<]*\)<\/Version>.*/\1/p' ./${ProjectName}/${ProjectName}.csproj) - echo "${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}" - - echo "Registry = ${Ali_Docker_Registry}" - docker build -f ${DockerfilePath} -t ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID} . - docker login -u ${Ali_Docker_UserName} -p ${Ali_Docker_Password} ${Ali_Docker_Registry} - docker push ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID} only: - - develop + - develop1 @@ -77,7 +76,7 @@ deploy_develop: script: - ssh -t ${Test_Server_Ip} "(docker stop ${PackageName} && docker rm ${PackageName} || echo 'Container ${PackageName} not found, skipping removal.') && docker login -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} ${HARBOR_HOST} && docker run -e TZ=Asia/Shanghai -d --restart=always -v /data/yesblog:/app/files --name ${PackageName} -p ${AppPort}:8080 ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}" only: - - develop + - develop1 From 5511bdfeff122954213bad042da2d919823a7202 Mon Sep 17 00:00:00 2001 From: xiang <27800734@qq.com> Date: Tue, 6 May 2025 23:37:47 +0800 Subject: [PATCH 2/5] 1 --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0616ea..89809f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,12 +21,12 @@ build_develop: script: - Version=$(sed -n 's/.*\([^<]*\)<\/Version>.*/\1/p' ./${ProjectName}/${ProjectName}.csproj) - echo "${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}" - - docker build -f ${DockerfilePath} -t ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID} . - - docker login -u ${Ali_Docker_UserName} -p ${Ali_Docker_Password} ${Ali_Docker_Registry} - - docker push ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID} + - docker build -f ${DockerfilePath} -t ${ProductionDockerImage}:v${Version}-develop${CI_PIPELINE_ID} . + #- docker login -u ${Ali_Docker_UserName} -p ${Ali_Docker_Password} ${Ali_Docker_Registry} + #- docker push ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID} only: - - develop1 + - develop From 167d855f7836e8e6a4ad316b49f19b022e0b24a7 Mon Sep 17 00:00:00 2001 From: xiang <27800734@qq.com> Date: Tue, 6 May 2025 23:42:46 +0800 Subject: [PATCH 3/5] 1 --- Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs b/Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs index 4fec708..c89b13e 100644 --- a/Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs +++ b/Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs @@ -6,7 +6,7 @@ string? Slug, string Content, string? CoverUrl, - string? Summary, + string? Summary,1 List? Tags ) : IRequest; From cf8d928110a1794b9f82b7f929d90bbf090a374a Mon Sep 17 00:00:00 2001 From: xiang <27800734@qq.com> Date: Tue, 6 May 2025 23:44:41 +0800 Subject: [PATCH 4/5] 1 --- Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs b/Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs index c89b13e..4fec708 100644 --- a/Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs +++ b/Yes.Application/Admins/Articles/CreateArticleCommandHandler.cs @@ -6,7 +6,7 @@ string? Slug, string Content, string? CoverUrl, - string? Summary,1 + string? Summary, List? Tags ) : IRequest; From 905a2401211cb1a0e37799df4d437696969f8779 Mon Sep 17 00:00:00 2001 From: xiang <27800734@qq.com> Date: Tue, 6 May 2025 23:56:24 +0800 Subject: [PATCH 5/5] 1 --- Yes.Blog/Areas/Install/Pages/Index.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Yes.Blog/Areas/Install/Pages/Index.cshtml b/Yes.Blog/Areas/Install/Pages/Index.cshtml index d8c6c13..3d7a339 100644 --- a/Yes.Blog/Areas/Install/Pages/Index.cshtml +++ b/Yes.Blog/Areas/Install/Pages/Index.cshtml @@ -143,7 +143,7 @@ this this.errorMessage = ""; this.successMessage = ""; - axios.post('/admin/api/install', this.data) + axios.post('/install', this.data) .then(res => { console.log("res",res) if(res.data.success){