feat: 修改商户组件

Author: kuangshp

package-lock.json

@@ -34,7 +34,6 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "cross-env": "^7.0.3",
-    "express-session": "^1.17.3",
     "ioredis": "^5.3.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
@@ -55,7 +54,6 @@
     "@nestjs/schematics": "^10.0.0",
     "@nestjs/testing": "^10.0.0",
     "@types/express": "^4.17.17",
-    "@types/express-session": "^1.17.8",
     "@types/jest": "^29.5.2",
     "@types/lodash": "^4.14.199",
     "@types/node": "^20.3.1",

package.json

@@ -3,7 +3,7 @@ import { Entity, Column, BaseEntity, PrimaryGeneratedColumn } from 'typeorm';
 @Entity('area')
 export class AreaEntity extends BaseEntity {
   @PrimaryGeneratedColumn({
-    type: 'bigint',
+    type: 'int',
     name: 'id',
     comment: '主键id',
   })

src/api/area/entities/area.entity.ts

@@ -192,7 +192,6 @@ export class TenantService {
       .addSelect('tenant.areaId', 'areaId')
       .addSelect('tenant.address', 'address')
       .addSelect('tenant.sort', 'sort')
-      .addSelect('tenant.type', 'type')
       .addSelect('tenant.description', 'description')
       .addSelect('tenant.createdAt', 'createdAt')
       .addSelect('tenant.updatedAt', 'updatedAt')
@@ -204,7 +203,7 @@ export class TenantService {
             .addSelect('area.name', 'provinceName')
             .from(AreaEntity, 'area'),
         'area',
-        'tenant.provinceId=area.id'
+        'tenant.provinceId=area.provinceId'
       )
       .leftJoinAndMapOne(
         'xx',
@@ -214,7 +213,7 @@ export class TenantService {
             .addSelect('area1.name', 'cityName')
             .from(AreaEntity, 'area1'),
         'area1',
-        'tenant.cityId=area1.id'
+        'tenant.cityId=area1.cityId'
       )
       .leftJoinAndMapOne(
         'xx',
@@ -224,7 +223,7 @@ export class TenantService {
             .addSelect('area2.name', 'areaName')
             .from(AreaEntity, 'area2'),
         'area2',
-        'tenant.cityId=area2.id'
+        'tenant.areaId=area2.areaId'
       );
   }
 }

src/api/tenant/tenant.service.ts

@@ -1,7 +1,6 @@
 import { NestFactory } from '@nestjs/core';
 import { VersioningType } from '@nestjs/common/enums';
 import { Logger } from '@nestjs/common/services';
-import session from 'express-session';
 import { AppModule } from './app.module';
 import { getConfig, IS_DEV } from './utils';
 
@@ -17,12 +16,6 @@ async function bootstrap() {
   });
   //允许跨域请求
   app.enableCors();
-  app.use(
-    session({
-      secret: 'code', //生成服务端session 签名
-      rolling: true, //在每次请求时强行设置 cookie
-    })
-  );
   // 启动版本管理
   app.enableVersioning({
     defaultVersion: '1', // 不指定默认版本为v1

src/main.ts

@@ -9,7 +9,7 @@ import {
 
 export class SharedEntity extends BaseEntity {
   @PrimaryGeneratedColumn({
-    type: 'bigint',
+    type: 'int',
     name: 'id',
     comment: '主键id',
   })

src/shared/entities/base.entity.ts

@@ -2368,11 +2368,6 @@
   "resolved" "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz"
   "version" "1.0.6"
 
-"cookie@0.4.2":
-  "integrity" "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
-  "resolved" "https://registry.npmmirror.com/cookie/-/cookie-0.4.2.tgz"
-  "version" "0.4.2"
-
 "cookie@0.5.0":
   "integrity" "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
   "resolved" "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz"
@@ -2586,7 +2581,7 @@
   "resolved" "https://registry.npmmirror.com/denque/-/denque-2.1.0.tgz"
   "version" "2.1.0"
 
-"depd@~2.0.0", "depd@2.0.0":
+"depd@2.0.0":
   "integrity" "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
   "resolved" "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz"
   "version" "2.0.0"
@@ -2938,20 +2933,6 @@
     "jest-message-util" "^29.7.0"
     "jest-util" "^29.7.0"
 
-"express-session@^1.17.3":
-  "integrity" "sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw=="
-  "resolved" "https://registry.npmmirror.com/express-session/-/express-session-1.17.3.tgz"
-  "version" "1.17.3"
-  dependencies:
-    "cookie" "0.4.2"
-    "cookie-signature" "1.0.6"
-    "debug" "2.6.9"
-    "depd" "~2.0.0"
-    "on-headers" "~1.0.2"
-    "parseurl" "~1.3.3"
-    "safe-buffer" "5.2.1"
-    "uid-safe" "~2.1.5"
-
 "express@4.18.2":
   "integrity" "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="
   "resolved" "https://registry.npmmirror.com/express/-/express-4.18.2.tgz"
@@ -4906,11 +4887,6 @@
   dependencies:
     "ee-first" "1.1.1"
 
-"on-headers@~1.0.2":
-  "integrity" "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-  "resolved" "https://registry.npmmirror.com/on-headers/-/on-headers-1.0.2.tgz"
-  "version" "1.0.2"
-
 "once@^1.3.0", "once@^1.3.1", "once@^1.4.0":
   "integrity" "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
   "resolved" "https://registry.npmmirror.com/once/-/once-1.4.0.tgz"
@@ -5276,11 +5252,6 @@
   "resolved" "https://registry.npmmirror.com/quick-lru/-/quick-lru-4.0.1.tgz"
   "version" "4.0.1"
 
-"random-bytes@~1.0.0":
-  "integrity" "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ=="
-  "resolved" "https://registry.npmmirror.com/random-bytes/-/random-bytes-1.0.0.tgz"
-  "version" "1.0.0"
-
 "randombytes@^2.1.0":
   "integrity" "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="
   "resolved" "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz"
@@ -6311,13 +6282,6 @@
   "resolved" "https://registry.npmmirror.com/typescript/-/typescript-5.2.2.tgz"
   "version" "5.2.2"
 
-"uid-safe@~2.1.5":
-  "integrity" "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA=="
-  "resolved" "https://registry.npmmirror.com/uid-safe/-/uid-safe-2.1.5.tgz"
-  "version" "2.1.5"
-  dependencies:
-    "random-bytes" "~1.0.0"
-
 "uid@2.0.2":
   "integrity" "sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g=="
   "resolved" "https://registry.npmmirror.com/uid/-/uid-2.0.2.tgz"