有关论坛同步更新
Gitee 克隆 DiscuzX 项目的 MitFrame 分支git clone --branch MitFrame https://gitee.com/Discuz/DiscuzX.git
检查当前状态
root@hetzner-fsn1-001:~/workspace/DiscuzX# git branch -v
* MitFrame ae3036db 更新版本至 20250701，新增X5模板
root@hetzner-fsn1-001:~/workspace/DiscuzX# git remote -v
originhttps://gitee.com/Discuz/DiscuzX.git (fetch)
originhttps://gitee.com/Discuz/DiscuzX.git (push)获取远程更新
拉取远程仓库的最新信息
# Fetch latest changes from remote
git fetch origin
同步更新上游
方法一：使用 git pull
# Pull latest changes and merge
git pull origin MitFrame
方法二：使用 fetch + merge
# Fetch remote changes first
git fetch origin
# Merge remote changes
git merge origin/MitFrame
方法三：使用 rebase
# Pull with rebase to maintain linear history
git pull --rebase origin MitFrame
处理可能的冲突
# After resolving conflicts manually
git add .
git commit -m "Resolve merge conflicts"
# If using rebase
git rebase --continue
验证更新
# Check commit history
git log --oneline -10
# Check if your branch is up to date
git status
root@hetzner-fsn1-001:~/workspace/DiscuzX# git log --oneline -10
ae3036db (HEAD -> MitFrame, origin/MitFrame) 更新版本至 20250701，新增X5模板
49546d06 同步更新
8b3e9227 修复更新
e8718ecc 同步更新
3da7db30 同步更新
61770758 同步更新
562a1fd5 !2547 【X5】解除JQ依赖，用原生JS改造【buyinvitecode】 * 解除JQ依赖，用原生JS改造【buyinvitecode】
5ffc1c09 !2545 【X5】优化手机端头像上传流程【新】 * 【X5】优化手机端头像上传流程【新】
b81ffe12 同步更新
aed7ab19 同步更新
root@hetzner-fsn1-001:~/workspace/DiscuzX# git status
On branch MitFrame
Your branch is up to date with 'origin/MitFrame'.
nothing to commit, working tree clean
该 MitFrame 分支在本地 ~/workspace/DiscuzX/，站点数据在 /home/wwwroot/cdbao.org/，同步更新本地 MitFrame 分支
备份现有站点
备份当前生产环境
# Create backup directory
mkdir -p ~/workspace/backup/cdbao.org/$(date +%Y%m%d_%H%M%S)
# Rsync site directory, remember that different time stamp ↑
rsync -av \
--exclude='data/attachment/' \
/home/wwwroot/cdbao.org/ \
/root/workspace/backup/cdbao.org/$(date +%Y%m%d_%H%M%S)/
# Backup entire site
# cp -r /home/wwwroot/cdbao.org/ ~/workspace/backup/cdbao.org/$(date +%Y%m%d_%H%M%S)/
# Backup database (if needed)
# mysqldump -u username -p database_name > ~/workspace/backup/bbs_$(date +%Y%m%d_%H%M%S).sql
使用 rsync 安全同步
使用 rsync 进行安全文件同步，并排除部分目录及文件
试运行更改
rsync -av --delete \
--exclude='/config/config_global.php' \
--exclude='/config/config_ucenter.php' \
--exclude='/data/' \
--exclude='/sitemaps/' \
--exclude='/sitemap.xml' \
--exclude='/source/child/cron/cron_sitemaps.php' \
--exclude='/source/child/cron/cron_sitemaps_split.php' \
--exclude='/template/default/common/common.css' \
--exclude='/template/default/common/module.css' \
--exclude='/template/default/common/header_common.php' \
--exclude='/template/default/touch/common/header.php' \
--exclude='/template/default/common/editor.css' \
--exclude='/template/default/common/iconfont.eot' \
--exclude='/template/default/home/space_notice.php' \
--exclude='/static/image/common/' \
--exclude='/static/image/feed/' \
--exclude='/static/image/smiley/nachoneko/' \
--exclude='/favicon.ico' \
--exclude='/favicon.ico.bak' \
--exclude='/test.php' \
--exclude='*.log' \
--exclude='*.bak' \
--dry-run \
/root/workspace/DiscuzX/upload/ \
/home/wwwroot/cdbao.org/
正式更改
rsync -av --delete \
--exclude='/config/config_global.php' \
--exclude='/config/config_ucenter.php' \
--exclude='/data/' \
--exclude='/sitemaps/' \
--exclude='/sitemap.xml' \
--exclude='/source/child/cron/cron_sitemaps.php' \
--exclude='/source/child/cron/cron_sitemaps_split.php' \
--exclude='/template/default/common/common.css' \
--exclude='/template/default/common/module.css' \
--exclude='/template/default/common/header_common.php' \
--exclude='/template/default/touch/common/header.php' \
--exclude='/template/default/common/editor.css' \
--exclude='/template/default/common/iconfont.eot' \
--exclude='/template/default/home/space_notice.php' \
--exclude='/static/image/common/' \
--exclude='/static/image/feed/' \
--exclude='/static/image/smiley/nachoneko/' \
--exclude='/favicon.ico' \
--exclude='/favicon.ico.bak' \
--exclude='/test.php' \
--exclude='*.log' \
--exclude='*.bak' \
/root/workspace/DiscuzX/upload/ \
/home/wwwroot/cdbao.org/
快速回退
rsync -av --delete \
--exclude='data/attachment/' \
/root/workspace/backup/cdbao.org/$DATE/ \
/home/wwwroot/cdbao.org/
确定目录权限
root@hetzner-fsn1-001:~/workspace/DiscuzX# ls -l /home/wwwroot/cdbao.org/
total 144
-rw-r--r--1 root root 52 Jul 20 01:54 admin.php
drwxr-xr-x 14 root root4096 Jul 20 01:54 api
-rw-r--r--1 root root 50 Jul 20 01:54 api.php
drwxr-xr-x2 root root4096 Jul 20 01:54 archiver
drwxr-xr-x2 root root4096 Jul 20 01:54 avatar
drwxr-xr-x2 wwwwww 4096 Jul 21 13:48 config
-rw-r--r--1 root root 102 Jul 20 01:54 crossdomain.xml
drwxr-xr-x 24 wwwwww 4096 Jul 19 12:22 data
-rw-r--r--1 wwwwww15406 Jul4 08:40 favicon.ico
-rw-r--r--1 wwwwww15406 Jun 28 03:10 favicon.ico.bak
-rw-r--r--1 root root 52 Jul 20 01:54 forum.php
-rw-r--r--1 root root 52 Jul 20 01:54 group.php
-rw-r--r--1 root root 51 Jul 20 01:54 home.php
-rw-r--r--1 root root 430 Jul 20 01:54 index.php
drwxr-xr-x5 root root4096 Jul 20 02:07 install
-rw-r--r--1 root root 111 Jul 20 01:54 login.php
-rw-r--r--1 root root 53 Jul 20 01:54 member.php
-rw-r--r--1 root root 51 Jul 20 01:54 misc.php
-rw-r--r--1 root root 53 Jul 20 01:54 plugin.php
-rw-r--r--1 root root 53 Jul 20 01:54 portal.php
-rw-r--r--1 root root 567 Jul 20 01:54 robots.txt
-rw-r--r--1 root root 53 Jul 20 01:54 search.php
drwxr-xr-x 10 root root4096 Jul 20 01:54 source
drwxr-xr-x8 root root4096 Jul 20 01:54 static
drwxr-xr-x5 root root4096 Jul 20 01:54 template
-rw-r--r--1 root root9436 Jun 28 08:18 test.php
drwxr-xr-x2 root root4096 Jul 20 01:54 vendor
-rw-r--r--1 root root 763 Jun 30 08:35 wget-log
用户和组需要更改至 www:www
chown -R www:www /home/wwwroot/cdbao.org/
# Or
find /home/wwwroot/cdbao.org/ -type d -name data -prune -o -print0 | xargs -0 chown www:www
root@hetzner-fsn1-001:~/workspace/DiscuzX# ls -l /home/wwwroot/cdbao.org/
total 144
-rw-r--r--1 www www 52 Jul 20 01:54 admin.php
drwxr-xr-x 14 www www4096 Jul 20 01:54 api
-rw-r--r--1 www www 50 Jul 20 01:54 api.php
drwxr-xr-x2 www www4096 Jul 20 01:54 archiver
drwxr-xr-x2 www www4096 Jul 20 01:54 avatar
drwxr-xr-x2 www www4096 Jul 21 13:48 config
-rw-r--r--1 www www 102 Jul 20 01:54 crossdomain.xml
drwxr-xr-x 24 www www4096 Jul 19 12:22 data
-rw-r--r--1 www www 15406 Jul4 08:40 favicon.ico
-rw-r--r--1 www www 15406 Jun 28 03:10 favicon.ico.bak
-rw-r--r--1 www www 52 Jul 20 01:54 forum.php
-rw-r--r--1 www www 52 Jul 20 01:54 group.php
-rw-r--r--1 www www 51 Jul 20 01:54 home.php
-rw-r--r--1 www www 430 Jul 20 01:54 index.php
drwxr-xr-x5 www www4096 Jul 20 02:07 install
-rw-r--r--1 www www 111 Jul 20 01:54 login.php
-rw-r--r--1 www www 53 Jul 20 01:54 member.php
-rw-r--r--1 www www 51 Jul 20 01:54 misc.php
-rw-r--r--1 www www 53 Jul 20 01:54 plugin.php
-rw-r--r--1 www www 53 Jul 20 01:54 portal.php
-rw-r--r--1 www www 567 Jul 20 01:54 robots.txt
-rw-r--r--1 www www 53 Jul 20 01:54 search.php
drwxr-xr-x 10 www www4096 Jul 20 01:54 source
drwxr-xr-x8 www www4096 Jul 20 01:54 static
drwxr-xr-x5 www www4096 Jul 20 01:54 template
-rw-r--r--1 www www9436 Jun 28 08:18 test.php
drwxr-xr-x2 www www4096 Jul 20 01:54 vendor
-rw-r--r--1 www www 763 Jun 30 08:35 wget-log
页:
[1]