xiongzhu há 4 anos atrás
pai
commit
8cab1837dc

+ 2 - 3
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

+ 5 - 1
src/main/java/com/izouma/nineth/domain/Collection.java

@@ -23,7 +23,11 @@ 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"),
+})
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

+ 4 - 1
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;
 }

+ 1 - 1
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));
     }

+ 1 - 0
src/main/vue/src/views/MinterEdit.vue

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