From 503ee7372ee96561009e9067ef03dfabdb38aa9c Mon Sep 17 00:00:00 2001 From: wangjia <809946525@qq.com> Date: Mon, 25 May 2026 00:49:22 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20git=20remote=20=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E8=87=B3=20git.51yanmei.com=EF=BC=8C=E6=96=B0=E5=A2=9E=20Andro?= =?UTF-8?q?id=20=E5=B9=B3=E5=8F=B0=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.6 --- client/android/.gitignore | 14 ++ client/android/app/build.gradle.kts | 44 +++++ .../android/app/src/debug/AndroidManifest.xml | 7 + .../android/app/src/main/AndroidManifest.xml | 45 +++++ .../kotlin/com/yanmei/jiu/MainActivity.kt | 5 + .../res/drawable-v21/launch_background.xml | 12 ++ .../main/res/drawable/launch_background.xml | 12 ++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 ++ .../app/src/main/res/values/styles.xml | 18 ++ .../app/src/profile/AndroidManifest.xml | 7 + client/android/build.gradle.kts | 24 +++ client/android/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 5 + client/android/settings.gradle.kts | 26 +++ docs/deployment-nas-gitea.md | 162 +++++------------- scripts/deploy.sh | 2 +- 21 files changed, 284 insertions(+), 119 deletions(-) create mode 100644 client/android/.gitignore create mode 100644 client/android/app/build.gradle.kts create mode 100644 client/android/app/src/debug/AndroidManifest.xml create mode 100644 client/android/app/src/main/AndroidManifest.xml create mode 100644 client/android/app/src/main/kotlin/com/yanmei/jiu/MainActivity.kt create mode 100644 client/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 client/android/app/src/main/res/drawable/launch_background.xml create mode 100644 client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 client/android/app/src/main/res/values-night/styles.xml create mode 100644 client/android/app/src/main/res/values/styles.xml create mode 100644 client/android/app/src/profile/AndroidManifest.xml create mode 100644 client/android/build.gradle.kts create mode 100644 client/android/gradle.properties create mode 100644 client/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 client/android/settings.gradle.kts diff --git a/client/android/.gitignore b/client/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/client/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/client/android/app/build.gradle.kts b/client/android/app/build.gradle.kts new file mode 100644 index 0000000..c7c02c6 --- /dev/null +++ b/client/android/app/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.yanmei.jiu" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.yanmei.jiu" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/client/android/app/src/debug/AndroidManifest.xml b/client/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/client/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/client/android/app/src/main/AndroidManifest.xml b/client/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..4bc45e1 --- /dev/null +++ b/client/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/client/android/app/src/main/kotlin/com/yanmei/jiu/MainActivity.kt b/client/android/app/src/main/kotlin/com/yanmei/jiu/MainActivity.kt new file mode 100644 index 0000000..1dac49d --- /dev/null +++ b/client/android/app/src/main/kotlin/com/yanmei/jiu/MainActivity.kt @@ -0,0 +1,5 @@ +package com.yanmei.jiu + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/client/android/app/src/main/res/drawable-v21/launch_background.xml b/client/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/client/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/client/android/app/src/main/res/drawable/launch_background.xml b/client/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/client/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/client/android/app/src/main/res/values-night/styles.xml b/client/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/client/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/client/android/app/src/main/res/values/styles.xml b/client/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/client/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/client/android/app/src/profile/AndroidManifest.xml b/client/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/client/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/client/android/build.gradle.kts b/client/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/client/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/client/android/gradle.properties b/client/android/gradle.properties new file mode 100644 index 0000000..fbee1d8 --- /dev/null +++ b/client/android/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true diff --git a/client/android/gradle/wrapper/gradle-wrapper.properties b/client/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e4ef43f --- /dev/null +++ b/client/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/client/android/settings.gradle.kts b/client/android/settings.gradle.kts new file mode 100644 index 0000000..ca7fe06 --- /dev/null +++ b/client/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false +} + +include(":app") diff --git a/docs/deployment-nas-gitea.md b/docs/deployment-nas-gitea.md index a0715cf..26bd207 100644 --- a/docs/deployment-nas-gitea.md +++ b/docs/deployment-nas-gitea.md @@ -10,9 +10,8 @@ | 服务 | 地址 | |------|------| -| Gitea Web UI | `http://192.168.3.200:3000` | -| Gitea SSH | `ssh://192.168.3.200:2222` | -| Actions 面板 | `http://192.168.3.200:3000/wangjia/jiu/actions` | +| Gitea Web UI | `https://git.51yanmei.com` | +| Actions 面板 | `https://git.51yanmei.com/wangjia/jiu/actions` | | 线上应用 | `https://jiu.51yanmei.com` | | 管理端 Web | `https://jiu.51yanmei.com/app/` | @@ -28,8 +27,8 @@ Runner 实际运行在**本机 Mac**（不是 NAS），通过 LaunchAgent 开机 |------|------| | `/Users/wangjia/bin/act_runner` | act_runner 二进制（v0.2.11） | | `/Users/wangjia/bin/act_runner_start.sh` | 启动脚本（含 TCP 中继逻辑） | -| `/Users/wangjia/bin/tcp_relay.py` | Python3 TCP 中继：`127.0.0.1:13000 → 192.168.3.200:3000` | -| `/Users/wangjia/.act_runner` | Runner 注册信息（地址指向 `127.0.0.1:13000`） | +| `/Users/wangjia/bin/tcp_relay.py` | Python3 TCP 中继（旧内网方案，现已通过域名直连） | +| `/Users/wangjia/.act_runner` | Runner 注册信息 | | `/Users/wangjia/.act_runner_config.yaml` | Runner 配置（label: `mac:host`，capacity: 1） | | `~/Library/LaunchAgents/com.jiu.act-runner.plist` | LaunchAgent plist，开机自启 | | `/tmp/act_runner.log` | 运行日志 | @@ -38,12 +37,6 @@ Runner 实际运行在**本机 Mac**（不是 NAS），通过 LaunchAgent 开机 `.gitea/workflows/deploy.yml` 和 `ci.yml` 中使用 `runs-on: mac`，对应 runner label `mac:host`。 -### 为什么需要 TCP 中继（重要） - -Shadowrocket（代理工具）的 Network Extension 会拦截 LaunchAgent 启动的 Go 二进制发出的 TCP 连接，即使 Shadowrocket 内已配置直连规则。现象：Go gRPC 报 `no route to host`，而同进程里的 Python3 socket 可以正常连接。 - -**解决方案：** 用 Python3 做透明 TCP 中继。`tcp_relay.py` 监听 `127.0.0.1:13000`，将连接转发到 `192.168.3.200:3000`。act_runner 的注册地址改为 `http://127.0.0.1:13000`，完全绕开 Shadowrocket 拦截。 - ### 检查 Runner 状态 ```bash @@ -51,7 +44,7 @@ Shadowrocket（代理工具）的 Network Extension 会拦截 LaunchAgent 启动 tail -f /tmp/act_runner.log # 确认进程在跑 -ps aux | grep -E "act_runner|tcp_relay" | grep -v grep +ps aux | grep act_runner | grep -v grep # 手动重启（LaunchAgent 会自动重启，一般不需要） kill $(pgrep -f act_runner_start.sh) @@ -59,12 +52,10 @@ kill $(pgrep -f act_runner_start.sh) ### Runner 不工作时的排查步骤 -1. **确认 NAS 可达**：`curl -sf http://192.168.3.200:3000/api/v1/version` -2. **确认 relay 在跑**：`ps aux | grep tcp_relay` -3. **确认 relay 端口监听**：`nc -zv 127.0.0.1 13000` -4. **查看最近日志**：`tail -30 /tmp/act_runner.log` -5. **手动测试**：`/Users/wangjia/bin/act_runner daemon --config ~/.act_runner_config.yaml`（从终端运行应直接成功） -6. **强制重启**：`kill $(pgrep -f act_runner_start.sh)` — LaunchAgent 会在几秒内自动重拉 +1. **确认 Gitea 可达**：`curl -sf https://git.51yanmei.com/api/v1/version` +2. **查看最近日志**：`tail -30 /tmp/act_runner.log` +3. **手动测试**：`/Users/wangjia/bin/act_runner daemon --config ~/.act_runner_config.yaml`（从终端运行应直接成功） +4. **强制重启**：`kill $(pgrep -f act_runner_start.sh)` — LaunchAgent 会在几秒内自动重拉 ### 重新注册 Runner（token 失效时） @@ -81,15 +72,12 @@ rm ~/.act_runner # 4. 注册（从终端运行，不要从 LaunchAgent） /Users/wangjia/bin/act_runner register \ --no-interactive \ - --instance http://192.168.3.200:3000 \ + --instance https://git.51yanmei.com \ --token <新token> \ --name mac-runner \ --labels mac:host -# 5. 把注册文件里的地址改回 127.0.0.1:13000 -sed -i '' 's|http://192.168.3.200:3000|http://127.0.0.1:13000|' ~/.act_runner - -# 6. 重启（LaunchAgent 自动接管） +# 5. 重启（LaunchAgent 自动接管） kill $(pgrep -f act_runner_start.sh) ``` @@ -101,19 +89,19 @@ kill $(pgrep -f act_runner_start.sh) ### `deploy.yml` — 主部署流程 -**触发条件：** push 到 `main` 分支 +**触发条件：** push `v*.*.*` tag **步骤：** -1. `go test ./...` — 跑后端测试 -2. `flutter test` — 跑前端测试 -3. 编译后端：`GOOS=linux GOARCH=amd64 go build` 生成 `jiu-server` -4. 编译 Flutter Web：`flutter build web --release --base-href=/app/` -5. 创建 Forgejo Release（版本号格式 `vYYYYMMDD.HHMM`），上传 `jiu-server` 和 `web.tar.gz` -6. SSH 到 EC2 部署： - - 停止 jiu 服务 → 替换二进制 → 启动 → 等待健康检查通过 - - 替换 Flutter Web 静态文件到 `/opt/jiu/web/` - - 同步营销站点到 `/opt/jiu/marketing/` - - `nginx -s reload` +1. `compile.sh` — 编译 Go 后端（linux/amd64）+ Flutter Web，打包到 `dist/` +2. `test.sh` — `go test` + `flutter analyze` +3. `release.sh` — 解析 CHANGELOG.md，更新 version.yaml，创建 Forgejo Release，上传 3 个 asset +4. `deploy.sh` — SSH 到 EC2 部署，完成后发 Telegram 通知 + +### `manual.yml` — 手动部署 / 回滚 + +**触发条件：** Forgejo UI 手动触发（workflow_dispatch），输入目标 tag（如 `v1.0.0`） + +**步骤：** 只运行 `deploy.sh`，从 Forgejo Release 下载已有产物直接部署，跳过编译和测试。 ### `ci.yml` — PR 测试流程 @@ -121,12 +109,6 @@ kill $(pgrep -f act_runner_start.sh) **步骤：** 只跑测试（`go test` + `flutter test`），不构建不部署。 -### `backup.yml` — 每日备份 - -**触发条件：** 每天凌晨 2:00（cron） - -**步骤：** SSH 到 EC2，导出 MySQL 数据库备份，上传到指定目录。 - --- ## Secrets 配置 @@ -138,26 +120,23 @@ kill $(pgrep -f act_runner_start.sh) | `EC2_SSH_KEY` | EC2 服务器的 SSH 私钥（PEM 格式，完整内容） | | `EC2_HOST` | EC2 服务器 IP 或域名 | | `EC2_USER` | EC2 SSH 用户名（如 `ec2-user`、`ubuntu`） | -| `DB_PASSWORD` | MySQL root 密码（备份 workflow 使用） | -| `FORGEJO_TOKEN` | Gitea 个人访问 Token（用于创建 Release） | -| `FORGEJO_URL` | Gitea 内网地址，如 `http://192.168.3.200:3000` | +| `FORGEJO_TOKEN` | Gitea 个人访问 Token（用于创建 Release、下载 asset） | +| `FORGEJO_URL` | Gitea 地址：`https://git.51yanmei.com` | +| `TELEGRAM_TOKEN` | Telegram Bot Token（部署通知） | +| `TELEGRAM_CHAT_ID` | Telegram Chat ID（接收通知的对话） | --- ## 触发部署方式 -日常开发流程： - ```bash -# 开发 → 本地测试 -go test ./... -flutter test - -# 用户确认后推送到 NAS Gitea（触发自动部署） -git push nas main +# 开发完成，确认测试通过后打 tag +git tag -a v1.1.0 -m "v1.1.0" +git push nas main && git push nas v1.1.0 +# → CI 自动：compile → test → release → deploy → Telegram 通知 ``` -推送到 `nas` remote（指向 `http://192.168.3.200:3000/wangjia/jiu.git`）后，Gitea Actions 自动运行 `deploy.yml`，全流程约 5~8 分钟。 +**回滚：** Forgejo UI → Actions → Manual Deploy → 输入旧 tag → Run --- @@ -166,17 +145,16 @@ git push nas main ``` /opt/jiu/ ├── backend/ -│ └── jiu-server # Go 可执行文件 +│ ├── jiu-server # Go 可执行文件 +│ └── config/ +│ └── version.yaml # 版本信息（由 CI 自动更新） ├── web/ # Flutter Web 构建产物（/app/ 路径） ├── marketing/ # 营销站点静态 HTML -│ ├── assets/ # CSS / SVG +│ ├── assets/ │ ├── index.html │ ├── docs.html │ ├── download.html -│ ├── scan.html -│ └── features/ -│ ├── inventory.html -│ └── approval.html +│ └── scan.html ├── images/ # 商品图片上传目录 └── web-old/ # 上一版本 Flutter Web（回滚备用） ``` @@ -188,64 +166,12 @@ Systemd 服务名：`jiu` ## Nginx 路由说明 -配置文件：`deploy/nginx-jiu.conf`（部署时手动 scp 至服务器） +配置文件：`deploy/nginx-jiu.conf`（CI 部署时自动更新） -| 路径 | 服务 | 目录 | -|------|------|------| -| `/api/*`, `/health`, `/version` | Go 后端 API | proxy → `localhost:8080` | -| `/images/*` | 商品图片 | `/opt/jiu/images/` | -| `/app/` | Flutter 管理端 SPA | `/opt/jiu/web/` | -| `/` | 营销首页 | `/opt/jiu/marketing/index.html` | -| `/docs` | 文档页 | `/opt/jiu/marketing/docs.html` | -| `/download` | 下载页 | `/opt/jiu/marketing/download.html` | -| `/scan/` | 商品防伪扫码页 | `/opt/jiu/marketing/scan.html` | -| `/features/*` | 功能介绍页 | `/opt/jiu/marketing/features/` | -| `/assets/*` | 营销站点静态资源 | `/opt/jiu/marketing/assets/` | - -> **注意：** `nginx-jiu.conf` 只包含 `jiu.51yanmei.com` 的 server block。服务器上其他服务的 nginx 配置不受影响。更新 nginx 配置时只需替换此文件，然后 `nginx -t && nginx -s reload`。 - ---- - -## 回滚方式 - -### 后端回滚 - -```bash -# SSH 到 EC2 -sudo systemctl stop jiu -# 从上一个 Forgejo Release 下载 jiu-server -cp /path/to/old-jiu-server /opt/jiu/backend/jiu-server -chmod +x /opt/jiu/backend/jiu-server -sudo systemctl start jiu -``` - -### Flutter Web 回滚 - -```bash -# 恢复上一版本 -mv /opt/jiu/web /opt/jiu/web-broken -mv /opt/jiu/web-old /opt/jiu/web -sudo nginx -s reload -``` - ---- - -## 环境变量（jiu 服务） - -Systemd service 文件（`/etc/systemd/system/jiu.service`）中配置： - -```ini -[Service] -Environment=DB_HOST=127.0.0.1 -Environment=DB_PORT=3306 -Environment=DB_NAME=jiu -Environment=DB_USER=jiu -Environment=DB_PASSWORD=<从 secrets 获取> -Environment=JWT_SECRET=<随机字符串> -Environment=APP_VERSION=1.0.0 -Environment=BUILD_DATE=2025-05-23 -Environment=DOWNLOAD_URL_MACOS= -Environment=DOWNLOAD_URL_WINDOWS= -``` - -`APP_VERSION` 和 `BUILD_DATE` 在每次部署时通过 deploy.yml 更新（预留，目前读取 Forgejo Release tag）。 +| 路径 | 服务 | +|------|------| +| `/api/*`, `/health`, `/version` | Go 后端 API | +| `/images/*` | 商品图片静态文件 | +| `/app/` | Flutter 管理端 SPA | +| `/` | 营销首页 | +| `/scan/` | 商品扫码页 | diff --git a/scripts/deploy.sh b/scripts/deploy.sh index dcbb14a..b683467 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -6,7 +6,7 @@ cd "$(dirname "$0")/.." EC2_HOST="${EC2_HOST:-$(grep EC2_HOST ~/.env 2>/dev/null | cut -d= -f2)}" EC2_USER="${EC2_USER:-$(grep EC2_USER ~/.env 2>/dev/null | cut -d= -f2)}" EC2_KEY="${EC2_KEY:-~/.ssh/wangjia.pem}" -FORGEJO_URL="http://192.168.3.200:3000" +FORGEJO_URL="https://git.51yanmei.com" FORGEJO_TOKEN="${FORGEJO_TOKEN:-$(grep FORGEJO_TOKEN ~/.env 2>/dev/null | cut -d= -f2)}" echo "==> 1/5 Go 测试"