From 371f5e23c3d7353598a48ea1849d7c46d05a49e9 Mon Sep 17 00:00:00 2001
From: lealife <lifephp@gmail.com>
Date: Thu, 27 Jul 2017 20:25:54 +0800
Subject: [PATCH] realease

---
 app/service/ConfigService.go            | 2 +-
 app/views/admin/setting/export_pdf.html | 6 +++---
 bin/release.sh                          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/service/ConfigService.go b/app/service/ConfigService.go
index ee9b957..9885114 100644
--- a/app/service/ConfigService.go
+++ b/app/service/ConfigService.go
@@ -606,5 +606,5 @@ func (this *ConfigService) HomePageIsAdminsBlog() bool {
 }
 
 func (this *ConfigService) GetVersion() string {
-	return "2.4"
+	return "2.5"
 }
diff --git a/app/views/admin/setting/export_pdf.html b/app/views/admin/setting/export_pdf.html
index 0686eb3..8268308 100644
--- a/app/views/admin/setting/export_pdf.html
+++ b/app/views/admin/setting/export_pdf.html
@@ -3,16 +3,16 @@
 
 <div class="row">
 
-<div class="col-sm-6">
+<div class="col-sm-8">
 	<form id="add_user_form">
 		<section class="panel panel-default">
 			<div class="panel-body">
 				<div class="form-group">
 					<label>Wkhtmltopdf Binary Path</label>
-					<input type="text" class="form-control" placeholder="/usr/local/bin/wkhtmltopdf" name="path" value="{{.str.exportPdfBinPath}}">
+					<input type="text" class="form-control" placeholder="/usr/local/bin/wkhtmltopdf or C:\Program Files\wkhtmltopdf\bin\wkhtmltopdf.exe" name="path" value="{{.str.exportPdfBinPath}}">
 					Leanote use <a target="_blank" href="http://wkhtmltopdf.org">wkhtmltopdf</a> to export pdf. You should install it on your server.
 					<br />
-					Please input the path that wkhtmltopdf installed, e.g. <code>/usr/local/bin/wkhtmltopdf</code> on mac os/linux or <code><C:\Program Files\wkhtmltopdf\bin\wkhtmltopdf.exe/code> on windows.
+					Please input the path that wkhtmltopdf installed, e.g. <code>/usr/local/bin/wkhtmltopdf</code> on mac os/linux or <code>C:\Program Files\wkhtmltopdf\bin\wkhtmltopdf.exe</code> on windows.
 				</div>
 			</div>
 
diff --git a/bin/release.sh b/bin/release.sh
index 99bbaab..993564e 100644
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -9,7 +9,7 @@ SP=$(cd "$(dirname "$0")"; pwd)
 tmp="/Users/life/Desktop/leanote_release"
 
 # version
-V="v2.4"
+V="v2.5"
 
 ##=================================
 # 1. 先build 成 3个平台, 2种bit = 6种