Merge branch 'master' into release

# Conflicts: # jenkins/Jenkinsfile.production-server-provision
fix Jenkins provision regex escaping
2026-05-19 22:40:44 +08:00 · 2026-05-19 11:46:54 +08:00 · 2026-05-19 10:56:39 +08:00 · 2026-05-19 10:27:19 +08:00 · 2026-05-19 07:09:17 +08:00 · 2026-05-19 00:08:16 +08:00
1 changed files with 1 additions and 1 deletions
--- a/jenkins/Jenkinsfile.production-server-provision
+++ b/jenkins/Jenkinsfile.production-server-provision
@@ -504,4 +504,4 @@ BASH
      echo "Server provision 完成: target=${params.DEPLOY_TARGET}, dryRun=${params.DRY_RUN}, nginxConfigMode=${params.NGINX_CONFIG_MODE}"
    }
  }
-}
+}
Author	SHA1	Message	Date
kdletters	49f3831d95	Merge branch 'master' into release # Conflicts: # jenkins/Jenkinsfile.production-server-provision	2026-05-19 22:40:44 +08:00
kdletters	ec0eeaac62	fix Jenkins provision regex escaping	2026-05-19 11:46:54 +08:00
kdletters	6fdf4ad65a	Merge branch 'master' into release	2026-05-19 10:56:39 +08:00
kdletters	5c9d39bde8	Merge pull request 'master' (#27 ) from master into release Reviewed-on: #27	2026-05-19 10:27:19 +08:00
kdletters	e0086a6e61	Merge branch 'master' into release	2026-05-19 07:09:17 +08:00
kdletters	f16e657c3c	Merge pull request '修复冲突错误' (#26 ) from master into release Reviewed-on: #26	2026-05-19 00:08:16 +08:00
kdletters	184e9f7ba9	Merge pull request 'master' (#25 ) from master into release Reviewed-on: #25	2026-05-18 23:19:10 +08:00
kdletters	3b7e1615c2	Merge pull request 'fix(jenkins): preflight node toolchain for database import/export' (#24 ) from master into release Reviewed-on: #24	2026-05-15 17:21:29 +08:00
kdletters	34dca5fccc	Merge pull request 'master' (#22 ) from master into release Reviewed-on: #22	2026-05-15 11:55:37 +08:00
kdletters	e8d832c1ea	Merge pull request 'fix: 修复微信支付生产构建依赖' (#20 ) from master into release Reviewed-on: #20	2026-05-14 03:38:41 +08:00
kdletters	b08f878841	Merge pull request 'master' (#19 ) from master into release Reviewed-on: #19	2026-05-14 01:25:03 +08:00
kdletters	ad1b91498d	Merge pull request 'master' (#17 ) from master into release Reviewed-on: #17	2026-05-13 20:26:33 +08:00
kdletters	71c7dd2558	Merge pull request 'Use domain fallback for Jenkins git checkout' (#16 ) from master into release Reviewed-on: #16	2026-05-13 19:38:54 +08:00
kdletters	a6de4d8a32	Merge branch 'master' into release	2026-05-13 17:34:46 +08:00
kdletters	8ddaf72eb7	Merge pull request 'master' (#15 ) from master into release Reviewed-on: #15	2026-05-13 16:21:57 +08:00
kdletters	ad970797e9	Merge pull request 'master' (#14 ) from master into release Reviewed-on: http://82.157.175.59:3000/GenarrativeAI/Genarrative/pulls/14	2026-05-13 13:23:06 +08:00