📝 90%

conf/const.go

@@ -177,7 +177,19 @@ type Conf struct {
 	GithubClientId string `yaml:"GithubClientId"`
 	GithubClientSecret string `yaml:"GithubClientSecret"`
 
-	Test string `yaml:"Test"`
+	OtherScript string `yaml:"OtherScript"`
+
+	ThemeJs string `yaml:"ThemeJs"`
+	ThemeCss string `yaml:"ThemeCss"`
+	ThemeImg string `yaml:"ThemeImg"`
+	ThemeFancyboxCss string `yaml:"ThemeFancyboxCss"`
+	ThemeFancyboxJs string `yaml:"ThemeFancyboxJs"`
+	ThemeHLightCss string `yaml:"ThemeHLightCss"`
+	ThemeHLightJs string `yaml:"ThemeHLightJs"`
+	ThemeShareCss string `yaml:"ThemeShareCss"`
+	ThemeShareJs string `yaml:"ThemeShareJs"`
+	ThemeArchivesJs string `yaml:"ThemeArchivesJs"`
+	ThemeArchivesCss string `yaml:"ThemeArchivesCss"`
 }
 
 

conf/default.go

@@ -7,7 +7,6 @@
 package conf
 
 import (
-	"fmt"
 	"github.com/go-redis/redis"
 	"github.com/go-xorm/xorm"
 	"github.com/izghua/zgh"
@@ -23,7 +22,6 @@ import (
 	"github.com/speps/go-hashids"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
-	"os"
 	"path/filepath"
 	"time"
 )
@@ -34,6 +32,7 @@ var (
 	CacheClient *redis.Client
 	MailClient *mail.EmailParam
 	Cnf *Conf
+	Env string
 )
 
 
@@ -59,6 +58,7 @@ func ZLogInit() {
 	if err != nil {
 		zgh.ZLog().Error(err.Error())
 	}
+	return
 }
 
 func DbInit () {
@@ -71,15 +71,17 @@ func DbInit () {
 	sqlServer,err := conn.InitMysql(dbUser,dbPwd,dbPort,dbHost,dbdb)
 	SqlServer = sqlServer
 	if err != nil {
-		zgh.ZLog().Error("有错误",err.Error())
+		zgh.ZLog().Error("some errors",err.Error())
+		panic(err.Error())
 	}
+	return
 }
 
 func BackUpInit() {
 	bp := new(backup.BackUpParam)
 	dest := "./zip/"+time.Now().Format("2006-01-02")+".zip"
 	backu := bp.SetFilePath(Cnf.BackUpFilePath).
-		SetFiles("./backup").
+		SetFiles("./backup","./static/uploads/images").
 		SetDest(dest).SetCronSpec(Cnf.BackUpDuration)
 	data := make(map[string]string)
 	data[time.Now().Format("2006-01-02")+".zip"] = dest
@@ -97,6 +99,7 @@ func BackUpInit() {
 	} else {
 		zgh.ZLog().Info("message","Congratulations for backup")
 	}
+	return
 }
 
 
@@ -109,6 +112,7 @@ func AlarmInit() {
 	if err != nil {
 		zgh.ZLog().Error(err.Error())
 	}
+	return
 }
 
 func MailInit() {
@@ -118,9 +122,15 @@ func MailInit() {
 	mailHost :=  m.SetMailHost(mail.EmailType(Cnf.MailHost))
 	mails,err := m.MailInit(mailPwd,mailHost,mailUser)
 	if err != nil {
-		zgh.ZLog().Error(err.Error())
+		zgh.ZLog().Error("message",err.Error())
+	} else {
+		MailClient = mails
+		zgh.ZLog().Info("message","begin to backup")
+		BackUpInit()
+		return
 	}
 	MailClient = mails
+	return
 }
 
 
@@ -134,7 +144,7 @@ func ZHashIdInit() {
 		zgh.ZLog().Error(err.Error())
 	}
 	ZHashId = zHashId
-
+	return
 }
 
 func RedisInit() {
@@ -145,8 +155,10 @@ func RedisInit() {
 	client,err := rc.RedisInit(addr,db,pwd)
 	if err != nil {
 		zgh.ZLog().Error(err.Error())
+		panic(err.Error())
 	}
 	CacheClient = client
+	return
 }
 
 func JwtInit() {
@@ -158,13 +170,15 @@ func JwtInit() {
 	rc := jt.SetRedisCache(CacheClient)
 	tl := jt.SetTokenLife(time.Hour * time.Duration(Cnf.JwtTokenLife))
 	_ = jt.JwtInit(ad,jti,iss,sk,rc,tl)
+	return
 }
 
 func QCaptchaInit() {
 	qc := new(qq_captcha.QQCaptcha)
 	aid := qc.SetAid(Cnf.QCaptchaAid)
 	sk := qc.SetSecretKey(Cnf.QCaptchaSecretKey)
 	_ = qc.QQCaptchaInit(aid,sk)
+	return
 }
 
 func CnfInit() {
@@ -226,27 +240,60 @@ func CnfInit() {
 		GithubRepo : "",
 		GithubClientId : "",
 		GithubClientSecret : "",
+		ThemeJs: "/static/home/assets/js",
+		ThemeCss: "/static/home/assets/css",
+		ThemeImg: "/static/home/assets/img",
+		ThemeFancyboxCss: "/static/home/assets/fancybox",
+		ThemeFancyboxJs: "/static/home/assets/fancybox",
+		ThemeHLightCss: "/static/home/assets/highlightjs",
+		ThemeHLightJs: "/static/home/assets/highlightjs",
+		ThemeShareCss: "/static/home/assets/css",
+		ThemeShareJs: "/static/home/assets/js",
+		ThemeArchivesJs: "/static/home/assets/js",
+		ThemeArchivesCss: "/static/home/assets/css",
 	}
-	res,err := filepath.Abs(filepath.Dir("./main.go"))
-	if err != nil {
-		zgh.ZLog().Error(err.Error())
-	}
-	//filepath.Match("")
-	dir,err := os.Getwd()
-	err = filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-		return nil
-	})
 
-	files,_ := filepath.Glob("./*")
-	fmt.Println(files)
+
+	files,_ := filepath.Glob("./env.*.yaml")
+	dev := false
+	prod := false
 	for _,v := range files {
-		fmt.Println(v)
+		switch v {
+		case "env.dev.yaml":
+			dev = true
+		case "env.prod.yaml":
+			prod = true
+		default:
+			continue
+		}
 	}
 
+	var fileName string
+	var env string
+	if dev {
+		fileName = "/env.dev.yaml"
+		env = "dev"
+	} else if prod {
+		fileName = "/env.prod.yaml"
+		env = "prod"
+	} else {
+		fileName = "default"
+		env = "dev"
+	}
+
+	if fileName == "default" {
+		Cnf = cf
+		Env = env
+		return
+	}
 
+	res,err := filepath.Abs(filepath.Dir("./main.go"))
+	if err != nil {
+		zgh.ZLog().Error(err.Error())
+	}
 
 	//读取yaml配置文件
-	yamlFile, err := ioutil.ReadFile(res+"/env.dev.yaml")
+	yamlFile, err := ioutil.ReadFile(res+fileName)
 	if err != nil {
 		zgh.ZLog().Error(err.Error())
 	}
@@ -257,4 +304,6 @@ func CnfInit() {
 	}
 
 	Cnf = cf
+	Env = env
+	return
 }

env.example.yaml

@@ -55,7 +55,7 @@ QCaptchaSecretKey: ""
 
 # 项目有备份功能,默认都是这个目录.所以打包后,这个目录一定要带着,且有写权限
 BackUpFilePath: "./backup/"
-BackUpDuration: "* * */1 * *"
+BackUpDuration: "@daily"
 BackUpSentTo: "xzghua@gmail.com"
 
 # 文章图 可以上传到本地也可以上传到七牛,功能已实现,默认同时上传,以防图片丢了..
@@ -84,3 +84,19 @@ LinkIndexKey: "index:all:link:list"
 SystemIndexKey: "index:all:system:list"
 PostDetailIndexKey: "index:post:detail"
 ArchivesKey: "index:archives:list"
+
+# 额外的js
+OtherScript: "<script type=\"text/javascript\"></script>"
+
+# 前台的静态文件
+ThemeJs: "/static/home/assets/js"
+ThemeCss: "/static/home/assets/css"
+ThemeImg: "/static/home/assets/img"
+ThemeFancyboxCss: "/static/home/assets/fancybox"
+ThemeFancyboxJs: "/static/home/assets/fancybox"
+ThemeHLightCss: "/static/home/assets/highlightjs"
+ThemeHLightJs: "/static/home/assets/highlightjs"
+ThemeShareCss: "/static/home/assets/css"
+ThemeShareJs: "/static/home/assets/js"
+ThemeArchivesJs: "/static/home/assets/js"
+ThemeArchivesCss: "/static/home/assets/css"

main.go

@@ -10,31 +10,12 @@ import (
 	"fmt"
 	"github.com/izghua/go-blog/conf"
 	"github.com/izghua/go-blog/router"
-	"github.com/izghua/zgh/utils/cron"
-	"time"
 )
 
 func main() {
 	conf.DefaultInit()
 	//csrf
-	f := func() {
-		fmt.Println(time.Now().Format(time.RFC3339))
-	}
-	spec := "0 * * * * *"
-	cron.ZgCron(spec,f)
 
-
-	//d, err := yaml.Marshal(&c)
-	//if err != nil {
-	//	fmt.Println(err.Error())
-	//}
-
-	//conf.GetAppUrls()
-	//fmt.Println(conf.NConf.AppUrl)
-	//conf.SetValueToStruct("AppUrl","./imgages222")
-	//conf.SetValueToStruct("AppImgUrl","./imgages3333333")
-	//conf.SetValueToStruct("aaa","./imgages3333333")
-	//fmt.Println(conf.NConf.AppImgUrl,conf.NConf.AppUrl)
 	r := router.RoutersInit()
 	fmt.Println("开始运行")
 	_ = r.Run(":8081")

router/router.go

@@ -9,6 +9,7 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/izghua/go-blog/common"
+	"github.com/izghua/go-blog/conf"
 	m2 "github.com/izghua/go-blog/middleware"
 	"github.com/izghua/go-blog/router/auth"
 	"github.com/izghua/go-blog/router/console"
@@ -23,16 +24,17 @@ import (
 )
 
 func RoutersInit() *gin.Engine{
-	gin.SetMode(gin.ReleaseMode)
+	if conf.Env == "prod" {
+		gin.SetMode(gin.ReleaseMode)
+	} else {
+		gin.SetMode(gin.DebugMode)
+	}
 	r := gin.New()
 	r.Use(m.CORS(m.CORSOptions{Origin: ""}))
 	r.Use(m.RequestID(m.RequestIDOptions{AllowSetting: true}))
 	r.Use(ginutil.Recovery(recoverHandler))
 	r.Use(m2.CheckExist())
 	r.Static("/static/uploads/images/","./static/uploads/images/")
-	//r.StaticFile("/*","./static/uploads/images/")
-	//r.Static("/","./static/console/")
-	//r.StaticFS("/",http.Dir("./static/console/"))
 	consolePost := console.NewPost()
 	consoleCate := console.NewCategory()
 	consoleTag := console.NewTag()
@@ -44,9 +46,7 @@ func RoutersInit() *gin.Engine{
 	consoleHome := console.NewStatistics()
 	c := r.Group("/console")
 	{
-		//r.LoadHTMLGlob("static/console/*")
 		r.LoadHTMLGlob("static/console/*.html")
-		//r.LoadHTMLFiles("static/console/*/*")
 		r.Static("/static/console","./static/console")
 		r.StaticFile("/backend/","static/console/index.html")
 		p := c.Group("/post")
@@ -130,9 +130,6 @@ func RoutersInit() *gin.Engine{
 		r.LoadHTMLGlob("template/home/*.tmpl")
 
 		r.Static("/static/home","./static/home")
-		//r.Static("/static/uploads/images/","./static/uploads/images/")
-		//r.StaticFS("/static/*",)
-		//r.StaticFile("/","static/home/index.html")
 		h.GET("/",web.Index)
 		h.GET("/categories/:name",web.IndexCate)
 		h.GET("/tags/:name",web.IndexTag)
@@ -141,7 +138,7 @@ func RoutersInit() *gin.Engine{
 		h.GET("/404",web.NoFound)
 	}
 
-	zgh.ZLog().Info("标记","路由")
+	zgh.ZLog().Info("note","router")
 	return r
 }
 

service/index.go

@@ -30,20 +30,21 @@ const  (
 
 func CommonData() (h gin.H,err error) {
 	h = gin.H{
-		"themeJs": "/static/home/assets/js",
-		"themeCss": "/static/home/assets/css",
-		"themeImg": "/static/home/assets/img",
-		"themeFancyboxCss": "/static/home/assets/fancybox",
-		"themeFancyboxJs": "/static/home/assets/fancybox",
-		"themeHLightCss": "/static/home/assets/highlightjs",
-		"themeHLightJs": "/static/home/assets/highlightjs",
-		"themeShareCss": "/static/home/assets/css",
-		"themeShareJs": "/static/home/assets/js",
-		"themeArchivesJs": "/static/home/assets/js",
-		"themeArchivesCss": "/static/home/assets/css",
+		"themeJs": conf.Cnf.ThemeJs,
+		"themeCss": conf.Cnf.ThemeCss,
+		"themeImg": conf.Cnf.ThemeImg,
+		"themeFancyboxCss": conf.Cnf.ThemeFancyboxCss,
+		"themeFancyboxJs": conf.Cnf.ThemeFancyboxJs,
+		"themeHLightCss": conf.Cnf.ThemeHLightCss,
+		"themeHLightJs": conf.Cnf.ThemeHLightJs,
+		"themeShareCss": conf.Cnf.ThemeShareCss,
+		"themeShareJs": conf.Cnf.ThemeShareJs,
+		"themeArchivesJs": conf.Cnf.ThemeArchivesJs,
+		"themeArchivesCss": conf.Cnf.ThemeArchivesCss,
 
 		"tem": "defaultList",
 	}
+	h["script"] = template.HTML(conf.Cnf.OtherScript)
 	cates,err := CateListBySort()
 	if err != nil {
 		zgh.ZLog().Error("message","service.Index.CommonData","err",err.Error())

template/home/master.tmpl

@@ -303,9 +303,8 @@ $$          $$$o       "o$$o$"$$"$$o$$o$$"$$o"       $$$          ""o
 </script>
 
 <!-- Initiate flexslider plugin -->
-<script type="text/javascript">
 
-</script>
+{{.script}}
 
 </body>
 </html>