Explorar el Código

✨ feat(auth): 添加租户ID配置与登录支持
- 在环境变量中添加TARO_APP_TENANT_ID配置项
- 微信登录时传递tenantId参数到后端接口

♻️ refactor(server): 调整模块导入路径
- 更新user、role、auth和file模块的导入路径,统一使用core-module-mt前缀

💄 style(api): 注释掉未使用的OrderGoods相关代码
- 注释OrderGoodsRoutes类型导入
- 注释orderGoodsClient客户端导出

yourname hace 1 mes
padre
commit
e9a2af35d4

+ 3 - 0
mini/.env.development

@@ -5,3 +5,6 @@
 # 需换成当前项目的
 TARO_APP_API_BASE_URL=https://d8d-ai-vscode-8080-184-172-template-6-group.r.d8d.fun
 TARO_APP_API_VERSION=v1
+
+# 租户ID
+TARO_APP_TENANT_ID=1

+ 2 - 2
mini/src/api.ts

@@ -7,7 +7,7 @@ import type {
   GoodsCategoryRoutes,
   DeliveryAddressRoutes,
   OrderRoutes,
-  OrderGoodsRoutes,
+  // OrderGoodsRoutes,
   MerchantRoutes,
   AreaRoutes
 } from '@d8d/server'
@@ -24,7 +24,7 @@ export const goodsClient = rpcClient<GoodsRoutes>().api.v1.goods
 export const goodsCategoryClient = rpcClient<GoodsCategoryRoutes>().api.v1['goods-categories']
 export const deliveryAddressClient = rpcClient<DeliveryAddressRoutes>().api.v1['delivery-addresses']
 export const orderClient = rpcClient<OrderRoutes>().api.v1.orders
-export const orderGoodsClient = rpcClient<OrderGoodsRoutes>().api.v1['orders-goods']
+// export const orderGoodsClient = rpcClient<OrderGoodsRoutes>().api.v1['orders-goods']
 export const merchantClient = rpcClient<MerchantRoutes>().api.v1.merchants
 
 // 系统相关客户端

+ 2 - 1
mini/src/pages/login/wechat-login.tsx

@@ -67,7 +67,8 @@ export default function WechatLogin() {
       const response = await authClient['mini-login'].$post({
         json: {
           code: loginRes.code,
-          userInfo: userProfile.userInfo
+          userInfo: userProfile.userInfo,
+          tenantId: Number(process.env.TARO_APP_TENANT_ID) || 1
         }
       })
 

+ 3 - 3
packages/server/src/index.ts

@@ -1,9 +1,9 @@
 import { OpenAPIHono } from '@hono/zod-openapi'
 import { swaggerUI } from '@hono/swagger-ui'
 import { errorHandler, initializeDataSource } from '@d8d/shared-utils'
-import { userRoutesMt as userModuleRoutes, roleRoutesMt as roleModuleRoutes } from '@d8d/user-module-mt'
-import { authRoutes as authModuleRoutes } from '@d8d/auth-module-mt'
-import { fileRoutesMt as fileModuleRoutes } from '@d8d/file-module-mt'
+import { userRoutesMt as userModuleRoutes, roleRoutesMt as roleModuleRoutes } from '@d8d/core-module-mt/user-module-mt'
+import { authRoutes as authModuleRoutes } from '@d8d/core-module-mt/auth-module-mt'
+import { fileRoutesMt as fileModuleRoutes } from '@d8d/core-module-mt/file-module-mt'
 import { tenantRoutes } from '@d8d/tenant-module-mt'
 import { AuthContext } from '@d8d/shared-types'
 import { AppDataSource } from '@d8d/shared-utils'