单点登录

pom.xml

@@ -86,8 +86,23 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.lettuce</groupId>
+            <artifactId>lettuce-core</artifactId>
         </dependency>
 
         <dependency>
@@ -344,6 +359,16 @@
             <artifactId>javacv-platform</artifactId>
             <version>1.5.6</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-hibernate5</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-hibernate4</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -1,17 +1,69 @@
 package com.izouma.nineth.config;
 
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.support.SimpleCacheManager;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.DefaultBaseTypeLimitingValidator;
+import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import com.fasterxml.jackson.datatype.hibernate4.Hibernate4Module;
+import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
+import org.springframework.boot.autoconfigure.cache.RedisCacheManagerBuilderCustomizer;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.time.Duration;
 
-@EnableCaching
 @Configuration
+@AutoConfigureAfter({RedisAutoConfiguration.class, CacheAutoConfiguration.class})
+@EnableRedisRepositories
 public class CacheConfig {
+
+    @Bean
+    RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(redisConnectionFactory);
+
+        //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值
+        Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(Object.class);
+
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance,
+                ObjectMapper.DefaultTyping.NON_FINAL,
+                JsonTypeInfo.As.WRAPPER_ARRAY);
+        mapper.registerModule(new Hibernate5Module());
+        serializer.setObjectMapper(mapper);
+
+        template.setValueSerializer(serializer);
+        //使用StringRedisSerializer来序列化和反序列化redis的key值
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(serializer);
+        template.afterPropertiesSet();
+        return template;
+    }
+
     @Bean
-    public CacheManager cacheManager() {
-        SimpleCacheManager manager = new SimpleCacheManager();
-        return manager;
+    public RedisCacheManager redisCacheManager(RedisTemplate redisTemplate) {
+        RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(redisTemplate.getConnectionFactory());
+        RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer()));
+        return new RedisCacheManager(redisCacheWriter, redisCacheConfiguration);
     }
 }

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

@@ -0,0 +1,30 @@
+package com.izouma.nineth.config;
+
+
+import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.fasterxml.jackson.databind.Module;
+
+/**
+ * Hibernate 懒加载失效 因为json序列化
+ */
+@Configuration
+public class HibernateJsonConfig {
+
+    /**
+     * 注册一个额外的Jackson模块
+     *
+     * @return Module
+     */
+    @Bean
+    public Module hibernate5Module() {
+        Hibernate5Module module = new Hibernate5Module();
+        //禁用(表示要忽略@Transient字段属性,默认为true,设置为false禁用)
+        module.disable(Hibernate5Module.Feature.USE_TRANSIENT_ANNOTATION);
+        //延时加载的对象不使用时设置为null
+        module.enable(Hibernate5Module.Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS);
+        return module;
+    }
+
+}

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

@@ -112,6 +112,8 @@ public class Collection extends BaseEntity {
     @ApiModelProperty("盲盒开售时间")
     private LocalDateTime startTime;
 
+    private boolean scheduleSale;
+
     @Data
     public static class CollectionProperty {
 

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

@@ -0,0 +1,4 @@
+package com.izouma.nineth.domain;
+
+public class SSOToken {
+}

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

@@ -0,0 +1,30 @@
+package com.izouma.nineth.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Table(indexes = {@Index(columnList = "userId")})
+public class UserToken extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private Long userId;
+
+    private String token;
+
+    public UserToken(Long userId, String token) {
+        this.userId = userId;
+        this.token = token;
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.izouma.nineth.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.annotations.Searchable;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+
+@Data
+public class OrderDTO {
+    @ExcelProperty("用户ID")
+    private Long userId;
+
+    @ExcelProperty("藏品ID")
+    private Long collectionId;
+
+    @ExcelProperty("数量")
+    private int qty;
+
+    @ExcelProperty("名称")
+    private String name;
+
+    @ExcelProperty("分类")
+    private String category;
+
+    @ExcelProperty("是否可转售")
+    private boolean canResale;
+
+    @ExcelProperty("版税比例")
+    private int royalties;
+
+    @ExcelProperty("手续费比例")
+    private int serviceCharge;
+
+    @ExcelProperty("类型")
+    @Enumerated(EnumType.STRING)
+    private String type;
+
+    @ExcelProperty("铸造者")
+    private String minter;
+
+    @ExcelProperty("铸造者ID")
+    private Long minterId;
+
+    @ExcelProperty("价格")
+    @Column(precision = 10, scale = 2)
+    private BigDecimal price;
+
+    @ExcelProperty("gas费")
+    @Column(precision = 10, scale = 2)
+    private BigDecimal gasPrice;
+
+    @ExcelProperty("总价")
+    @Column(precision = 10, scale = 2)
+    private BigDecimal totalPrice;
+
+    @ExcelProperty("状态")
+    @Enumerated(EnumType.STRING)
+    private String status;
+
+    @ExcelProperty("支付方式")
+    private String payMethod;
+
+    @ExcelProperty("交易ID")
+    @Searchable
+    private String transactionId;
+
+    @ExcelProperty("支付时间")
+    private LocalDateTime payTime;
+
+    @ExcelProperty("取消时间")
+    private LocalDateTime cancelTime;
+
+    @ExcelProperty("交易hash")
+    private String txHash;
+
+    @ExcelProperty("消耗gas")
+    private BigInteger gasUsed;
+
+    @ExcelProperty("区块高度")
+    private BigInteger blockNumber;
+
+    @ExcelProperty("收货人")
+    private String contactName;
+
+    @ExcelProperty("收货电话")
+    private String contactPhone;
+
+    @ExcelProperty("收货地址")
+    private String address;
+}

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

@@ -4,8 +4,9 @@ public enum AuthorityName {
     ROLE_USER("普通用户"),
     ROLE_MINTER("铸造者"),
     ROLE_DEV("开发者"),
-    ROLE_ADMIN("管理员"),
-    ROLE_OPERATOR("运营");
+    ROLE_ADMIN("高级管理员"),
+    ROLE_OPERATOR("普通管理员"),
+    ;
     private final String description;
 
     AuthorityName(String description) {

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

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -26,4 +27,6 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     @Query(value = "select distinct c from Collection c join Like l on l.collectionId = c.id " +
             "where l.userId = ?1 and l.del = false and c.del = false")
     List<Collection> userLikes(Long userId);
+
+    List<Collection> findByScheduleSaleTrueAndOnShelfFalseAndStartTimeBeforeAndDelFalse(LocalDateTime time);
 }

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

@@ -2,6 +2,7 @@ package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.security.Authority;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

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

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.UserToken;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+
+import javax.transaction.Transactional;
+import java.util.Optional;
+
+public interface UserTokenRepo extends JpaRepository<UserToken, Long> {
+    @Modifying
+    @Transactional
+    int deleteByUserId(Long userId);
+
+    Optional<UserToken> findFirstByToken(String token);
+}

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

@@ -1,5 +1,6 @@
 package com.izouma.nineth.security;
 
+import com.izouma.nineth.repo.UserTokenRepo;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.SignatureException;
 import lombok.extern.slf4j.Slf4j;
@@ -26,11 +27,13 @@ public class JwtAuthorizationTokenFilter extends OncePerRequestFilter {
     private final UserDetailsService userDetailsService;
     private final JwtTokenUtil       jwtTokenUtil;
     private final String             tokenHeader;
+    private final UserTokenRepo      userTokenRepo;
 
-    public JwtAuthorizationTokenFilter(@Qualifier("jwtUserDetailsService") UserDetailsService userDetailsService, JwtTokenUtil jwtTokenUtil, @Value("${jwt.header}") String tokenHeader) {
+    public JwtAuthorizationTokenFilter(@Qualifier("jwtUserDetailsService") UserDetailsService userDetailsService, JwtTokenUtil jwtTokenUtil, @Value("${jwt.header}") String tokenHeader, UserTokenRepo userTokenRepo) {
         this.userDetailsService = userDetailsService;
         this.jwtTokenUtil = jwtTokenUtil;
         this.tokenHeader = tokenHeader;
+        this.userTokenRepo = userTokenRepo;
     }
 
     @Override

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

@@ -1,5 +1,7 @@
 package com.izouma.nineth.security;
 
+import com.izouma.nineth.domain.UserToken;
+import com.izouma.nineth.repo.UserTokenRepo;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Clock;
@@ -27,8 +29,11 @@ public class JwtTokenUtil implements Serializable {
     private Clock     clock = DefaultClock.INSTANCE;
     private JwtConfig jwtConfig;
 
-    public JwtTokenUtil(JwtConfig jwtConfig) {
+    private final UserTokenRepo userTokenRepo;
+
+    public JwtTokenUtil(JwtConfig jwtConfig, UserTokenRepo userTokenRepo) {
         this.jwtConfig = jwtConfig;
+        this.userTokenRepo = userTokenRepo;
     }
 
     public String getUsernameFromToken(String token) {
@@ -57,7 +62,7 @@ public class JwtTokenUtil implements Serializable {
 
     private Boolean isTokenExpired(String token) {
         final Date expiration = getExpirationDateFromToken(token);
-        return expiration.before(clock.now());
+        return expiration.before(clock.now()) || !userTokenRepo.findFirstByToken(token).isPresent();
     }
 
     private Boolean isCreatedBeforeLastPasswordReset(Date created, Date lastPasswordReset) {
@@ -70,8 +75,12 @@ public class JwtTokenUtil implements Serializable {
     }
 
     public String generateToken(UserDetails userDetails) {
+        JwtUser jwtUser = (JwtUser) userDetails;
         Map<String, Object> claims = new HashMap<>();
-        return doGenerateToken(claims, userDetails.getUsername());
+        String token = doGenerateToken(claims, userDetails.getUsername());
+        userTokenRepo.deleteByUserId(jwtUser.getUser().getId());
+        userTokenRepo.save(new UserToken(jwtUser.getUser().getId(), token));
+        return token;
     }
 
     public String doGenerateToken(Map<String, Object> claims, String subject) {

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

@@ -2,6 +2,7 @@ package com.izouma.nineth.security;
 
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.repo.UserRepo;
+import com.izouma.nineth.service.UserService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -11,11 +12,11 @@ import org.springframework.stereotype.Service;
 @AllArgsConstructor
 @Service("jwtUserDetailsService")
 public class JwtUserDetailsService implements UserDetailsService {
-    private UserRepo userRepo;
+    private UserService userService;
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        User user = userRepo.findByUsernameAndDelFalse(username).orElse(null);
+        User user = userService.findByUsernameAndDelFalse(username).orElse(null);
 
         if (user == null) {
             throw new UsernameNotFoundException(String.format("No user found with username '%s'.", username));

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

@@ -87,6 +87,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/user/get/*").permitAll()
                 .antMatchers("/user/forgotPassword").permitAll()
                 .antMatchers("/sysConfig/get/*").permitAll()
+                .antMatchers("/sysConfig/getDecimal/*").permitAll()
                 // all other requests need to be authenticated
                 .anyRequest().authenticated().and()
                 // make sure we use stateless session; session won't be used to

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

@@ -16,6 +16,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -63,6 +64,12 @@ public class CollectionService {
         record.setOwnerAvatar(minter.getAvatar());
         record.setStock(record.getTotal());
         record.setSale(0);
+        if (record.isScheduleSale()) {
+            if (record.getStartTime() == null) {
+                throw new BusinessException("请填写定时发布时间");
+            }
+            record.setOnShelf(record.getStartTime().isBefore(LocalDateTime.now()));
+        }
         return collectionRepo.save(record);
     }
 
@@ -170,4 +177,13 @@ public class CollectionService {
                 .blindBoxId(id)
                 .build());
     }
+
+    @Scheduled(fixedRate = 60000)
+    public void scheduleOnShelf() {
+        List<Collection> collections = collectionRepo.findByScheduleSaleTrueAndOnShelfFalseAndStartTimeBeforeAndDelFalse(LocalDateTime.now());
+        for (Collection collection : collections) {
+            collection.setOnShelf(true);
+        }
+        collectionRepo.saveAll(collections);
+    }
 }

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

@@ -106,6 +106,7 @@ public class OrderService {
                 .royalties(collection.getRoyalties())
                 .serviceCharge(collection.getServiceCharge())
                 .type(collection.getType())
+                .minterId(collection.getMinterId())
                 .minter(minter.getNickname())
                 .minterAvatar(minter.getAvatar())
                 .qty(qty)

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

@@ -6,9 +6,9 @@ import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.SysConfigRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
-import springfox.documentation.annotations.Cacheable;
 
 import java.math.BigDecimal;
 import java.time.LocalTime;
@@ -23,13 +23,18 @@ public class SysConfigService {
         return sysConfigRepo.findAll(JpaUtils.toSpecification(pageQuery, SysConfig.class), JpaUtils.toPageRequest(pageQuery));
     }
 
-//    @Cacheable("SysConfigServiceGetBigDecimal")
+    @Cacheable("SysConfigServiceGetBigDecimal")
     public BigDecimal getBigDecimal(String name) {
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         return sysConfigRepo.findByName(name).map(sysConfig -> new BigDecimal(sysConfig.getValue()))
                 .orElse(BigDecimal.ZERO);
     }
 
-//    @Cacheable("SysConfigServiceGetTime")
+    @Cacheable("SysConfigServiceGetTime")
     public LocalTime getTime(String name) {
         String str = sysConfigRepo.findByName(name).map(SysConfig::getValue)
                 .orElseThrow(new BusinessException("配置不存在"));
@@ -37,14 +42,14 @@ public class SysConfigService {
         return LocalTime.from(dateTimeFormatter.parse(str));
     }
 
-//    @Cacheable("SysConfigServiceGetBoolean")
+    @Cacheable("SysConfigServiceGetBoolean")
     public boolean getBoolean(String name) {
         String str = sysConfigRepo.findByName(name).map(SysConfig::getValue)
                 .orElseThrow(new BusinessException("配置不存在"));
         return str.equals("1");
     }
 
-//    @Cacheable("SysConfigServiceGetInt")
+    @Cacheable("SysConfigServiceGetInt")
     public int getInt(String name) {
         String str = sysConfigRepo.findByName(name).map(SysConfig::getValue)
                 .orElseThrow(new BusinessException("配置不存在"));

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

@@ -20,6 +20,7 @@ import com.izouma.nineth.security.JwtUserFactory;
 import com.izouma.nineth.service.sms.SmsService;
 import com.izouma.nineth.service.storage.StorageService;
 import com.izouma.nineth.utils.JpaUtils;
+import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,6 +31,8 @@ import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.jpa.domain.Specification;
@@ -58,6 +61,23 @@ public class UserService {
     private FollowService  followService;
     private FollowRepo     followRepo;
 
+    //    @CacheEvict(value = "user", key = "#user.username")
+    public User update(User user) {
+        User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));
+        ObjUtils.merge(orig, user);
+        orig = userRepo.save(orig);
+        userRepo.updateMinterForCollection(orig.getId());
+        userRepo.updateOwnerForCollection(orig.getId());
+        userRepo.updateMinterForOrder(orig.getId());
+        userRepo.updateMinterForAsset(orig.getId());
+        return orig;
+    }
+
+    //    @Cacheable("user")
+    public Optional<User> findByUsernameAndDelFalse(String username) {
+        return userRepo.findByUsernameAndDelFalse(username);
+    }
+
     public Page<User> all(PageQuery pageQuery) {
         Specification<User> specification = JpaUtils.toSpecification(pageQuery, User.class);
 
@@ -112,8 +132,8 @@ public class UserService {
     }
 
     public User loginByPhone(String phone, String code) {
+        User user = userRepo.findByPhoneAndDelFalse(phone).orElseThrow(new BusinessException("该手机未注册"));
         smsService.verify(phone, code);
-        User user = userRepo.findByPhoneAndDelFalse(phone).orElse(null);
         if (user == null) {
             String name = "9th_" + RandomStringUtils.randomAlphabetic(8);
             user = create(UserRegister.builder()

src/main/java/com/izouma/nineth/utils/excel/BigIntegerConverter.java

@@ -0,0 +1,39 @@
+package com.izouma.nineth.utils.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.math.BigInteger;
+import java.time.LocalDate;
+
+public class BigIntegerConverter implements Converter<BigInteger> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return BigInteger.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public BigInteger convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            return BigInteger.valueOf(Long.valueOf(cellData.getStringValue()));
+        } catch (Exception e) {
+        }
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(BigInteger bigInteger, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (bigInteger != null) {
+            return new CellData(bigInteger.toString());
+        }
+        return null;
+    }
+}

src/main/java/com/izouma/nineth/utils/excel/ExcelUtils.java

@@ -16,8 +16,9 @@ public class ExcelUtils<T> {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
         EasyExcel.write(response.getOutputStream(), data.get(0).getClass()).sheet("sheet")
-                 .registerConverter(new LocalDateConverter())
-                 .registerConverter(new LocalDateTimeConverter())
-                 .doWrite(data);
+                .registerConverter(new LocalDateConverter())
+                .registerConverter(new LocalDateTimeConverter())
+                .registerConverter(new BigIntegerConverter())
+                .doWrite(data);
     }
 }

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

@@ -1,7 +1,11 @@
 package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.Order;
+import com.izouma.nineth.dto.OrderDTO;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.CollectionType;
+import com.izouma.nineth.enums.OrderStatus;
+import com.izouma.nineth.enums.PayMethod;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.OrderRepo;
 import com.izouma.nineth.service.OrderService;
@@ -9,12 +13,15 @@ import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/order")
@@ -55,7 +62,14 @@ public class OrderController extends BaseController {
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
         List<Order> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
+        ExcelUtils.export(response, data.stream().map(order -> {
+            OrderDTO dto = new OrderDTO();
+            BeanUtils.copyProperties(order, dto);
+            dto.setStatus(Optional.ofNullable(order.getStatus()).map(OrderStatus::getDescription).orElse(null));
+            dto.setPayMethod(Optional.ofNullable(order.getPayMethod()).map(PayMethod::getDescription).orElse(null));
+            dto.setType(Optional.ofNullable(order.getType()).map(CollectionType::getDescription).orElse(null));
+            return dto;
+        }).collect(Collectors.toList()));
     }
 
     @PostMapping("/create")

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

@@ -8,12 +8,14 @@ import com.izouma.nineth.service.SysConfigService;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 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.math.BigDecimal;
 import java.util.List;
 
 @RestController
@@ -25,7 +27,7 @@ public class SysConfigController extends BaseController {
 
     @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-//    @CacheEvict(value = {"SysConfigServiceGetBigDecimal", "SysConfigServiceGetTime", "SysConfigServiceGetBoolean", "SysConfigServiceGetInt"}, allEntries = true)
+    @CacheEvict(value = {"SysConfigServiceGetBigDecimal", "SysConfigServiceGetTime", "SysConfigServiceGetBoolean", "SysConfigServiceGetInt"}, allEntries = true)
     public SysConfig save(@RequestBody SysConfig record) {
         return sysConfigRepo.save(record);
     }
@@ -41,6 +43,12 @@ public class SysConfigController extends BaseController {
         return sysConfigRepo.findByName(id).orElseThrow(new BusinessException("无记录"));
     }
 
+    @Cacheable("SysConfigServiceGetBigDecimal")
+    @GetMapping("/getDecimal/{id}")
+    public BigDecimal getDecimal(@PathVariable String id) {
+        return sysConfigService.getBigDecimal(id);
+    }
+
     @PostMapping("/del/{id}")
     public void del(@PathVariable String id) {
         sysConfigRepo.deleteById(id);

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

@@ -58,14 +58,7 @@ public class UserController extends BaseController {
     @PostMapping("/save")
     public User save(@RequestBody User user) {
         if (user.getId() != null) {
-            User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, user);
-            orig = userRepo.save(orig);
-            userRepo.updateMinterForCollection(orig.getId());
-            userRepo.updateOwnerForCollection(orig.getId());
-            userRepo.updateMinterForOrder(orig.getId());
-            userRepo.updateMinterForAsset(orig.getId());
-            return orig;
+            return userService.update(user);
         }
         return userRepo.save(user);
     }

src/main/resources/application.yaml

@@ -32,13 +32,14 @@ spring:
       hibernate:
         enable_lazy_load_no_trans: true
   redis:
-    host: 127.0.0.1
+    host: 118.178.226.110
     port: 6379
     lettuce:
       pool:
         max_active: 8
         max_idle: 8
         min_idle: 0
+    password: 3edc#EDC
   servlet:
     multipart:
       max_file_size: 100MB
@@ -47,7 +48,7 @@ spring:
     settings:
       number_format: 0
   cache:
-    type: caffeine
+    type: redis
 jwt:
   secret: XvAD0kboD76Dpebm
   header: Authorization

src/main/vue/src/components/CropUpload.vue

@@ -1,6 +1,11 @@
 <template>
     <div>
-        <div id="upload-wrapper" class="upload-wrapper">
+        <div class="upload-wrapper" v-show="disabled" key="2">
+            <img v-if="src" :src="src" />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            <div v-if="loading" class="loading"><i class="el-icon-loading"></i></div>
+        </div>
+        <div id="upload-wrapper" class="upload-wrapper" v-show="!disabled" key="1">
             <img v-if="src" :src="src" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             <div v-if="loading" class="loading"><i class="el-icon-loading"></i></div>
@@ -15,6 +20,7 @@
             :upload-url="uploadUrl"
             :labels="{ submit: '确定', cancel: '取消' }"
             :upload-headers="headers"
+            disabled
         />
     </div>
 </template>
@@ -32,6 +38,10 @@ export default {
         height: {
             type: Number,
             default: 350
+        },
+        disabled: {
+            default: false,
+            type: Boolean
         }
     },
     created() {

src/main/vue/src/components/ObjectUpload.vue

@@ -42,7 +42,8 @@ export default {
     props: {
         value: {},
         disabled: {
-            default: false
+            default: false,
+            type: Boolean
         }
     },
     data() {

src/main/vue/src/views/CollectionEdit.vue

@@ -108,7 +108,18 @@
                     <!-- <el-form-item prop="likes" label="点赞">
                         <el-input-number v-model="formData.likes"></el-input-number>
                     </el-form-item> -->
-                    <el-form-item prop="onShelf" label="上架">
+                    <el-form-item prop="startTime" label="定时发布">
+                        <el-switch v-model="formData.scheduleSale" active-text="是" inactive-text="否"></el-switch>
+                        <div style="margin-top: 10px" v-if="formData.scheduleSale">
+                            <el-date-picker
+                                v-model="formData.startTime"
+                                type="datetime"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="发布时间"
+                            ></el-date-picker>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="onShelf" label="上架" v-if="!formData.scheduleSale">
                         <el-switch v-model="formData.onShelf" active-text="上架" inactive-text="下架"></el-switch>
                     </el-form-item>
                     <el-form-item prop="salable" label="可售">
@@ -151,7 +162,15 @@ export default {
     data() {
         return {
             saving: false,
-            formData: { onShelf: true, salable: true, properties: [], type: 'DEFAULT', source: 'OFFICIAL', pics: [] },
+            formData: {
+                onShelf: true,
+                salable: true,
+                properties: [],
+                type: 'DEFAULT',
+                source: 'OFFICIAL',
+                pics: [],
+                scheduleSale: false
+            },
             rules: {
                 name: [
                     {
@@ -348,4 +367,9 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/ .el-switch__label--left {
+    width: 50px;
+    text-align: right;
+}
+</style>

src/main/vue/src/views/CollectionList.vue

@@ -45,6 +45,11 @@
             <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="名称" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="createdAt" label="创建时间" width="150">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
             <el-table-column prop="pics" label="作品内容" width="90" align="center">
                 <template slot-scope="{ row }">
                     <el-image
@@ -59,8 +64,16 @@
             <el-table-column prop="minterId" label="铸造者ID"> </el-table-column>
             <el-table-column prop="type" label="类型" :formatter="typeFormatter"> </el-table-column>
             <el-table-column prop="source" label="来源" :formatter="sourceFormatter"> </el-table-column>
-            <el-table-column prop="total" label="发行数量" width="90" align="center"> </el-table-column>
-            <el-table-column prop="stock" label="剩余库存" width="90" align="center"> </el-table-column>
+            <el-table-column prop="total" label="发行数量" width="105" align="center">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
+            <el-table-column prop="stock" label="剩余库存" width="105" align="center">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
             <el-table-column prop="onShelf" label="上架" width="90" align="center">
                 <template v-slot="{ row }">
                     <el-tag type="success" v-if="row.onShelf">是</el-tag>
@@ -101,8 +114,10 @@
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
+import SortableHeader from '../components/SortableHeader.vue';
 
 export default {
+    components: { SortableHeader },
     name: 'CollectionList',
     mixins: [pageableTable],
     data() {
@@ -120,7 +135,8 @@ export default {
                 { label: '官方', value: 'OFFICIAL' },
                 { label: '用户铸造', value: 'USER' },
                 { label: '转让', value: 'TRANSFER' }
-            ]
+            ],
+            sort: { createdAt: 'desc' }
         };
     },
     computed: {

src/main/vue/src/views/MenuAuthority.vue

@@ -80,7 +80,7 @@ export default {
                     return this.$http.get('/authority/all');
                 })
                 .then(res => {
-                    this.authorities = res;
+                    this.authorities = res.filter(i => i.name === 'ROLE_ADMIN' || i.name === 'ROLE_OPERATOR');
                     if (!this.authority && res[0]) {
                         this.authority = res[0].name;
                     }

src/main/vue/src/views/Menus.vue

@@ -88,7 +88,7 @@ export default {
     created() {
         this.getData();
         this.$http.get('/authority/all').then(res => {
-            this.authorities = res;
+            this.authorities = res.filter(i => i.name === 'ROLE_ADMIN' || i.name === 'ROLE_OPERATOR');
         });
     },
     data() {

src/main/vue/src/views/OrderEdit.vue

@@ -2,91 +2,93 @@
     <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>
+            <!-- <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="94px" 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="collectionId" label="藏品ID">
-                                    <el-input-number type="number" v-model="formData.collectionId"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="qty" label="数量">
-                                    <el-input v-model="formData.qty"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="name" label="名称">
-                                    <el-input v-model="formData.name"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="pic" label="图片">
-                                    <multi-upload v-model="formData.pic"></multi-upload>
-                        </el-form-item>
-                        <el-form-item prop="minter" label="铸造者">
-                        </el-form-item>
-                        <el-form-item prop="minterId" label="铸造者ID">
-                                    <el-input-number type="number" v-model="formData.minterId"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="minterAvatar" label="铸造者头像">
-                        </el-form-item>
-                        <el-form-item prop="price" label="价格">
-                                    <el-input-number type="number" v-model="formData.price"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="gasPrice" label="gas费">
-                                    <el-input-number type="number" v-model="formData.gasPrice"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="totalPrice" label="总价">
-                                    <el-input-number type="number" v-model="formData.totalPrice"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="status" label="状态">
-                                    <el-select v-model="formData.status" clearable filterable placeholder="请选择">
-                                        <el-option
-                                                v-for="item in statusOptions"
-                                                :key="item.value"
-                                                :label="item.label"
-                                                :value="item.value">
-                                        </el-option>
-                                    </el-select>
-                        </el-form-item>
-                        <el-form-item prop="payMethod" label="支付方式">
-                                    <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
-                                        <el-option
-                                                v-for="item in payMethodOptions"
-                                                :key="item.value"
-                                                :label="item.label"
-                                                :value="item.value">
-                                        </el-option>
-                                    </el-select>
-                        </el-form-item>
-                        <el-form-item prop="transactionId" label="交易ID">
-                                    <el-input v-model="formData.transactionId"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="payTime" label="支付时间">
-                                    <el-date-picker
-                                            v-model="formData.payTime"
-                                            type="datetime"
-                                            value-format="yyyy-MM-dd HH:mm:ss"
-                                            placeholder="选择日期时间">
-                                    </el-date-picker>
-                        </el-form-item>
-                        <el-form-item prop="txHash" label="链上hash">
-                                    <el-input v-model="formData.txHash"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="gas" label="消耗gas">
-                                    <el-input v-model="formData.gas"></el-input>
-                        </el-form-item>
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="94px"
+                    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" disabled></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="collectionId" label="藏品ID">
+                        <el-input-number type="number" v-model="formData.collectionId" disabled></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="qty" label="数量">
+                        <el-input v-model="formData.qty" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item prop="name" label="名称">
+                        <el-input v-model="formData.name" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="图片">
+                        <object-upload :value="pic" disabled></object-upload>
+                    </el-form-item>
+                    <el-form-item prop="minterId" label="铸造者ID">
+                        <el-input-number type="number" v-model="formData.minterId" disabled></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="price" label="价格">
+                        <el-input-number type="number" v-model="formData.price" disabled></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="gasPrice" label="gas费">
+                        <el-input-number type="number" v-model="formData.gasPrice" disabled></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="totalPrice" label="总价">
+                        <el-input-number type="number" v-model="formData.totalPrice" disabled></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="status" label="状态">
+                        <el-select v-model="formData.status" clearable filterable placeholder="请选择" disabled>
+                            <el-option
+                                v-for="item in statusOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="payMethod" label="支付方式">
+                        <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择" disabled>
+                            <el-option
+                                v-for="item in payMethodOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="transactionId" label="交易ID">
+                        <el-input v-model="formData.transactionId" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item prop="payTime" label="支付时间">
+                        <el-date-picker
+                            v-model="formData.payTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择日期时间"
+                            disabled
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="txHash" label="链上hash">
+                        <el-input v-model="formData.txHash" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item prop="gas" label="消耗gas">
+                        <el-input v-model="formData.gas" disabled></el-input>
+                    </el-form-item>
                     <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" type="primary">
-                            保存
-                        </el-button>
+                        <!-- <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> -->
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>
@@ -95,73 +97,87 @@
     </div>
 </template>
 <script>
-    export default {
-        name: 'OrderEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('order/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: {
-                },
-                statusOptions: [{"label":"未支付","value":"NOT_PAID"},{"label":"已支付，处理中","value":"PROCESSING"},{"label":"已完成","value":"FINISH"},{"label":"已取消","value":"CANCELLED"}],
-                payMethodOptions: [{"label":"微信","value":"WEIXIN"},{"label":"支付宝","value":"ALIPAY"}],
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
+export default {
+    name: 'OrderEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('order/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
                 });
-            },
-            submit() {
-                let data = {...this.formData};
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            statusOptions: [
+                { label: '未支付', value: 'NOT_PAID' },
+                { label: '已支付，处理中', value: 'PROCESSING' },
+                { label: '已完成', value: 'FINISH' },
+                { label: '已取消', value: 'CANCELLED' }
+            ],
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '支付宝', value: 'ALIPAY' }
+            ]
+        };
+    },
+    computed: {
+        pic() {
+            return (this.formData.pic || [])[0] || {};
+        }
+    },
+    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('/order/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(`/order/del/${this.formData.id}`)
-                }).then(() => {
+            this.saving = true;
+            this.$http
+                .post('/order/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(`/order/del/${this.formData.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.$router.go(-1);
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         console.log(e);
                         this.$message.error((e || {}).error || '删除失败');
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
 <style lang="less" scoped></style>

src/main/vue/src/views/OrderList.vue

@@ -77,8 +77,8 @@
             <el-table-column prop="gasUsed" label="消耗gas"> </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>
+                    <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>
@@ -189,7 +189,7 @@ export default {
                     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]);
+                    link.setAttribute('download', '订单.xlsx');
                     document.body.appendChild(link);
                     link.click();
                     link.remove();

src/main/vue/src/views/UserEdit.vue

@@ -22,14 +22,14 @@
                     style="max-width: 500px"
                 >
                     <el-form-item prop="avatar" label="头像">
-                        <crop-upload v-model="formData.avatar"></crop-upload>
+                        <crop-upload v-model="formData.avatar" :disabled="formData.id"></crop-upload>
                     </el-form-item>
                     <el-form-item prop="username" label="用户名">
-                        <el-input v-model="formData.username"></el-input>
+                        <el-input v-model="formData.username" :disabled="formData.id"></el-input>
                         <div class="gen" @dblclick="gen"></div>
                     </el-form-item>
                     <el-form-item prop="nickname" label="昵称">
-                        <el-input v-model="formData.nickname"></el-input>
+                        <el-input v-model="formData.nickname" :disabled="formData.id"></el-input>
                     </el-form-item>
                     <el-form-item v-if="formData.id" label="密码">
                         <el-button type="primary" plain @click="resetPassword" size="mini">重置 </el-button>
@@ -38,7 +38,7 @@
                         <el-input v-model="formData.password"></el-input>
                     </el-form-item>
                     <el-form-item prop="phone" label="手机">
-                        <el-input v-model="formData.phone" :disabled="formData.id"></el-input>
+                        <el-input v-model="formData.phone"></el-input>
                     </el-form-item>
                     <el-form-item prop="authorities" label="角色">
                         <el-select
@@ -91,7 +91,7 @@ export default {
         this.$http
             .get('/authority/all')
             .then(res => {
-                this.authorities = res;
+                this.authorities = res.filter(i => /ROLE_ADMIN|ROLE_OPERATOR|ROLE_USER|ROLE_MINTER/.test(i.name));
             })
             .catch(e => {
                 console.log(e);
@@ -101,7 +101,7 @@ export default {
         return {
             saving: false,
             formData: {
-                avatar: 'https://zhumj.oss-cn-hangzhou.aliyuncs.com/image/user.jpg'
+                avatar: 'https://awesomeadmin.oss-cn-hangzhou.aliyuncs.com/image/avatar_male.png'
             },
             rules: {
                 avatar: [{ required: true, message: '请上传头像', trigger: 'blur' }],
@@ -115,7 +115,7 @@ export default {
                         trigger: 'blur'
                     }
                 ],
-                authorities: [{ required: true, message: '请选择角色', trigger: 'blur' }],
+                authorities: [{ required: true, message: '请选择角色', trigger: 'blur' }]
             },
             authorities: []
         };

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

@@ -1,9 +1,9 @@
 <template>
     <div class="list-view">
         <page-title>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" :loading="downloading" class="filter-item">
+            <!-- <el-button @click="addRow" type="primary" icon="el-icon-plus" :loading="downloading" class="filter-item">
                 新增
-            </el-button>
+            </el-button> -->
             <el-button @click="download" icon="el-icon-upload2" :loading="downloading" class="filter-item">
                 导出
             </el-button>