From a0ca976e66c5a63f2336069dffe3d891cf913736 Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Wed, 23 Jul 2025 10:13:42 -0700 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=BC=80=E5=90=AF=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=B9=B6=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 开启调试模式以便更好地排查问题。 添加代码对比脚本 see.sh,用于简洁地对比代码变更,包括文件变更对比和变更统计,方便查看我们和他们的修改情况。 --- etc/ppanel.yaml | 2 +- see.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 see.sh diff --git a/etc/ppanel.yaml b/etc/ppanel.yaml index c13a46c..9d26a4d 100644 --- a/etc/ppanel.yaml +++ b/etc/ppanel.yaml @@ -4,7 +4,7 @@ TLS: Enable: false CertFile: "" KeyFile: "" -Debug: false +Debug: true JwtAuth: AccessSecret: 89270267-f1dc-4136-9c9c-dc38c4685d63 AccessExpire: 604800 diff --git a/see.sh b/see.sh new file mode 100644 index 0000000..06f9cb4 --- /dev/null +++ b/see.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# 简洁的代码对比脚本 +echo "🔍 代码对比报告" +echo "===========================================" +echo "" + +# 检查old远程仓库是否存在 +if ! git remote | grep -q "old"; then + echo "❌ 请先添加old远程仓库: git remote add old https://github.com/perfect-panel/server.git && git fetch old" + exit 1 +fi + +echo "📋 文件变更对比:" +echo "-------------------------------------------" +echo "我们修改的文件:" +git diff --name-status old/master main | grep -E '^[AM]' | sed 's/^A/🆕 新增: /' | sed 's/^M/✏️ 修改: /' +echo "" +echo "他们修改的文件:" +git diff --name-status main old/master | grep -E '^[AM]' | sed 's/^A/🆕 新增: /' | sed 's/^M/✏️ 修改: /' +echo "" + +echo "📊 变更统计:" +echo "-------------------------------------------" +echo "我们的变更:" +git diff --stat --color=always old/master main | tail -1 +echo "他们的变更:" +git diff --stat --color=always main old/master | tail -1 +echo "" + +echo "✅ 对比完成!" \ No newline at end of file