commit fc72f805d57a6664d6a2eb6c33922292a46f4c8f Author: liuhuayong Date: Sat Jun 13 13:16:57 2026 +0800 chore: add .gitignore and stage all project files diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34e0026 --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +# macOS resource forks +._* +.DS_Store +.AppleDouble +.LSOverride + +# IDE +.idea/ +.vscode/ +*.swp +*.swo +*~ + +# Python +__pycache__/ +*.py[cod] +*.egg-info/ +.venv/ +venv/ + +# Node +node_modules/ +.npm/ +dist/ +.next/ +.nuxt/ + +# Rust / Cargo +target/ + +# Archives +*.rar +*.tar +*.tar.gz +*.zip + +# Logs +*.log +logs/ + +# Env files (keep example only) +.env +.env.local +.env.*.local + diff --git a/xyadmin b/xyadmin new file mode 160000 index 0000000..e2e9086 --- /dev/null +++ b/xyadmin @@ -0,0 +1 @@ +Subproject commit e2e9086252725467edb950a73e413b860d84c0ca diff --git a/xyadmin-web b/xyadmin-web new file mode 160000 index 0000000..09a89dc --- /dev/null +++ b/xyadmin-web @@ -0,0 +1 @@ +Subproject commit 09a89dc1454095811e01958908abd2aa7c2968e1 diff --git a/xykj-git/xyadmin/C/xyadmin/file/processImagesFromPath/DM-20250619.xlsx b/xykj-git/xyadmin/C/xyadmin/file/processImagesFromPath/DM-20250619.xlsx new file mode 100644 index 0000000..7b03546 Binary files /dev/null and b/xykj-git/xyadmin/C/xyadmin/file/processImagesFromPath/DM-20250619.xlsx differ diff --git a/xykj-plus/.claude/settings.json b/xykj-plus/.claude/settings.json new file mode 100644 index 0000000..56bdc93 --- /dev/null +++ b/xykj-plus/.claude/settings.json @@ -0,0 +1,9 @@ +{ + "env": { + }, + "enabledPlugins": { + "frontend-design@claude-plugins-official": true, + "autofix-bot@claude-plugins-official": true, + "skill-creator@claude-plugins-official": true + } +} diff --git a/xykj-plus/.claude/settings.local.json b/xykj-plus/.claude/settings.local.json new file mode 100644 index 0000000..4d0e732 --- /dev/null +++ b/xykj-plus/.claude/settings.local.json @@ -0,0 +1,6 @@ +{ + "enabledPlugins": { + "skill-creator@claude-plugins-official": true, + "autofix-bot@claude-plugins-official": true + } +} diff --git a/xykj-plus/.claw.json b/xykj-plus/.claw.json new file mode 100644 index 0000000..e0e4c18 --- /dev/null +++ b/xykj-plus/.claw.json @@ -0,0 +1,5 @@ +{ + "permissions": { + "defaultMode": "dontAsk" + } +} diff --git a/xykj-plus/.gitignore b/xykj-plus/.gitignore new file mode 100644 index 0000000..3b06b46 --- /dev/null +++ b/xykj-plus/.gitignore @@ -0,0 +1,3 @@ +# Claw Code local artifacts +.claw/settings.local.json +.claw/sessions/ diff --git a/xykj-plus/CLAW.md b/xykj-plus/CLAW.md new file mode 100644 index 0000000..032e0ff --- /dev/null +++ b/xykj-plus/CLAW.md @@ -0,0 +1,12 @@ +# CLAW.md + +This file provides guidance to Claw Code (clawcode.dev) when working with code in this repository. + +## Detected stack +- No specific language markers were detected yet; document the primary language and verification commands once the project structure settles. +- Frameworks: none detected from the supported starter markers. + +## Working agreement +- Prefer small, reviewable changes and keep generated bootstrap files aligned with actual repo workflows. +- Keep shared defaults in `.claw.json`; reserve `.claw/settings.local.json` for machine-local overrides. +- Do not overwrite existing `CLAW.md` content automatically; update it intentionally when repo workflows change. diff --git a/xykj-plus/claude-ecc b/xykj-plus/claude-ecc new file mode 160000 index 0000000..c858db1 --- /dev/null +++ b/xykj-plus/claude-ecc @@ -0,0 +1 @@ +Subproject commit c858db11718cf9b03f07f0d4931730fd7792e841 diff --git a/xykj-plus/publish_all.sh b/xykj-plus/publish_all.sh new file mode 100644 index 0000000..6b9e0f8 --- /dev/null +++ b/xykj-plus/publish_all.sh @@ -0,0 +1,70 @@ +#!/bin/bash + +# 前后端完整发布脚本 +# 作者: @岳小强 @可可 + +set -e # 遇到错误立即退出 + +echo "==========================================" +echo "开始完整发布（前端 + 后端）..." +echo "==========================================" +echo "" + +# 发布前端 +echo "==========================================" +echo "🌐 [1/2] 开始发布前端代码..." +echo "==========================================" +cd /Users/liuhuayong/workspace/xykj-plus +bash publish_web.sh + +echo "" +echo "==========================================" +echo "✅ 前端发布完成！" +echo "==========================================" +echo "" + +# 发布后端 +echo "==========================================" +echo "⚙️ [2/2] 开始发布后端代码..." +echo "==========================================" +cd /Users/liuhuayong/workspace/xykj-plus/xykj-admin-plus + +# 设置 Java 17 环境变量 +export JAVA_HOME=/opt/homebrew/opt/openjdk@17 +export PATH=$JAVA_HOME/bin:$PATH + +# 使用 Maven 构建 +echo "📦 正在构建后端项目..." +mvn clean package -Pprod -DskipTests + +# 检查构建是否成功 +if [ ! -f "ruoyi-admin/target/ruoyi-admin.jar" ]; then + echo "❌ 构建失败：ruoyi-admin.jar 不存在" + exit 1 +fi + +echo "✅ 构建成功！" +echo "📁 构建输出文件：ruoyi-admin/target/ruoyi-admin.jar" + +# 显示 jar 包大小 +ls -lh ruoyi-admin/target/ruoyi-admin.jar + +# 部署到服务器 +echo "" +echo "📤 正在上传 jar 包到 root@xy101:/home/www/xykj-admin-plus/server/ ..." +scp ruoyi-admin/target/ruoyi-admin.jar root@xy101:/home/www/xykj-admin-plus/server/ + +echo "✅ 上传成功！" + +echo "" +echo "==========================================" +echo "🎉 完整发布完成！" +echo "==========================================" +echo "" +echo "📊 发布摘要：" +echo " ✅ 前端: /home/www/xykj-admin-plus/view/dist/" +echo " ✅ 后端: /home/www/xykj-admin-plus/server/ruoyi-admin.jar" +echo "" +echo "🚀 启动服务请执行:" +echo " ssh root@xy101 '/home/www/xykj-admin-plus/run-in-docker'" +echo "" diff --git a/xykj-plus/publish_backend.sh b/xykj-plus/publish_backend.sh new file mode 100644 index 0000000..aa40d8b --- /dev/null +++ b/xykj-plus/publish_backend.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +# 后端代码发布脚本 +# 作者: @岳小强 @可可 + +set -e # 遇到错误立即退出 + +# 设置 Java 17 环境 +export JAVA_HOME=/opt/homebrew/opt/openjdk@17 +export PATH=$JAVA_HOME/bin:$PATH + +echo "==========================================" +echo "开始发布后端代码..." +echo "==========================================" +echo "Java 版本：" +java -version + +# 切换到项目目录 +cd /Users/liuhuayong/workspace/xykj-plus/xykj-admin-plus + +# 使用 Maven 构建 +echo "📦 正在构建后端项目..." +mvn clean package -Pprod -DskipTests + +# 检查构建是否成功 +if [ ! -f "ruoyi-admin/target/ruoyi-admin.jar" ]; then + echo "❌ 构建失败：ruoyi-admin.jar 不存在" + exit 1 +fi + +echo "✅ 构建成功！" +echo "📁 构建输出文件：ruoyi-admin/target/ruoyi-admin.jar" + +# 显示 jar 包大小 +ls -lh ruoyi-admin/target/ruoyi-admin.jar + +# 部署到服务器 +echo "" +echo "==========================================" +echo "开始部署到服务器..." +echo "==========================================" + +# 上传 jar 包 +echo "📤 正在上传 jar 包到 root@xy101:/home/www/xykj-admin-plus/server/ ..." +scp ruoyi-admin/target/ruoyi-admin.jar root@xy101:/home/www/xykj-admin-plus/server/ + +echo "✅ 上传成功！" + +echo "" +echo "==========================================" +echo "发布完成！" +echo "==========================================" +echo "🎉 后端代码已成功上传到服务器" +echo "📍 服务器地址: root@xy101:/home/www/xykj-admin-plus/server/ruoyi-admin.jar" +echo "" +echo "🚀 启动服务请执行:" +echo " ssh root@xy101 '/home/www/xykj-admin-plus/run-in-docker'" +echo "" diff --git a/xykj-plus/publish_web.sh b/xykj-plus/publish_web.sh new file mode 100644 index 0000000..c68802c --- /dev/null +++ b/xykj-plus/publish_web.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +# 前端代码发布脚本 +# 作者: @岳小强 @可可 + +set -e # 遇到错误立即退出 + +echo "==========================================" +echo "开始发布前端代码..." +echo "==========================================" + +# 切换到项目目录 +cd /Users/liuhuayong/workspace/xykj-plus/xykj-web-plus + +# 使用 pnpm 构建 +echo "📦 正在构建前端项目..." +pnpm build:antd + +# 检查构建是否成功 +if [ ! -d "apps/web-antd/dist" ]; then + echo "❌ 构建失败：dist 目录不存在" + exit 1 +fi + +echo "✅ 构建成功！" +echo "📁 构建输出目录：apps/web-antd/dist" + +# 显示构建产物大小 +du -sh apps/web-antd/dist + +# 部署到服务器 +echo "" +echo "==========================================" +echo "开始部署到服务器..." +echo "==========================================" + +# 进入 dist 目录 +cd apps/web-antd + +# 创建 zip 压缩包 +echo "📦 正在打包构建产物..." +zip -r dist.zip dist/ + +echo "📤 正在上传压缩包到 root@xy101:/home/www/xykj-admin-plus/view/ ..." +# 上传 zip 文件（单个文件传输更稳定） +scp dist.zip root@xy101:/home/www/xykj-admin-plus/view/ + +echo "🔧 正在服务器上解压并部署..." +# 在服务器上解压并覆盖 +ssh root@xy101 "cd /home/www/xykj-admin-plus/view/ && rm -rf dist/ && unzip -o dist.zip -d . && rm -f dist.zip" + +echo "✅ 部署成功！" +echo "" +echo "==========================================" +echo "发布完成！" +echo "==========================================" +echo "🎉 前端代码已成功部署到服务器" +echo "📍 服务器地址: root@xy101:/home/www/xykj-admin-plus/view/dist/" +echo "" diff --git a/xykj-plus/start_claude.sh b/xykj-plus/start_claude.sh new file mode 100644 index 0000000..3bd3f7c --- /dev/null +++ b/xykj-plus/start_claude.sh @@ -0,0 +1 @@ +ANTHROPIC_BASE_URL='http://192.168.31.10:11435' ANTHROPIC_AUTH_TOKEN='liuhuayong' ANTHROPIC_DEFAULT_OPUS_MODEL='MiniMax-M2.5-MLX-4bit' ANTHROPIC_DEFAULT_SONNET_MODEL='MiniMax-M2.5-MLX-4bit' ANTHROPIC_DEFAULT_HAIKU_MODEL='MiniMax-M2.5-MLX-4bit' API_TIMEOUT_MS=3000000 CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 claude diff --git a/xykj-plus/start_claw.sh b/xykj-plus/start_claw.sh new file mode 100644 index 0000000..e5c926b --- /dev/null +++ b/xykj-plus/start_claw.sh @@ -0,0 +1 @@ +ANTHROPIC_BASE_URL='http://192.168.31.10:11435' ANTHROPIC_AUTH_TOKEN='liuhuayong' ANTHROPIC_DEFAULT_OPUS_MODEL='MiniMax-M2.5-MLX-4bit' ANTHROPIC_DEFAULT_SONNET_MODEL='MiniMax-M2.5-MLX-4bit' ANTHROPIC_DEFAULT_HAIKU_MODEL='MiniMax-M2.5-MLX-4bit' API_TIMEOUT_MS=3000000 CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 claw diff --git a/xykj-plus/www@192.168.0.102 b/xykj-plus/www@192.168.0.102 new file mode 100644 index 0000000..6b9e0f8 --- /dev/null +++ b/xykj-plus/www@192.168.0.102 @@ -0,0 +1,70 @@ +#!/bin/bash + +# 前后端完整发布脚本 +# 作者: @岳小强 @可可 + +set -e # 遇到错误立即退出 + +echo "==========================================" +echo "开始完整发布（前端 + 后端）..." +echo "==========================================" +echo "" + +# 发布前端 +echo "==========================================" +echo "🌐 [1/2] 开始发布前端代码..." +echo "==========================================" +cd /Users/liuhuayong/workspace/xykj-plus +bash publish_web.sh + +echo "" +echo "==========================================" +echo "✅ 前端发布完成！" +echo "==========================================" +echo "" + +# 发布后端 +echo "==========================================" +echo "⚙️ [2/2] 开始发布后端代码..." +echo "==========================================" +cd /Users/liuhuayong/workspace/xykj-plus/xykj-admin-plus + +# 设置 Java 17 环境变量 +export JAVA_HOME=/opt/homebrew/opt/openjdk@17 +export PATH=$JAVA_HOME/bin:$PATH + +# 使用 Maven 构建 +echo "📦 正在构建后端项目..." +mvn clean package -Pprod -DskipTests + +# 检查构建是否成功 +if [ ! -f "ruoyi-admin/target/ruoyi-admin.jar" ]; then + echo "❌ 构建失败：ruoyi-admin.jar 不存在" + exit 1 +fi + +echo "✅ 构建成功！" +echo "📁 构建输出文件：ruoyi-admin/target/ruoyi-admin.jar" + +# 显示 jar 包大小 +ls -lh ruoyi-admin/target/ruoyi-admin.jar + +# 部署到服务器 +echo "" +echo "📤 正在上传 jar 包到 root@xy101:/home/www/xykj-admin-plus/server/ ..." +scp ruoyi-admin/target/ruoyi-admin.jar root@xy101:/home/www/xykj-admin-plus/server/ + +echo "✅ 上传成功！" + +echo "" +echo "==========================================" +echo "🎉 完整发布完成！" +echo "==========================================" +echo "" +echo "📊 发布摘要：" +echo " ✅ 前端: /home/www/xykj-admin-plus/view/dist/" +echo " ✅ 后端: /home/www/xykj-admin-plus/server/ruoyi-admin.jar" +echo "" +echo "🚀 启动服务请执行:" +echo " ssh root@xy101 '/home/www/xykj-admin-plus/run-in-docker'" +echo "" diff --git a/xykj-plus/xykj-admin-plus b/xykj-plus/xykj-admin-plus new file mode 160000 index 0000000..b91d45d --- /dev/null +++ b/xykj-plus/xykj-admin-plus @@ -0,0 +1 @@ +Subproject commit b91d45d305710f0fa974d9e6ef94ed0613d8464c diff --git a/xykj-plus/xykj-web-plus b/xykj-plus/xykj-web-plus new file mode 160000 index 0000000..edef832 --- /dev/null +++ b/xykj-plus/xykj-web-plus @@ -0,0 +1 @@ +Subproject commit edef8325fdc8403bb8a3bab55462a41426a78c4d