[pull] main from kejilion:main

.github/workflows/translate.yml

@@ -1,17 +1,13 @@
-
 name: Weekly Translation Workflow
 
 on:
   schedule:
-    # 每周日 UTC 02:00 执行 (北京时间周日 10:00)
     - cron: '0 2 * * 0'
-  workflow_dispatch: # 允许手动触发
-
+  workflow_dispatch:
 
 permissions:
   contents: write
 
-
 jobs:
   translate:
     runs-on: ubuntu-latest
@@ -50,148 +46,115 @@ jobs:
             return bool(re.search(r'[\u4e00-\u9fff]', text))
 
         def translate_text(text, target_lang):
+            if not text.strip() or not is_chinese(text):
+                return text
             try:
-                return GoogleTranslator(source='zh-CN', target=target_lang).translate(text)
+                # 过滤掉一些不该翻译的特殊符号
+                clean_text = text.strip()
+                result = GoogleTranslator(source='zh-CN', target=target_lang).translate(clean_text)
+                return result
             except Exception as e:
-                print(f"\nTranslation error: {e}")
+                print(f"\n[Error] {e}")
                 return text
-        
-        def translate_line_preserving_variables(line, target_lang):
+
+        def process_content_with_vars(content, target_lang):
             """
-            Translate only Chinese parts in echo/read/send_stats commands, excluding shell variables
+            核心逻辑：保护 ${var} 和 $var，翻译其中的中文部分
             """
-            # Match double or single quoted strings
-            def repl(match):
-                full_string = match.group(0)
-                quote = full_string[0]
-                content = full_string[1:-1]
-                # Split by variable expressions
-                parts = re.split(r'(\$\{?\w+\}?)', content)
-                translated_parts = [
-                    translate_text(p, target_lang) if is_chinese(p) else p
-                    for p in parts
-                ]
-                return quote + ''.join(translated_parts) + quote
-
-            return re.sub(r'(?:\'[^\']*\'|"[^"]*")', repl, line)
+            # 匹配 ${var} 或 $var (字母数字下划线)
+            parts = re.split(r'(\$\{\w+\}|\$\w+)', content)
+            translated_parts = []
+            for p in parts:
+                if p.startswith('$'): # 变量部分，保持原样
+                    translated_parts.append(p)
+                elif is_chinese(p): # 中文部分，翻译
+                    translated_parts.append(translate_text(p, target_lang))
+                else: # 其他英文/符号，保持原样
+                    translated_parts.append(p)
+            return "".join(translated_parts)
+
+        def universal_translator(line, target_lang):
+            """
+            通用翻译引擎：识别行内所有引号内容并翻译
+            """
+            # 1. 保护注释行
+            leading_space = re.match(r'^(\s*)', line).group(1)
+            stripped = line.strip()
+            if stripped.startswith('#'):
+                comment_content = stripped[1:].strip()
+                if is_chinese(comment_content):
+                    return f"{leading_space}# {translate_text(comment_content, target_lang)}\n"
+                return line
+
+            # 2. 识别所有引号内的内容 (双引号或单引号)
+            # 使用正则匹配引号对，同时处理转义引号 \"
+            def replacer(match):
+                quote_type = match.group(1) # ' 或 "
+                content = match.group(2)    # 引号内的文本内容
+                if is_chinese(content):
+                    # 翻译内容，但保护里面的变量
+                    translated = process_content_with_vars(content, target_lang)
+                    return f"{quote_type}{translated}{quote_type}"
+                return match.group(0)
+
+            # 匹配 "content" 或 'content'
+            new_line = re.sub(r'([\'"])(.*?)(?<!\\)\1', replacer, line)
+            return new_line
 
         def translate_file(input_file, output_file, target_lang):
             print(f"Translating to {target_lang}...")
+            if not os.path.exists(input_file): return False
 
-            if not os.path.exists(input_file):
-                print(f"Error: Input file {input_file} not found")
-                return False
-
-            total_lines = sum(1 for _ in open(input_file, 'r', encoding='utf-8'))
-            processed_lines = 0
+            with open(input_file, 'r', encoding='utf-8') as f:
+                lines = f.readlines()
 
-            with open(input_file, 'r', encoding='utf-8') as f_in, \
-                 open(output_file, 'w', encoding='utf-8') as f_out:
-
-                for line in f_in:
-                    processed_lines += 1
-                    progress = processed_lines / total_lines * 100
-                    print(f"\rProcessing: {progress:.1f}% ({processed_lines}/{total_lines})", end='')
-
-                    leading_space = re.match(r'^(\s*)', line).group(1)
-                    stripped = line.strip()
+            total = len(lines)
+            with open(output_file, 'w', encoding='utf-8') as f_out:
+                for i, line in enumerate(lines):
+                    if (i + 1) % 10 == 0 or i + 1 == total:
+                        print(f"\rProgress: {(i+1)/total*100:.1f}%", end='')
 
-                    if stripped.startswith('#') and is_chinese(stripped):
-                        comment_mark = '#'
-                        comment_text = stripped[1:].strip()
-                        if comment_text:
-                            translated = translate_text(comment_text, target_lang)
-                            f_out.write(f"{leading_space}{comment_mark} {translated}\n")
-                        else:
-                            f_out.write(line)
-                    elif any(cmd in stripped for cmd in ['echo', 'read', 'send_stats']) and is_chinese(stripped):
-                        translated_line = translate_line_preserving_variables(line, target_lang)
-                        f_out.write(translated_line)
+                    # 只要行内有中文，就尝试用通用引擎翻译
+                    if is_chinese(line):
+                        f_out.write(universal_translator(line, target_lang))
                     else:
                         f_out.write(line)
-
-            print(f"\nTranslation to {target_lang} completed.")
-            print(f"Original file size: {os.path.getsize(input_file)} bytes")
-            print(f"Translated file size: {os.path.getsize(output_file)} bytes")
+            print(f"\n{target_lang} Success.")
             return True
 
         if __name__ == "__main__":
             input_file = 'kejilion.sh'
-
-            # 语言映射：目录名 -> Google翻译语言代码
-            languages = {
-                'en': 'en',      # 英语
-                'tw': 'zh-TW',   # 繁体中文
-                'kr': 'ko',      # 韩语
-                'jp': 'ja'       # 日语
-            }
-
-            success_count = 0
-
-            for dir_name, lang_code in languages.items():
-                output_file = f'{dir_name}/kejilion.sh'
-                if translate_file(input_file, output_file, lang_code):
-                    success_count += 1
-                    print(f"✓ Successfully translated to {dir_name}")
-                else:
-                    print(f"✗ Failed to translate to {dir_name}")
-                print("-" * 50)
-
-            print(f"\nTranslation summary: {success_count}/{len(languages)} languages completed")
-
-            if success_count == 0:
-                sys.exit(1)
+            langs = {'en': 'en', 'tw': 'zh-TW', 'kr': 'ko', 'jp': 'ja'}
+            for dir_name, lang_code in langs.items():
+                translate_file(input_file, f'{dir_name}/kejilion.sh', lang_code)
         EOF
 
     - name: Run translation
-      run: |
-        python translate.py
+      run: python translate.py
 
     - name: Check for changes
       id: check_changes
       run: |
         git add .
-        if git diff --staged --quiet; then
-          echo "has_changes=false" >> $GITHUB_OUTPUT
-        else
-          echo "has_changes=true" >> $GITHUB_OUTPUT
-        fi
+        git diff --staged --quiet || echo "has_changes=true" >> $GITHUB_OUTPUT
 
     - name: Commit and push changes
       if: steps.check_changes.outputs.has_changes == 'true'
       run: |
         git config --local user.email "action@github.com"
         git config --local user.name "GitHub Action"
-        git add .
         git commit -m "🌐 Weekly translation update - $(date +'%Y-%m-%d %H:%M:%S')"
         git push
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    
+
     - name: Create summary
       if: always()
       run: |
         echo "## Translation Summary 📊" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "| Language | Directory | Status |" >> $GITHUB_STEP_SUMMARY
-        echo "|----------|-----------|--------|" >> $GITHUB_STEP_SUMMARY
-
+        echo "| Language | Status |" >> $GITHUB_STEP_SUMMARY
+        echo "|----------|--------|" >> $GITHUB_STEP_SUMMARY
         for dir in en tw kr jp; do
-          if [ -f "$dir/kejilion.sh" ]; then
-            size=$(stat -c%s "$dir/kejilion.sh")
-            echo "| $dir | /$dir/ | ✅ Success (${size} bytes) |" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "| $dir | /$dir/ | ❌ Failed |" >> $GITHUB_STEP_SUMMARY
-          fi
+          [ -f "$dir/kejilion.sh" ] && status="✅ Success" || status="❌ Failed"
+          echo "| $dir | $status |" >> $GITHUB_STEP_SUMMARY
         done
-
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "**Execution time:** $(date)" >> $GITHUB_STEP_SUMMARY
-
-        if [ "${{ steps.check_changes.outputs.has_changes }}" == "true" ]; then
-          echo "**Changes:** New translations committed and pushed" >> $GITHUB_STEP_SUMMARY
-        else
-          echo "**Changes:** No changes detected" >> $GITHUB_STEP_SUMMARY
-        fi
-
-

README.ja.md

@@ -27,7 +27,7 @@ bash <(curl -sL kejilion.sh) jp
 ***
 ## 🖼️ 実際のスクリーンショット
 
-<img src="https://kejilion.sh/kejilionsh_jp.webp" alt="日本語版プレビュー" width="75%"/>
+<img src="https://kejilion.sh/img/screenshots/kejilionsh_jp.webp" alt="日本語版プレビュー" width="75%"/>
 
 
 ***

README.kr.md

@@ -28,7 +28,7 @@ bash <(curl -sL kejilion.sh) kr
 
 ## 🖼️ 실제 화면 미리보기 (Preview)
 
-<img src="https://kejilion.sh/kejilionsh_kr.webp" alt="한국어 버전 미리보기" width="75%"/>
+<img src="https://kejilion.sh/img/screenshots/kejilionsh_kr.webp" alt="한국어 버전 미리보기" width="75%"/>
 
 
 

README.md

@@ -98,8 +98,8 @@ bash <(curl -sL kejilion.sh) en
 
 ## 🖼️ 效果图预览 (Preview)
 <p>
-  <img src="https://kejilion.sh/kejilionsh.webp" alt="中文版" width="48%" style="display:inline-block; margin-right:10px;"/>
-  <img src="https://kejilion.sh/kejilionsh_en.webp" alt="English Version" width="48%" style="display:inline-block;"/>
+  <img src="https://kejilion.sh/img/screenshots/kejilionsh.webp" alt="中文版" width="48%" style="display:inline-block; margin-right:10px;"/>
+  <img src="https://kejilion.sh/img/screenshots/kejilionsh_en.webp" alt="English Version" width="48%" style="display:inline-block;"/>
 </p>
 
 

README.ru.md

@@ -1,6 +1,6 @@
 <br><br><br>
 <div align="center">
-<img src="https://kejilion.sh/kejilionsh_logo.webp?v=2" alt="логотип" width="650">
+<img src="https://kejilion.sh/img/screenshots/kejilionsh_logo.webp?v=2" alt="логотип" width="650">
 </div>
 
 <div align="center" style="margin-top:-200px;">
@@ -90,7 +90,7 @@ bash <(curl -sL kejilion.sh) ru
 <br><br>
 
 ## 🖼️ Предпросмотр интерфейса
-<img src="https://kejilion.sh/kejilionsh_ru.webp" alt="Предпросмотр русской версии" width="75%"/>
+<img src="https://kejilion.sh/img/screenshots/kejilionsh_ru.webp" alt="Предпросмотр русской версии" width="75%"/>
 
 
 

README.tw.md

@@ -27,7 +27,7 @@ bash <(curl -sL kejilion.sh) tw
 
 ## 🖼️ 실제 화면 미리보기 (Preview)
 
-<img src="https://kejilion.sh/kejilionsh_tw.webp" alt="한국어 버전 미리보기" width="75%"/>
+<img src="https://kejilion.sh/img/screenshots/kejilionsh_tw.webp" alt="한국어 버전 미리보기" width="75%"/>
 
 
 

apps/README.md

@@ -0,0 +1,4 @@
+# 🚀 开发者应用入驻指南 (kejilion.sh)
+
+https://github.com/kejilion/apps
+

auto_cert_renewal.sh

@@ -23,35 +23,64 @@ for cert_file in $certs_directory*_cert.pem; do
     # 计算距离过期还有几天
     days_until_expiry=$(( ($expiration_timestamp - $current_timestamp) / 86400 ))
 
-    # 检查是否需要续签（在满足续签条件的情况下）
     if [ $days_until_expiry -le $days_before_expiry ]; then
+
         echo "证书将在${days_before_expiry}天内过期，正在进行自动续签。"
-
-        docker run --rm -v /etc/letsencrypt/:/etc/letsencrypt certbot/certbot delete --cert-name "$yuming" -n
 
-        docker stop nginx > /dev/null 2>&1
+        # 1. 检查目录是否存在
+        docker exec nginx [ -d /var/www/letsencrypt ] && DIR_OK=true || DIR_OK=false
+
+        # 2. 检查配置文件是否包含关键字
+        # 假设你的配置文件在容器内的 /etc/nginx/conf.d/ 目录下（这是 Nginx 容器的默认路径）
+        docker exec nginx grep -q "letsencrypt" /etc/nginx/conf.d/$yuming.conf && CONF_OK=true || CONF_OK=false
+
+        # 输出结果
+        echo "--- 自动化环境检测报告 ---"
+        if [ "$DIR_OK" = true ]; then echo "✅ 目录检测：/var/www/letsencrypt 存在"; else echo "❌ 目录检测：/var/www/letsencrypt 不存在"; fi
+        if [ "$CONF_OK" = true ]; then echo "✅ 配置检测：$yuming.conf 已包含续签规则"; else echo "❌ 配置检测：$yuming.conf 未发现 letsencrypt 字样"; fi
+
+        if [ "$DIR_OK" = true ] && [ "$CONF_OK" = true ]; then
+            docker run --rm -v /etc/letsencrypt/:/etc/letsencrypt certbot/certbot delete --cert-name "$yuming" -n
+
+            docker run --rm \
+              -v "/etc/letsencrypt:/etc/letsencrypt" \
+              -v "/home/web/letsencrypt:/var/www/letsencrypt" \
+              certbot/certbot certonly \
+              --webroot \
+              -w /var/www/letsencrypt \
+              -d "$yuming" \
+              --email your@email.com \
+              --agree-tos \
+              --no-eff-email \
+              --key-type ecdsa \
+              --force-renewal
+
+            mkdir -p /home/web/certs/
+            cp /etc/letsencrypt/live/$yuming/fullchain.pem /home/web/certs/${yuming}_cert.pem > /dev/null 2>&1
+            cp /etc/letsencrypt/live/$yuming/privkey.pem /home/web/certs/${yuming}_key.pem > /dev/null 2>&1
+
+            openssl rand -out /home/web/certs/ticket12.key 48
+            openssl rand -out /home/web/certs/ticket13.key 80
+
+            docker exec nginx nginx -t && docker exec nginx nginx -s reload
+
+        else
+            docker run --rm -v /etc/letsencrypt/:/etc/letsencrypt certbot/certbot delete --cert-name "$yuming" -n
 
-        iptables -P INPUT ACCEPT
-        iptables -P FORWARD ACCEPT
-        iptables -P OUTPUT ACCEPT
-        iptables -F
+            docker stop nginx > /dev/null 2>&1
 
-        ip6tables -P INPUT ACCEPT
-        ip6tables -P FORWARD ACCEPT
-        ip6tables -P OUTPUT ACCEPT
-        ip6tables -F
+            docker run --rm -p 80:80 -v /etc/letsencrypt/:/etc/letsencrypt certbot/certbot certonly --standalone -d $yuming --email your@email.com --agree-tos --no-eff-email --force-renewal --key-type ecdsa
 
-        docker run --rm -p 80:80 -v /etc/letsencrypt/:/etc/letsencrypt certbot/certbot certonly --standalone -d $yuming --email your@email.com --agree-tos --no-eff-email --force-renewal --key-type ecdsa  
+            mkdir -p /home/web/certs/
+            cp /etc/letsencrypt/live/$yuming/fullchain.pem /home/web/certs/${yuming}_cert.pem > /dev/null 2>&1
+            cp /etc/letsencrypt/live/$yuming/privkey.pem /home/web/certs/${yuming}_key.pem > /dev/null 2>&1
 
-        mkdir -p /home/web/certs/
-        cp /etc/letsencrypt/live/$yuming/fullchain.pem /home/web/certs/${yuming}_cert.pem > /dev/null 2>&1
-        cp /etc/letsencrypt/live/$yuming/privkey.pem /home/web/certs/${yuming}_key.pem > /dev/null 2>&1
+            openssl rand -out /home/web/certs/ticket12.key 48
+            openssl rand -out /home/web/certs/ticket13.key 80
 
-        openssl rand -out /home/web/certs/ticket12.key 48
-        openssl rand -out /home/web/certs/ticket13.key 80
-
-        docker start nginx > /dev/null 2>&1
+            docker start nginx > /dev/null 2>&1
 
+        fi
 
         echo "证书已成功续签。"
     else