{"id":2,"date":"2026-03-30T14:20:17","date_gmt":"2026-03-30T06:20:17","guid":{"rendered":"http:\/\/peishop.cn\/?page_id=2"},"modified":"2026-03-30T15:16:37","modified_gmt":"2026-03-30T07:16:37","slug":"sample-page","status":"publish","type":"page","link":"https:\/\/peishop.cn\/index.php\/sample-page\/","title":{"rendered":"Git\u6743\u9650\u8bbe\u8ba1"},"content":{"rendered":"\n
    \n
  1. \u6838\u5fc3\u5206\u652f\u7ed3\u6784<\/li>\n<\/ol>\n\n\n\n

    main (\u6216 master) – \u751f\u4ea7\u73af\u5883\u4ee3\u7801
    \u251c\u2500\u2500 staging – \u6d4b\u8bd5\/\u9884\u53d1\u5e03\u73af\u5883
    \u251c\u2500\u2500 develop – \u5f00\u53d1\u4e3b\u5206\u652f
    \u2502 \u251c\u2500\u2500 feature\/* – \u529f\u80fd\u5206\u652f
    \u2502 \u251c\u2500\u2500 bugfix\/* – \u7f3a\u9677\u4fee\u590d\u5206\u652f
    \u2502 \u2514\u2500\u2500 hotfix\/* – \u7d27\u6025\u4fee\u590d\u5206\u652f
    \u2514\u2500\u2500 release\/* – \u53d1\u5e03\u5206\u652f<\/p>\n\n\n\n

    \u6c38\u4e45\u5206\u652f<\/p>\n\n\n\n

    1. main\/master \u5206\u652f – \u751f\u4ea7\u73af\u5883<\/h1>\n\n\n\n

    \u6743\u9650\uff1a\u53ea\u6709\u7ba1\u7406\u5458\u53ef\u4ee5\u5408\u5e76<\/h1>\n\n\n\n

    git checkout -b main<\/p>\n\n\n\n

    \u4fdd\u62a4\u89c4\u5219\uff1a\u7981\u6b62\u76f4\u63a5push\uff0c\u5fc5\u987b\u901a\u8fc7PR<\/h1>\n\n\n\n

    <\/p>\n\n\n\n

    2. staging \u5206\u652f – \u6d4b\u8bd5\/\u9884\u53d1\u5e03\u73af\u5883<\/h1>\n\n\n\n

    git checkout -b staging<\/p>\n\n\n\n

    \u4fdd\u62a4\u89c4\u5219\uff1a\u53ea\u6709\u6d4b\u8bd5\u8d1f\u8d23\u4eba\u53ef\u4ee5\u5408\u5e76<\/h1>\n\n\n\n

    <\/p>\n\n\n\n

    3. develop \u5206\u652f – \u5f00\u53d1\u4e3b\u5206\u652f<\/h1>\n\n\n\n

    git checkout -b develop<\/p>\n\n\n\n

    \u4fdd\u62a4\u89c4\u5219\uff1a\u5f00\u53d1\u8005\u53ef\u4ee5\u521b\u5efa\u5206\u652f\uff0c\u5408\u5e76\u9700\u8981\u4ee3\u7801\u5ba1\u67e5<\/h1>\n\n\n\n

    <\/p>\n\n\n\n

    \u4e34\u65f6\u5206\u652f<\/p>\n\n\n\n

    1. \u529f\u80fd\u5206\u652f feature\/<\/h1>\n\n\n\n

    git checkout -b feature\/user-authentication<\/p>\n\n\n\n

    \u4ecedevelop\u521b\u5efa\uff0c\u5408\u5e76\u56dedevelop<\/h1>\n\n\n\n

    \u547d\u540d\uff1afeature\/\u529f\u80fd\u540d\u79f0-issue\u53f7<\/h1>\n\n\n\n

    2. \u7f3a\u9677\u4fee\u590d\u5206\u652f bugfix\/<\/h1>\n\n\n\n

    git checkout -b bugfix\/login-error-123<\/p>\n\n\n\n

    \u4ecedevelop\u521b\u5efa\uff0c\u5408\u5e76\u56dedevelop<\/h1>\n\n\n\n

    \u547d\u540d\uff1abugfix\/\u95ee\u9898\u63cf\u8ff0-issue\u53f7<\/h1>\n\n\n\n

    <\/p>\n\n\n\n

    3. \u7d27\u6025\u4fee\u590d\u5206\u652f hotfix\/<\/h1>\n\n\n\n

    git checkout -b hotfix\/critical-security-456<\/p>\n\n\n\n

    \u4ecemain\u521b\u5efa\uff0c\u5408\u5e76\u5230main\u548cdevelop<\/h1>\n\n\n\n

    \u547d\u540d\uff1ahotfix\/\u95ee\u9898\u63cf\u8ff0-issue\u53f7<\/h1>\n\n\n\n

    <\/p>\n\n\n\n

    4. \u53d1\u5e03\u5206\u652f release\/<\/h1>\n\n\n\n

    git checkout -b release\/v1.2.0<\/p>\n\n\n\n

    \u4ecedevelop\u521b\u5efa\uff0c\u5408\u5e76\u5230main\u548cdevelop<\/h1>\n\n\n\n

    \u547d\u540d\uff1arelease\/\u7248\u672c\u53f7<\/h1>\n\n\n\n

    <\/p>\n\n\n\n

      \n
    1. GitLab\u6743\u9650\u914d\u7f6e\u793a\u4f8b (.gitlab-ci.yml)<\/li>\n<\/ol>\n\n\n\n

      .gitlab-ci.yml<\/h1>\n\n\n\n

      stages:<\/p>\n\n\n\n

        \n
      • test<\/li>\n\n\n\n
      • build<\/li>\n\n\n\n
      • deploy<\/li>\n<\/ul>\n\n\n\n

        variables:
        PRODUCTION_BRANCH: “main”
        STAGING_BRANCH: “staging”
        DEVELOP_BRANCH: “develop”<\/p>\n\n\n\n

        \u5206\u652f\u4fdd\u62a4\u89c4\u5219<\/h1>\n\n\n\n

        workflow:
        rules:
        – if: ‘$CI_COMMIT_REF_NAME == $PRODUCTION_BRANCH’
        when: manual # \u751f\u4ea7\u90e8\u7f72\u9700\u8981\u624b\u52a8\u89e6\u53d1
        – if: ‘$CI_COMMIT_REF_NAME == $STAGING_BRANCH’
        when: on_success
        – if: ‘$CI_COMMIT_REF_NAME =~ \/^feature\\\/.*\/’
        when: on_success
        – if: ‘$CI_COMMIT_REF_PROTECTED == “true”‘
        when: never # \u4fdd\u62a4\u5206\u652f\u4e0d\u5141\u8bb8\u76f4\u63a5push<\/p>\n\n\n\n

        \u4ee3\u7801\u8d28\u91cf\u68c0\u67e5<\/h1>\n\n\n\n

        code_quality:
        stage: test
        script:
        – echo “Running code quality checks\u2026”
        – sonar-scanner
        only:
        – develop
        – staging
        – merge_requests<\/p>\n\n\n\n

        \u5355\u5143\u6d4b\u8bd5<\/h1>\n\n\n\n

        unit_test:
        stage: test
        script:
        – echo “Running unit tests\u2026”
        – phpunit
        only:
        – develop
        – staging
        – merge_requests<\/p>\n\n\n\n

        \u6784\u5efa<\/h1>\n\n\n\n

        build:
        stage: build
        script:
        – echo “Building application\u2026”
        – npm run build
        only:
        – develop
        – staging
        – tags<\/p>\n\n\n\n

        \u90e8\u7f72\u5230\u5f00\u53d1\u73af\u5883<\/h1>\n\n\n\n

        deploy_development:
        stage: deploy
        script:
        – echo “Deploying to development\u2026”
        – .\/deploy.sh development
        only:
        – develop
        environment:
        name: development
        url: https:\/\/dev.example.com<\/p>\n\n\n\n

        \u90e8\u7f72\u5230\u6d4b\u8bd5\u73af\u5883<\/h1>\n\n\n\n

        deploy_staging:
        stage: deploy
        script:
        – echo “Deploying to staging\u2026”
        – .\/deploy.sh staging
        only:
        – staging
        when: manual
        environment:
        name: staging
        url: https:\/\/staging.example.com<\/p>\n\n\n\n

        \u90e8\u7f72\u5230\u751f\u4ea7\u73af\u5883<\/h1>\n\n\n\n

        deploy_production:
        stage: deploy
        script:
        – echo “Deploying to production\u2026”
        – .\/deploy.sh production
        only:
        – main
        when: manual
        environment:
        name: production
        url: https:\/\/example.com<\/p>\n\n\n\n

        \u5206\u652f\u4fdd\u62a4\u89c4\u5219<\/p>\n\n\n\n

        Git\u914d\u7f6e\u793a\u4f8b<\/h1>\n\n\n\n

        1. main\u5206\u652f\u4fdd\u62a4<\/h1>\n\n\n\n

        git config branch.main.protect true
        git config branch.main.requireReview 2
        git config branch.main.requireCI true
        git config branch.main.noDirectPush true
        git config branch.main.requireSignedCommits true<\/p>\n\n\n\n

        2. staging\u5206\u652f\u4fdd\u62a4<\/h1>\n\n\n\n

        git config branch.staging.protect true
        git config branch.staging.requireReview 1
        git config branch.staging.requireCI true<\/p>\n\n\n\n

        3. develop\u5206\u652f\u4fdd\u62a4<\/h1>\n\n\n\n

        git config branch.develop.protect true
        git config branch.develop.requireReview 1<\/p>\n\n\n\n

        \u529f\u80fd\u5f00\u53d1\u6d41\u7a0b<\/p>\n\n\n\n

        1. \u4ecedevelop\u521b\u5efa\u529f\u80fd\u5206\u652f<\/h1>\n\n\n\n

        git checkout develop
        git pull origin develop
        git checkout -b feature\/user-login-123<\/p>\n\n\n\n

        2. \u5f00\u53d1\u529f\u80fd<\/h1>\n\n\n\n

        git add .
        git commit -m “feat: \u6dfb\u52a0\u7528\u6237\u767b\u5f55\u529f\u80fd #123”
        git push origin feature\/user-login-123<\/p>\n\n\n\n

        3. \u521b\u5efaPull Request<\/h1>\n\n\n\n

        \u76ee\u6807\u5206\u652f: develop<\/h1>\n\n\n\n

        \u6dfb\u52a0\u5ba1\u67e5\u8005: @reviewer1 @reviewer2<\/h1>\n\n\n\n

        \u5173\u8054Issue: #123<\/h1>\n\n\n\n

        4. \u4ee3\u7801\u5ba1\u67e5\u901a\u8fc7\u540e\uff0c\u5408\u5e76\u5230develop<\/h1>\n\n\n\n

        git checkout develop
        git merge –no-ff feature\/user-login-123
        git branch -d feature\/user-login-123<\/p>\n\n\n\n

        \u53d1\u5e03\u6d41\u7a0b<\/p>\n\n\n\n

        1. \u4ecedevelop\u521b\u5efarelease\u5206\u652f<\/h1>\n\n\n\n

        git checkout develop
        git pull origin develop
        git checkout -b release\/v1.2.0<\/p>\n\n\n\n

        2. \u7248\u672c\u53f7\u66f4\u65b0\u3001\u6587\u6863\u66f4\u65b0<\/h1>\n\n\n\n

        \u4fee\u6539version.txt, CHANGELOG.md\u7b49<\/h1>\n\n\n\n

        git add .
        git commit -m “chore: \u51c6\u5907\u53d1\u5e03v1.2.0”<\/p>\n\n\n\n

        3. \u5408\u5e76\u5230staging\u8fdb\u884c\u6d4b\u8bd5<\/h1>\n\n\n\n

        git checkout staging
        git merge –no-ff release\/v1.2.0
        git push origin staging<\/p>\n\n\n\n

        4. \u6d4b\u8bd5\u901a\u8fc7\u540e\uff0c\u5408\u5e76\u5230main<\/h1>\n\n\n\n

        git checkout main
        git merge –no-ff release\/v1.2.0
        git tag -a v1.2.0 -m “\u53d1\u5e03v1.2.0”
        git push origin main –tags<\/p>\n\n\n\n

        5. \u5408\u5e76\u56dedevelop<\/h1>\n\n\n\n

        git checkout develop
        git merge –no-ff release\/v1.2.0
        git branch -d release\/v1.2.0<\/p>\n\n\n\n

        \u7d27\u6025\u4fee\u590d\u6d41\u7a0b<\/p>\n\n\n\n

        1. \u4ecemain\u521b\u5efahotfix\u5206\u652f<\/h1>\n\n\n\n

        git checkout main
        git pull origin main
        git checkout -b hotfix\/critical-bug-456<\/p>\n\n\n\n

        2. \u4fee\u590d\u95ee\u9898<\/h1>\n\n\n\n

        git add .
        git commit -m “fix: \u4fee\u590d\u4e25\u91cdbug #456”
        git push origin hotfix\/critical-bug-456<\/p>\n\n\n\n

        3. \u5feb\u901f\u6d4b\u8bd5\u540e\u5408\u5e76\u5230main<\/h1>\n\n\n\n

        git checkout main
        git merge –no-ff hotfix\/critical-bug-456
        git tag -a v1.2.1 -m “\u7d27\u6025\u4fee\u590d\u7248\u672cv1.2.1”
        git push origin main –tags<\/p>\n\n\n\n

        4. \u5408\u5e76\u5230develop<\/h1>\n\n\n\n

        git checkout develop
        git merge –no-ff hotfix\/critical-bug-456
        git branch -d hotfix\/critical-bug-456<\/p>\n\n\n\n

        \u81ea\u52a8\u5316\u90e8\u7f72\u811a\u672c<\/p>\n\n\n\n

        !\/bin\/bash<\/h1>\n\n\n\n

        deploy.sh<\/h1>\n\n\n\n

        ENVIRONMENT=$1
        VERSION=$2<\/p>\n\n\n\n

        case $ENVIRONMENT in
        development)
        echo “\ud83d\ude80 \u90e8\u7f72\u5230\u5f00\u53d1\u73af\u5883\u2026”
        BRANCH=”develop”
        SERVER=”dev-server.example.com”
        DEPLOY_PATH=”\/var\/www\/dev”
        ;;
        staging)
        echo “\ud83d\ude80 \u90e8\u7f72\u5230\u6d4b\u8bd5\u73af\u5883\u2026”
        BRANCH=”staging”
        SERVER=”staging-server.example.com”
        DEPLOY_PATH=”\/var\/www\/staging”
        ;;
        production)
        echo “\ud83d\ude80 \u90e8\u7f72\u5230\u751f\u4ea7\u73af\u5883\u2026”
        BRANCH=”main”
        SERVER=”prod-server.example.com”
        DEPLOY_PATH=”\/var\/www\/prod”
        ;;
        *)
        echo “\u274c \u672a\u77e5\u73af\u5883: $ENVIRONMENT”
        exit 1
        ;;
        esac<\/p>\n\n\n\n

        \u68c0\u67e5\u5f53\u524d\u5206\u652f<\/h1>\n\n\n\n

        CURRENT_BRANCH=$(git rev-parse –abbrev-ref HEAD)
        if [ “$CURRENT_BRANCH” != “$BRANCH” ]; then
        echo “\u274c \u5fc5\u987b\u5728 $BRANCH \u5206\u652f\u4e0a\u90e8\u7f72\u5230 $ENVIRONMENT \u73af\u5883”
        exit 1
        fi<\/p>\n\n\n\n

        \u90e8\u7f72<\/h1>\n\n\n\n

        echo “1. \u62c9\u53d6\u6700\u65b0\u4ee3\u7801\u2026”
        git pull origin $BRANCH<\/p>\n\n\n\n

        echo “2. \u5b89\u88c5\u4f9d\u8d56\u2026”
        composer install –no-dev
        npm install –production<\/p>\n\n\n\n

        echo “3. \u6784\u5efa\u2026”
        npm run build<\/p>\n\n\n\n

        echo “4. \u540c\u6b65\u5230\u670d\u52a1\u5668\u2026”
        rsync -avz –delete \\
        –exclude=’.git’ \\
        –exclude=’.env’ \\
        –exclude=’node_modules’ \\
        .\/ $SERVER:$DEPLOY_PATH\/<\/p>\n\n\n\n

        echo “5. \u91cd\u542f\u670d\u52a1\u2026”
        ssh $SERVER “cd $DEPLOY_PATH && systemctl restart php-fpm && systemctl restart nginx”<\/p>\n\n\n\n

        echo “\u2705 \u90e8\u7f72\u5b8c\u6210!”<\/p>\n\n\n\n

        \u5206\u652f\u547d\u540d\u89c4\u8303<\/p>\n\n\n\n

        \u529f\u80fd\u5206\u652f<\/h1>\n\n\n\n

        feature\/user-auth-123
        feature\/payment-gateway-456<\/p>\n\n\n\n

        \u7f3a\u9677\u4fee\u590d<\/h1>\n\n\n\n

        bugfix\/login-error-123
        bugfix\/api-timeout-456<\/p>\n\n\n\n

        \u7d27\u6025\u4fee\u590d<\/h1>\n\n\n\n

        hotfix\/security-patch-789
        hotfix\/db-connection-999<\/p>\n\n\n\n

        \u53d1\u5e03\u5206\u652f<\/h1>\n\n\n\n

        release\/v1.2.0
        release\/v2.0.0-beta<\/p>\n\n\n\n

        \u91cd\u6784<\/h1>\n\n\n\n

        refactor\/user-service-123
        refactor\/database-layer-456<\/p>\n","protected":false},"excerpt":{"rendered":"

        main (\u6216 master) – \u751f\u4ea7\u73af\u5883\u4ee3\u7801\u251c\u2500\u2500 staging – \u6d4b\u8bd5\/\u9884\u53d1 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"parent":0,"menu_order":0,"comment_status":"closed","ping_status":"open","template":"","meta":{"footnotes":""},"_links":{"self":[{"href":"https:\/\/peishop.cn\/index.php\/wp-json\/wp\/v2\/pages\/2"}],"collection":[{"href":"https:\/\/peishop.cn\/index.php\/wp-json\/wp\/v2\/pages"}],"about":[{"href":"https:\/\/peishop.cn\/index.php\/wp-json\/wp\/v2\/types\/page"}],"author":[{"embeddable":true,"href":"https:\/\/peishop.cn\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/peishop.cn\/index.php\/wp-json\/wp\/v2\/comments?post=2"}],"version-history":[{"count":2,"href":"https:\/\/peishop.cn\/index.php\/wp-json\/wp\/v2\/pages\/2\/revisions"}],"predecessor-version":[{"id":12,"href":"https:\/\/peishop.cn\/index.php\/wp-json\/wp\/v2\/pages\/2\/revisions\/12"}],"wp:attachment":[{"href":"https:\/\/peishop.cn\/index.php\/wp-json\/wp\/v2\/media?parent=2"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}