Merge branch 'develop' into 'release'

Develop

See merge request yescent/yes.blog!4

.gitlab-ci.yml

@@ -21,10 +21,9 @@ build_develop:
   script:
     - Version=$(sed -n 's/.*<Version>\([^<]*\)<\/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}
+    - 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:
     - develop
@@ -78,7 +77,7 @@ deploy_develop:
   script:
     - ssh -t 192.168.31.123 "(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
 
 
 

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