@reglow/reglow 0.7.0 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/dist/reglow/common/errors.d.ts +1 -0
  2. package/dist/reglow/common/errors.js +1 -0
  3. package/dist/reglow/common/errors.js.map +1 -1
  4. package/dist/reglow/core/config.js +1 -1
  5. package/dist/reglow/core/entities.d.ts +20 -0
  6. package/dist/reglow/core/models.d.ts +2 -0
  7. package/dist/reglow/core/models.js +1 -0
  8. package/dist/reglow/core/models.js.map +1 -1
  9. package/dist/reglow/modules/customer_service/controller.js +6 -0
  10. package/dist/reglow/modules/customer_service/controller.js.map +1 -1
  11. package/dist/reglow/modules/customer_service/repository.js +10 -0
  12. package/dist/reglow/modules/customer_service/repository.js.map +1 -1
  13. package/dist/reglow/modules/customer_service/schema.d.ts +20 -0
  14. package/dist/reglow/modules/customer_service/schema.js +21 -0
  15. package/dist/reglow/modules/customer_service/schema.js.map +1 -1
  16. package/dist/reglow/modules/customer_service/sdk_template.html +1523 -221
  17. package/dist/reglow/modules/customer_service/service.d.ts +10 -0
  18. package/dist/reglow/modules/customer_service/service.js +130 -1
  19. package/dist/reglow/modules/customer_service/service.js.map +1 -1
  20. package/dist/reglow/modules/region/controller.d.ts +6 -0
  21. package/dist/reglow/modules/region/controller.js +77 -0
  22. package/dist/reglow/modules/region/controller.js.map +1 -0
  23. package/dist/reglow/modules/region/controller_admin.d.ts +6 -0
  24. package/dist/reglow/modules/region/controller_admin.js +126 -0
  25. package/dist/reglow/modules/region/controller_admin.js.map +1 -0
  26. package/dist/reglow/modules/region/data/pcas.json +1 -0
  27. package/dist/reglow/modules/region/model.d.ts +22 -0
  28. package/dist/reglow/modules/region/model.js +9 -0
  29. package/dist/reglow/modules/region/model.js.map +1 -0
  30. package/dist/reglow/modules/region/repository.d.ts +22 -0
  31. package/dist/reglow/modules/region/repository.js +75 -0
  32. package/dist/reglow/modules/region/repository.js.map +1 -0
  33. package/dist/reglow/modules/region/router.d.ts +16 -0
  34. package/dist/reglow/modules/region/router.js +11 -0
  35. package/dist/reglow/modules/region/router.js.map +1 -0
  36. package/dist/reglow/modules/region/schema.d.ts +38 -0
  37. package/dist/reglow/modules/region/schema.js +33 -0
  38. package/dist/reglow/modules/region/schema.js.map +1 -0
  39. package/dist/reglow/modules/region/seed.d.ts +2 -0
  40. package/dist/reglow/modules/region/seed.js +101 -0
  41. package/dist/reglow/modules/region/seed.js.map +1 -0
  42. package/dist/reglow/modules/region/service.d.ts +28 -0
  43. package/dist/reglow/modules/region/service.js +88 -0
  44. package/dist/reglow/modules/region/service.js.map +1 -0
  45. package/dist/reglow/modules/user/controller.js +31 -6
  46. package/dist/reglow/modules/user/controller.js.map +1 -1
  47. package/dist/reglow/modules/user/controller_client.js +2 -0
  48. package/dist/reglow/modules/user/controller_client.js.map +1 -1
  49. package/dist/reglow/modules/user/repository.d.ts +2 -0
  50. package/dist/reglow/modules/user/repository.js +11 -0
  51. package/dist/reglow/modules/user/repository.js.map +1 -1
  52. package/dist/reglow/modules/user/schema.d.ts +21 -0
  53. package/dist/reglow/modules/user/schema.js +20 -0
  54. package/dist/reglow/modules/user/schema.js.map +1 -1
  55. package/dist/reglow/modules/user/service.d.ts +3 -1
  56. package/dist/reglow/modules/user/service.js +43 -0
  57. package/dist/reglow/modules/user/service.js.map +1 -1
  58. package/dist/reglow/scripts/schema.js +29 -0
  59. package/dist/reglow/scripts/schema.js.map +1 -1
  60. package/package.json +2 -2
@@ -0,0 +1,22 @@
1
+ /**
2
+ * 行政区划模块 - 表名与级别常量定义
3
+ * 对应 backend-python 的 reglow/modules/region/model.py
4
+ */
5
+ import type { TimestampFields } from "../../core/entities.js";
6
+ export declare const REGION_TABLE: "biz_region";
7
+ export declare const LEVEL_COUNTRY = 0;
8
+ export declare const LEVEL_PROVINCE = 1;
9
+ export declare const LEVEL_CITY = 2;
10
+ export declare const LEVEL_DISTRICT = 3;
11
+ export declare const LEVEL_STREET = 4;
12
+ export declare const LEVEL_VILLAGE = 5;
13
+ /** 行政区划节点(懒加载树形结构,parent_id 关联) */
14
+ export interface Region extends TimestampFields {
15
+ id: number;
16
+ name: string;
17
+ level: number;
18
+ parent_id: number;
19
+ code: string;
20
+ sort: number;
21
+ status: string;
22
+ }
@@ -0,0 +1,9 @@
1
+ export const REGION_TABLE = "biz_region";
2
+ // 级别常量:0=国家 1=省 2=市 3=区县 4=街道乡镇 5=村/居委会
3
+ export const LEVEL_COUNTRY = 0;
4
+ export const LEVEL_PROVINCE = 1;
5
+ export const LEVEL_CITY = 2;
6
+ export const LEVEL_DISTRICT = 3;
7
+ export const LEVEL_STREET = 4;
8
+ export const LEVEL_VILLAGE = 5;
9
+ //# sourceMappingURL=model.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../reglow/modules/region/model.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,YAAY,GAAG,YAAqB,CAAC;AAElD,wCAAwC;AACxC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC;AAC/B,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC;AAChC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC;AAC5B,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC;AAChC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC;AAC9B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC"}
@@ -0,0 +1,22 @@
1
+ import { type Region } from "./model.js";
2
+ /** biz_region 表可排序列白名单(自有列,无敏感列) */
3
+ export declare const REGION_SORTABLE_COLUMNS: readonly string[];
4
+ export declare class RegionRepository {
5
+ /** 懒加载:返回指定父级下的子节点(默认仅 enabled),支持级别/状态/关键词过滤与排序 */
6
+ listChildren(params: {
7
+ parentId: number;
8
+ level: number | null;
9
+ status: string | null;
10
+ keyword: string | null;
11
+ sortBy?: string | null;
12
+ sortOrder?: string | null;
13
+ }): Promise<Region[]>;
14
+ /** 节点是否有子节点(懒加载展开箭头用) */
15
+ hasChildren(regionId: number): Promise<boolean>;
16
+ findById(regionId: number): Promise<Region | undefined>;
17
+ findByParentIds(parentIds: number[]): Promise<Region[]>;
18
+ findByNameAndParents(name: string, parentIds: number[]): Promise<Region | undefined>;
19
+ create(data: Record<string, unknown>): Promise<Region>;
20
+ update(regionId: number, data: Record<string, unknown>): Promise<Region>;
21
+ delete(regionId: number): Promise<void>;
22
+ }
@@ -0,0 +1,75 @@
1
+ /**
2
+ * 行政区划模块 Repository - 数据访问层
3
+ * 对应 backend-python 的 reglow/modules/region/repository.py
4
+ */
5
+ import { knex } from "../../core/database.js";
6
+ import { REGION_TABLE } from "./model.js";
7
+ import { applySort } from "../../common/sort.js";
8
+ /** biz_region 表可排序列白名单(自有列,无敏感列) */
9
+ export const REGION_SORTABLE_COLUMNS = [
10
+ "id",
11
+ "name",
12
+ "level",
13
+ "parent_id",
14
+ "code",
15
+ "sort",
16
+ "status",
17
+ "created_at",
18
+ "updated_at",
19
+ ];
20
+ export class RegionRepository {
21
+ /** 懒加载:返回指定父级下的子节点(默认仅 enabled),支持级别/状态/关键词过滤与排序 */
22
+ async listChildren(params) {
23
+ const { parentId, level, status, keyword } = params;
24
+ let query = knex(REGION_TABLE).where("parent_id", parentId);
25
+ if (level !== null && level !== undefined) {
26
+ query = query.where("level", level);
27
+ }
28
+ if (status && status !== "all") {
29
+ query = query.where("status", status);
30
+ }
31
+ if (keyword) {
32
+ query = query.where("name", "like", `%${keyword.trim()}%`);
33
+ }
34
+ query = applySort(query, params.sortBy, params.sortOrder, REGION_SORTABLE_COLUMNS, [["sort", "asc"], ["id", "asc"]]);
35
+ return (await query);
36
+ }
37
+ /** 节点是否有子节点(懒加载展开箭头用) */
38
+ async hasChildren(regionId) {
39
+ const row = (await knex(REGION_TABLE)
40
+ .where("parent_id", regionId)
41
+ .select("id")
42
+ .first());
43
+ return row !== undefined;
44
+ }
45
+ async findById(regionId) {
46
+ return (await knex(REGION_TABLE)
47
+ .where("id", regionId)
48
+ .first());
49
+ }
50
+ async findByParentIds(parentIds) {
51
+ if (!parentIds.length)
52
+ return [];
53
+ return (await knex(REGION_TABLE).whereIn("parent_id", parentIds));
54
+ }
55
+ async findByNameAndParents(name, parentIds) {
56
+ if (!parentIds.length)
57
+ return undefined;
58
+ return (await knex(REGION_TABLE)
59
+ .where("name", name)
60
+ .whereIn("parent_id", parentIds)
61
+ .first());
62
+ }
63
+ async create(data) {
64
+ const [id] = await knex(REGION_TABLE).insert(data);
65
+ return (await knex(REGION_TABLE).where("id", id).first());
66
+ }
67
+ async update(regionId, data) {
68
+ await knex(REGION_TABLE).where("id", regionId).update(data);
69
+ return (await knex(REGION_TABLE).where("id", regionId).first());
70
+ }
71
+ async delete(regionId) {
72
+ await knex(REGION_TABLE).where("id", regionId).delete();
73
+ }
74
+ }
75
+ //# sourceMappingURL=repository.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/region/repository.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,16 @@
1
+ /**
2
+ * 行政区划模块路由注册定义 - 供 core/plugin.ts 自动发现
3
+ * 对应 backend-python 的 reglow/modules/region/router.py
4
+ */
5
+ import { regionAdminRoutes } from "./controller_admin.js";
6
+ import { regionClientRoutes } from "./controller.js";
7
+ export declare const routerTags: string[];
8
+ export declare const clientRouterTags: string[];
9
+ export declare const adminRouters: {
10
+ prefix: string;
11
+ register: typeof regionAdminRoutes;
12
+ }[];
13
+ export declare const clientRouters: {
14
+ prefix: string;
15
+ register: typeof regionClientRoutes;
16
+ }[];
@@ -0,0 +1,11 @@
1
+ /**
2
+ * 行政区划模块路由注册定义 - 供 core/plugin.ts 自动发现
3
+ * 对应 backend-python 的 reglow/modules/region/router.py
4
+ */
5
+ import { regionAdminRoutes } from "./controller_admin.js";
6
+ import { regionClientRoutes } from "./controller.js";
7
+ export const routerTags = ["行政区划管理"];
8
+ export const clientRouterTags = ["行政区划"];
9
+ export const adminRouters = [{ prefix: "/regions", register: regionAdminRoutes }];
10
+ export const clientRouters = [{ prefix: "/regions", register: regionClientRoutes }];
11
+ //# sourceMappingURL=router.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../reglow/modules/region/router.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAC,CAAC;AACrC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAM,CAAC,CAAC;AACzC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;AAClF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC,CAAC"}
@@ -0,0 +1,38 @@
1
+ /**
2
+ * 行政区划模块 Schema - TypeBox 运行时校验 + 编译期类型
3
+ * 对应 backend-python 的 reglow/modules/region/schema.py
4
+ */
5
+ import { type Static } from "@sinclair/typebox";
6
+ export declare const LEVEL_LABELS: Record<number, string>;
7
+ export declare const MAX_LEVEL = 5;
8
+ export declare const RegionCreateSchema: import("@sinclair/typebox").TObject<{
9
+ name: import("@sinclair/typebox").TString;
10
+ level: import("@sinclair/typebox").TInteger;
11
+ parent_id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
12
+ code: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
13
+ sort: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
14
+ status: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
15
+ }>;
16
+ export type RegionCreateBody = Static<typeof RegionCreateSchema>;
17
+ export declare const RegionUpdateSchema: import("@sinclair/typebox").TObject<{
18
+ name: import("@sinclair/typebox").TString;
19
+ level: import("@sinclair/typebox").TInteger;
20
+ parent_id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
21
+ code: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
22
+ sort: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
23
+ status: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
24
+ }>;
25
+ export type RegionUpdateBody = Static<typeof RegionUpdateSchema>;
26
+ /** 行政区划节点(懒加载返回单层) */
27
+ export interface RegionItem {
28
+ id: number;
29
+ name: string;
30
+ level: number;
31
+ parent_id: number;
32
+ code: string;
33
+ sort: number;
34
+ status: string;
35
+ has_children: boolean;
36
+ created_at: unknown;
37
+ updated_at: unknown;
38
+ }
@@ -0,0 +1,33 @@
1
+ /**
2
+ * 行政区划模块 Schema - TypeBox 运行时校验 + 编译期类型
3
+ * 对应 backend-python 的 reglow/modules/region/schema.py
4
+ */
5
+ import { Type } from "@sinclair/typebox";
6
+ import { LEVEL_COUNTRY, LEVEL_PROVINCE, LEVEL_CITY, LEVEL_DISTRICT, LEVEL_STREET, LEVEL_VILLAGE, } from "./model.js";
7
+ // 级别文案(前后端共用;国际化:顶级为国家)
8
+ export const LEVEL_LABELS = {
9
+ [LEVEL_COUNTRY]: "国家",
10
+ [LEVEL_PROVINCE]: "省",
11
+ [LEVEL_CITY]: "市",
12
+ [LEVEL_DISTRICT]: "区县",
13
+ [LEVEL_STREET]: "街道乡镇",
14
+ [LEVEL_VILLAGE]: "村/居委会",
15
+ };
16
+ export const MAX_LEVEL = LEVEL_VILLAGE;
17
+ export const RegionCreateSchema = Type.Object({
18
+ name: Type.String({ minLength: 1, maxLength: 50 }),
19
+ level: Type.Integer({ minimum: 0, maximum: MAX_LEVEL }),
20
+ parent_id: Type.Optional(Type.Integer({ minimum: 0 })),
21
+ code: Type.Optional(Type.String({ maxLength: 20 })),
22
+ sort: Type.Optional(Type.Integer()),
23
+ status: Type.Optional(Type.String({ maxLength: 20 })),
24
+ });
25
+ export const RegionUpdateSchema = Type.Object({
26
+ name: Type.String({ minLength: 1, maxLength: 50 }),
27
+ level: Type.Integer({ minimum: 0, maximum: MAX_LEVEL }),
28
+ parent_id: Type.Optional(Type.Integer({ minimum: 0 })),
29
+ code: Type.Optional(Type.String({ maxLength: 20 })),
30
+ sort: Type.Optional(Type.Integer()),
31
+ status: Type.Optional(Type.String({ maxLength: 20 })),
32
+ });
33
+ //# sourceMappingURL=schema.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../reglow/modules/region/schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,IAAI,EAAe,MAAM,mBAAmB,CAAC;AACtD,OAAO,EACL,aAAa,EACb,cAAc,EACd,UAAU,EACV,cAAc,EACd,YAAY,EACZ,aAAa,GACd,MAAM,YAAY,CAAC;AAEpB,wBAAwB;AACxB,MAAM,CAAC,MAAM,YAAY,GAA2B;IAClD,CAAC,aAAa,CAAC,EAAE,IAAI;IACrB,CAAC,cAAc,CAAC,EAAE,GAAG;IACrB,CAAC,UAAU,CAAC,EAAE,GAAG;IACjB,CAAC,cAAc,CAAC,EAAE,IAAI;IACtB,CAAC,YAAY,CAAC,EAAE,MAAM;IACtB,CAAC,aAAa,CAAC,EAAE,OAAO;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,CAAC;AAEvC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAClD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;IACvD,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IACtD,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;CACtD,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC;IAC5C,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAClD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;IACvD,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;IACtD,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;CACtD,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ /** 导入行政区划种子数据(幂等:国家级数据已存在则跳过)。 */
2
+ export declare function seedRegions(): Promise<void>;
@@ -0,0 +1,101 @@
1
+ /**
2
+ * 行政区划种子数据(幂等:已存在国家级数据则跳过)
3
+ *
4
+ * 数据来源 modood/Administrative-divisions-of-China 公开数据集 pcas.json
5
+ * (省/市/区县/街道乡镇 四级,约 4.6 万条),位于 reglow/modules/region/data/pcas.json。
6
+ *
7
+ * 国际化:顶级为国家(level=0),默认仅播种「中国」,其下为省/市/区县/街道乡镇。
8
+ * 对应 backend-python 的 reglow/modules/region/seed.py
9
+ */
10
+ import fs from "node:fs";
11
+ import path from "node:path";
12
+ import { fileURLToPath, pathToFileURL } from "node:url";
13
+ import { knex } from "../../core/database.js";
14
+ import { logger } from "../../core/logging.js";
15
+ import { REGION_TABLE, LEVEL_COUNTRY } from "./model.js";
16
+ const __dirname = path.dirname(fileURLToPath(import.meta.url));
17
+ const SEED_FILE = path.join(__dirname, "data", "pcas.json");
18
+ // 默认顶级国家(国际化:默认仅中国,可在后台继续维护其他国家)
19
+ const DEFAULT_COUNTRY = { name: "中国", code: "CN" };
20
+ /** 递归展开 JSON 树为平铺行(name/level/parent_code/code) */
21
+ function flatten(nodes, level, parentCode, out) {
22
+ for (const node of nodes) {
23
+ const children = node.children || [];
24
+ out.push({
25
+ name: node.name || "",
26
+ level,
27
+ parent_code: parentCode,
28
+ code: node.code || "",
29
+ });
30
+ if (children.length)
31
+ flatten(children, level + 1, node.code || "", out);
32
+ }
33
+ }
34
+ /** 导入行政区划种子数据(幂等:国家级数据已存在则跳过)。 */
35
+ export async function seedRegions() {
36
+ const existing = await knex(REGION_TABLE)
37
+ .where("level", LEVEL_COUNTRY)
38
+ .select("id")
39
+ .first();
40
+ if (existing) {
41
+ logger.info("行政区划数据已存在,跳过种子导入");
42
+ return;
43
+ }
44
+ if (!fs.existsSync(SEED_FILE)) {
45
+ logger.warning("行政区划种子数据文件缺失: %s,跳过导入", SEED_FILE);
46
+ return;
47
+ }
48
+ const root = JSON.parse(fs.readFileSync(SEED_FILE, "utf-8"));
49
+ // 1. 顶级国家(默认仅中国)
50
+ const [countryId] = await knex(REGION_TABLE).insert({
51
+ name: DEFAULT_COUNTRY.name,
52
+ level: LEVEL_COUNTRY,
53
+ parent_id: 0,
54
+ code: DEFAULT_COUNTRY.code,
55
+ sort: 0,
56
+ status: "enabled",
57
+ });
58
+ // 2. 平铺省/市/区县/街道乡镇(pcas 顶级即省份,level 从 1 开始)
59
+ const rows = [];
60
+ flatten(root, 1, "", rows);
61
+ // 逐级插入,直接用插入后的 id 建立 code → id 映射,避免大数据量 IN 查询超限
62
+ const codeId = { [DEFAULT_COUNTRY.code]: countryId };
63
+ for (let level = 1; level <= 4; level++) {
64
+ const levelRows = rows.filter((r) => r.level === level);
65
+ if (!levelRows.length)
66
+ continue;
67
+ const batch = levelRows.map((r) => ({
68
+ name: r.name,
69
+ level: r.level,
70
+ parent_id: codeId[r.parent_code] ?? countryId,
71
+ code: r.code,
72
+ sort: 0,
73
+ status: "enabled",
74
+ }));
75
+ // 分批插入(避免单条 SQL 过长)
76
+ for (let i = 0; i < batch.length; i += 500) {
77
+ await knex(REGION_TABLE).insert(batch.slice(i, i + 500));
78
+ }
79
+ // 回填映射供下一级关联父级
80
+ const inserted = (await knex(REGION_TABLE)
81
+ .where("level", level)
82
+ .select("id", "code"));
83
+ for (const row of inserted) {
84
+ if (row.code)
85
+ codeId[row.code] = Number(row.id);
86
+ }
87
+ }
88
+ logger.info("行政区划种子导入完成:国家=%s,节点=%s", DEFAULT_COUNTRY.name, rows.length);
89
+ }
90
+ const isMainModule = process.argv[1]
91
+ ? import.meta.url === pathToFileURL(process.argv[1]).href
92
+ : false;
93
+ if (isMainModule) {
94
+ seedRegions()
95
+ .then(() => process.exit(0))
96
+ .catch((e) => {
97
+ logger.error("[seed] 行政区划初始化失败:", e.message);
98
+ process.exit(1);
99
+ });
100
+ }
101
+ //# sourceMappingURL=seed.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../../reglow/modules/region/seed.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,28 @@
1
+ import { RegionRepository } from "./repository.js";
2
+ import type { Region } from "./model.js";
3
+ export declare class RegionService {
4
+ repo: RegionRepository;
5
+ /** 懒加载:返回指定父级下的子节点(默认仅 enabled)。parent_id=0 返回顶级(国家,默认仅中国) */
6
+ listChildren(params: {
7
+ parentId: number;
8
+ level?: number | null;
9
+ status?: string | null;
10
+ keyword?: string | null;
11
+ sortBy?: string | null;
12
+ sortOrder?: string | null;
13
+ }): Promise<Region[]>;
14
+ /** 节点是否有子节点(懒加载展开箭头用) */
15
+ hasChildren(regionId: number): Promise<boolean>;
16
+ getRegion(regionId: number): Promise<Region>;
17
+ /** 获取节点到根的全链路(含自身),用于编辑回显选中路径 */
18
+ getAncestors(regionId: number): Promise<Region[]>;
19
+ /** 按名称拼接完整路径文本(如「中国/福建省/厦门市/思明区」),跳过占位节点(市辖区等) */
20
+ buildPathText(regionId: number): Promise<string>;
21
+ /**
22
+ * 按名称序列解析路径(用于编辑回显 region 路径文本 → 节点ID 序列)。
23
+ *
24
+ * 逐级向下查找;若当前级找不到(如路径未含国家、或直辖市存库时跳过了「市辖区」占位节点),
25
+ * 自动下探一层继续查找。返回从根开始的匹配节点列表。
26
+ */
27
+ resolvePathByNames(names: string[]): Promise<Region[]>;
28
+ }
@@ -0,0 +1,88 @@
1
+ /**
2
+ * 行政区划服务层(懒加载 + 路径解析)
3
+ * 对应 backend-python 的 reglow/modules/region/service.py
4
+ */
5
+ import { AppException, ErrorCode } from "../../common/errors.js";
6
+ import { RegionRepository } from "./repository.js";
7
+ // 路径拼接占位符节点:直辖市「市辖区」、省直辖县级行政区划等非真实行政区,拼接路径时跳过
8
+ const PLACEHOLDER_NAMES = new Set([
9
+ "市辖区",
10
+ "省直辖县级行政区划",
11
+ "自治区直辖县级行政区划",
12
+ ]);
13
+ export class RegionService {
14
+ repo = new RegionRepository();
15
+ /** 懒加载:返回指定父级下的子节点(默认仅 enabled)。parent_id=0 返回顶级(国家,默认仅中国) */
16
+ async listChildren(params) {
17
+ return this.repo.listChildren({
18
+ parentId: params.parentId,
19
+ level: params.level ?? null,
20
+ status: params.status ?? null,
21
+ keyword: params.keyword ?? null,
22
+ sortBy: params.sortBy ?? null,
23
+ sortOrder: params.sortOrder ?? null,
24
+ });
25
+ }
26
+ /** 节点是否有子节点(懒加载展开箭头用) */
27
+ async hasChildren(regionId) {
28
+ return this.repo.hasChildren(regionId);
29
+ }
30
+ async getRegion(regionId) {
31
+ const region = await this.repo.findById(regionId);
32
+ if (!region) {
33
+ throw new AppException(ErrorCode.NOT_FOUND, "行政区划不存在", 404);
34
+ }
35
+ return region;
36
+ }
37
+ /** 获取节点到根的全链路(含自身),用于编辑回显选中路径 */
38
+ async getAncestors(regionId) {
39
+ const path = [];
40
+ let cur = await this.getRegion(regionId);
41
+ while (cur) {
42
+ path.push(cur);
43
+ if (!cur.parent_id)
44
+ break;
45
+ cur = await this.repo.findById(cur.parent_id);
46
+ }
47
+ path.reverse();
48
+ return path;
49
+ }
50
+ /** 按名称拼接完整路径文本(如「中国/福建省/厦门市/思明区」),跳过占位节点(市辖区等) */
51
+ async buildPathText(regionId) {
52
+ const path = await this.getAncestors(regionId);
53
+ const names = path
54
+ .filter((r) => !PLACEHOLDER_NAMES.has(r.name))
55
+ .map((r) => r.name);
56
+ return names.join("/");
57
+ }
58
+ /**
59
+ * 按名称序列解析路径(用于编辑回显 region 路径文本 → 节点ID 序列)。
60
+ *
61
+ * 逐级向下查找;若当前级找不到(如路径未含国家、或直辖市存库时跳过了「市辖区」占位节点),
62
+ * 自动下探一层继续查找。返回从根开始的匹配节点列表。
63
+ */
64
+ async resolvePathByNames(names) {
65
+ const matched = [];
66
+ let currentIds = [0]; // 当前候选层的 parent_id 集合(0 = 顶级/国家)
67
+ for (let raw of names) {
68
+ const name = (raw || "").trim();
69
+ if (!name)
70
+ break;
71
+ let node = await this.repo.findByNameAndParents(name, currentIds);
72
+ if (!node) {
73
+ // 下探一层:将当前候选层所有子节点作为候选(跳过占位层)
74
+ const children = await this.repo.findByParentIds(currentIds);
75
+ const ids = children.map((r) => r.id);
76
+ if (!ids.length)
77
+ break;
78
+ node = await this.repo.findByNameAndParents(name, ids);
79
+ if (!node)
80
+ break;
81
+ }
82
+ matched.push(node);
83
+ currentIds = [node.id];
84
+ }
85
+ return matched;
86
+ }
87
+ }
88
+ //# sourceMappingURL=service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/region/service.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { ApiResponse, PageData } from "../../common/response.js";
2
2
  import { mapTimestamp } from "../../common/serialize.js";
3
3
  import { UserService } from "./service.js";
4
- import { UpdateUserSchema, PasswordResetSchema, } from "./schema.js";
4
+ import { CreateUserSchema, UpdateUserSchema, PasswordResetSchema, } from "./schema.js";
5
5
  function int(v, def) {
6
6
  const n = parseInt(String(v), 10);
7
7
  return Number.isNaN(n) ? def : n;
@@ -35,6 +35,7 @@ function toUserListDto(u) {
35
35
  birthday: u.birthday ?? null,
36
36
  phone: u.phone ?? null,
37
37
  email: u.email ?? null,
38
+ nationality: u.nationality ?? null,
38
39
  region: u.region ?? null,
39
40
  bio: u.bio ?? null,
40
41
  source: u.source ?? null,
@@ -58,6 +59,7 @@ function toUserDto(u) {
58
59
  birthday: u.birthday ?? null,
59
60
  phone: u.phone ?? null,
60
61
  email: u.email ?? null,
62
+ nationality: u.nationality ?? null,
61
63
  region: u.region ?? null,
62
64
  bio: u.bio ?? null,
63
65
  source: u.source ?? null,
@@ -76,14 +78,28 @@ function toUserDto(u) {
76
78
  }
77
79
  export async function userRoutes(fastify) {
78
80
  const service = new UserService();
79
- fastify.get("/", { schema: { summary: "查询用户列表" }, preHandler: [fastify.requirePermission("system:user:list")] }, async (request) => {
81
+ fastify.get("/", {
82
+ schema: { summary: "查询用户列表" },
83
+ preHandler: [fastify.requirePermission("system:user:list")],
84
+ }, async (request) => {
80
85
  const query = request.query;
81
86
  const page = Math.max(1, int(query.page, 1));
82
87
  const size = Math.min(100, Math.max(1, int(query.size, 20)));
83
88
  const { items, total } = await service.listUsers(page, size, query.keyword || null, intOrNull(query.status), query.source || null, toBoolOrNull(query.is_verified), query.sort_by || null, query.sort_order || null);
84
89
  return ApiResponse.success(new PageData(items.map((u) => toUserListDto(u)), total, page, size));
85
90
  });
86
- fastify.get("/:user_id", { schema: { summary: "查询用户详情" }, preHandler: [fastify.requirePermission("system:user:list")] }, async (request) => {
91
+ fastify.post("/", {
92
+ preHandler: [fastify.requirePermission("system:user:create")],
93
+ schema: { summary: "创建用户", body: CreateUserSchema },
94
+ }, async (request) => {
95
+ const data = request.body;
96
+ const user = await service.createUser(data);
97
+ return ApiResponse.success(toUserDto(user), "创建成功");
98
+ });
99
+ fastify.get("/:user_id", {
100
+ schema: { summary: "查询用户详情" },
101
+ preHandler: [fastify.requirePermission("system:user:list")],
102
+ }, async (request) => {
87
103
  const userId = int(request.params.user_id, 0);
88
104
  const user = await service.getUserId(userId);
89
105
  return ApiResponse.success(toUserDto(user));
@@ -97,12 +113,18 @@ export async function userRoutes(fastify) {
97
113
  const user = await service.updateUser(userId, body);
98
114
  return ApiResponse.success(toUserDto(user), "更新成功");
99
115
  });
100
- fastify.delete("/:user_id", { schema: { summary: "删除用户" }, preHandler: [fastify.requirePermission("system:user:delete")] }, async (request) => {
116
+ fastify.delete("/:user_id", {
117
+ schema: { summary: "删除用户" },
118
+ preHandler: [fastify.requirePermission("system:user:delete")],
119
+ }, async (request) => {
101
120
  const userId = int(request.params.user_id, 0);
102
121
  await service.deleteUser(userId);
103
122
  return ApiResponse.success(null, "删除成功");
104
123
  });
105
- fastify.put("/:user_id/status", { schema: { summary: "更新用户" }, preHandler: [fastify.requirePermission("system:user:update")] }, async (request) => {
124
+ fastify.put("/:user_id/status", {
125
+ schema: { summary: "更新用户" },
126
+ preHandler: [fastify.requirePermission("system:user:update")],
127
+ }, async (request) => {
106
128
  const userId = int(request.params.user_id, 0);
107
129
  const status = int(request.query.status, 0);
108
130
  const user = await service.updateStatus(userId, status);
@@ -117,7 +139,10 @@ export async function userRoutes(fastify) {
117
139
  await service.resetPassword(userId, body.new_password);
118
140
  return ApiResponse.success(null, "密码重置成功");
119
141
  });
120
- fastify.put("/:user_id/unlock", { schema: { summary: "更新用户" }, preHandler: [fastify.requirePermission("system:user:update")] }, async (request) => {
142
+ fastify.put("/:user_id/unlock", {
143
+ schema: { summary: "更新用户" },
144
+ preHandler: [fastify.requirePermission("system:user:update")],
145
+ }, async (request) => {
121
146
  const userId = int(request.params.user_id, 0);
122
147
  await service.unlock(userId);
123
148
  return ApiResponse.success(null, "解锁成功");
@@ -1 +1 @@
1
- {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/user/controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/user/controller.ts"],"names":[],"mappings":"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"}
@@ -170,6 +170,7 @@ export async function userClientRoutes(fastify) {
170
170
  birthday: user.birthday ?? null,
171
171
  phone: user.phone ?? null,
172
172
  email: user.email ?? null,
173
+ nationality: user.nationality ?? null,
173
174
  region: user.region ?? null,
174
175
  bio: user.bio ?? null,
175
176
  source: user.source ?? null,
@@ -197,6 +198,7 @@ export async function userClientRoutes(fastify) {
197
198
  birthday: updated.birthday ?? null,
198
199
  phone: updated.phone ?? null,
199
200
  email: updated.email ?? null,
201
+ nationality: updated.nationality ?? null,
200
202
  region: updated.region ?? null,
201
203
  bio: updated.bio ?? null,
202
204
  source: updated.source ?? null,