diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..c76c14f --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "marscode.marscode-extension" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..137d9f4 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "marscode.chatLanguage": "cn", + "marscode.codeCompletionPro": { + "enableCodeCompletionPro": true + }, + "marscode.enableInlineCommand": true +} \ No newline at end of file diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts index 8b82ed1..91928ec 100755 --- a/apps/server/src/main.ts +++ b/apps/server/src/main.ts @@ -4,19 +4,27 @@ import { TrpcRouter } from './trpc/trpc.router'; import { WebSocketService } from './socket/websocket.service'; async function bootstrap() { + // 创建NestJS应用实例 const app = await NestFactory.create(AppModule); // 启用 CORS 并允许所有来源 app.enableCors({ origin: '*', }); + + // 获取WebSocket服务实例并初始化 const wsService = app.get(WebSocketService); await wsService.initialize(app.getHttpServer()); + + // 获取tRPC路由实例并应用中间件 const trpc = app.get(TrpcRouter); trpc.applyMiddleware(app); + // 设置服务器端口，优先使用环境变量中的值，默认3000 const port = process.env.SERVER_PORT || 3000; + // 启动应用，监听指定端口 await app.listen(port); } +// 启动应用 bootstrap(); diff --git a/apps/server/src/models/goods/goods.controller.ts b/apps/server/src/models/goods/goods.controller.ts index f14b858..f0bc95c 100644 --- a/apps/server/src/models/goods/goods.controller.ts +++ b/apps/server/src/models/goods/goods.controller.ts @@ -38,4 +38,8 @@ export class GoodsController { results: [] }; } -} \ No newline at end of file +<<<<<<< HEAD +} +======= +} +>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276 diff --git a/apps/server/src/models/goods/goods.module.ts b/apps/server/src/models/goods/goods.module.ts index e569130..3439841 100644 --- a/apps/server/src/models/goods/goods.module.ts +++ b/apps/server/src/models/goods/goods.module.ts @@ -3,6 +3,7 @@ import { GoodsService } from './goods.service'; import { GoodsController } from './goods.controller'; @Module({ +<<<<<<< HEAD providers: [GoodsService], controllers:[GoodsController] @@ -10,4 +11,10 @@ import { GoodsController } from './goods.controller'; }) -export class GoodsModule {} \ No newline at end of file +export class GoodsModule {} +======= + providers: [GoodsService], + controllers: [GoodsController], +}) +export class GoodsModule {} +>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276 diff --git a/apps/server/src/models/goods/goods.service.ts b/apps/server/src/models/goods/goods.service.ts index 8270b7a..3fd16d8 100644 --- a/apps/server/src/models/goods/goods.service.ts +++ b/apps/server/src/models/goods/goods.service.ts @@ -1,4 +1,10 @@ import { Injectable } from '@nestjs/common'; @Injectable() -export class GoodsService {} \ No newline at end of file +<<<<<<< HEAD +export class GoodsService {} +======= +export class GoodsService { + +} +>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276 diff --git a/apps/server/src/models/message/message.controller.ts b/apps/server/src/models/message/message.controller.ts index 0738c08..e265c5c 100755 --- a/apps/server/src/models/message/message.controller.ts +++ b/apps/server/src/models/message/message.controller.ts @@ -3,7 +3,6 @@ import { Controller, Get, Query, UseGuards } from '@nestjs/common'; import { MessageService } from './message.service'; import { AuthGuard } from '@server/auth/auth.guard'; import { db, VisitType } from '@nice/common'; - @Controller('message') export class MessageController { constructor(private readonly messageService: MessageService) { } diff --git a/apps/server/src/trpc/trpc.module.ts b/apps/server/src/trpc/trpc.module.ts index 2f7f3a5..b07978d 100755 --- a/apps/server/src/trpc/trpc.module.ts +++ b/apps/server/src/trpc/trpc.module.ts @@ -34,9 +34,13 @@ import { GoodsModule } from '@server/models/goods/goods.module'; VisitModule, WebSocketModule, ResourceModule, +<<<<<<< HEAD GoodsModule, +======= + GoodsModule +>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276 ], controllers: [], providers: [TrpcService, TrpcRouter, Logger], }) -export class TrpcModule {} +export class TrpcModule { } diff --git a/apps/web/src/app/main/component/People.tsx b/apps/web/src/app/main/component/People.tsx new file mode 100644 index 0000000..835b87e --- /dev/null +++ b/apps/web/src/app/main/component/People.tsx @@ -0,0 +1,51 @@ +import { useEffect } from 'react'; +import { api } from '@nice/client'; + +function People() { + // 使用 useQuery 钩子从 API 获取数据，限制查询结果数量为 10 + const { data } = api.staff.findMany.useQuery({ + take: 10, // 限制查询结果数量 + }); + // 当 data 发生变化时，打印数据到控制台 + useEffect(() => { + console.log(data); + }, [data]); + + return ( +
+ { + // 遍历 data 并渲染每个元素 + data?.map((i) => { + return ( + + + + + + + + + + + + + {data?.map((i) => ( + + + + + + + + + ))} + +
UsernameIDShownamePasswordPhone NumberOrder
{i.username}{i.id}{i.showname}{i.password}{i.phoneNumber}{i.order}
+ ); + }) + } +
+ ); +} + +export default People; diff --git a/apps/web/src/app/main/home/page.tsx b/apps/web/src/app/main/home/page.tsx index 743f588..74836b4 100755 --- a/apps/web/src/app/main/home/page.tsx +++ b/apps/web/src/app/main/home/page.tsx @@ -1,3 +1,4 @@ +<<<<<<< HEAD import { api } from "@nice/client"; import { apiClient } from "@web/src/utils"; @@ -50,4 +51,51 @@ function HomePage() { ); } -export default HomePage; \ No newline at end of file +export default HomePage; +======= +import { api } from "@nice/client" +import { apiClient } from "@web/src/utils" +import { Button, Tag } from "antd" +import { useEffect, useMemo, useState } from "react" + +function HomePage() { + const { data } = api.staff.findMany.useQuery({ + take: 10 + }) + const [counter, setCounter] = useState(0) + const counterText = useMemo(() => { + return `当前计数为：${counter}` + }, [counter]) + + const getData = async () => { + const res = await apiClient.get("/goods/hello") + console.log(res) + } + useEffect(() => { + getData() + }, []) + return
+ {counterText} +
+ + +
+ + { + data?.map(i => { + return
+ {i.username} +
+ }) + } +
+} +// export { HomePage } +export default HomePage +>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276 diff --git a/packages/common/prisma/schema.prisma b/packages/common/prisma/schema.prisma index 021f720..6f088a9 100755 --- a/packages/common/prisma/schema.prisma +++ b/packages/common/prisma/schema.prisma @@ -325,7 +325,12 @@ model Resource { @@map("resource") } +<<<<<<< HEAD +======= + + +>>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276 //商品表 model Goods {