qiaozhi 3 місяців тому
батько
коміт
1c979589bd
3 змінених файлів з 27 додано та 35 видалено
  1. 8 8
      main.go
  2. 2 6
      server/encode_decode.go
  3. 17 21
      util/mysql.go

+ 8 - 8
main.go

@@ -410,14 +410,14 @@ func main() {
 	}()
 	go search.UpdateIndex()
 	go util.TimingTask()
-	//go func() {
-	//	ch := make(chan os.Signal)
-	//	signal.Notify(ch, syscall.SIGUSR2) //syscall.SIGHUP
-	//	for {
-	//		<-ch
-	//		config.Reload("")
-	//	}
-	//}()
+	go func() {
+		ch := make(chan os.Signal)
+		signal.Notify(ch, syscall.SIGUSR2) //syscall.SIGHUP
+		for {
+			<-ch
+			config.Reload("")
+		}
+	}()
 	logger.Log("fatal", <-errc)
 }
 func interrupt() error {

+ 2 - 6
server/encode_decode.go

@@ -66,9 +66,6 @@ func touchSessionToken(r *http.Request) {
 // by JSON decoding from the request body. It's designed to be used in
 // transport/http.Server.
 func DecodeRequest(r *http.Request, ptype reflect.Type, shouldLogin ...bool) (interface{}, error) {
-	if len(shouldLogin) > 0 {
-		shouldLogin[0] = false
-	}
 	var pl interface{}
 	if ptype == nil {
 		pl = make(map[string]interface{})
@@ -103,7 +100,7 @@ func DecodeRequest(r *http.Request, ptype reflect.Type, shouldLogin ...bool) (in
 		}
 	}
 	//验证token是否有效
-	//_, err = validateAPIToken(r, reqItem.ClientId)
+	_, err = validateAPIToken(r, reqItem.ClientId)
 	if err != nil {
 		return nil, err
 	}
@@ -155,7 +152,6 @@ func DecodeRequest(r *http.Request, ptype reflect.Type, shouldLogin ...bool) (in
 			reqItem.Mobile = udatas[1]
 		}
 	}
-	reqItem.Mobile = "13141018539"
 	return reqItem, err
 }
 
@@ -170,7 +166,7 @@ func EncodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
 	return jencoder.Encode(response)
 }
 
-//20220719 不打印日志,部分信息并没有太大意义。免得日志文件增长过快
+// 20220719 不打印日志,部分信息并没有太大意义。免得日志文件增长过快
 func EncodeResponseNoLog(ctx context.Context, w http.ResponseWriter, response interface{}) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	//wr := io.MultiWriter(w, os.Stdout)

+ 17 - 21
util/mysql.go

@@ -3,6 +3,7 @@ package util
 import (
 	"crypto/md5"
 	"encoding/hex"
+	"fmt"
 	"log"
 	"math"
 	"reflect"
@@ -18,28 +19,23 @@ import (
 var instance *sqlx.DB
 var once sync.Once
 
-var str = "xiaoniao_n:xnC+21%@Ydm@tcp(114.67.232.21:3308)/xn_db_clear"
-
-//var str = "xiaoniao_web:sy1xn8902^!(@@tcp(101.201.196.166:3308)/xiaoniao_db"
-
 func createSqlDB() {
 	var err error
 	var (
-		//dsec     = config.IniConf.Section("database")
-		//host     = dsec.Key("mysql.host").Value()
-		//user     = dsec.Key("mysql.user").Value()
-		//password = dsec.Key("mysql.password").Value()
-		//port     = dsec.Key("mysql.port").Value()
-		//database = dsec.Key("mysql.database").Value()
-		//dns      = fmt.Sprintf("%s:%s@(%s:%s)/%s", user, password, host, port, database)
+		dsec     = config.IniConf.Section("database")
+		host     = dsec.Key("mysql.host").Value()
+		user     = dsec.Key("mysql.user").Value()
+		password = dsec.Key("mysql.password").Value()
+		port     = dsec.Key("mysql.port").Value()
+		database = dsec.Key("mysql.database").Value()
+		dns      = fmt.Sprintf("%s:%s@(%s:%s)/%s", user, password, host, port, database)
 	)
 
 	if instance != nil {
 		instance.Close()
 	}
-	//instance, err = sqlx.Connect("mysql", dns)
+	instance, err = sqlx.Connect("mysql", dns)
 	//instance, err = sqlx.Connect("mysql", "xiaoniao:xn321#@!@tcp(123.57.224.234:3306)/jeecg")
-	instance, err = sqlx.Connect("mysql", str)
 	if err != nil {
 		log.Println(err)
 	}
@@ -60,18 +56,18 @@ var wonce sync.Once
 func createWriteSqlDB() {
 	var err error
 	var (
-	//dsec     = config.IniConf.Section("database")
-	//host     = dsec.Key("mysql.write.host").Value()
-	//user     = dsec.Key("mysql.write.user").Value()
-	//password = dsec.Key("mysql.write.password").Value()
-	//port     = dsec.Key("mysql.write.port").Value()
-	//database = dsec.Key("mysql.database").Value()
-	//dns      = fmt.Sprintf("%s:%s@(%s:%s)/%s", user, password, host, port, database)
+		dsec     = config.IniConf.Section("database")
+		host     = dsec.Key("mysql.write.host").Value()
+		user     = dsec.Key("mysql.write.user").Value()
+		password = dsec.Key("mysql.write.password").Value()
+		port     = dsec.Key("mysql.write.port").Value()
+		database = dsec.Key("mysql.database").Value()
+		dns      = fmt.Sprintf("%s:%s@(%s:%s)/%s", user, password, host, port, database)
 	)
 	if winstance != nil {
 		winstance.Close()
 	}
-	winstance, err = sqlx.Connect("mysql", str)
+	winstance, err = sqlx.Connect("mysql", dns)
 	//instance, err = sqlx.Connect("mysql", "xiaoniao:xn321#@!@tcp(123.57.224.234:3306)/jeecg")
 	if err != nil {
 		log.Println(err)