Просмотр исходного кода

fix: git pull 冲突时强制用仓库版本覆盖

使用 git reset --hard origin/master 确保本地与远程一致

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
MyFramework User 4 месяцев назад
Родитель
Сommit
afe31c0365
3 измененных файлов с 4 добавлено и 39 удалено
  1. 0 28
      server/cert/wx/apiclient_key.pem
  2. 0 9
      server/cert/wx/pub_key.pem
  3. 4 2
      server/deploy-simple.sh

+ 0 - 28
server/cert/wx/apiclient_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCaAck8CaL7V7sX
-R6H9GlXvnXYJRNBJjGt1CYqdiqAXr3yoW3qESaS7EpNioDjohzs7RTfvHfNtuy0z
-XRGzaW6M/jiK6kTPmxobuSUhKHElGAcKz/+gXkL+07oznyM/Kal/xkT99Zv6mzkd
-HtJ6uKvVBktrQQ3HptLBXdJ+hMuxdmYyRGo88gMAh9pL58YVZFE+W1eHsrCGe3jJ
-+lF63qC9ZcgKcEYcjn/3frg6ZjQyyX+cPolP8Oz3rw5fv6ay0hZlv14gL5WieuRh
-SKiEWBt+eyGHw/EwkHXpi1CqebPTA8CWvmL43Qey0zAQONpW1YMSB7Q7rwbAdm5P
-GBv0jVzbAgMBAAECggEBAJlFfclKrfIHdiPNHuKO+0fmJjtDSShpn+hy/omcFYh9
-FktX/674vAGSkyxs2TZSoBh04x4PaN2kk2+zCJLOM0APIqbeUG1tp6Y/tTwyy6hn
-KVsRdw9bwMFsZrxJfQK3rAGGidNWRU48fbMFoeSRNjJkeVrc+6Hf3ZCkl4FjGHYc
-HIL/as0Qiksbvo8QlSa/qdqq2zAQ1aD13ykdQiP0uK8+7mmv48XRD4B46NGuCUKV
-DZQyPzZJksMCP3KYqCYsOrtjgunWOfmLp7CwPEC/idbH/hPoD2w5lndq0m1FAovN
-Jab7yQm0fg9pR+R+AdJ1JaN/5fCJeLpr2HigBHwOwkECgYEAyawvZNcFWDoTo+v+
-30WZ085rWLELTgrD7wr/ntik5faZqQm3nBk+x0lmdOLviTagpZYaUtxmmeAd5RDc
-As3nYhJxufPbZBgHMrxd55CP0bIPcLNJ/xjxSGQZbbDyJIAmmTmna5A8ixkdtdEx
-YIoDiQ19Nr25LQjZSOKPgTNFK6cCgYEAw3530ABdjP6CfhyHpA8a1sJ33pRqosA/
-j2bi6mT4NklboD2cklC5O/SNuTSFOcmU5YruOT5oySrjs3Jm0QUVh50xc4OtgpVz
-eCJ73NzQgTmm/Dx6j4MxRODoESm63gn8pEk1TFqp8FrhkKyXGog/b1LcZ+Mx0YnA
-rdZRCeyx260CgYBYBv5Q58H/dqon/NStJDY2y3zzo6Oplu1bI9Pbw/iGIBOGQyWP
-zz0lw5YjIwMnQ17vqAspa+ak97xUxf0ihDmhByf44MY8dHh/3tSmROVhxHUU3k1I
-Odznmjm3NWscH4u5if7X5odmt7nOKNeCqftNEUQ8ZqezTo95TtsQrA5fNQKBgD2Y
-VlXCF7e55RGpGY+2dqVd5njJ2INpAV3EdBCYOaCZInZtkyyCpKpgVlsZUjSv7+sX
-CBIfONLRYacDj6Oh73OoMpGL1pqDTjt22gHvzP46VQO6Zn9bPaXPGy91L3yQNvro
-WhOxqUOiztlPl9hzP1FrESjma6byuTPMiAIRgsSNAoGBAKnw0pUuwHMdbZzBtS1k
-j1qeq+9rQzXMI83zaeciD1+GlnENm+17QyCnV/ZwajWSqmk6mz688VB9M4wLAtIw
-P8xfytUQ6vvtU4RCJg9s5hBqmKPQcOTyCn8soOY/32l9rudhDC25x9AAEqBMQuEj
-3OVeODeGTvCMN1JoUjUKzuvr
------END PRIVATE KEY-----

+ 0 - 9
server/cert/wx/pub_key.pem

@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmZ9zqIsyL46h+e1k3M1e
-sVU2pD4bVCfisms3p2eUzlCAr5Ye74sjZN29Z32zpBESWQr31ROmAhaMC0lH3yx4
-OfOw6pxLQyndiNRCGC3yzFJ9iu1PxtRDFFM0pfL6AiNU5QZlDuHcRgZzTg4Z+RDq
-nrGbOKa+OOHeiHc9wAA3XSpkmVVzMdmn5rlvTcA5aHi951BCgfkaYzTfefaanqAq
-zeb0Zi5SAN/c5y8byYek69zZ8yE5aRapGwYSxQkA5T10YNCcRCQpGG/zgvUFB/va
-gURtYKDSzzW3uMYSRv816vsRd+5cM/IhfYyQ0EkRrhlE0Sazr/QKjUhjKuLe61dj
-CQIDAQAB
------END PUBLIC KEY-----

+ 4 - 2
server/deploy-simple.sh

@@ -17,9 +17,11 @@ log "========== 开始自动部署 =========="
 # 切换到项目目录
 cd "$PROJECT_DIR"
 
-# Git pull
+# Git pull (冲突时强制用仓库版本)
 log "执行 git pull..."
-git pull origin master 2>&1 | tee -a "$DEPLOY_LOG"
+cd "$PROJECT_DIR"
+git fetch origin
+git reset --hard origin/master 2>&1 | tee -a "$DEPLOY_LOG"
 
 # ========== 启动/重启前端 ==========
 log "启动前端 dev server..."