diff --git a/.gitignore b/.gitignore index 9e35c58..ac6b3ec 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,8 @@ deploy/0.2.1/.env /deploy/prod/.env /deploy/prod/data/ + +# 本地临时脚本 (含口令, 不入库) +scripts/_*.mjs +.dsh-ops/ + diff --git a/deploy/prod/sql/uuid-triggers.sql b/deploy/prod/sql/uuid-triggers.sql new file mode 100644 index 0000000..79b3fbe --- /dev/null +++ b/deploy/prod/sql/uuid-triggers.sql @@ -0,0 +1,82 @@ +-- iBoard 0.2.1: 澶栭敭 uuid 闀滃儚鍒楄Е鍙戝櫒 +-- 鐢 0.2.1 楠岃瘉搴撳鍑; 鏈嶅姟绔啓鍏ユ椂鑷姩缁存姢 projectUuid/columnUuid/parentUuid/taskUuid, +-- 鍚屾娴佹嵁姝ゆ妸闀滃儚鍒椾互 projectId/columnId/parentId/taskId 鐨勫埆鍚嶄笅鍙戠粰瀹㈡埛绔 + +CREATE OR REPLACE FUNCTION public.func_boardcolumn_uuid_map() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ +BEGIN + SELECT "uuid" INTO NEW."projectUuid" FROM "Project" WHERE "id" = NEW."projectId"; + IF NOT FOUND THEN RAISE EXCEPTION 'Project % 涓嶅瓨鍦', NEW."projectId"; END IF; + RETURN NEW; +END; +$function$ + +; + +CREATE OR REPLACE FUNCTION public.func_projectmember_uuid_map() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ +BEGIN + SELECT "uuid" INTO NEW."projectUuid" FROM "Project" WHERE "id" = NEW."projectId"; + IF NOT FOUND THEN RAISE EXCEPTION 'Project % 涓嶅瓨鍦', NEW."projectId"; END IF; + RETURN NEW; +END; +$function$ + +; + +CREATE OR REPLACE FUNCTION public.func_task_uuid_map() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ +BEGIN + SELECT "uuid" INTO NEW."projectUuid" FROM "Project" WHERE "id" = NEW."projectId"; + IF NOT FOUND THEN RAISE EXCEPTION 'Project % 涓嶅瓨鍦', NEW."projectId"; END IF; + SELECT "uuid" INTO NEW."columnUuid" FROM "BoardColumn" WHERE "id" = NEW."columnId"; + IF NOT FOUND THEN RAISE EXCEPTION 'BoardColumn % 涓嶅瓨鍦', NEW."columnId"; END IF; + IF NEW."parentId" IS NULL THEN + NEW."parentUuid" := NULL; + ELSE + SELECT "uuid" INTO NEW."parentUuid" FROM "Task" WHERE "id" = NEW."parentId"; + IF NOT FOUND THEN RAISE EXCEPTION 'Task % 涓嶅瓨鍦', NEW."parentId"; END IF; + END IF; + RETURN NEW; +END; +$function$ + +; + +CREATE OR REPLACE FUNCTION public.func_taskmember_uuid_map() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ +BEGIN + SELECT "uuid" INTO NEW."taskUuid" FROM "Task" WHERE "id" = NEW."taskId"; + IF NOT FOUND THEN RAISE EXCEPTION 'Task % 涓嶅瓨鍦', NEW."taskId"; END IF; + RETURN NEW; +END; +$function$ + +; + +CREATE OR REPLACE FUNCTION public.func_tasktag_uuid_map() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ +BEGIN + SELECT "uuid" INTO NEW."taskUuid" FROM "Task" WHERE "id" = NEW."taskId"; + IF NOT FOUND THEN RAISE EXCEPTION 'Task % 涓嶅瓨鍦', NEW."taskId"; END IF; + RETURN NEW; +END; +$function$ + +; + +CREATE TRIGGER trg_boardcolumn_uuid_map BEFORE INSERT OR UPDATE ON public."BoardColumn" FOR EACH ROW EXECUTE FUNCTION func_boardcolumn_uuid_map(); +CREATE TRIGGER trg_projectmember_uuid_map BEFORE INSERT OR UPDATE ON public."ProjectMember" FOR EACH ROW EXECUTE FUNCTION func_projectmember_uuid_map(); +CREATE TRIGGER trg_task_uuid_map BEFORE INSERT OR UPDATE ON public."Task" FOR EACH ROW EXECUTE FUNCTION func_task_uuid_map(); +CREATE TRIGGER trg_taskmember_uuid_map BEFORE INSERT OR UPDATE ON public."TaskMember" FOR EACH ROW EXECUTE FUNCTION func_taskmember_uuid_map(); +CREATE TRIGGER trg_tasktag_uuid_map BEFORE INSERT OR UPDATE ON public."TaskTag" FOR EACH ROW EXECUTE FUNCTION func_tasktag_uuid_map(); diff --git a/docs/021浠诲姟.md b/docs/021浠诲姟.md index 92ec42d..2c10b69 100644 --- a/docs/021浠诲姟.md +++ b/docs/021浠诲姟.md @@ -1,8 +1,29 @@ # 0.2.1 鍙戝竷浠诲姟 鈥 鐩爣涓庣幇鐘 -> 鏈鍚庢洿鏂帮細2026-10-27 07:05 -> 鍒嗘敮锛歚dev-0.2`锛堝凡鎺ㄩ侊紝涓 `origin/dev-0.2` 鍚屾浜 `b29be62`锛 -> 鐘舵侊細**浠ｇ爜涓庢墦鍖呭叏閮ㄥ氨缁紱鐢熶骇鍒囨崲灏氭湭鎵ц锛堝仠鍦"闀滃儚宸叉瀯寤猴紝寰呰捣鏍+杩佺Щ+鍒囧煙鍚"锛** +> 鏈鍚庢洿鏂帮細2026-10-27 08:05 +> 鍒嗘敮锛歚dev-0.2`锛堝凡鎺ㄩ侊級 +> 鐘舵侊細**鐢熶骇宸插垏鎹㈠埌 0.2.1 鍗曠鍙ｆ灦鏋勫苟楠岃瘉閫氳繃锛涘墿浣 "鍚 master 鍙戝竷" 涓姝** + +## 闆躲佹墽琛岀粨鏋滈熻锛2026-10-27 宸插畬鎴愶級 + +| 椤圭洰 | 缁撴灉 | +| --- | --- | +| 鐢熶骇鍦板潃 | `https://iboard.honor3.com` 鈫 baihu **3001**锛圢PM + 鏈夋晥璇佷功锛 | +| 鐢熶骇鏋舵瀯 | `iboard-prod-app-1`(3001 瀵瑰) + `iboard-prod-pg-1`(鍐呯綉) + `iboard-prod-powersync-1`(鍐呯綉) | +| 绔彛 | **鍙墿 3001**锛13001 / 13002 / 13443 鍏ㄩ儴涓嬬嚎 | +| 鏁版嵁杩佺Щ | MySQL 鈫 PG 瀹屾垚锛歅roject 3銆乀ask 25銆丅oardColumn 12銆乁ser 1銆丆heckIn 17銆丯ews 19銆両ndicatorPoint 245銆丮ihome 绛夊叏閮ㄨ縼鍏 | +| 鏃х敓浜 | 瀹瑰櫒 `iboard` 宸 **stop锛堟湭鍒犻櫎锛**锛宍docker start iboard` 鍙绾у洖婊 | +| 鐧诲綍鎬 | `JWT_SECRET` 娌跨敤 `iboard`锛岀幇鏈夌敤鎴锋棤闇閲嶆柊鐧诲綍 | +| 绫冲鍑瘉 | `/app/iboard/cache` 鈫 `deploy/prod/data/cache`锛坄auth.txt` + `apizero/`锛 | +| E2E 楠岃瘉 | 鍦ㄧ嚎锛氶」鐩崱鐗 + `ADMIN-16`/`ADMIN-18` 缂栧彿锛涙柇缃戯細寰芥爣鍑虹幇銆佷换鍔￠〉鏁版嵁瀹屾暣銆佹棤 fail fetch锛涙仮澶嶏細寰芥爣娑堝け | + +### 杩佺Щ杩囩▼涓俯鍒板苟淇帀鐨勫潙 + +1. `prisma/migrations/` 鏄 **MySQL 璇硶**锛堝弽寮曞彿锛夛紝PG 鏃犳硶 `migrate deploy` 鈫 鏀圭敤 `prisma db push --accept-data-loss` 鎸 schema 寤鸿〃銆 +2. `db push` 棣栨鍥犲弬鏁颁笉琚瘑鍒岃緭鍑哄府鍔╋紙琛ㄧ粨鏋勫仠鍦ㄦ棫 schema锛岀己 `autoArchive`锛夆啋 鍘绘帀閿欒鍙傛暟閲嶈窇锛屽垪宸茶ˉ榻愩 +3. 鏂板簱缂 **uuid 闀滃儚瑙﹀彂鍣**锛坄projectUuid`/`columnUuid`/`parentUuid`/`taskUuid`锛夆啋 浠 0.2.1 楠岃瘉搴撳鍑 5 涓嚱鏁 + 5 涓Е鍙戝櫒锛岃惤搴撳苟鍏ュ簱 `deploy/prod/sql/uuid-triggers.sql`銆 +4. bash 鎶 `$$` 灞曞紑鎴 PID 瀵艰嚧 TRUNCATE 鑴氭湰鎶ラ敊 鈫 鏀圭敤 SQL 鏂囦欢浼犲叆銆 +5. baihu 涓 `docker build` 缂 buildx 鈫 鏀圭敤 `docker compose build`銆 --- @@ -147,6 +168,116 @@ bash /app/iboard-prod/scripts/deploy/prod.sh curl -s https://iboard.honor3.com/api/health ``` +## 浜斾箣浜屻佸悗缁姩浣滄墽琛屾楠わ紙宸茬‘璁ゆ柟妗堬紝鎸夊簭鎵ц锛 + +### 鍐崇瓥纭锛2026-10-27锛 + +| 椤 | 鍐冲畾 | +| --- | --- | +| PG 瀵嗛挜 | **涓嶈繘 Gitea Secrets**锛岀洿鎺ュ啓鍦ㄦ湇鍔″櫒 `/app/iboard-prod/deploy/prod/.env`锛600锛 | +| 杩佺Щ鏃舵満 | 绔嬪嵆鎵ц | +| 绫冲鍑瘉 | 淇濈暀锛宍/app/iboard/cache` 鎼埌鏂版爤 `deploy/prod/data/cache` | +| `JWT_SECRET` | 娌跨敤鐜扮綉鍊硷紙`iboard`锛夛紝淇濇寔鐜版湁鐧诲綍鎬 | +| 鍩熷悕 | `iboard.honor3.com` 鈫 baihu **3001**锛圢PM 宸查厤濂斤紝SSL 寮哄埗锛 | + +### 姝ラ A锛氬噯澶囷紙涓嶆敼鍔ㄧ幇缃戯級 + +```bash +# A1. 娌跨敤鐜扮綉 JWT_SECRET (鍏朵綑瀵嗛挜淇濇寔宸茬敓鎴愮殑闅忔満鍊) +cd /app/iboard-prod/deploy/prod +sed -i 's/^JWT_SECRET=.*/JWT_SECRET=iboard/' .env + +# A2. 鎼背瀹剁紦瀛 (auth.txt 绛) +mkdir -p data/cache +rsync -a /app/iboard/cache/ data/cache/ + +# A3. 淇濈暀鏃ч暅鍍忕敤浜庡洖婊 +docker tag iboard:latest iboard:mysql-final # 闇鍦ㄩ噸鏂版瀯寤哄墠鎵ц; 鑻ュ凡瑕嗙洊瑙"鍥炴粴棰勬" +``` + +### 姝ラ B锛氳捣鐏板害鏍堬紙涓嶅姩鐜扮綉 3001锛 + +```bash +cd /app/iboard-prod/deploy/prod +HOST_PORT=13011 docker compose --project-name iboard-prod \ + --env-file .env -f docker-compose.yml up -d pg + +# 杩佺Щ寤鸿〃 +docker run --rm --network iboard-prod_default \ + -e DATABASE_URL="postgresql://iboard:$(grep ^PG_PASSWORD .env | cut -d= -f2)@pg:5432/iboard" \ + iboard:latest npx prisma migrate deploy + +# 寤 publication (蹇呴』鍦ㄥ缓琛ㄤ箣鍚) +docker compose --project-name iboard-prod --env-file .env -f docker-compose.yml exec -T pg \ + psql -U iboard -d iboard -v ON_ERROR_STOP=1 -f /dev/stdin < sql/publication.sql + +# 璧 app + powersync (鍙湁 13011 瀵瑰) +HOST_PORT=13011 docker compose --project-name iboard-prod \ + --env-file .env -f docker-compose.yml up -d app powersync + +# 楠屾敹 +curl -s http://127.0.0.1:13011/api/health # {"ok":true,...} +ss -tlnp | grep -E ':(13011|5432|8080)\b' # 鍙簲鐪嬪埌 13011 +``` + +### 姝ラ C锛氭暟鎹縼绉伙紙MySQL 鈫 PG锛 + +```bash +docker run --rm --network iboard-prod_default \ + -e DATABASE_URL="postgresql://iboard:@pg:5432/iboard" \ + -e SRC_DATABASE_URL="mysql://root:@:3306/iboard" \ + iboard:latest node scripts/etl-mariadb-to-pg.mjs + +# 杩佺Щ鍚庨噸鍚悓姝ユ湇鍔￠噸寤哄揩鐓 +docker compose --project-name iboard-prod --env-file .env -f docker-compose.yml restart powersync +``` + +**楠屾敹**锛氶」鐩 3 涓紙ADMIN / IBOARD / P3F921锛夈佷换鍔 ~22 鏉°佺敤鎴 1 涓紙admin@iboard.local锛夛紱 +`docker compose logs powersync` 鏄剧ず replication 宸叉縺娲讳笖鏃犳姤閿欍 + +### 姝ラ D锛氬姛鑳介獙璇侊紙13011锛 + +- 鐧诲綍 `admin@iboard.local` +- 浠诲姟椤碉細椤圭洰鍗＄墖銆佷换鍔＄紪鍙凤紙濡 `ADMIN-16`锛 +- **绂荤嚎楠岃瘉**锛氭柇缃戝悗鍒楄〃浠嶅彲璇汇佸乏涓婅鍑虹幇銆岀绾裤嶅窘鏍囷紝鎭㈠缃戠粶鑷姩鍚屾鍥炴祦 +- 鐩戞帶 / 瀹忚 / 鎵撳崱椤垫湁鏁版嵁 + +### 姝ラ E锛氬垏鎹㈢敓浜 + +```bash +# E1. 鍋滄棫瀹瑰櫒 (MySQL 鐗) +docker rm -vf iboard || true + +# E2. 鏂版爤鏀圭粦 3001 +cd /app/iboard-prod/deploy/prod +HOST_PORT=3001 docker compose --project-name iboard-prod \ + --env-file .env -f docker-compose.yml up -d app +curl -s https://iboard.honor3.com/api/health # 缁 NPM + 璇佷功 + +# E3. 涓嬬嚎 0.2.1 楠岃瘉鏍 (閲婃斁 13001/13002/13443) +cd /app/iboard-0.2.1/deploy/0.2.1 && docker compose down +``` + +**楠屾敹**锛歚https://iboard.honor3.com` 鍙櫥褰曘佷换鍔℃甯搞佺绾垮彲缂栬緫锛 +`ss -tlnp` 鍙墿 3001锛堝鍔犱粎渚涙湰鏈虹殑 3306锛夈 + +### 姝ラ F锛氬彂甯 + +```bash +git checkout master && git merge dev-0.2 --no-edit +git push origin master # 瑙﹀彂 CI: 鏋勫缓闀滃儚 + OTA +``` + +CI 鏈厤 PG secrets 鈫 鍙瀯寤轰笉閮ㄧ讲锛涚敓浜у凡鐢辨楠 B~E 鎵嬪伐灏辩华銆 + +### 鍥炴粴棰勬 + +| 鍦烘櫙 | 鍔ㄤ綔 | +| --- | --- | +| 鏂版爤璧蜂笉鏉 | 鏃у鍣ㄦ湭鍋滐紝鐜扮綉涓嶅彈褰卞搷锛屽洖姝ラ B 鎺掓煡 | +| 杩佺Щ鏁版嵁涓嶅 | 娓呯┖ `deploy/prod/data/pg` 鍚庨噸璺 ETL | +| 鍒囨崲鍚庝弗閲嶆晠闅 | 鐢 `iboard:mysql-final` 鏃ч暅鍍忔寜鍘 MySQL 鍙傛暟鎭㈠ 3001 | + ## 鍏佸凡鐭ラ仐鐣 - `dev-0.2.1` / `dev-windows-0.1` 涓や釜 worktree 鍒嗘敮鍐呭宸插叏閮ㄥ苟鍏 `dev-0.2`锛屽彲鎷╂満鍒犻櫎銆