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

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

@@ -135,7 +135,7 @@ public class DomainOrderService {
 
         DomainOrder domainOrder = new DomainOrder();
 //        domainOrder.setPic(Collections.singletonList(fileObject));
-        domain = domain.replaceAll("[^a-zA-Z0-9\\u4E00-\\u9FA5]", "");
+//        domain = domain.replaceAll("[^a-zA-Z0-9\\u4E00-\\u9FA5]", "");
         domainOrder.setPicName(domain);
         domainOrder.setPrice(price);
         domainOrder.setDomainName((domain + ".nft").toLowerCase());
@@ -259,7 +259,7 @@ public class DomainOrderService {
             int dotIndex = domain.indexOf(".");
             domain = domain.substring(0, dotIndex);
         }
-        domain = domain.replaceAll("[^a-zA-Z0-9\\u4E00-\\u9FA5]", "");
+//        domain = domain.replaceAll("[^a-zA-Z0-9\\u4E00-\\u9FA5]", "");
         Pageable pageable = PageRequest.of(0, 10, Sort.by("createdAt").descending());
         List<DomainOrder> used = domainOrderRepo.searchUsedDomain("%" + domain + "%", OrderStatus.CANCELLED, pageable)
                 .getContent();

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

@@ -2,11 +2,13 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.DomainOrder;
 import com.izouma.nineth.dto.excel.DomainCountDTO;
+import com.izouma.nineth.enums.AuthorityName;
 import com.izouma.nineth.service.DomainOrderService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.DomainOrderRepo;
 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.cache.annotation.Cacheable;
@@ -29,7 +31,7 @@ public class DomainOrderController extends BaseController {
     private DomainOrderService domainOrderService;
     private DomainOrderRepo    domainOrderRepo;
 
-    //@PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public DomainOrder save(@RequestBody DomainOrder record) {
         if (record.getId() != null) {
@@ -44,6 +46,9 @@ public class DomainOrderController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<DomainOrder> all(@RequestBody PageQuery pageQuery) {
+        if (!SecurityUtils.hasRole(AuthorityName.ROLE_ADMIN)) {
+            pageQuery.getQuery().put("userId", SecurityUtils.getAuthenticatedUser().getId());
+        }
         if (pageQuery.getSize() == 50) {
             return new PageImpl<>(domainOrderService.newest(), PageRequest.of(0, 50), 50);
         }
@@ -61,7 +66,7 @@ public class DomainOrderController extends BaseController {
     }
 
     @PostMapping("/topTen")
-//    @Cacheable(value = "domainTopTen")
+    @Cacheable(value = "domainTopTen")
     public List<DomainCountDTO> topTen() {
         return domainOrderService.top20();
     }
@@ -71,11 +76,7 @@ public class DomainOrderController extends BaseController {
         return domainOrderRepo.findById(id).orElseThrow(new BusinessException("无记录"));
     }
 
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        domainOrderRepo.softDelete(id);
-    }
-
+    @PreAuthorize("hasRole('ADMIN')")
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {