Merge branch 'master' into dev

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

@@ -33,6 +33,7 @@ import org.springframework.data.redis.core.BoundValueOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.PostConstruct;
 import javax.persistence.criteria.Predicate;
@@ -456,4 +457,17 @@ public class CollectionService {
         rocketMQTemplate.convertAndSend(generalProperties.getUpdateQuotaTopic(), id);
         return stock;
     }
+
+    @Cacheable(value = "recommendLegacy", key = "#type")
+    public List<CollectionDTO> recommendLegacy(@RequestParam String type) {
+        return collectionRepo.recommend(type).stream().map(rc -> {
+            if (StringUtils.isNotBlank(rc.getRecommend().getPic())) {
+                rc.getCollection().setPic(Collections.singletonList(new FileObject(null, rc.getRecommend()
+                        .getPic(), null, null)));
+            }
+            CollectionDTO collectionDTO = new CollectionDTO();
+            BeanUtils.copyProperties(rc.getCollection(), collectionDTO);
+            return collectionDTO;
+        }).collect(Collectors.toList());
+    }
 }

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

@@ -131,7 +131,11 @@ public class CollectionController extends BaseController {
 
     @GetMapping("/recommend")
     @Cacheable("recommend")
-    public List<RecommendDTO> recommendAll() {
+    public Object recommendAll(@RequestParam(required = false) String type) {
+        if (StringUtils.isNotEmpty(type)) {
+            return collectionService.recommendLegacy(type);
+        }
+
         List<RecommendDTO> recommedDTOS = new ArrayList<>();
 
         List<RecommendDTO> collectionDTOS = collectionRepo.recommend("LIST").stream().map(rc -> {
@@ -157,6 +161,7 @@ public class CollectionController extends BaseController {
         return recommedDTOS;
     }
 
+
     @PreAuthorize("hasRole('ADMIN')")
     @GetMapping("/clearRecommend")
     public String clearRecommend() {

src/main/vue/package.json

@@ -43,8 +43,6 @@
     "@vue/cli-plugin-vuex": "^4.4.4",
     "@vue/cli-service": "^4.4.4",
     "@vue/eslint-config-prettier": "^6.0.0",
-    "element-theme": "^2.0.1",
-    "element-theme-chalk": "^2.15.1",
     "less": "^3.0.4",
     "less-loader": "^5.0.0",
     "less-vars-loader": "^1.1.0",

src/main/vue/src/router.js

@@ -174,7 +174,7 @@ const router = new Router({
                 {
                     path: '/orderUsedList',
                     name: 'OrderUsedList',
-                    component: () => import(/* webpackChunkName: "orderList" */ '@/views/OrderUsedList.vue'),
+                    component: () => import(/* webpackChunkName: "orderUsedList" */ '@/views/OrderUsedList.vue'),
                     meta: {
                         title: '订单'
                     }

src/main/vue/src/views/BlindBoxList.vue

@@ -46,7 +46,7 @@
         >
             <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="name" label="名称" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="pic" label="作品内容">
                 <template slot-scope="{ row }">
                     <el-image