Git Flow 现代实操指南含代码到 CI/CD 全流程的长尾关键词解析与实践要点

# 示例分支命名
feature/user/add-avatar-upload  # 功能分支：用户模块添加头像上传
fix/auth/jwt-token-expire       # 修复分支：认证模块JWT过期问题
chore/ci/update-test-env        # 维护分支：CI环境更新

# 标准提交示例
✨ feat(user): 添加头像上传功能           # 新功能
🐛 fix(auth): 修复JWT令牌过期问题        # 修复bug
📚 docs: 更新API文档                    # 文档更新
🚀 chore(ci): 配置GitHub Actions自动部署 # 构建/工具链更新

git init
git add .
git commit -m "🎉 init: 创建Spring Boot项目"
git branch -M main  # 使用main作为主分支
git remote add origin <远程仓库URL>
git push -u origin main

git checkout -b feature/auth/add-jwt-auth main

// AuthController.java
@RestController
@RequestMapping("/api/auth")
public class AuthController {
    @PostMapping("/login")
    public ResponseEntity<AuthResponse> login(@RequestBody LoginRequest request) {
        // JWT认证逻辑
        String token = jwtService.generateToken(request.getUsername());
        return ResponseEntity.ok(new AuthResponse(token));
    }
}

git add .
git commit -m "✨ feat(auth): 添加JWT认证接口"

# .github/workflows/ci.yml
name: Java CI
on: [push, pull_request]
jobs:
  build:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-java@v4
        with:
          java-version: '17'
          distribution: 'temurin'
      - name: Build with Maven
        run: mvn -B clean verify
      - name: SonarCloud分析
        run: mvn sonar:sonar -Dsonar.projectKey=my-project

git checkout -b release/v1.0.0 main

# Maven项目更新版本
mvn versions:set -DnewVersion=1.0.0
git commit -am "📦 release: 更新版本号到1.0.0"

# .github/workflows/release.yml
name: Release
on:
  push:
    branches:
      - 'release/*'
jobs:
  release:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: 构建Docker镜像
        run: |
          docker build -t my-app:${GITHUB_REF##*/} .
          docker push my-app:${GITHUB_REF##*/}
      - name: 部署到测试环境
        uses: deploy-to-kubernetes@v1
        with:
          namespace: test
          images: my-app:${GITHUB_REF##*/}

git checkout -b hotfix/v1.0.1 main

// 修复SQL注入漏洞
@GetMapping("/users")
public List<User> getUsers(@RequestParam String name) {
    // 使用参数化查询防止SQL注入
    return userRepository.findByName(name);
}

# .github/workflows/hotfix.yml
name: Hotfix
on:
  push:
    branches:
      - 'hotfix/*'
jobs:
  deploy:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: 构建紧急修复版本
        run: mvn -B package -DskipTests
      - name: 部署到生产环境
        uses: deploy-to-kubernetes@v1
        with:
          namespace: production
          images: my-app:${GITHUB_REF##*/}

# 分支与环境映射
main  → 生产环境
develop → 测试环境
release/* → 预发布环境
feature/* → 开发人员个人环境

<!-- Maven依赖锁定 -->
<dependencyManagement>
  <dependencies>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-dependencies</artifactId>
      <version>3.2.0</version>
      <type>pom</type>
      <scope>import</scope>
    </dependency>
  </dependencies>
</dependencyManagement>

# 交互式合并工具配置
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'

# 安全回滚（保留提交历史）
git revert HEAD  # 回滚最近一次提交

# 定期将main同步到develop
git checkout develop
git merge main