@oj-module/cli 0.2.2 → 0.2.5

package/templates/api/tests/rbac-settings.spec.ts

@@ -55,6 +55,14 @@ describe("PRD §4.3：系统设置", () => {
 		expect(security?.items.find(i => i.key === "market.cdn_url")?.value).toBe("***");
 	});
 
+	it("组标题回填（P2-15③）：group_label_key 落库行 → 组面收敛出 label_key", async () => {
+		dbo.prepare("INSERT INTO sys_setting (key, module, \"group\", type, value, secret, update_time, group_label_key) VALUES ('demo-solution.display.theme', 'demo-solution', 'display', 'string', 'auto', 0, 0, 'demo-solution:settings.group.display')").run();
+		dbo.prepare("INSERT INTO sys_setting (key, module, \"group\", type, value, secret, update_time, group_label_key) VALUES ('demo-solution.display.size', 'demo-solution', 'display', 'int', '20', 0, 0, 'demo-solution:settings.group.display')").run();
+		const groups = await listSettings();
+		const display = groups.find(x => x.group === "display");
+		expect(display?.label_key).toBe("demo-solution:settings.group.display");
+	});
+
 	it("更新写值 + update_time + 审计（market 安全项须 superadmin 操作者）", async () => {
 		dbo.prepare("INSERT INTO sys_setting (key, module, \"group\", type, value, secret, update_time) VALUES ('framework.site_title', 'framework', 'general', 'string', 'ACME', 0, 0)").run();
 		dbo.prepare("INSERT INTO sys_setting (key, module, \"group\", type, value, secret, update_time) VALUES ('market.cdn_url', 'market', 'security', 'string', 'x', 1, 0)").run();

package/templates/init.include.yaml

@@ -0,0 +1,56 @@
+# `ojm init` 拷入新工程的白名单（路径相对本 templates 根目录）。
+#
+# 与已废弃的 init.exclude.yaml 逻辑相反：模板里大部分文件是「模板自运行/
+# demo/产物」，不该进用户工程——用排除清单会越列越长，故反转为白名单：
+# 凡未列出的路径一律不拷，也不计入 init 报告的 created/skipped。四类不列入：
+#  1. demo-only 演示模块——模板内置供演示，新工程默认不需要（文件缺失会崩）。
+#     其 web.config.ts 条目由 `// #region demo-only` 标注，init 时整段剥离。
+#  2. 模板自运行专属文件——templates 本身也是一个可 `pnpm dev` 的工程，
+#     它的 package.json / node_modules / bin / lock 绝不能泄漏进用户工程；
+#     package.json 由 init 现场生成（钉死真实版本，不带 workspace:/catalog:）。
+#  3. 构建与运行期产物——api/dist、web/dist、api/logs、签发的私钥与 sqlite；
+#     模板跑过 build/dev 后会留在本地，既不进用户工程，更不该让所有工程
+#     共享同一把私钥。
+#  4. 模板自用元数据——本清单自身。
+#
+# 注意 web/src/{demo,home}/__client 不在清单：其 api 模块（api/src/demo、
+# api/src/home）是 demo-only 不进脚手架，client 生成物留着会指向不存在的端点，
+# 故 demo/home 只列页面源码（entry/locales/pages），不列整棵模块目录。
+include:
+  # —— 工程级文件 ——
+  - README.md
+  - tsconfig.json
+  - env.d.ts
+  - web.config.ts
+  - openapi.json
+  - .gitignore
+  - web/src/styles.css
+  # —— api 后端：配置 / 种子 / 测试 / 默认模块 ——
+  - api/config.yaml
+  - api/.ojm-api-exempt.json
+  - api/seed.mysql.sql
+  - api/seed.pg.sql
+  - api/vitest.config.ts
+  - api/tests
+  - api/src/_platform
+  - api/src/auth
+  - api/src/notification
+  - api/src/notifications
+  - api/src/personal-center
+  - api/src/system
+  - api/src/web
+  # —— web 前端模块（demo/home 只列页面源码，__client 见顶部说明）——
+  - web/src/_platform
+  - web/src/auth
+  - web/src/demo/entry.ts
+  - web/src/demo/locales
+  - web/src/demo/pages
+  - web/src/home/entry.ts
+  - web/src/home/locales
+  - web/src/home/pages
+  - web/src/login
+  - web/src/notification
+  - web/src/notifications
+  - web/src/personal-center
+  - web/src/system
+  - web/src/web

package/templates/openapi.json

@@ -35,6 +35,242 @@
 				}
 			}
 		},
+		"/api/_platform/market/install": {
+			"post": {
+				"operationId": "_platform_market_install_post",
+				"summary": "POST api/_platform/market/install",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/install/cancel": {
+			"post": {
+				"operationId": "_platform_market_install_cancel_post",
+				"summary": "POST api/_platform/market/install/cancel",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/task": {
+			"get": {
+				"operationId": "_platform_market_task_get",
+				"summary": "GET api/_platform/market/task",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/enable": {
+			"post": {
+				"operationId": "_platform_market_enable_post",
+				"summary": "POST api/_platform/market/enable",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/meta": {
+			"get": {
+				"operationId": "_platform_market_meta_get",
+				"summary": "GET api/_platform/market/meta",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/trust": {
+			"get": {
+				"operationId": "_platform_market_trust_get",
+				"summary": "GET api/_platform/market/trust",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			},
+			"post": {
+				"operationId": "_platform_market_trust_post",
+				"summary": "POST api/_platform/market/trust",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/trust/key": {
+			"post": {
+				"operationId": "_platform_market_trust_key_post",
+				"summary": "POST api/_platform/market/trust/key",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			},
+			"delete": {
+				"operationId": "_platform_market_trust_key_delete",
+				"summary": "DELETE api/_platform/market/trust/key",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/index": {
+			"get": {
+				"operationId": "_platform_market_index_get",
+				"summary": "GET api/_platform/market/index",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/uninstall-impact": {
+			"get": {
+				"operationId": "_platform_market_uninstall_impact_get",
+				"summary": "GET api/_platform/market/uninstall-impact",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/uninstall": {
+			"post": {
+				"operationId": "_platform_market_uninstall_post",
+				"summary": "POST api/_platform/market/uninstall",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/market/history": {
+			"get": {
+				"operationId": "_platform_market_history_get",
+				"summary": "GET api/_platform/market/history",
+				"x-oj-file": "_platform/market/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/solutions/routes": {
+			"get": {
+				"operationId": "_platform_solutions_routes_get",
+				"summary": "GET api/_platform/solutions/routes",
+				"x-oj-file": "_platform/solutions/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/solutions/verify": {
+			"post": {
+				"operationId": "_platform_solutions_verify_post",
+				"summary": "POST api/_platform/solutions/verify",
+				"x-oj-file": "_platform/solutions/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
+		"/api/_platform/solutions/verify/last": {
+			"get": {
+				"operationId": "_platform_solutions_verify_last_get",
+				"summary": "GET api/_platform/solutions/verify/last",
+				"x-oj-file": "_platform/solutions/api.ts",
+				"tags": [
+					"_platform"
+				],
+				"responses": {
+					"200": {
+						"description": "OK"
+					}
+				}
+			}
+		},
 		"/api/auth/login": {
 			"post": {
 				"operationId": "auth_login_post",
@@ -134,6 +370,213 @@
 				}
 			}
 		},
+		"/api/demo/todos": {
+			"get": {
+				"operationId": "demo_todos_get",
+				"summary": "GET api/demo/todos",
+				"x-oj-file": "demo/todos/api.ts",
+				"tags": [
+					"demo"
+				],
+				"parameters": [
+					{
+						"name": "keyword",
+						"in": "query",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "OK",
+						"x-oj-response-enforced": false,
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "object",
+									"required": [
+										"code",
+										"msg",
+										"data"
+									],
+									"properties": {
+										"code": {
+											"type": "integer"
+										},
+										"msg": {
+											"type": "string"
+										},
+										"data": {
+											"type": "object",
+											"required": [
+												"list",
+												"total"
+											],
+											"properties": {
+												"list": {
+													"type": "array",
+													"items": {
+														"type": "object",
+														"required": [
+															"id",
+															"title",
+															"done"
+														],
+														"properties": {
+															"id": {
+																"type": "number"
+															},
+															"title": {
+																"type": "string"
+															},
+															"done": {
+																"type": "boolean"
+															}
+														}
+													}
+												},
+												"total": {
+													"type": "number"
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/api/home/line": {
+			"post": {
+				"operationId": "home_line_post",
+				"summary": "POST api/home/line",
+				"x-oj-file": "home/line/api.ts",
+				"tags": [
+					"home"
+				],
+				"requestBody": {
+					"required": true,
+					"content": {
+						"application/json": {
+							"schema": {
+								"type": "object",
+								"required": [
+									"range"
+								],
+								"properties": {
+									"range": {
+										"type": "string"
+									}
+								}
+							}
+						}
+					}
+				},
+				"responses": {
+					"200": {
+						"description": "OK",
+						"x-oj-response-enforced": false,
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "object",
+									"required": [
+										"code",
+										"msg",
+										"data"
+									],
+									"properties": {
+										"code": {
+											"type": "integer"
+										},
+										"msg": {
+											"type": "string"
+										},
+										"data": {
+											"type": "array",
+											"items": {
+												"type": "number"
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/api/home/pie": {
+			"get": {
+				"operationId": "home_pie_get",
+				"summary": "GET api/home/pie",
+				"x-oj-file": "home/pie/api.ts",
+				"tags": [
+					"home"
+				],
+				"parameters": [
+					{
+						"name": "by",
+						"in": "query",
+						"required": false,
+						"schema": {
+							"type": [
+								"string",
+								"number"
+							]
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "OK",
+						"x-oj-response-enforced": false,
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "object",
+									"required": [
+										"code",
+										"msg",
+										"data"
+									],
+									"properties": {
+										"code": {
+											"type": "integer"
+										},
+										"msg": {
+											"type": "string"
+										},
+										"data": {
+											"type": "array",
+											"items": {
+												"type": "object",
+												"required": [
+													"value",
+													"code"
+												],
+												"properties": {
+													"value": {
+														"type": "number"
+													},
+													"code": {
+														"type": "string"
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/api/notification/notifications": {
 			"get": {
 				"operationId": "notification_notifications_get",
@@ -684,6 +1127,84 @@
 						}
 					}
 				}
+			},
+			"post": {
+				"operationId": "system_oplog_post",
+				"summary": "POST api/system/oplog",
+				"x-oj-file": "system/oplog/api.ts",
+				"tags": [
+					"system"
+				],
+				"requestBody": {
+					"required": true,
+					"content": {
+						"application/json": {
+							"schema": {
+								"type": "object",
+								"required": [
+									"action",
+									"module"
+								],
+								"properties": {
+									"action": {
+										"type": "string",
+										"minLength": 1
+									},
+									"module": {
+										"type": "string",
+										"minLength": 1
+									},
+									"version": {
+										"type": "string"
+									},
+									"target": {
+										"type": "string"
+									},
+									"level": {
+										"type": "number"
+									}
+								}
+							}
+						}
+					}
+				},
+				"responses": {
+					"200": {
+						"description": "OK",
+						"x-oj-response-enforced": false,
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "object",
+									"required": [
+										"code",
+										"msg",
+										"data"
+									],
+									"properties": {
+										"code": {
+											"type": "integer"
+										},
+										"msg": {
+											"type": "string"
+										},
+										"data": {
+											"type": "object",
+											"required": [
+												"ok"
+											],
+											"properties": {
+												"ok": {
+													"type": "boolean"
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
 			}
 		},
 		"/api/system/permissions": {
@@ -1481,6 +2002,12 @@
 		{
 			"name": "auth"
 		},
+		{
+			"name": "demo"
+		},
+		{
+			"name": "home"
+		},
 		{
 			"name": "notification"
 		},

package/templates/package.json

@@ -0,0 +1,52 @@
+{
+	"name": "@oj-module/template-demo",
+	"type": "module",
+	"version": "0.0.0",
+	"private": true,
+	"scripts": {
+		"dev": "ojm dev",
+		"build": "ojm build",
+		"preview": "ojm preview",
+		"info": "ojm info",
+		"typecheck": "tsc --noEmit -p tsconfig.json"
+	},
+	"devDependencies": {
+		"@ant-design/cssinjs": "catalog:",
+		"@ant-design/icons": "catalog:",
+		"@ant-design/pro-components": "catalog:",
+		"@dnd-kit/core": "catalog:",
+		"@dnd-kit/sortable": "catalog:",
+		"@dnd-kit/utilities": "catalog:",
+		"@oj-module/cli": "workspace:*",
+		"@oj-module/runtime": "workspace:*",
+		"@tanstack/react-query": "catalog:",
+		"@types/react": "catalog:",
+		"@vitejs/plugin-react": "catalog:",
+		"ahooks": "catalog:",
+		"antd": "catalog:",
+		"antd-img-crop": "catalog:",
+		"clsx": "catalog:",
+		"dayjs": "catalog:",
+		"echarts": "catalog:",
+		"echarts-for-react": "catalog:",
+		"i18next": "catalog:",
+		"keepalive-for-react": "catalog:",
+		"ky": "catalog:",
+		"motion": "catalog:",
+		"nprogress": "catalog:",
+		"pinyin-pro": "catalog:",
+		"react": "catalog:",
+		"react-countup": "catalog:",
+		"react-dom": "catalog:",
+		"react-error-boundary": "catalog:",
+		"react-i18next": "catalog:",
+		"react-jss": "catalog:",
+		"react-router": "catalog:",
+		"simplebar-react": "catalog:",
+		"spin-delay": "catalog:",
+		"tailwind-merge": "catalog:",
+		"use-sync-external-store": "catalog:",
+		"vditor": "catalog:",
+		"zustand": "catalog:"
+	}
+}

package/templates/web/src/_platform/__client/api.schemas.ts

@@ -0,0 +1,8 @@
+/* eslint-disable */
+// 生成物：ojm api 从契约生成，勿手改（改动请改契约文件后重跑 ojm api）
+// AC-D15：仅供 DEV 校验动态 import，生产构建不进产物
+import { z } from "@oj-module/runtime";
+
+export const schemas = {
+
+};