posts = postService.findPostsByTags(tag, pageable);
+ model.addAttribute("posts", posts);
+ model.addAttribute("tag", tag);
return this.render("index");
}
}
diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java
index 359c721e8..a06372d1d 100644
--- a/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java
+++ b/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java
@@ -1,9 +1,7 @@
package cc.ryanc.halo.web.interceptor;
import cc.ryanc.halo.model.dto.HaloConst;
-import cc.ryanc.halo.service.OptionsService;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
@@ -20,12 +18,9 @@ import javax.servlet.http.HttpServletResponse;
@Component
public class InstallInterceptor implements HandlerInterceptor {
- @Autowired
- private OptionsService optionsService;
-
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception {
- if(StringUtils.equals("true",HaloConst.OPTIONS.get("is_install"))){
+ if (StringUtils.equals("true", HaloConst.OPTIONS.get("is_install"))) {
return true;
}
response.sendRedirect("/install");
@@ -33,8 +28,10 @@ public class InstallInterceptor implements HandlerInterceptor {
}
@Override
- public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception { }
+ public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception {
+ }
@Override
- public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception { }
+ public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
+ }
}
diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java
index f30a1e4fb..1b182527d 100755
--- a/src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java
+++ b/src/main/java/cc/ryanc/halo/web/interceptor/LoginInterceptor.java
@@ -15,12 +15,12 @@ import javax.servlet.http.HttpServletResponse;
* description: 登录拦截器
*/
@Component
-public class LoginInterceptor implements HandlerInterceptor{
+public class LoginInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
Object obj = request.getSession().getAttribute(HaloConst.USER_SESSION_KEY);
//如果user不为空则放行
- if(null!=obj){
+ if (null != obj) {
return true;
}
//否则拦截并跳转到登录
@@ -29,8 +29,10 @@ public class LoginInterceptor implements HandlerInterceptor{
}
@Override
- public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { }
+ public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+ }
@Override
- public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { }
+ public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+ }
}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index eb022cbbd..57f53c377 100755
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -7,22 +7,28 @@ server:
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
+
# H2database 配置
- driver-class-name: org.h2.Driver
- url: jdbc:h2:file:~/halo/halo
- username: admin
+ #driver-class-name: org.h2.Driver
+ #url: jdbc:h2:file:~/halo/halo
+ #username: admin
+ #password: 123456
+
+ # MySql配置
+ driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/halodb?characterEncoding=utf8&useSSL=false
+ username: root
password: 123456
- h2:
- console:
- settings:
- web-allow-others: true
- path: /h2-console
- enabled: true
+ #h2:
+ #console:
+ #settings:
+ #web-allow-others: true
+ #path: /h2-console
+ #enabled: true
jpa:
hibernate:
ddl-auto: update
- show-sql: true
- database-platform: org.hibernate.dialect.H2Dialect
+ show-sql: false
freemarker:
allow-request-override: false
cache: false
diff --git a/src/main/resources/static/js/app.js b/src/main/resources/static/js/app.js
index 4a1776443..038abda5f 100755
--- a/src/main/resources/static/js/app.js
+++ b/src/main/resources/static/js/app.js
@@ -33,4 +33,19 @@ function stringEncode(str){
div.textContent=str;
}
return div.innerHTML;
+}
+
+/**
+ * 保存设置选项
+ */
+function saveOptions(option) {
+ var param = $('#'+option).serialize();
+ $.ajax({
+ type: 'post',
+ url: '/admin/option/save',
+ data: param,
+ success: function (result) {
+ showMsg("保存成功！","success",1000);
+ }
+ });
}
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/admin_comment.ftl b/src/main/resources/templates/admin/admin_comment.ftl
index 6a18fdae3..abadcd2f1 100755
--- a/src/main/resources/templates/admin/admin_comment.ftl
+++ b/src/main/resources/templates/admin/admin_comment.ftl
@@ -58,12 +58,12 @@
<#switch comment.commentStatus>
<#case 0>
-
+
<#break >
<#case 1>
通过
-
+
<#break >
<#case 2>
还原
diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl
index 54c6af036..9487a4ea9 100755
--- a/src/main/resources/templates/admin/admin_index.ftl
+++ b/src/main/resources/templates/admin/admin_index.ftl
@@ -333,6 +333,7 @@
+
<#include "module/_footer.ftl">
diff --git a/src/main/resources/templates/admin/admin_option.ftl b/src/main/resources/templates/admin/admin_option.ftl
index 19ec26d1b..1fa692297 100755
--- a/src/main/resources/templates/admin/admin_option.ftl
+++ b/src/main/resources/templates/admin/admin_option.ftl
@@ -76,11 +76,7 @@
-
-
+ <#---->
+ <#---->