Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_back into dev

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

@@ -25,7 +25,9 @@ import java.util.List;
 @Table(indexes = {
         @Index(columnList = "userId"),
         @Index(columnList = "tokenId"),
-        @Index(columnList = "collectionId")
+        @Index(columnList = "collectionId"),
+        @Index(columnList = "minterId"),
+        @Index(columnList = "ownerId"),
 })
 @AllArgsConstructor
 @NoArgsConstructor

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

@@ -9,12 +9,11 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
 
 @Data
 @Entity
+@Table(indexes = {@Index(columnList = "type")})
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

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

@@ -11,14 +11,17 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
+import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.List;
 
 @Data
 @Entity
+@Table(indexes = {
+        @Index(columnList = "blindBoxId"),
+        @Index(columnList = "collectionId"),
+        @Index(columnList = "minterId"),
+})
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

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

@@ -23,7 +23,12 @@ import java.util.List;
 
 @Data
 @Entity
-@Table(name = "collection_info")
+@Table(name = "collection_info", indexes = {
+        @Index(columnList = "type,source"),
+        @Index(columnList = "minterId"),
+        @Index(columnList = "onShelf"),
+        @Index(columnList = "ownerId"),
+})
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

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

@@ -8,12 +8,11 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
 
 @Data
 @Entity
+@Table(indexes = {@Index(columnList = "userId")})
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

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

@@ -34,7 +34,8 @@ import java.util.List;
         @Index(columnList = "status"),
         @Index(columnList = "assetId"),
         @Index(columnList = "collectionId"),
-        @Index(columnList = "transactionId")
+        @Index(columnList = "transactionId"),
+        @Index(columnList = "minterId"),
 })
 @AllArgsConstructor
 @NoArgsConstructor

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

@@ -29,7 +29,9 @@ import java.util.Set;
 @Table(indexes = {
         @Index(columnList = "phone"),
         @Index(columnList = "collectionId"),
-        @Index(columnList = "collectionInvitor")
+        @Index(columnList = "collectionInvitor"),
+        @Index(columnList = "admin"),
+        @Index(columnList = "minter"),
 })
 @AllArgsConstructor
 @NoArgsConstructor
@@ -138,4 +140,5 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty("优先购买")
     private int vipPurchase;
 
+    private boolean minter;
 }

src/main/java/com/izouma/nineth/service/UserService.java

@@ -109,7 +109,11 @@ public class UserService {
 
             if (pageQuery.getQuery().containsKey("hasRole")) {
                 String roleName = (String) pageQuery.getQuery().get("hasRole");
-                and.add(criteriaBuilder.isMember(Authority.get(AuthorityName.valueOf(roleName)), root.get("authorities")));
+                if (roleName.equals("ROLE_MINTER")) {
+                    and.add(criteriaBuilder.equal(root.get("minter"), true));
+                } else {
+                    and.add(criteriaBuilder.isMember(Authority.get(AuthorityName.valueOf(roleName)), root.get("authorities")));
+                }
             }
 
             if (pageQuery.getQuery().containsKey("vip")) {
@@ -164,7 +168,7 @@ public class UserService {
             if (!collection.isOnShelf() || !collection.isSalable()) {
                 collectionId = null;
             } else if (collection.isScheduleSale()) {
-                if (collection.getStartTime().isAfter(LocalDateTime.now())){
+                if (collection.getStartTime().isAfter(LocalDateTime.now())) {
                     collectionId = null;
                 }
             }

src/main/java/com/izouma/nineth/web/UserController.java

@@ -84,7 +84,7 @@ public class UserController extends BaseController {
     @PostMapping("/all")
     public Page<UserDTO> all(@RequestBody PageQuery pageQuery) {
         if (!(SecurityUtils.getAuthenticatedUser() != null && SecurityUtils.getAuthenticatedUser().isAdmin())) {
-            pageQuery.getQuery().put("hasRole", "ROLE_MINTER");
+            pageQuery.getQuery().put("minter", true);
         }
         return userService.toDTO(userService.all(pageQuery));
     }

src/main/vue/src/views/MinterEdit.vue

@@ -109,6 +109,7 @@ export default {
         return {
             saving: false,
             formData: {
+                minter: true,
                 username:
                     '9th_' +
                     randomstring.generate({

src/main/vue/src/views/MinterList.vue

@@ -81,7 +81,7 @@ export default {
     },
     methods: {
         beforeGetData() {
-            return { search: this.search, query: { hasRole: 'ROLE_MINTER' } };
+            return { search: this.search, query: { minter: true } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;