Merge branch 'dev' of xiongzhu/9th into master

src/main/comos/src/views/account/Register.vue

@@ -23,6 +23,20 @@
                     <img :src="require('@assets/svgs/login_icon_zhanghao.svg')" class="icon" />
                 </template>
             </van-field>
+            <van-field
+                name="图形验证码"
+                placeholder="请输入图形验证码"
+                v-model="form.captcha"
+                :maxlength="6"
+                :rules="[{ required: true, message: '请输入图形验证码' }]"
+            >
+                <template #left-icon>
+                    <img :src="require('@assets/svgs/login_icon_code.svg')" class="icon" />
+                </template>
+                <template #button>
+                    <van-image @click="getCode" :src="codeImg" width="68" height="32" fit="contain" />
+                </template>
+            </van-field>
 
             <van-field
                 type="digit"
@@ -48,6 +62,7 @@
                     </van-button>
                 </template>
             </van-field>
+
             <van-field
                 type="password"
                 name="密码"
@@ -103,7 +118,7 @@
                     native-type="submit"
                     :color="`linear-gradient(to right, ${$colors.prim}, ${$colors.warn})`"
                     class="sure"
-                    >登录</van-button
+                    >注册</van-button
                 >
                 <van-button class="del" round block plain @click="$router.replace('/login')"
                     >已有账号，立即登陆</van-button
@@ -139,20 +154,46 @@ export default {
                 password2: '',
                 code: '',
                 inviteCode: this.$store.state.inviteCode || '',
-                invitor: ''
+                invitor: '',
+                captchaKey: '',
+                captcha: ''
             },
-            checked: false
+            checked: false,
+            codeImg: ''
         };
     },
     mounted() {
         if (this.invitor) {
             this.form.invitor = this.invitor;
         }
+        this.getCode();
     },
     methods: {
+        getCode() {
+            this.$http.get('/captcha/get').then(res => {
+                this.form.captchaKey = res.key;
+                this.codeImg = res.image;
+            });
+        },
         sendPhone() {
-            this.$refs.form.validate('手机号码').then(() => {
-                this.sendMsg(this.form.phone);
+            this.$refs.form.validate(['手机号码', '图形验证码']).then(() => {
+                // this.sendMsg(this.form.phone);
+                this.$http
+                    .get('/sms/sendCaptchaVerify', {
+                        phone: this.form.phone,
+                        captchaKey: this.form.captchaKey,
+                        captcha: this.form.captcha
+                    })
+                    .then(res => {
+                        this.isSend = true;
+                        this.setTime(60);
+                        this.msgCode = res;
+                        this.$toast.success('发送成功');
+                    })
+                    .catch(e => {
+                        this.$toast(e.error);
+                        this.setTime(0);
+                    });
             });
         },
         submit() {

src/main/comos/src/views/product/List.vue

@@ -105,6 +105,7 @@ export default {
 
         if (this.$route.query.source) {
             this.source = this.$route.query.source;
+            this.salable = true;
         }
 
         if (this.$route.query.minterId) {

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

@@ -0,0 +1,49 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@ApiModel("活动收集")
+public class ActivityCollection extends BaseEntity {
+    @ApiModelProperty("活动名称")
+    @Searchable
+    private String name;
+
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty("图片")
+    private String pic;
+
+    @ApiModelProperty("藏品名称")
+    private String collectionName;
+
+    @ApiModelProperty("藏品ID")
+    private Long collectionId;
+
+    @ApiModelProperty("藏品数量")
+    private int num;
+
+    @ApiModelProperty("剩余数量")
+    private int stock;
+
+    @ApiModelProperty("发行数量")
+    private int total;
+
+    @ApiModelProperty("领取藏品ID")
+    private Long awardCollectionId;
+
+    @ApiModelProperty("领取藏品名称")
+    private String awardCollectionName;
+}

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

@@ -0,0 +1,42 @@
+package com.izouma.nineth.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.izouma.nineth.converter.FileObjectListConverter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.util.List;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
+public class ActivityMaterial extends BaseEntity {
+    private Long orderId;
+
+    private Long assetId;
+
+    private Long collectionId;
+
+    private String name;
+
+    @ApiModelProperty("图片")
+    @Convert(converter = FileObjectListConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<FileObject> pic;
+
+    @ApiModelProperty("编号")
+    private Integer number;
+
+    @ApiModelProperty("分类")
+    private String category;
+
+}

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

@@ -0,0 +1,33 @@
+package com.izouma.nineth.domain;
+
+
+import com.izouma.nineth.annotations.Searchable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+public class ActivityOrder extends BaseEntity {
+
+    private Long userId;
+
+    @Searchable
+    private String phone;
+
+    private Long activityCollectionId;
+
+    private String activityCollection;
+
+    @Transient
+    private List<ActivityMaterial> material;
+
+}

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

@@ -15,6 +15,9 @@ import java.util.List;
 
 @Data
 @Entity
+@Table(name = "air_drop", indexes = {
+        @Index(columnList = "name")
+})
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

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

@@ -131,9 +131,9 @@ public class User extends BaseEntity implements Serializable {
 
     @Column(columnDefinition = "int(11) default 0")
     @ApiModelProperty(value = "邀请数量")
-    private int inviteNum =0;
+    private int inviteNum = 0;
 
     @Column(columnDefinition = "int(11) default 0")
     @ApiModelProperty(value = "获得得空投数量")
-    private int inviteAirDrop=0 ;
+    private int inviteAirDrop = 0;
 }

src/main/java/com/izouma/nineth/listener/UpdateActivityStockListener.java

@@ -0,0 +1,28 @@
+package com.izouma.nineth.listener;
+
+import com.izouma.nineth.service.ActivityCollectionService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        consumerGroup = "${general.update-activity-stock-group}",
+        topic = "${general.update-activity-stock-topic}",
+        consumeMode = ConsumeMode.ORDERLY)
+@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
+public class UpdateActivityStockListener implements RocketMQListener<Long> {
+
+    private ActivityCollectionService activityCollectionService;
+
+    @Override
+    public void onMessage(Long id) {
+        activityCollectionService.syncStock(id);
+    }
+}

src/main/java/com/izouma/nineth/repo/ActivityCollectionRepo.java

@@ -0,0 +1,24 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ActivityCollection;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ActivityCollectionRepo extends JpaRepository<ActivityCollection, Long>, JpaSpecificationExecutor<ActivityCollection> {
+    @Query("update ActivityCollection t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    @Query("select c.stock from ActivityCollection c where c.id = ?1")
+    Integer getStock(Long id);
+
+    @Query("update ActivityCollection c set c.stock = ?2 where c.id = ?1")
+    @Transactional
+    @Modifying
+    int updateStock(Long id, int stock);
+}

src/main/java/com/izouma/nineth/repo/ActivityMaterialRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ActivityMaterial;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ActivityMaterialRepo extends JpaRepository<ActivityMaterial, Long>, JpaSpecificationExecutor<ActivityMaterial> {
+    @Query("update ActivityMaterial t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/repo/ActivityOrderRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ActivityOrder;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ActivityOrderRepo extends JpaRepository<ActivityOrder, Long>, JpaSpecificationExecutor<ActivityOrder> {
+    @Query("update ActivityOrder t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/repo/AirDropRepo.java

@@ -7,10 +7,15 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface AirDropRepo extends JpaRepository<AirDrop, Long>, JpaSpecificationExecutor<AirDrop> {
     @Query("update AirDrop t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+
+    @Query(nativeQuery = true,value = "select * from air_drop where air_drop.user_ids like ?1 and name like ?2 ")
+    List<AirDrop> findAllByUserIdsAndName(String userIds, String name);
 }

src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -87,6 +87,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/activity/get/**").permitAll()
                 .antMatchers("/asset/get/**").permitAll()
                 .antMatchers("/asset/tokenHistory").permitAll()
+                .antMatchers("/sms/sendCaptchaVerify").permitAll()
                 .antMatchers("/user/all").permitAll()
                 .antMatchers("/user/get/*").permitAll()
                 .antMatchers("/user/forgotPassword").permitAll()

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

@@ -0,0 +1,57 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.annotations.Debounce;
+import com.izouma.nineth.config.GeneralProperties;
+import com.izouma.nineth.config.RedisKeys;
+import com.izouma.nineth.domain.ActivityCollection;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.ActivityCollectionRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.data.domain.Page;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class ActivityCollectionService {
+
+    private ActivityCollectionRepo        activityCollectionRepo;
+    private RedisTemplate<String, Object> redisTemplate;
+    private CacheService                  cacheService;
+    private RocketMQTemplate              rocketMQTemplate;
+    private GeneralProperties             generalProperties;
+
+    public Page<ActivityCollection> all(PageQuery pageQuery) {
+        return activityCollectionRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityCollection.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public synchronized Long increaseStock(Long id, int number) {
+        BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps(RedisKeys.MINT_ACTIVITY_STOCK + id);
+        if (ops.get() == null) {
+            Boolean success = ops.setIfAbsent(Optional.ofNullable(activityCollectionRepo.getStock(id))
+                    .orElse(0), 7, TimeUnit.DAYS);
+            log.info("创建redis铸造活动库存：{}", success);
+        }
+        Long stock = ops.increment(number);
+        rocketMQTemplate.convertAndSend(generalProperties.getUpdateActivityStockTopic(), id);
+        return stock;
+    }
+
+    @Debounce(key = "#id", delay = 500)
+    public void syncStock(Long id) {
+        Integer stock = (Integer) redisTemplate.opsForValue().get(RedisKeys.MINT_ACTIVITY_STOCK + id);
+        if (stock != null) {
+            log.info("同步铸造活动库存信息{}", id);
+            activityCollectionRepo.updateStock(id, stock);
+            cacheService.clearActivityCollection(id);
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.ActivityMaterial;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.ActivityMaterialRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ActivityMaterialService {
+
+    private ActivityMaterialRepo activityMaterialRepo;
+
+    public Page<ActivityMaterial> all(PageQuery pageQuery) {
+        return activityMaterialRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityMaterial.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.ActivityCollection;
+import com.izouma.nineth.domain.ActivityOrder;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityCollectionRepo;
+import com.izouma.nineth.repo.ActivityOrderRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@AllArgsConstructor
+public class ActivityOrderService {
+
+    private ActivityOrderRepo         activityOrderRepo;
+    private ActivityCollectionRepo    activityCollectionRepo;
+    private ActivityCollectionService activityCollectionService;
+
+    public Page<ActivityOrder> all(PageQuery pageQuery) {
+        return activityOrderRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityOrder.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+
+    public void created(List<Long> assetId, Long mintActivityId) {
+        ActivityCollection collection = activityCollectionRepo.findById(mintActivityId)
+                .orElseThrow(new BusinessException("活动不存在"));
+
+        int stock = Optional.ofNullable(activityCollectionService.increaseStock(mintActivityId, -1))
+                .map(Math::toIntExact)
+                .orElseThrow(new BusinessException("很遗憾，活动已无库存"));
+
+        if (stock < 0) {
+            throw new BusinessException("活动已无库存");
+        }
+
+    }
+}

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

@@ -20,4 +20,8 @@ public class CacheService {
     @CacheEvict(value = "user", key = "#username")
     public void clearUser(String username) {
     }
+
+    @CacheEvict(value = "activityCollection", key = "#id")
+    public void clearActivityCollection(Long id) {
+    }
 }

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

@@ -1,14 +1,18 @@
 package com.izouma.nineth.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.kevinsawicki.http.HttpRequest;
 import com.izouma.nineth.domain.AirDrop;
+import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.IdentityAuth;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.AirDropType;
 import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AirDropRepo;
+import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.repo.IdentityAuthRepo;
 import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
@@ -26,6 +30,8 @@ public class IdentityAuthService {
     private UserRepo         userRepo;
     private AdapayService    adapayService;
     private AirDropService   airDropService;
+    private AirDropRepo      airDropRepo;
+    private CollectionRepo   collectionRepo;
 
     public Page<IdentityAuth> all(PageQuery pageQuery) {
         return identityAuthRepo.findAll(JpaUtils.toSpecification(pageQuery, IdentityAuth.class), JpaUtils.toPageRequest(pageQuery));
@@ -60,18 +66,28 @@ public class IdentityAuthService {
             if (user.getInvitor() != null) {
                 userRepo.findByIdAndDelFalse(user.getInvitor()).ifPresent(user1 -> {
                     user1.setInviteNum(user1.getInviteNum() + 1);
-
-                    if (user1.getInviteNum() / 10 > user1.getInviteAirDrop()) {
-                        airDropService.create(AirDrop.builder()
-                                .name("邀请新人得空投奖励")
-                                .type(AirDropType.asset)
-                                .collectionId(1187810L)
-                                .phone(List.of(user1.getPhone()))
-                                .userIds(List.of(user.getInvitor()))
-                                .projectId(1)
-                                .build());
-                        user1.setInviteAirDrop(user1.getInviteAirDrop() + 1);
+                    if (user1.getInviteNum() >= 10) {
+                        // 藏品数量
+                        Collection collection = collectionRepo.findById(1187810L)
+                                .orElseThrow(new BusinessException("无藏品"));
+                        if (collection.getStock() > 0) {
+                            List<Long> userIds = List.of(user.getInvitor());
+                            String name = "邀请新人得空投奖励";
+                            List<AirDrop> airDrops = airDropRepo.findAllByUserIdsAndName(String.valueOf(user.getInvitor()), name);
+                            if (CollUtil.isEmpty(airDrops)) {
+                                airDropService.create(AirDrop.builder()
+                                        .name(name)
+                                        .type(AirDropType.asset)
+                                        .collectionId(1187810L)
+                                        .phone(List.of(user1.getPhone()))
+                                        .userIds(userIds)
+                                        .projectId(1)
+                                        .build());
+                                user1.setInviteAirDrop(user1.getInviteAirDrop() + 1);
+                            }
+                        }
                     }
+
                     userRepo.save(user1);
                 });
             }

src/main/java/com/izouma/nineth/service/sms/AliSmsService.java

@@ -101,9 +101,9 @@ public class AliSmsService implements SmsService {
     @Override
     public String verify(String phone, String code) {
         SmsRecord smsRecord = smsRecordRepo.findLastByPhoneAndExpiresAtAfterAndExpiredFalse(phone, LocalDateTime.now())
-                .orElseThrow(new BusinessException("验证码错误"));
+                .orElseThrow(new BusinessException("短信验证码错误"));
         if (!smsRecord.getCode().equalsIgnoreCase(code)) {
-            throw new BusinessException("验证码错误");
+            throw new BusinessException("短信验证码错误");
         }
         smsRecord.setExpired(true);
         smsRecordRepo.save(smsRecord);

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

@@ -0,0 +1,66 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.ActivityCollection;
+import com.izouma.nineth.service.ActivityCollectionService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityCollectionRepo;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityCollection")
+@AllArgsConstructor
+public class ActivityCollectionController extends BaseController {
+    private ActivityCollectionService activityCollectionService;
+    private ActivityCollectionRepo    activityCollectionRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public ActivityCollection save(@RequestBody ActivityCollection record) {
+        if (record.getCollectionId().equals(record.getAwardCollectionId())) {
+            throw new BusinessException("兑换的藏品不能和领取的藏品相同");
+        }
+        if (record.getId() != null) {
+            ActivityCollection orig = activityCollectionRepo.findById(record.getId())
+                    .orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return activityCollectionRepo.save(orig);
+        }
+        record.setStock(record.getStock());
+        return activityCollectionRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<ActivityCollection> all(@RequestBody PageQuery pageQuery) {
+        return activityCollectionService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public ActivityCollection get(@PathVariable Long id) {
+        return activityCollectionRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        activityCollectionRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ActivityCollection> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+import com.izouma.nineth.domain.ActivityMaterial;
+import com.izouma.nineth.service.ActivityMaterialService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityMaterialRepo;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityMaterial")
+@AllArgsConstructor
+public class ActivityMaterialController extends BaseController {
+    private ActivityMaterialService activityMaterialService;
+    private ActivityMaterialRepo activityMaterialRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public ActivityMaterial save(@RequestBody ActivityMaterial record) {
+        if (record.getId() != null) {
+            ActivityMaterial orig = activityMaterialRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return activityMaterialRepo.save(orig);
+        }
+        return activityMaterialRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<ActivityMaterial> all(@RequestBody PageQuery pageQuery) {
+        return activityMaterialService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public ActivityMaterial get(@PathVariable Long id) {
+        return activityMaterialRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        activityMaterialRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ActivityMaterial> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+import com.izouma.nineth.domain.ActivityOrder;
+import com.izouma.nineth.service.ActivityOrderService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityOrderRepo;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityOrder")
+@AllArgsConstructor
+public class ActivityOrderController extends BaseController {
+    private ActivityOrderService activityOrderService;
+    private ActivityOrderRepo activityOrderRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public ActivityOrder save(@RequestBody ActivityOrder record) {
+        if (record.getId() != null) {
+            ActivityOrder orig = activityOrderRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return activityOrderRepo.save(orig);
+        }
+        return activityOrderRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<ActivityOrder> all(@RequestBody PageQuery pageQuery) {
+        return activityOrderService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public ActivityOrder get(@PathVariable Long id) {
+        return activityOrderRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        activityOrderRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ActivityOrder> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -3,11 +3,12 @@ package com.izouma.nineth.web;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.enums.AuthorityName;
 import com.izouma.nineth.exception.AuthenticationException;
+import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.security.JwtTokenUtil;
 import com.izouma.nineth.security.JwtUser;
 import com.izouma.nineth.security.JwtUserFactory;
+import com.izouma.nineth.service.CaptchaService;
 import com.izouma.nineth.service.UserService;
-import com.izouma.nineth.service.sms.SmsService;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -31,6 +32,7 @@ public class AuthenticationController {
     private final AuthenticationManager authenticationManager;
     private final JwtTokenUtil          jwtTokenUtil;
     private final UserService           userService;
+    private final CaptchaService        captchaService;
 
     @PostMapping("/login")
     public String loginByUserPwd(String username, String password, Integer expiration) {
@@ -65,7 +67,12 @@ public class AuthenticationController {
 
     @PostMapping("/phoneRegister")
     @ApiOperation(value = "手机号密码注册")
-    public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor) {
+    public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor,
+                                String captcha, String captchaKey) {
+        boolean verify = captchaService.verify(captchaKey, captcha);
+        if (!verify) {
+            throw new BusinessException("验证码错误");
+        }
         User user = userService.phoneRegister(phone, code, password, inviteCode, invitor);
         return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }

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

@@ -2,6 +2,7 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.config.Constants;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.service.CaptchaService;
 import com.izouma.nineth.service.sms.SmsService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,13 +16,28 @@ import java.util.regex.Pattern;
 @RequestMapping("/sms")
 @AllArgsConstructor
 public class SmsController {
-    private SmsService smsService;
+    private SmsService     smsService;
+    private CaptchaService captchaService;
 
     @GetMapping("/sendVerify")
     public String sendVerify(@RequestParam String phone) {
         if (!Pattern.matches(Constants.Regex.PHONE, phone)) {
             throw new BusinessException("请输入正确的手机号");
         }
+
+        return smsService.sendVerify(phone);
+    }
+
+    @GetMapping("/sendCaptchaVerify")
+    public String sendVerify(@RequestParam String phone, @RequestParam String captcha, @RequestParam String captchaKey) {
+        if (!Pattern.matches(Constants.Regex.PHONE, phone)) {
+            throw new BusinessException("请输入正确的手机号");
+        }
+        boolean verify = captchaService.verify(captchaKey, captcha);
+        if (!verify) {
+            throw new BusinessException("图形验证码错误");
+        }
+
         return smsService.sendVerify(phone);
     }
 

src/main/resources/genjson/ActivityCollection.json

@@ -0,0 +1 @@
+{"tableName":"ActivityCollection","className":"ActivityCollection","remark":"活动收集","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/9th/src/main/java/com/izouma/nineth","viewPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/9th/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"活动名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"pic","modelName":"pic","remark":"图片","showInList":true,"showInForm":true,"formType":"singleImage"},{"name":"collectionName","modelName":"collectionName","remark":"藏品名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"collectionId","modelName":"collectionId","remark":"藏品ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"num","modelName":"num","remark":"藏品数量","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"stock","modelName":"stock","remark":"剩余数量","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"total","modelName":"total","remark":"发行数量","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"awardCollectionId","modelName":"awardCollectionId","remark":"领取藏品ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"awardCollectionName","modelName":"awardCollectionName","remark":"领取藏品名称","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.ActivityCollection"}

src/main/resources/genjson/ActivityMaterial.json

@@ -0,0 +1 @@
+{"tableName":"ActivityMaterial","className":"ActivityMaterial","remark":"兑换材料","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"javaPath":"/Users/qiufangchao/Desktop/project/9th/src/main/java/com/izouma/nineth","viewPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/9th/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"orderId","modelName":"orderId","remark":"orderId","showInList":true,"showInForm":true,"formType":"number"},{"name":"assetId","modelName":"assetId","remark":"assetId","showInList":true,"showInForm":true,"formType":"number"},{"name":"collectionId","modelName":"collectionId","remark":"collectionId","showInList":true,"showInForm":true,"formType":"number"},{"name":"name","modelName":"name","remark":"name","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"pic","modelName":"pic","remark":"图片","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"number","modelName":"number","remark":"编号","showInList":true,"showInForm":true,"formType":"number"},{"name":"category","modelName":"category","remark":"分类","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.ActivityMaterial"}

src/main/resources/genjson/ActivityOrder.json

@@ -0,0 +1 @@
+{"tableName":"ActivityOrder","className":"ActivityOrder","remark":"收集记录","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/9th/src/main/java/com/izouma/nineth","viewPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/9th/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"phone","modelName":"phone","remark":"手机号","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"activityCollectionId","modelName":"activityCollectionId","remark":"活动ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"activityCollection","modelName":"activityCollection","remark":"活动名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"material","modelName":"material","remark":"material","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.ActivityOrder"}

src/main/vue/.env.development

@@ -1 +1 @@
-VUE_APP_BASE_URL=http://localhost:8080
+VUE_APP_BASE_URL=https://nfttest.9space.vip/

src/main/vue/src/router.js

@@ -454,6 +454,38 @@ const router = new Router({
                     meta: {
                        title: 'ada',
                     },
+               },
+                {
+                    path: '/activityCollectionEdit',
+                    name: 'ActivityCollectionEdit',
+                    component: () => import(/* webpackChunkName: "activityCollectionEdit" */ '@/views/ActivityCollectionEdit.vue'),
+                    meta: {
+                       title: '活动收集编辑',
+                    },
+                },
+                {
+                    path: '/activityCollectionList',
+                    name: 'ActivityCollectionList',
+                    component: () => import(/* webpackChunkName: "activityCollectionList" */ '@/views/ActivityCollectionList.vue'),
+                    meta: {
+                       title: '活动收集',
+                    },
+               },
+                {
+                    path: '/activityOrderEdit',
+                    name: 'ActivityOrderEdit',
+                    component: () => import(/* webpackChunkName: "activityOrderEdit" */ '@/views/ActivityOrderEdit.vue'),
+                    meta: {
+                       title: '收集记录编辑',
+                    },
+                },
+                {
+                    path: '/activityOrderList',
+                    name: 'ActivityOrderList',
+                    component: () => import(/* webpackChunkName: "activityOrderList" */ '@/views/ActivityOrderList.vue'),
+                    meta: {
+                       title: '收集记录',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/ActivityCollectionEdit.vue

@@ -0,0 +1,233 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="108px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="name" label="活动名称">
+                        <el-input v-model="formData.name"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="图片">
+                        <single-upload v-model="formData.pic"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="collectionId" label="兑换藏品">
+                        <!-- <collection-search v-model="formData.collectionId" style="width: 300px"></collection-search> -->
+                        <el-select
+                            v-model="formData.collectionId"
+                            filterable
+                            :filter-method="filterCollection"
+                            style="width: 100%"
+                            @change="changCollection"
+                            :disabled="!canEdit"
+                        >
+                            <el-option v-for="item in filterOptions" :label="item.name" :value="item.id" :key="item.id">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">#{{ item.id }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="num" label="兑换数量">
+                        <el-input-number type="number" v-model="formData.num" :disabled="!canEdit"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="total" label="发行数量">
+                        <el-input-number type="number" v-model="formData.total" :disabled="!canEdit"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="awardCollectionId" label="获得藏品">
+                        <!-- <collection-search
+                            v-model="formData.awardCollectionId"
+                            style="width: 300px"
+                        ></collection-search> -->
+                        <el-select
+                            v-model="formData.awardCollectionId"
+                            filterable
+                            :filter-method="filterCollection"
+                            style="width: 100%"
+                            @change="changAwardCollection"
+                            :disabled="!canEdit"
+                        >
+                            <el-option v-for="item in filterOptions" :label="item.name" :value="item.id" :key="item.id">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">#{{ item.id }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'ActivityCollectionEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('activityCollection/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .post(
+                '/collection/all',
+                {
+                    size: 10000,
+                    sort: 'sort,desc;createdAt,desc',
+                    query: { del: false, source: 'OFFICIAL', type: 'DEFAULT' }
+                },
+                { body: 'json' }
+            )
+            .then(res => {
+                this.filterOptions = this.options = res.content;
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入名称',
+                        trigger: 'blur'
+                    }
+                ],
+                pic: [
+                    {
+                        required: true,
+                        message: '请上传图片',
+                        trigger: 'blur'
+                    }
+                ],
+                collectionId: [
+                    {
+                        required: true,
+                        message: '请选择兑换藏品',
+                        trigger: 'blur'
+                    }
+                ],
+                num: [
+                    {
+                        required: true,
+                        message: '请输入兑换数量',
+                        trigger: 'blur'
+                    }
+                ],
+                total: [
+                    {
+                        required: true,
+                        message: '请输入发行数量',
+                        trigger: 'blur'
+                    }
+                ],
+                awardCollectionId: [
+                    {
+                        required: true,
+                        message: '请选择获得藏品',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            options: [],
+            filterOptions: []
+        };
+    },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
+    methods: {
+        filterCollection(val) {
+            this.filterOptions = this.options.filter(i => i.name.includes(val) || i.id == val);
+        },
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/activityCollection/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/activityCollection/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        },
+        changAwardCollection(row) {
+            let data = this.options.find(item => {
+                return item.id === row;
+            });
+            this.formData.awardCollectionName = data.name;
+            console.log(this.formData.awardCollectionName);
+        },
+        changCollection(row) {
+            let data = this.options.find(item => {
+                return item.id === row;
+            });
+            this.formData.collectionName = data.name;
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+/deep/.el-input.is-disabled .el-input__inner {
+    color: #7c7e7e;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #7c7e7e;
+}
+</style>

src/main/vue/src/views/ActivityCollectionList.vue

@@ -0,0 +1,193 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button>
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="活动名称"> </el-table-column>
+            <el-table-column prop="pic" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic"
+                        fit="cover"
+                        :preview-src-list="[row.pic]"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="collectionName" label="藏品名称"> </el-table-column>
+            <el-table-column prop="collectionId" label="藏品ID"> </el-table-column>
+            <el-table-column prop="num" label="藏品数量"> </el-table-column>
+            <el-table-column prop="stock" label="剩余数量"> </el-table-column>
+            <el-table-column prop="total" label="发行数量"> </el-table-column>
+            <el-table-column prop="awardCollectionId" label="领取藏品ID"> </el-table-column>
+            <el-table-column prop="awardCollectionName" label="领取藏品名称"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'ActivityCollectionList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/activityCollection/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/activityCollectionEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/activityCollectionEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/activityCollection/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/activityCollection/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/ActivityOrderEdit.vue

@@ -0,0 +1,112 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                删除
+            </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right"
+                         size="small"
+                         style="max-width: 500px;">
+                        <el-form-item prop="userId" label="用户ID">
+                                    <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="phone" label="手机号">
+                                    <el-input v-model="formData.phone"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="activityCollectionId" label="活动ID">
+                                    <el-input-number type="number" v-model="formData.activityCollectionId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="activityCollection" label="活动名称">
+                                    <el-input v-model="formData.activityCollection"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="material" label="material">
+                                    <el-input v-model="formData.material"></el-input>
+                        </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'ActivityOrderEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('activityOrder/get/' + this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/activityOrder/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$confirm('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/activityOrder/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/ActivityOrderList.vue

@@ -0,0 +1,175 @@
+<template>
+    <div  class="list-view">
+        <page-title>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
+                新增
+            </el-button>
+            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                    placeholder="搜索..."
+                    v-model="search"
+                    clearable
+                    class="filter-item search"
+                    @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight" v-loading="fetchingData">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="userId" label="用户ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="phone" label="手机号"
+>
+                    </el-table-column>
+                    <el-table-column prop="activityCollectionId" label="活动ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="activityCollection" label="活动名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="material" label="material"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'ActivityOrderList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/activityOrder/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                return { search: this.search, query: { del: false } };
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/activityOrderEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/activityOrderEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/activityOrder/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/activityOrder/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/Admin.vue

@@ -233,7 +233,8 @@ export default {
             this.$refs.pwdForm.validate(valid => {
                 if (valid) {
                     this.$http
-                        .post('/user/setPassword', {
+                        .post('/user/setPasswordAdmin', {
+                            userId: this.userInfo.id,
                             password: this.pwdForm.password
                         })
                         .then(res => {

src/main/vue/src/views/UserList.vue

@@ -45,6 +45,7 @@
             <el-table-column label="手机" prop="phone" min-width="100"></el-table-column>
             <el-table-column label="注册时间" prop="createdAt" min-width="150"></el-table-column>
             <el-table-column label="邀请人数" prop="inviteNum" min-width="80"></el-table-column>
+            <el-table-column label="空投数量" prop="inviteAirDrop" min-width="80"></el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="220">
                 <template slot-scope="{ row }">
                     <el-button @click="getInviteInfo(row)" type="text" size="mini">邀请列表</el-button>

src/test/java/com/izouma/nineth/repo/AirDropRepoTest.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.ApplicationTests;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public class AirDropRepoTest extends ApplicationTests {
+
+    @Autowired
+    private AirDropRepo airDropRepo;
+
+    @Test
+    public void test() {
+        System.out.println(airDropRepo.findAllByUserIdsAndName("7834", "邀请新人得空投奖励"));
+    }
+}