gallery = galleryService.findByGalleryId(galleryId);
+ model.addAttribute("gallery",gallery.get());
+
+ model.addAttribute("options",HaloConst.OPTIONS);
+ return "admin/widget/_gallery-detail";
+ }
+
+ /**
+ * 删除图库中的图片
+ *
+ * @param galleryId galleryId
+ * @return string
+ */
+ @GetMapping(value = "/gallery/remove")
+ @ResponseBody
+ public boolean removeGallery(@RequestParam("galleryId") Long galleryId){
+ try {
+ galleryService.removeByGalleryId(galleryId);
+ }catch (Exception e){
+ log.error("删除图片失败:{0}",e.getMessage());
+ return false;
+ }
+ return true;
+ }
}
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
index ee045e99b..66e8afc27 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javax.swing.text.html.Option;
import javax.websocket.server.PathParam;
import java.util.List;
import java.util.Optional;
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
index 1e9f48afa..c72e97df5 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.*;
import javax.websocket.server.PathParam;
import java.util.List;
-import java.util.Optional;
/**
* @author : RYAN0UP
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 1abc4755a..efacec492 100755
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8090
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/src/main/resources/templates/admin/admin_comment.ftl b/src/main/resources/templates/admin/admin_comment.ftl
index 6aa091b23..e3bbbc1cc 100755
--- a/src/main/resources/templates/admin/admin_comment.ftl
+++ b/src/main/resources/templates/admin/admin_comment.ftl
@@ -80,10 +80,10 @@
第${comments.number+1}/${comments.totalPages}页
diff --git a/src/main/resources/templates/admin/admin_menu.ftl b/src/main/resources/templates/admin/admin_menu.ftl
index 12372e6a6..bf0f3a991 100644
--- a/src/main/resources/templates/admin/admin_menu.ftl
+++ b/src/main/resources/templates/admin/admin_menu.ftl
@@ -39,7 +39,7 @@
-
+