Revert "猴子直白"

This reverts commit a790e2fc

src/main/java/com/izouma/nineth/config/Constants.java

@@ -29,6 +29,8 @@ public interface Constants {
 
     String USER_HOLD_CACHE_KEY = "userHoldList";
 
+    String APP_TOP = "appTop";
+
     String WHETHER_TEST = "whether_test";
 
     String INTERNAL_TEST = "internal_test";

src/main/java/com/izouma/nineth/config/MetaConstants.java

@@ -14,6 +14,8 @@ public interface MetaConstants {
 
     String META_LUCKY_DRAW_ID = "META_LUCKY_DRAW_ID";
 
-    String SPLIT = ",";
+    String COMMA = ",";
+
+    String BLANK = " ";
 
 }

src/main/java/com/izouma/nineth/config/RedisKeys.java

@@ -21,6 +21,8 @@ public class RedisKeys {
 
     public static final String ORDER_LOCK = "orderLock::";
 
+    public static final String DOMAIN_LOCK = "domainLock::";
+
     public static final String MINT_ACTIVITY_STOCK = "mintActivityStock::";
 
     public static final String MINT_ORDER_LOCK = "mintOrderLock::";

src/main/java/com/izouma/nineth/domain/Activity.java

@@ -13,10 +13,6 @@ import javax.persistence.Convert;
 import javax.persistence.Entity;
 import java.util.List;
 
-
-/**
- * 活动
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/AdaTrade.java

@@ -3,9 +3,6 @@ package com.izouma.nineth.domain;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
-/**
- * 交易相关参数
- */
 @Data
 public class AdaTrade {
     private String 交易时间;

src/main/java/com/izouma/nineth/domain/AdapayMerchant.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 
-/**
- * 好像是阿里云的支付一些秘钥key
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/AirDrop.java

@@ -15,9 +15,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.*;
 import java.util.List;
 
-/**
- * 空投
- */
 @Data
 @Entity
 @AllArgsConstructor
@@ -33,7 +30,7 @@ public class AirDrop extends BaseEntity {
     private String remark;
 
     @Enumerated(EnumType.STRING)
-    @ApiModelProperty("空投类型")//有资产asset     优惠卷coupon
+    @ApiModelProperty("空投类型")
     private AirDropType type;
 
     @ApiModelProperty("兑换券ID")

src/main/java/com/izouma/nineth/domain/AppVersion.java

@@ -10,10 +10,6 @@ import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
-
-/**
- * app版本,有安卓和苹果
- */
 @Data
 @Table(indexes = {@Index(columnList = "version,platform,channel")},
         uniqueConstraints = @UniqueConstraint(columnNames = {"version", "platform", "channel"}))

src/main/java/com/izouma/nineth/domain/Appointment.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 预约服务,目前数据库没有数据
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/Asset.java

@@ -10,6 +10,7 @@ import com.izouma.nineth.converter.PropertyListConverter;
 import com.izouma.nineth.enums.AssetSource;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.enums.CollectionType;
+import com.izouma.nineth.enums.MetaSize;
 import com.izouma.nineth.utils.CollectionTagSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +26,7 @@ import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.util.*;
 
-//资产
+
 @Data
 @Entity
 @Table(indexes = {
@@ -200,7 +201,7 @@ public class Asset extends CollectionBaseEntity {
     @Column(columnDefinition = "tinyint unsigned default 1")
     private boolean opened = true;
 
-    @ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
+    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.MERGE})
     @JoinTable(
             name = "asset_tag",
             joinColumns = {@JoinColumn(name = "asset_id", referencedColumnName = "id", foreignKey = @ForeignKey(
@@ -240,10 +241,17 @@ public class Asset extends CollectionBaseEntity {
     @Column(columnDefinition = "int default 3 not null")
     private int chainFlag;
 
+    @Transient
+    private LocalDateTime endTime;
+
     @Transient
     @ApiModelProperty("元宇宙展厅是否上架")
     private boolean metaPutOn;
 
+    @ApiModelProperty("元宇宙尺寸")
+    @Enumerated(EnumType.STRING)
+    private MetaSize metaSize;
+
     public static Asset create(Collection collection, User user) {
         Set<Tag> tags;
         if (collection.getTags() != null) {
@@ -285,6 +293,7 @@ public class Asset extends CollectionBaseEntity {
                 .empower(collection.getEmpower())
                 .companyId(collection.getCompanyId())
                 .chainFlag(collection.getChainFlag())
+                .metaSize(collection.getMetaSize())
                 .build();
     }
 

src/main/java/com/izouma/nineth/domain/AssetLock.java

@@ -9,9 +9,6 @@ import javax.persistence.Entity;
 import java.time.Duration;
 import java.time.LocalDateTime;
 
-/**
- * 资产锁定时间
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/AuctionActivity.java

@@ -18,11 +18,6 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
-/**
- * 拍卖藏品
- * Auction拍卖
- * Activity活动
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/AuctionOrder.java

@@ -15,9 +15,6 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
-/**
- * 拍卖订单
- */
 @Entity
 @Data
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/AuctionPassRecord.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import java.math.BigDecimal;
 
-/**
- * 流拍记录表
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/AuditedEntity.java

@@ -15,9 +15,6 @@ import javax.persistence.EntityListeners;
 import javax.persistence.MappedSuperclass;
 import java.time.LocalDateTime;
 
-/**
- * 被审计实体
- */
 @MappedSuperclass
 @Audited
 @EntityListeners(AuditingEntityListener.class)

src/main/java/com/izouma/nineth/domain/AutoWithdrawRecord.java

@@ -9,9 +9,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import java.time.LocalDate;
 
-/**
- * 自动提现记录
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/BalanceRecord.java

@@ -11,9 +11,6 @@ import javax.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-/**
- * 余额记录
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/Banner.java

@@ -11,9 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
-/**
- * 横幅
- */
 @Data
 @Entity
 @Table(indexes = {@Index(columnList = "type")})

src/main/java/com/izouma/nineth/domain/BaseEntity.java

@@ -15,10 +15,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import javax.persistence.*;
 import java.time.LocalDateTime;
 
-/**
- * 基本信息,包含创建时间,创建人等
- */
-
 @MappedSuperclass
 @Audited
 @EntityListeners(AuditingEntityListener.class)

src/main/java/com/izouma/nineth/domain/BaseEntityNoID.java

@@ -17,11 +17,6 @@ import javax.persistence.EntityListeners;
 import javax.persistence.MappedSuperclass;
 import java.time.LocalDateTime;
 
-
-/**
- * 基本信息,包含创建时间,创建人等,不包含id
- */
-
 @MappedSuperclass
 @Audited
 @EntityListeners(AuditingEntityListener.class)

src/main/java/com/izouma/nineth/domain/BlackList.java

@@ -6,9 +6,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 黑名单
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/BlindBoxItem.java

@@ -15,9 +15,6 @@ import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * 盲盒项目
- */
 @Data
 @Entity
 @Table(indexes = {

src/main/java/com/izouma/nineth/domain/BlinkBox.java

@@ -16,9 +16,6 @@ import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * 盲盒
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/BonusGive.java

@@ -10,9 +10,6 @@ import javax.persistence.Entity;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-/**
- * 奖金给
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/BonusGiveItem.java

@@ -9,10 +9,6 @@ import javax.persistence.Entity;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-
-/**
- * 奖金给予项目
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/Collection.java

@@ -10,6 +10,7 @@ import com.izouma.nineth.converter.PrivilegeListConverter;
 import com.izouma.nineth.converter.PropertyListConverter;
 import com.izouma.nineth.enums.CollectionSource;
 import com.izouma.nineth.enums.CollectionType;
+import com.izouma.nineth.enums.MetaSize;
 import com.izouma.nineth.utils.CollectionTagSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,9 +29,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-/**
- * 藏品
- */
 @Data
 @Entity
 @Table(name = "collection_info", indexes = {
@@ -70,7 +68,6 @@ public class Collection extends CollectionBaseEntity {
         }
     }
 
-    //@transient 就是在给某个javabean上需要添加个属性，但是这个属性你又不希望给存到数据库中去，仅仅是做个临时变量，用一下。不修改已经存在数据库的数据的数据结构。
     @Transient
     private boolean liked;
 
@@ -84,7 +81,6 @@ public class Collection extends CollectionBaseEntity {
     @Searchable
     private String name;
 
-    //columnDefinition 实在是比较万能，不好定义或者没有这个属性的直接用columnDefinition根据ddl来定义即可，字段的注释也是可以定义的。
     @ApiModelProperty("图片")
     @Column(columnDefinition = "TEXT")
     @Convert(converter = FileObjectListConverter.class)
@@ -257,7 +253,7 @@ public class Collection extends CollectionBaseEntity {
     @ApiModelProperty("是否支付中")
     private boolean inPaying;
 
-    @ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
+    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.MERGE})
     @JoinTable(
             name = "collection_tag",
             joinColumns = {@JoinColumn(name = "collection_id", referencedColumnName = "id",
@@ -276,10 +272,10 @@ public class Collection extends CollectionBaseEntity {
     @Column(columnDefinition = "TEXT")
     private String rule;
 
-    private String     hcTxHash;
+    private String hcTxHash;
     private BigInteger hcBlockNumber;
     private BigInteger hcGasUsed;
-    private String     hcTokenId;
+    private String hcTokenId;
 
     @ApiModelProperty("系列名称")
     @Column(length = 100)
@@ -309,4 +305,8 @@ public class Collection extends CollectionBaseEntity {
     private LocalDateTime newsCreatedTime;
 
     private boolean messNumber;
+
+    @ApiModelProperty("元宇宙尺寸")
+    @Enumerated(EnumType.STRING)
+    private MetaSize metaSize;
 }

src/main/java/com/izouma/nineth/domain/CollectionBaseEntity.java

@@ -16,9 +16,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import javax.persistence.*;
 import java.time.LocalDateTime;
 
-/**
- * 藏品基础类
- */
 @MappedSuperclass
 @Audited
 @EntityListeners(AuditingEntityListener.class)

src/main/java/com/izouma/nineth/domain/CollectionNumber.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 
-/**
- * 藏品编号
- */
 
 @Data
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/CollectionProperty.java

@@ -2,9 +2,6 @@ package com.izouma.nineth.domain;
 
 import lombok.Data;
 
-/**
- * 藏品价值
- */
 @Data
 public class CollectionProperty {
 

src/main/java/com/izouma/nineth/domain/CommissionRecord.java

@@ -16,9 +16,6 @@ import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import java.math.BigDecimal;
 
-/**
- * 分销记录
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/Company.java

@@ -7,9 +7,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 公司
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/CompanyCollection.java

@@ -17,9 +17,6 @@ import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * 企业申请的藏品
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/Coupon.java

@@ -16,9 +16,6 @@ import javax.persistence.Transient;
 import java.time.LocalDateTime;
 import java.util.List;
 
-/**
- * 兑换券
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/DailySign.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import java.time.LocalDate;
 
-/**
- * 每日签到
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/DestroyRecord.java

@@ -14,9 +14,6 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 
-/**
- * 销毁记录
- */
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/District.java

@@ -10,9 +10,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
-/**
- * 行政区域
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/DomainOrder.java

@@ -18,9 +18,6 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
-/**
- * ....订单,我也不清楚
- */
 @Data
 @Entity
 @AllArgsConstructor
@@ -79,4 +76,6 @@ public class DomainOrder extends BaseEntity {
     private Long years;
 
     private LocalDateTime endTime;
+
+    private String result;
 }

src/main/java/com/izouma/nineth/domain/DropTarget.java

@@ -4,9 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 放下目标,不太清楚
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/ExceptionLog.java

@@ -12,9 +12,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.*;
 import java.time.LocalDateTime;
 
-/**
- * 异常日志
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/ExportWithdraw.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import java.math.BigDecimal;
 
-/**
- * 出口提款
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/FaceAuth.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-/**
- * 人脸认证
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/FileObject.java

@@ -4,9 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 文件对象
- */
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/Follow.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 关注对象
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/GiftOrder.java

@@ -17,9 +17,6 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 
-/**
- * 礼品订单
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/HeatInfo.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
-/**
- * 热力值详情
- */
 @Data
 @Entity
 @Table(name = "heat_info", indexes =

src/main/java/com/izouma/nineth/domain/IdentityAuth.java

@@ -11,9 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
-/**
- * 身份认证
- */
 @Data
 @Entity
 @Table(indexes = {@Index(columnList = "userId"), @Index(columnList = "idNo")})

src/main/java/com/izouma/nineth/domain/Invite.java

@@ -11,9 +11,6 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 
-/**
- * 邀请
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/Like.java

@@ -10,9 +10,6 @@ import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
-/**
- * 点赞
- */
 @Data
 @Entity
 @Table(name = "like_info", indexes =

src/main/java/com/izouma/nineth/domain/Menu.java

@@ -15,9 +15,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-/**
- * 菜单,各种系统的名字
- */
 @Data
 @Entity
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/Message.java

@@ -17,9 +17,6 @@ import javax.persistence.Entity;
 import java.time.LocalDateTime;
 import java.util.List;
 
-/**
- * 留言
- */
 @Data
 @Builder
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaAccessories.java

@@ -13,9 +13,6 @@ import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.Transient;
 
-/**
- * 元宇宙配饰
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaAccessoriesPurchaseRecord.java

@@ -7,9 +7,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 元宇宙配饰购买记录
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -21,6 +18,4 @@ public class MetaAccessoriesPurchaseRecord extends BaseEntity {
 
     private Long metaAccessoriesId;
 
-
-
 }

src/main/java/com/izouma/nineth/domain/MetaAdvertRecord.java

@@ -12,9 +12,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import java.math.BigDecimal;
 
-/**
- * 元宇宙广告
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaBoatPosition.java

@@ -15,9 +15,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.*;
 import java.util.List;
 
-/**
- * 元宇宙空间船位
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaBonusScene.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 元宇宙彩蛋
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaChannel.java

@@ -0,0 +1,27 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Entity
+@ApiModel("频道管理")
+public class MetaChannel extends BaseEntity{
+
+    @ApiModelProperty("名称")
+    @ExcelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("介绍")
+    @ExcelProperty("介绍")
+    private String intro;
+
+}

src/main/java/com/izouma/nineth/domain/MetaDestroyActivity.java

@@ -13,9 +13,6 @@ import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
 
-/**
- * 元宇宙销毁任务
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaEmail.java

@@ -10,9 +10,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import javax.persistence.Transient;
 
-/**
- * 元宇宙邮件配置
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaEmailRecord.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 元宇宙题库记录
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaFeedBack.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 元宇宙用户反馈
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaGameAward.java

@@ -6,9 +6,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 元游戏奖
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaGameBoxPoints.java

@@ -12,9 +12,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import javax.persistence.Transient;
 
-/**
- * 元宇宙GameBox积分
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaGameCopy.java

@@ -18,9 +18,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.*;
 import java.util.List;
 
-/**
- * 元宇宙游戏副本配置
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaGameProcess.java

@@ -17,9 +17,6 @@ import javax.persistence.Convert;
 import javax.persistence.Entity;
 import java.util.List;
 
-/**
- * 元宇宙游戏进度
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaGameStageAward.java

@@ -12,9 +12,6 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 
-/**
- * 元宇宙游戏里程碑奖励
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaItem.java

@@ -13,9 +13,6 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 
-/**
- * 元宇宙物品
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaLuckyDraw.java

@@ -14,9 +14,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.*;
 import java.util.List;
 
-/**
- * 元宇宙抽奖活动
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaLuckyDrawAwardModel.java

@@ -6,9 +6,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 抽奖模型
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaLuckyDrawAwardReceiveRecord.java

@@ -13,9 +13,6 @@ import javax.persistence.Convert;
 import javax.persistence.Entity;
 import java.time.LocalDateTime;
 
-/**
- * 元宇宙抽奖活动领取记录
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaMMOLoginInfo.java

@@ -17,9 +17,6 @@ import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.time.LocalDateTime;
 
-/**
- * 元宇宙玩家登陆信息
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaParamsConfig.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
-/**
- * 元参数配置
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaPlayerInfo.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-/**
- * 元宇宙玩家信息
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaPlayerOfflineInfo.java

@@ -12,9 +12,6 @@ import javax.persistence.Convert;
 import javax.persistence.Entity;
 import java.util.List;
 
-/**
- * MetaPlayerOfflineInfo
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaPlayerRoleClassify.java

@@ -12,9 +12,6 @@ import javax.persistence.Convert;
 import javax.persistence.Entity;
 import java.util.List;
 
-/**
- * 元玩家角色分类
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaPlayerWear.java

@@ -10,9 +10,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
-/**
- * 元宇宙玩家服饰
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaPlayerWearCount.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-/**
- * 元宇宙服饰相关
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaProp.java

@@ -14,9 +14,6 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 
-/**
- * 元宇宙道具
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaQuestion.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 元宇宙题库配置
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaResourceVersion.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 
-/**
- * 元宇宙资源版本
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaResources.java

@@ -1,19 +1,15 @@
 package com.izouma.nineth.domain;
 
 import com.izouma.nineth.annotations.Searchable;
-import com.izouma.nineth.converter.FileObjectListConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
 
-/**
- * 元宇宙资源管理
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -25,8 +21,7 @@ public class MetaResources extends BaseEntity {
     @Searchable
     private String name;
 
-    @ApiModelProperty("图片")
+    @ApiModelProperty("文件")
     @Column(columnDefinition = "TEXT")
-    @Convert(converter = FileObjectListConverter.class)
-    private List<FileObject> pic;
+    private String value;
 }

src/main/java/com/izouma/nineth/domain/MetaShowRoomAsset.java

@@ -15,9 +15,6 @@ import javax.persistence.Convert;
 import javax.persistence.Entity;
 import javax.persistence.Transient;
 
-/**
- * 元宇宙展厅藏品
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/MetaSign.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.enums.MetaAwardTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,9 +13,6 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 
-/**
- * 元宇宙签到管理
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -46,4 +44,9 @@ public class MetaSign extends BaseEntity {
     @ApiModelProperty("金币奖励数量")
     @ExcelProperty("金币奖励数量")
     private int goldNum;
+
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
+    @Searchable
+    private Long channelId;
 }

src/main/java/com/izouma/nineth/domain/MetaSignAward.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.enums.MetaAwardTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,9 +15,6 @@ import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.Transient;
 
-/**
- * 元宇宙累计签到奖励配置
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -49,6 +47,11 @@ public class MetaSignAward extends BaseEntity {
     @ExcelProperty("道具id")
     private Long metaPropId;
 
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
+    @Searchable
+    private Long channelId;
+
     @Transient
     @ApiModelProperty("是否领取过")
     @ExcelIgnore

src/main/java/com/izouma/nineth/domain/MetaSignRecord.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.annotations.Searchable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -25,4 +26,9 @@ public class MetaSignRecord extends BaseEntity {
     @ExcelProperty("签到时间")
     private LocalDate signTime;
 
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
+    @Searchable
+    private Long channelId;
+
 }

src/main/java/com/izouma/nineth/domain/MetaTask.java

@@ -21,7 +21,7 @@ import javax.persistence.Enumerated;
 @NoArgsConstructor
 @Entity
 @ApiModel("元宇宙任务")
-public class MetaTask extends BaseEntity{
+public class MetaTask extends BaseEntity {
 
     @ApiModelProperty("任务名称")
     @Searchable
@@ -71,7 +71,12 @@ public class MetaTask extends BaseEntity{
     @ExcelProperty("是否自动领取")
     private boolean autoReceive;
 
-    @ApiModelProperty("道具id")
-    @ExcelProperty("道具id")
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
     private Long metaPropId;
+
+    @ApiModelProperty("通道id")
+    @ExcelProperty("通道id")
+    @Searchable
+    private Long channelId;
 }

src/main/java/com/izouma/nineth/domain/MetaTaskToUser.java

@@ -69,6 +69,11 @@ public class MetaTaskToUser extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private MetaTaskStatus status;
 
+    @ApiModelProperty("频道id")
+    @ExcelProperty("频道id")
+    @Searchable
+    private Long channelId;
+
     @Transient
     @ApiModelProperty("进度")
     @ExcelIgnore

src/main/java/com/izouma/nineth/domain/MetaTourist.java

@@ -0,0 +1,21 @@
+package com.izouma.nineth.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("元宇宙游客id")
+public class MetaTourist extends BaseEntityNoID {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long userId;
+
+}

src/main/java/com/izouma/nineth/domain/MintMaterial.java

@@ -13,9 +13,6 @@ import javax.persistence.Convert;
 import javax.persistence.Entity;
 import java.util.List;
 
-/**
- * 锻造材料
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/News.java

@@ -8,9 +8,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
-/**
- * 数据库里没有这个类
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/User.java

@@ -202,4 +202,7 @@ public class User extends UserBaseEntity implements Serializable {
 
     @Enumerated(EnumType.STRING)
     private InviteType inviteType;
+
+    @Transient
+    private String metaCompany;
 }

src/main/java/com/izouma/nineth/domain/UserBalance.java

@@ -12,9 +12,6 @@ import javax.persistence.Id;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-/**
- * 用户余额
- */
 @Data
 @Entity
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/UserProperty.java

@@ -9,9 +9,6 @@ import org.springframework.data.redis.core.RedisHash;
 
 import javax.persistence.Id;
 
-/**
- * 用户属性
- */
 @RedisHash(value = "UserProperty")
 @Data
 @AllArgsConstructor

src/main/java/com/izouma/nineth/domain/netease/NeteaseMessage.java

@@ -9,11 +9,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import java.sql.Timestamp;
 
-/**
- * 百度翻译为 :网易公司
- * 有点像聊天对话框
- * 有点像个人用户信息
- */
 @Entity
 @Data
 @NoArgsConstructor

src/main/java/com/izouma/nineth/domain/netease/NeteaseUser.java

@@ -9,9 +9,6 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-/**
- * 网易个人信息
- */
 @Entity
 @Data
 @NoArgsConstructor

src/main/java/com/izouma/nineth/dto/CollectionDTO.java

@@ -6,8 +6,6 @@ import lombok.Data;
 @Data
 public class CollectionDTO extends Collection {
     private boolean liked;
-    //预约
     private boolean appointment;
-    //vip盈余
     private int     vipSurplus;
 }

src/main/java/com/izouma/nineth/dto/CollectionStockAndSale.java

@@ -4,9 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 藏品库存和销售
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/nineth/dto/MetaGameBoxPointsDTO.java

@@ -19,6 +19,6 @@ public class MetaGameBoxPointsDTO {
     @ApiModelProperty("当前用户最高积分")
     private int selfHiScore;
 
-    @ApiModelProperty("积分top20")
+    @ApiModelProperty("积分top50")
     private List<MetaGameBoxPoints> data;
 }

src/main/java/com/izouma/nineth/dto/MetaTouristDTO.java

@@ -0,0 +1,12 @@
+package com.izouma.nineth.dto;
+
+import lombok.Data;
+
+@Data
+public class MetaTouristDTO {
+
+    private Long userId;
+
+    private String nickName;
+
+}

src/main/java/com/izouma/nineth/enums/AssetStatus.java

@@ -11,7 +11,8 @@ public enum AssetStatus {
     AUCTION_TRADING("拍卖中"),
     AUCTIONED("已拍卖"),
     DESTROYED("已销毁"),
-    DESTROYING("销毁中")
+    DESTROYING("销毁中"),
+    PENDING("元域名审核")
     ;
 
     private final String description;

src/main/java/com/izouma/nineth/enums/MetaSize.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.enums;
+
+public enum MetaSize {
+
+    ONE_ONE("1:1"),
+
+    NINE_SIXTEEN("9:16"),
+
+    SIXTEEN_NINE("16:9");
+
+    private final String description;
+
+    MetaSize(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}