Merge branch 'main' of http://git.cc-lotus.info/follow-up/follow_server

src/entity/config.entity.ts

@@ -18,6 +18,8 @@ export class Config extends BaseModel {
     remark: 'File类型',
   })
   user_url: File;
+  @prop({ required: false, index: false, zh: '语音logo', remark: 'File类型' })
+  audio_url: File;
   @prop({ required: false, index: false, zh: '用户协议和隐私协议' })
   agreement: string;
   @prop({ required: false, index: false, zh: '底部文字' })

src/interface/config.interface.ts

@@ -22,6 +22,8 @@ export class FVO_config {
   'friend_url': Array<any> = undefined;
   @ApiProperty({ description: '用户默认头像' })
   'user_url': Array<any> = undefined;
+  @ApiProperty({ description: '音频logo' })
+  'audio_url': Array<any> = undefined;
   @ApiProperty({ description: '用户协议和隐私协议' })
   'agreement': string = undefined;
   @ApiProperty({ description: '底部文字' })
@@ -57,6 +59,9 @@ export class CDTO_config {
   @ApiProperty({ description: '用户默认头像' })
   @Rule(RuleType['array']().empty(''))
   'user_url': Array<any> = undefined;
+  @ApiProperty({ description: '音频logo' })
+  @Rule(RuleType['array']().empty(''))
+  'audio_url': Array<any> = undefined;
   @ApiProperty({ description: '用户协议和隐私协议' })
   @Rule(RuleType['string']().empty(''))
   'agreement': string = undefined;

src/service/chat.service.ts

@@ -25,7 +25,7 @@ export class ChatService extends BaseService<modelType> {
 
   async query(filter: SearchBase, pageOptions: PageOptions = {}): Promise<Array<any>> {
     const dup = cloneDeep(filter.getFilter());
-    const data = await this.model.find(dup, {}, { ...pageOptions }).populate('speaker');
+    const data = await this.model.find(dup, {}, { ...pageOptions, sort: { 'meta.createdAt': -1 } }).populate('speaker');
     return data;
   }