From 6c88aa4c056169327ffb26e705fe5e1042103810 Mon Sep 17 00:00:00 2001
From: mrdong916 <mrdong916@163.com>
Date: Thu, 19 Sep 2019 00:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=A2=9E=E5=8A=A0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../halo/app/controller/admin/api/LinkController.java    | 2 +-
 src/main/java/run/halo/app/model/dto/LinkDTO.java        | 2 ++
 src/main/java/run/halo/app/model/entity/Link.java        | 9 +++++++++
 src/main/java/run/halo/app/model/params/LinkParam.java   | 3 +++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/run/halo/app/controller/admin/api/LinkController.java b/src/main/java/run/halo/app/controller/admin/api/LinkController.java
index fec0f7aaf..ca59717c2 100644
--- a/src/main/java/run/halo/app/controller/admin/api/LinkController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/LinkController.java
@@ -35,7 +35,7 @@ public class LinkController {
      * @return List
      */
     @GetMapping
-    public List<LinkDTO> listLinks(@SortDefault(sort = "updateTime", direction = Sort.Direction.DESC) Sort sort) {
+    public List<LinkDTO> listLinks(@SortDefault(sort = "priority", direction = Sort.Direction.ASC) Sort sort) {
         return linkService.listDtos(sort);
     }
 
diff --git a/src/main/java/run/halo/app/model/dto/LinkDTO.java b/src/main/java/run/halo/app/model/dto/LinkDTO.java
index 5882b1c62..2c95ca0d8 100644
--- a/src/main/java/run/halo/app/model/dto/LinkDTO.java
+++ b/src/main/java/run/halo/app/model/dto/LinkDTO.java
@@ -24,4 +24,6 @@ public class LinkDTO implements OutputConverter<LinkDTO, Link> {
     private String description;
 
     private String team;
+
+    private Integer priority;
 }
diff --git a/src/main/java/run/halo/app/model/entity/Link.java b/src/main/java/run/halo/app/model/entity/Link.java
index 06cd24d83..3b64992e7 100644
--- a/src/main/java/run/halo/app/model/entity/Link.java
+++ b/src/main/java/run/halo/app/model/entity/Link.java
@@ -54,6 +54,11 @@ public class Link extends BaseEntity {
     @Column(name = "team", columnDefinition = "varchar(255) default ''")
     private String team;
 
+    /**
+     * Sort.
+     */
+    @Column(name = "priority", columnDefinition = "int default 0")
+    private Integer priority;
 
     @Override
     public void prePersist() {
@@ -61,6 +66,10 @@ public class Link extends BaseEntity {
 
         id = null;
 
+        if (priority == null) {
+            priority = 0;
+        }
+
         if (logo == null) {
             logo = "";
         }
diff --git a/src/main/java/run/halo/app/model/params/LinkParam.java b/src/main/java/run/halo/app/model/params/LinkParam.java
index b0e7a3b33..629e40110 100644
--- a/src/main/java/run/halo/app/model/params/LinkParam.java
+++ b/src/main/java/run/halo/app/model/params/LinkParam.java
@@ -5,6 +5,7 @@ import org.hibernate.validator.constraints.URL;
 import run.halo.app.model.dto.base.InputConverter;
 import run.halo.app.model.entity.Link;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
@@ -35,4 +36,6 @@ public class LinkParam implements InputConverter<Link> {
     @Size(max = 255, message = "友情链接分组的字符长度 {max}")
     private String team;
 
+    @Min(value = 0, message = "排序编号不能低于 {value}")
+    private Integer priority;
 }