zs před 1 rokem
rodič
revize
0f9a93946e

+ 1 - 1
src/controller/login.controller.ts

@@ -49,7 +49,7 @@ export class LoginController {
   async wxAppLogin(@Param('openid') openid: string) {
     if (!openid) throw new ServiceError('缺少微信凭证!', FrameworkErrorEnum.BAD_PARAMS);
     const user = await this.loginService.wxAppLogin(openid);
-    return user;
+    return user || {};
   }
   /**
    * 修改密码

+ 1 - 1
src/entity/core/chat.entity.ts

@@ -13,7 +13,7 @@ export class Chat extends BaseModel {
   @prop({ required: false, index: false, zh: '内容' })
   content: string;
   @prop({ required: false, index: false, zh: '创建时间' })
-  create_time: string;
+  time: string;
   @prop({ required: false, index: false, zh: '类型', default: '0' })
   type: string;
   @prop({ required: false, index: false, zh: '是否已读', default: '0' })

+ 3 - 3
src/entity/system/user.entity.ts

@@ -7,7 +7,7 @@ export class User extends BaseModel {
   @prop({ required: false, index: false, zh: '微信小程序id' })
   openid: string;
   @prop({ required: false, index: false, zh: '昵称' })
-  nick_name: string;
+  nickname: string;
   @prop({ required: false, index: false, zh: '姓名' })
   name: string;
   @prop({ required: false, index: false, zh: '身份证号' })
@@ -15,7 +15,7 @@ export class User extends BaseModel {
   @prop({ required: false, index: false, zh: '电话' })
   phone: string;
   @prop({ required: false, index: false, zh: '身份证正面' })
-  file_one: Array<any>;
+  fileOne: Array<any>;
   @prop({ required: false, index: false, zh: '身份证反面' })
-  file_two: Array<any>;
+  fileTwo: Array<any>;
 }

+ 2 - 2
src/interface/core/chat.interface.ts

@@ -23,7 +23,7 @@ export class FVO_chat {
   @ApiProperty({ description: '内容' })
   'content': string = undefined;
   @ApiProperty({ description: '创建时间' })
-  'create_time': string = undefined;
+  'time': string = undefined;
   @ApiProperty({ description: '类型' })
   'type': string = undefined;
   @ApiProperty({ description: '是否已读' })
@@ -63,7 +63,7 @@ export class CDTO_chat {
   'content': string = undefined;
   @ApiProperty({ description: '创建时间' })
   @Rule(RuleType['string']().empty(''))
-  'create_time': string = undefined;
+  'time': string = undefined;
   @ApiProperty({ description: '类型' })
   @Rule(RuleType['string']().empty(''))
   'type': string = undefined;

+ 6 - 6
src/interface/system/user.interface.ts

@@ -17,7 +17,7 @@ export class FVO_user {
   @ApiProperty({ description: '微信小程序id' })
   'openid': string = undefined;
   @ApiProperty({ description: '昵称' })
-  'nick_name': string = undefined;
+  'nickname': string = undefined;
   @ApiProperty({ description: '姓名' })
   'name': string = undefined;
   @ApiProperty({ description: '身份证号' })
@@ -25,9 +25,9 @@ export class FVO_user {
   @ApiProperty({ description: '电话' })
   'phone': string = undefined;
   @ApiProperty({ description: '身份证正面' })
-  'file_one': Array<any> = undefined;
+  'fileOne': Array<any> = undefined;
   @ApiProperty({ description: '身份证反面' })
-  'file_two': Array<any> = undefined;
+  'fileTwo': Array<any> = undefined;
 }
 
 export class QDTO_user extends SearchBase {
@@ -52,7 +52,7 @@ export class CDTO_user {
   'openid': string = undefined;
   @ApiProperty({ description: '昵称' })
   @Rule(RuleType['string']().empty(''))
-  'nick_name': string = undefined;
+  'nickname': string = undefined;
   @ApiProperty({ description: '姓名' })
   @Rule(RuleType['string']().empty(''))
   'name': string = undefined;
@@ -64,10 +64,10 @@ export class CDTO_user {
   'phone': string = undefined;
   @ApiProperty({ description: '身份证正面' })
   @Rule(RuleType['array']().empty(''))
-  'file_one': Array<any> = undefined;
+  'fileOne': Array<any> = undefined;
   @ApiProperty({ description: '身份证反面' })
   @Rule(RuleType['array']().empty(''))
-  'file_two': Array<any> = undefined;
+  'fileTwo': Array<any> = undefined;
 }
 
 export class CVO_user extends FVO_user {