update: 日志

conf/config.go

@@ -2,20 +2,11 @@ package conf
 
 import (
 	beego "github.com/beego/beego/v2/server/web"
-	"runtime"
 )
 
-func init() {
-	if runtime.GOOS == "windows" {
-		Server_test = true
-	} else {
-		Server_test = false
-	}
-}
-var Server_test = false
-
 var HTTPPort, _ = beego.AppConfig.String("HTTPPort")
 var AppName, _ = beego.AppConfig.String("appname")
+var RunMode, _ = beego.AppConfig.String("runmode")
 
 var Page_size = 10
 

controllers/Account.go

@@ -72,7 +72,7 @@ func (c *AccountController) Login_Admin_verification() {
 // 管理员-列表-
 func (c *AccountController) List() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -116,7 +116,7 @@ func (c *AccountController) List() {
 // 管理员-添加-
 func (c *AccountController) Add() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -166,7 +166,7 @@ func (c *AccountController) Add() {
 // 管理员-修改-
 func (c *AccountController) Up() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -224,7 +224,7 @@ func (c *AccountController) Up() {
 // 管理员-删除-
 func (c *AccountController) Del() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -261,7 +261,7 @@ func (c *AccountController) Del() {
 // 用户权限-所有列表-
 func (c *AccountController) UserPower_List_All() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -282,7 +282,7 @@ func (c *AccountController) UserPower_List_All() {
 // 管理员-全部列表-
 func (c *AccountController) List_All() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/Certificate.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/Certificate"
 	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
@@ -17,7 +18,7 @@ type CertificateController struct {
 // 列表-
 func (c *CertificateController) List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -67,7 +68,7 @@ func (c *CertificateController) List() {
 // 添加-
 func (c *CertificateController) Add() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -103,7 +104,7 @@ func (c *CertificateController) Add() {
 // 删除-
 func (c *CertificateController) Del() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -136,7 +137,7 @@ func (c *CertificateController) Del() {
 // 列表-
 func (c *CertificateController) Pdf_List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -172,7 +173,7 @@ func (c *CertificateController) Pdf_List() {
 // 添加-
 func (c *CertificateController) Pdf_Add() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -226,7 +227,7 @@ func (c *CertificateController) Pdf_Add() {
 // 修改-
 func (c *CertificateController) Pdf_Up() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -293,7 +294,7 @@ func (c *CertificateController) Pdf_Up() {
 // 删除-
 func (c *CertificateController) Pdf_Del() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/Device.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/Device"
 	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
@@ -16,7 +17,7 @@ type DeviceController struct {
 // 列表 -
 func (c *DeviceController) List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -53,7 +54,7 @@ func (c *DeviceController) List() {
 // 添加-
 func (c *DeviceController) Add() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -90,7 +91,7 @@ func (c *DeviceController) Add() {
 // 修改-
 func (c *DeviceController) Up() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -131,7 +132,7 @@ func (c *DeviceController) Up() {
 // 删除-
 func (c *DeviceController) Del() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -165,7 +166,7 @@ func (c *DeviceController) Del() {
 // 列表 - 分类设备
 func (c *DeviceController) Device_Class() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -220,7 +221,7 @@ func (c *DeviceController) Device_Class() {
 // 列表 - 分类设备
 func (c *DeviceController) Device_Data() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/DeviceClass.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/Device"
 	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
@@ -16,7 +17,7 @@ type DeviceClassController struct {
 // 列表 -
 func (c *DeviceClassController) List() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -52,7 +53,7 @@ func (c *DeviceClassController) List() {
 // 获取-
 func (c *DeviceClassController) Get() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -85,7 +86,7 @@ func (c *DeviceClassController) Get() {
 // 添加-
 func (c *DeviceClassController) Add() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -115,7 +116,7 @@ func (c *DeviceClassController) Add() {
 // 修改-
 func (c *DeviceClassController) Up() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -163,7 +164,7 @@ func (c *DeviceClassController) Up() {
 // 删除-
 func (c *DeviceClassController) Del() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -207,7 +208,7 @@ func (c *DeviceClassController) Del() {
 // 列表 -
 func (c *DeviceClassController) List_List() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -256,7 +257,7 @@ func (c *DeviceClassController) List_List() {
 // 添加-
 func (c *DeviceClassController) List_Add() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -314,7 +315,7 @@ func (c *DeviceClassController) List_Add() {
 // 修改-
 func (c *DeviceClassController) List_Up() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -367,7 +368,7 @@ func (c *DeviceClassController) List_Up() {
 // 删除-
 func (c *DeviceClassController) List_Del() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/Logs.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/System"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
@@ -14,7 +15,7 @@ type LogsController struct {
 
 // 列表 -
 func (c *LogsController) List() {
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -50,7 +51,7 @@ func (c *LogsController) List() {
 
 // 列表 -
 func (c *LogsController) UserLogs() {
-	_, User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/Task.go

@@ -18,7 +18,7 @@ type TaskController struct {
 // 列表 -
 func (c *TaskController) List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -59,7 +59,7 @@ func (c *TaskController) List() {
 // 列表 -
 func (c *TaskController) UserTaskList() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -97,7 +97,7 @@ func (c *TaskController) UserTaskList() {
 // 获取-
 func (c *TaskController) Get() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -123,7 +123,7 @@ func (c *TaskController) Get() {
 func (c *TaskController) Add() {
 
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -133,7 +133,7 @@ func (c *TaskController) Add() {
 		T_uuid:  User_r.T_uuid,
 		T_State: 1,
 	}
-	Id, is := Device.Add_DeviceClass(dc)
+	T_class_id, is := Device.Add_DeviceClass(dc)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加分类失败!"}
 		c.ServeJSON()
@@ -151,7 +151,7 @@ func (c *TaskController) Add() {
 	T_delivery := c.GetString("T_delivery")
 
 	var_ := Task.Task{
-		T_class:             int(Id),
+		T_class:             int(T_class_id),
 		T_uuid:              T_uuid,
 		T_name:              T_name,
 		T_VerifyTemplate_id: T_VerifyTemplate_id,
@@ -181,7 +181,7 @@ func (c *TaskController) Add() {
 // 修改-
 func (c *TaskController) Up() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -319,7 +319,7 @@ func (c *TaskController) Up() {
 // 删除-
 func (c *TaskController) Del() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -349,7 +349,7 @@ func (c *TaskController) Del() {
 // 列表 -
 func (c *TaskController) Logs_List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/TaskData.go

@@ -4,6 +4,7 @@ import (
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
+	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/Device"
 	"ColdVerify_server/models/System"
 	"ColdVerify_server/models/Task"
@@ -25,7 +26,7 @@ type TaskDataController struct {
 // 获取-
 func (c *TaskDataController) Extract_TaskData() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -42,13 +43,6 @@ func (c *TaskDataController) Extract_TaskData() {
 		return
 	}
 
-	//T_Class_id, err := c.GetInt("T_Class_id")
-	//if err != nil {
-	//	c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_Class_id 错误!"}
-	//	c.ServeJSON()
-	//	return
-	//}
-
 	DeviceClass_List := Device.Read_DeviceClassList_List_id(Task_r.T_class)
 	if len(DeviceClass_List) == 0 {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_Class_id 分类设备列表 为空!"}
@@ -85,7 +79,7 @@ func (c *TaskDataController) Extract_TaskData() {
 // 列表 -
 func (c *TaskDataController) TaskData_List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -136,7 +130,7 @@ func (c *TaskDataController) TaskData_List() {
 // 列表 -
 func (c *TaskDataController) UserTaskData_List() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -193,7 +187,7 @@ func (c *TaskDataController) UserTaskData_List() {
 // 列表 -
 func (c *TaskDataController) TaskDataClass_List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -218,7 +212,7 @@ func (c *TaskDataController) TaskDataClass_List() {
 // 添加-
 func (c *TaskDataController) TaskData_AddS() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -267,7 +261,7 @@ func (c *TaskDataController) TaskData_AddS() {
 // 添加-
 func (c *TaskDataController) TaskData_Add() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -305,7 +299,7 @@ func (c *TaskDataController) TaskData_Add() {
 // 修改-
 func (c *TaskDataController) TaskData_Up() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -357,7 +351,7 @@ func (c *TaskDataController) TaskData_Up() {
 // 删除-
 func (c *TaskDataController) TaskData_Del() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -395,7 +389,7 @@ func (c *TaskDataController) TaskData_Del() {
 // 删除-
 func (c *TaskDataController) TaskData_Del_t_id() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -433,7 +427,7 @@ func (c *TaskDataController) TaskData_Del_t_id() {
 // 列表 - 接口
 func (c *TaskDataController) Export_Data_Excel() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -497,7 +491,7 @@ func (c *TaskDataController) Export_Data_Excel() {
 	timeStr := time.Now().Format("20060102150405")
 	// 保存文件
 	if err := f.SaveAs("ofile/" + timeStr + ".xlsx"); err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	if !lib.Pload_qiniu("ofile/"+timeStr+".xlsx", "ofile/"+timeStr+".xlsx") {
@@ -508,7 +502,7 @@ func (c *TaskDataController) Export_Data_Excel() {
 	//删除目录
 	//err = os.Remove("ofile/" + timeStr + ".xlsx")
 	//if err != nil {
-	//	fmt.Println(err)
+	//	logs.Error(lib.FuncName(),err)
 	//}
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: "https://bzdcoldverifyoss.baozhida.cn/" + "ofile/" + timeStr + ".xlsx"}
@@ -519,7 +513,7 @@ func (c *TaskDataController) Export_Data_Excel() {
 // 列表 - 接口
 func (c *TaskDataController) Export_Data_PDF() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -671,7 +665,7 @@ func (c *TaskDataController) Export_Data_PDF() {
 	//删除目录
 	err = os.Remove(timeStr)
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: "https://bzdcoldverifyoss.baozhida.cn/" + timeStr}
@@ -683,7 +677,7 @@ func (c *TaskDataController) Export_Data_PDF() {
 // 列表 - 接口
 func (c *TaskDataController) Check() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/Template.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/System"
 	"ColdVerify_server/models/Template"
 	beego "github.com/beego/beego/v2/server/web"
@@ -16,7 +17,7 @@ type TemplateController struct {
 // 列表 -
 func (c *TemplateController) List_html() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -52,7 +53,7 @@ func (c *TemplateController) List_html() {
 // 二级页面
 func (c *TemplateController) List_() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -72,7 +73,7 @@ func (c *TemplateController) List_() {
 // 获取-
 func (c *TemplateController) Get() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -101,7 +102,7 @@ func (c *TemplateController) Get() {
 // 列表 -
 func (c *TemplateController) List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -138,7 +139,7 @@ func (c *TemplateController) List() {
 // 添加-
 func (c *TemplateController) Add() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -173,7 +174,7 @@ func (c *TemplateController) Add() {
 // 修改-
 func (c *TemplateController) Up() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -224,7 +225,7 @@ func (c *TemplateController) Up() {
 // 删除-
 func (c *TemplateController) Del() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/UpFile.go

@@ -59,7 +59,7 @@ func (c *UpFileController) UpFile() {
 // 列表 -
 func (c *UpFileController) ConfigUpFileToken() {
 	// 验证登录 User_r, User_x
-	//b_, User_r, _ := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	//b_, User_r, _ := Account.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	//if !b_ {
 	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 	//	c.ServeJSON()

controllers/User.go

@@ -16,7 +16,7 @@ type UserController struct {
 // 获取-
 func (c *UserController) Get() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -45,7 +45,7 @@ func (c *UserController) Get() {
 // 列表 -
 func (c *UserController) List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -81,7 +81,7 @@ func (c *UserController) List() {
 // 添加-
 func (c *UserController) Add() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -120,7 +120,7 @@ func (c *UserController) Add() {
 // 修改-
 func (c *UserController) Up() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -174,7 +174,7 @@ func (c *UserController) Up() {
 // 删除-
 func (c *UserController) Del() {
 	// 验证登录 User_is, User_r
-	user_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	user_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()

controllers/VerifyTemplate.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/System"
 	"ColdVerify_server/models/Task"
 	"ColdVerify_server/models/VerifyTemplate"
@@ -18,7 +19,7 @@ type VerifyTemplateController struct {
 // 列表 -
 func (c *VerifyTemplateController) List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -54,7 +55,7 @@ func (c *VerifyTemplateController) List() {
 // 添加-
 func (c *VerifyTemplateController) Add() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -85,7 +86,7 @@ func (c *VerifyTemplateController) Add() {
 // 修改-
 func (c *VerifyTemplateController) Up() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -128,7 +129,7 @@ func (c *VerifyTemplateController) Up() {
 // 删除-
 func (c *VerifyTemplateController) Del() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -158,7 +159,7 @@ func (c *VerifyTemplateController) Del() {
 // 标签列表 -
 func (c *VerifyTemplateController) Map_List() {
 	// 验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -195,7 +196,7 @@ func (c *VerifyTemplateController) Map_List() {
 // 标签添加-
 func (c *VerifyTemplateController) Map_Add() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -243,7 +244,7 @@ func (c *VerifyTemplateController) Map_Add() {
 // 标签修改-
 func (c *VerifyTemplateController) Map_Up() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -316,7 +317,7 @@ func (c *VerifyTemplateController) Map_Up() {
 // 标签删除-
 func (c *VerifyTemplateController) Map_Del() {
 	// 验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -346,7 +347,7 @@ func (c *VerifyTemplateController) Map_Del() {
 // 标签数据列表 -
 func (c *VerifyTemplateController) Map_Data_List() {
 	//验证登录 User_is, User_r
-	_, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
 	if !User_is {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -380,14 +381,17 @@ func (c *VerifyTemplateController) Map_Data_List() {
 // 添加标签数据
 func (c *VerifyTemplateController) Map_Data_Pu() {
 	//验证登录 User_is, User_r
-	User_r, User_is := lib.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
-	if !User_is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
-		c.ServeJSON()
-		return
-	}
+
+	//token := c.Ctx.Request.Header.Get("user_tokey")
+	//User_r, User_is := Account.Verification_Admin(token, "")
+	//if !User_is {
+	//	c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+	//	c.ServeJSON()
+	//	return
+	//}
 
 	type RequestBody struct {
+		User_tokey            string
 		T_source              int
 		T_task_id             string
 		T_VerifyTemplate_id   string
@@ -402,6 +406,13 @@ func (c *VerifyTemplateController) Map_Data_Pu() {
 		c.ServeJSON()
 	}
 
+	User_r, User_is := Account.Verification_Admin(body.User_tokey, "")
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+
 	_, is := Task.Read_Task(body.T_task_id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_task_id 错误!"}

lib/Qiniu.go

@@ -17,21 +17,23 @@ import (
 
 var Qiniu *qbox.Mac
 
-//var (
+// var (
+//
 //	//BUCKET是你在存储空间的名称
 //	accessKey = "-8ezB_d-8-eUFTMvhOGbGzgeQRPeKQnaQ3DBcUxo"
 //	secretKey = "KFhkYxTAJ2ZPN3ZS3euTsfWk8-C92rKgkhAMkDRN"
 //	BUCKET    = "bzdcoldoss"
-//)
+//
+// )
 func init() {
 	Qiniu = qbox.NewMac(conf.Qiniu_AccessKey, conf.Qiniu_SecretKey)
 }
 
-//if !lib.Pload_qiniu("ofile/"+timeStr+".xlsx","ofile/"+timeStr+".xlsx"){
-//c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
-//c.ServeJSON()
-//return
-//}
+// if !lib.Pload_qiniu("ofile/"+timeStr+".xlsx","ofile/"+timeStr+".xlsx"){
+// c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
+// c.ServeJSON()
+// return
+// }
 func Pload_qiniu(localFile string, name string) bool {
 	//localFile := "C:\\Users\\Administrator\\Downloads\\kodo-browser-Windows-x64-v1.0.15.zip"
 	//key := "kodo-browser-Windows-x64-v1.0.15.zip"
@@ -62,7 +64,7 @@ func Pload_qiniu(localFile string, name string) bool {
 	}
 	err := formUploader.PutFile(context.Background(), &ret, upToken, name, localFile, &putExtra)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(FuncName(), err)
 		System.Add_Logs("七牛云", "上传文件失败"+localFile, err.Error())
 		return false
 	}

lib/lib.go

@@ -1,33 +1,18 @@
 package lib
 
 import (
-	"ColdVerify_server/models/Account"
 	"encoding/json"
 	"fmt"
 	"github.com/signintech/gopdf"
-	"log"
 	"math/rand"
 	"os"
+	"runtime"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 )
 
-var Run_My_Server = false // 运行当期服务
-
-type Cl_ struct {
-	Uuid_list map[string]string // 泛型
-}
-
-var CountrySnMap map[string]Cl_                        /*创建集合 */
-var CountryRead_DeviceParameterSnMap map[string]string /*创建集合 */
-func init() {
-	CountrySnMap = make(map[string]Cl_)
-	CountryRead_DeviceParameterSnMap = make(map[string]string)
-
-}
-
 type JSONS struct {
 	//必须的大写开头
 	Code int16
@@ -63,55 +48,6 @@ type LOG_JSONS struct {
 	Pages      []Page_T
 }
 
-// 登录验证
-func Verification(GetCookie string, GetString string) (Account.User, bool) {
-	// 自适应 参数
-	User_tokey := GetCookie
-	if len(User_tokey) == 0 {
-		User_tokey = GetString
-	}
-	if len(User_tokey) == 0 {
-		return Account.User{}, false
-	}
-	// 判断 tokey 是否存在
-	tokey, is := Account.Read_Tokey(User_tokey)
-	if !is {
-		return Account.User{}, false
-	}
-
-	err, user_r := Account.Read_User_ByT_uuid(tokey)
-	if err != nil {
-		return Account.User{}, false
-	}
-	log.Println("登录 User_name 为：", user_r.T_name)
-	return user_r, true
-}
-
-// 登录验证
-func Verification_Admin(GetCookie string, GetString string) (Account.Admin, bool) {
-	Run_My_Server = true // 运行当期服务
-	// 自适应 参数
-	User_tokey := GetCookie
-	if len(User_tokey) == 0 {
-		User_tokey = GetString
-	}
-	if len(User_tokey) == 0 {
-		return Account.Admin{}, false
-	}
-	// 判断 tokey 是否存在
-	tokey, is := Account.Read_Tokey(User_tokey)
-	if !is {
-		return Account.Admin{}, false
-	}
-
-	err, user_r := Account.Read_Admin_ByT_uuid(tokey)
-	if err != nil {
-		return Account.Admin{}, false
-	}
-	log.Println("登录 Admin_name 为：", user_r.T_name)
-	return user_r, true
-}
-
 // func_page 分页   [{3 1} {4 2} {4 3} {4 4} {4 5} {4 6} {4 7} {4 8} {4 9} {5 2}]-
 type Page_T struct {
 	A int
@@ -362,7 +298,7 @@ func Random(min, max int) int {
 	return rand.Intn(max-min) + min
 }
 
-//取文本（字符串）中间
+// 取文本（字符串）中间
 func GetBetweenStr(str, start, end string) string {
 	n := strings.Index(str, start)
 	if n == -1 {
@@ -471,3 +407,11 @@ func Create_Dir(path string) error {
 	}
 	return nil
 }
+
+// 获取正在运行的函数名
+func FuncName() string {
+	pc := make([]uintptr, 1)
+	runtime.Callers(2, pc)
+	f := runtime.FuncForPC(pc[0])
+	return f.Name()
+}

logs/LogPrintln.go

@@ -1,36 +1,58 @@
 package logs
 
 import (
-	"fmt"
+	"ColdVerify_server/conf"
 	"github.com/astaxie/beego/logs"
-	"runtime"
-	"time"
 )
 
 var logx *logs.BeeLogger
-var Test = true
 
 func init() {
 	logx = logs.NewLogger()
 	logx.SetLogger(logs.AdapterFile, `{"filename":"logs/logx/logx.log"}`)
+	logx.EnableFuncCallDepth(true)
+	logx.SetLogFuncCallDepth(3)
+	if conf.RunMode == "dev" {
+		logx.SetLogger(logs.AdapterConsole)
+	}
+}
+
+func Println(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+	logx.Info(format, v...)
+}
 
-	if runtime.GOOS == "windows" {
-		Test = true
-	} else {
-		Test = false
+// Debug Log DEBUG level message.
+func Debug(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
 	}
+	logx.Debug(format, v...)
 }
 
-func Println(a ...interface{}) {
-	if Test {
-		fmt.Println(time.Now().Format("2006-01-02 15:04:05"), "=>", a)
+// Info Log ERROR level message.
+func Info(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
 	}
-	logx.Info(time.Now().Format("2006-01-02 15:04:05")+">", a)
+	logx.Info(format, v...)
 }
 
-//func Println(a ...interface{}) {
-//	if test {
-//		fmt.Printf("=>", a)
-//	}
-//	logx.Info(">", a)
-//}
+// Error Log ERROR level message.
+func Error(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+
+	logx.Error(format, v...)
+}
+
+// Warning Log WARNING level message.
+func Warning(format string, v ...interface{}) {
+	for _, _ = range v {
+		format += " %v"
+	}
+	logx.Warning(format, v...)
+}

models/Account/Admin.go

@@ -1,6 +1,7 @@
 package Account
 
 import (
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
@@ -69,7 +70,7 @@ func Add_Admin(m Admin) (id int64, err error) {
 
 	id, err = o.Insert(&m)
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return id, err
 }
@@ -79,7 +80,7 @@ func Read_Admin_verification(T_user string, T_pass string) (error, Admin) {
 	r := Admin{T_user: T_user, T_pass: T_pass, T_State: 1}
 	err := o.Read(&r, "T_user", "T_pass", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return err, r
 }

models/Account/Power.go

@@ -2,6 +2,8 @@ package Account
 
 import (
 	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	"time"
@@ -49,7 +51,7 @@ func Add_UserPower(m UserPower) (id int64, err error) {
 	o := orm.NewOrm()
 	id, err = o.Insert(&m)
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return id, err
 }
@@ -60,7 +62,7 @@ func Read_UserPower_ById(Id int) (r UserPower, err error) {
 	r = UserPower{Id: Id}
 	err = o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return r, err
 }

models/Account/Tokey.go

@@ -6,6 +6,7 @@ import (
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	uuid "github.com/satori/go.uuid"
+	"log"
 	"time"
 )
 
@@ -27,7 +28,7 @@ func init() {
 }
 
 // ---------------- Redis -------------------
-//Redis_Set(m.T_sn,m) // Redis 更新缓存
+// Redis_Set(m.T_sn,m) // Redis 更新缓存
 func Redis_Tokey_Set(key string, r string) (err error) {
 	err = redisCache_Tokey.Put(key, r, 24*time.Hour)
 	if err != nil {
@@ -36,9 +37,9 @@ func Redis_Tokey_Set(key string, r string) (err error) {
 	return
 }
 
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
+// if r,is :=Redis_Get(T_sn);is{
+// return r,nil
+// }
 func Redis_Tokey_Get(key string) (r string, is bool) {
 	if redisCache_Tokey.IsExist(key) {
 		//println("找到key:",key)
@@ -79,3 +80,50 @@ func Add_Tokey(User_uuid string) (Tokey string) {
 	return Tokey
 }
 
+// 登录验证
+func Verification(GetCookie string, GetString string) (User, bool) {
+	// 自适应 参数
+	User_tokey := GetCookie
+	if len(User_tokey) == 0 {
+		User_tokey = GetString
+	}
+	if len(User_tokey) == 0 {
+		return User{}, false
+	}
+	// 判断 tokey 是否存在
+	tokey, is := Read_Tokey(User_tokey)
+	if !is {
+		return User{}, false
+	}
+
+	err, user_r := Read_User_ByT_uuid(tokey)
+	if err != nil {
+		return User{}, false
+	}
+	log.Println("登录 User_name 为：", user_r.T_name)
+	return user_r, true
+}
+
+// 登录验证
+func Verification_Admin(GetCookie string, GetString string) (Admin, bool) {
+	// 自适应 参数
+	User_tokey := GetCookie
+	if len(User_tokey) == 0 {
+		User_tokey = GetString
+	}
+	if len(User_tokey) == 0 {
+		return Admin{}, false
+	}
+	// 判断 tokey 是否存在
+	tokey, is := Read_Tokey(User_tokey)
+	if !is {
+		return Admin{}, false
+	}
+
+	err, user_r := Read_Admin_ByT_uuid(tokey)
+	if err != nil {
+		return Admin{}, false
+	}
+	log.Println("登录 Admin_name 为：", user_r.T_name)
+	return user_r, true
+}

models/Account/User.go

@@ -1,6 +1,7 @@
 package Account
 
 import (
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
@@ -13,7 +14,7 @@ import (
 type User struct {
 	Id         int       `orm:"column(ID);size(11);auto;pk"`
 	T_uuid     string    `orm:"size(256);null"`                                        //
-	T_power    int       `orm:"size(2);0"`                                             // 权限
+	T_power    int       `orm:"size(2);default(0)"`                                    // 权限
 	T_name     string    `orm:"size(256);null"`                                        // 某某公司名称
 	T_user     string    `orm:"size(256);null"`                                        // 登录用户名
 	T_pass     string    `orm:"size(256);null"`                                        // 密码 MD5
@@ -70,7 +71,7 @@ func Read_User_verification(T_user string, T_pass string) (error, User) {
 	r := User{T_user: T_user, T_pass: T_pass, T_State: 1}
 	err := o.Read(&r, "T_user", "T_pass", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return err, r
 }
@@ -83,7 +84,7 @@ func Read_User_ById(id int) (r User, is bool) {
 	r = User{Id: id, T_State: 1}
 	err := o.Read(&r, "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -123,7 +124,7 @@ func Add_User(r User) (id int64, is bool) {
 
 	id, err = o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return 0, false
 	}
 

models/Certificate/Certificate.go

@@ -1,6 +1,7 @@
 package Certificate
 
 import (
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
@@ -40,7 +41,7 @@ func Read_Certificate_ById(id int) (r Certificate, is bool) {
 	r = Certificate{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -53,6 +54,7 @@ func Read_Certificate(T_sn string) (r Certificate, is bool) {
 	qs := o.QueryTable(new(Certificate))
 	err := qs.Filter("T_sn", T_sn).Filter("T_State", 1).One(&r)
 	if err != nil {
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 
@@ -68,7 +70,7 @@ func Add_Certificate(r Certificate) (id int64, is bool) {
 	}
 	id, err = o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return 0, false
 	}
 	return id, true
@@ -80,6 +82,7 @@ func Delete_Certificate(v Certificate) bool {
 	if num, err := o.Delete(&v); err == nil {
 		logs.Println("Number of records deleted in database:", num)
 	} else {
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 
@@ -93,6 +96,7 @@ func Delete_Certificate_(v Certificate) bool {
 	if num, err := o.Update(&v, "T_State"); err == nil {
 		fmt.Println("Number of records updated in database:", num)
 	} else {
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 
@@ -104,8 +108,9 @@ func Update_Certificate(m Certificate, cols ...string) bool {
 	o := orm.NewOrm()
 	if num, err := o.Update(&m, cols...); err == nil {
 		fmt.Println("Number of records updated in database:", num)
-
 		return true
+	} else {
+		logs.Error(lib.FuncName(), err)
 	}
 	return false
 }

models/Certificate/CertificatePdf.go

@@ -1,6 +1,7 @@
 package Certificate
 
 import (
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
@@ -56,7 +57,7 @@ func Read_CertificatePdf_ById(id int) (r CertificatePdf, is bool) {
 	r = CertificatePdf{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -68,6 +69,9 @@ func Read_CertificatePdf(T_Certificate_sn, T_release_time, T_failure_time string
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(CertificatePdf))
 	err = qs.Filter("T_Certificate_sn", T_Certificate_sn).Filter("T_release_time", T_release_time).Filter("T_failure_time", T_failure_time).Filter("T_State", 1).One(&r)
+	if err != nil {
+		logs.Println(lib.FuncName(), err)
+	}
 	return r, err
 }
 
@@ -82,7 +86,7 @@ func Add_CertificatePdf(r CertificatePdf) (id int64, is bool) {
 
 	id, err = o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Println(lib.FuncName(), err)
 		return 0, false
 	}
 
@@ -95,6 +99,7 @@ func Delete_CertificatePdf(v CertificatePdf) bool {
 	if num, err := o.Delete(&v); err == nil {
 		logs.Println("Number of records deleted in database:", num)
 	} else {
+		logs.Println(lib.FuncName(), err)
 		return false
 	}
 
@@ -108,6 +113,7 @@ func Delete_CertificatePdf_(v CertificatePdf) bool {
 	if num, err := o.Update(&v, "T_State"); err == nil {
 		fmt.Println("Number of records updated in database:", num)
 	} else {
+		logs.Println(lib.FuncName(), err)
 		return false
 	}
 
@@ -119,8 +125,9 @@ func Update_CertificatePdf(m CertificatePdf, cols ...string) bool {
 	o := orm.NewOrm()
 	if num, err := o.Update(&m, cols...); err == nil {
 		fmt.Println("Number of records updated in database:", num)
-
 		return true
+	} else {
+		logs.Println(lib.FuncName(), err)
 	}
 	return false
 }

models/Device/Device.go

@@ -2,6 +2,7 @@ package Device
 
 import (
 	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	orm2 "github.com/beego/beego/v2/client/orm"
 
@@ -26,13 +27,13 @@ type Device struct {
 	T_rh   float32   `orm:"size(10);null"`         // 湿度
 	T_time time.Time `orm:"type(timestamp);null;"` // 采集时间
 
-	T_MSISDN             string `orm:"size(256);null"` // 物联网卡
-	T_version            int    `orm:"size(2);1"`      // 版本
-	T_signal             int    `orm:"size(2);1"`      // 信号强度
-	T_electric           int    `orm:"size(2);1"`      // 电量百分比
-	T_up_time_interval   int    `orm:"size(2);1"`      //上传时间间隔
-	T_note_time_interval int    `orm:"size(2);1"`      //记录时间间隔
-	T_note_file_num      int    `orm:"size(2);1"`      //记录文件数量
+	T_MSISDN             string `orm:"size(256);null"`      // 物联网卡
+	T_version            int    `orm:"size(2);;default(1)"` // 版本
+	T_signal             int    `orm:"size(2);;default(1)"` // 信号强度
+	T_electric           int    `orm:"size(2);;default(1)"` // 电量百分比
+	T_up_time_interval   int    `orm:"size(2);;default(1)"` // 上传时间间隔
+	T_note_time_interval int    `orm:"size(2);;default(1)"` // 记录时间间隔
+	T_note_file_num      int    `orm:"size(2);;default(1)"` // 记录文件数量
 
 	int `orm:"size(2);1"` // 电量百分比
 
@@ -65,12 +66,12 @@ func init() {
 }
 
 // ---------------- Redis -------------------
-//Redis_Set(m.T_sn,m) // Redis 更新缓存
+// Redis_Set(m.T_sn,m) // Redis 更新缓存
 func Redis_Device_Set(key string, r Device) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	err = redisCache_Device.Put(key, str, 24*time.Hour)
@@ -80,9 +81,9 @@ func Redis_Device_Set(key string, r Device) (err error) {
 	return
 }
 
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
+// if r,is :=Redis_Get(T_sn);is{
+// return r,nil
+// }
 func Redis_Device_Get(key string) (r Device, is bool) {
 	if redisCache_Device.IsExist(key) {
 		logs.Println("找到key:", key)
@@ -95,6 +96,9 @@ func Redis_Device_Get(key string) (r Device, is bool) {
 }
 func Redis_Device_DelK(key string) (err error) {
 	err = redisCache_Device.Delete(key)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+	}
 	return
 }
 
@@ -106,7 +110,7 @@ func Read_Device_ById(id int) (r Device, is bool) {
 	r = Device{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -122,6 +126,7 @@ func Read_Device(T_sn string) (r Device, is bool) {
 	qs := o.QueryTable(new(Device))
 	err := qs.Filter("T_sn", T_sn).One(&r)
 	if err != nil {
+		logs.Println(lib.FuncName(), err)
 		return r, false
 	}
 
@@ -135,7 +140,7 @@ func Add_Device(r Device) (id int64, is bool) {
 
 	id, err := o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return 0, false
 	}
 	CREATE_DeviceData(r.T_sn)
@@ -149,6 +154,7 @@ func Delete_Device(v Device) bool {
 	if num, err := o.Delete(&v); err == nil {
 		logs.Println("Number of records deleted in database:", num)
 	} else {
+		logs.Println(lib.FuncName(), err)
 		return false
 	}
 
@@ -163,6 +169,7 @@ func Delete_Device_(v Device) bool {
 	if num, err := o.Update(&v, "T_State"); err == nil {
 		fmt.Println("Number of records updated in database:", num)
 	} else {
+		logs.Println(lib.FuncName(), err)
 		return false
 	}
 
@@ -177,6 +184,8 @@ func Update_Device(m Device, cols ...string) bool {
 		fmt.Println("Number of records updated in database:", num)
 		Redis_Device_Set(m.T_sn, m)
 		return true
+	} else {
+		logs.Println(lib.FuncName(), err)
 	}
 	return false
 }

models/Device/DeviceClass.go

@@ -2,6 +2,7 @@ package Device
 
 import (
 	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"encoding/json"
 	"fmt"
@@ -18,7 +19,7 @@ type DeviceClass struct {
 	T_uuid string `orm:"size(256);null"` // 管理员 UUID
 	T_name string `orm:"size(256);null"` // 标题
 
-	T_State    int       `orm:"size(2);1"`                                             // 0 删除   1 正常
+	T_State    int       `orm:"size(2);default(1)"`                                    // 0 删除   1 正常
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
 }
@@ -47,12 +48,12 @@ func init() {
 }
 
 // ---------------- Redis -------------------
-//Redis_Set(m.T_sn,m) // Redis 更新缓存
+// Redis_Set(m.T_sn,m) // Redis 更新缓存
 func Redis_DeviceClass_Set(key string, r DeviceClass) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	err = redisCache_DeviceClass.Put(key, str, 24*time.Hour)
@@ -62,9 +63,9 @@ func Redis_DeviceClass_Set(key string, r DeviceClass) (err error) {
 	return
 }
 
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
+// if r,is :=Redis_Get(T_sn);is{
+// return r,nil
+// }
 func Redis_DeviceClass_Get(key string) (r DeviceClass, is bool) {
 	if redisCache_DeviceClass.IsExist(key) {
 		logs.Println("找到key:", key)
@@ -88,7 +89,7 @@ func Read_DeviceClass_ById(id int) (r DeviceClass, is bool) {
 	r = DeviceClass{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -100,7 +101,7 @@ func Add_DeviceClass(r DeviceClass) (id int64, is bool) {
 
 	id, err := o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return 0, false
 	}
 
@@ -113,6 +114,7 @@ func Delete_DeviceClass(v DeviceClass) bool {
 	if num, err := o.Delete(&v); err == nil {
 		logs.Println("Number of records deleted in database:", num)
 	} else {
+		logs.Println(lib.FuncName(), err)
 		return false
 	}
 
@@ -126,6 +128,7 @@ func Delete_DeviceClass_(v DeviceClass) bool {
 	if num, err := o.Update(&v, "T_State"); err == nil {
 		fmt.Println("Number of records updated in database:", num)
 	} else {
+		logs.Println(lib.FuncName(), err)
 		return false
 	}
 
@@ -137,8 +140,9 @@ func Update_DeviceClass(m DeviceClass, cols ...string) bool {
 	o := orm.NewOrm()
 	if num, err := o.Update(&m, cols...); err == nil {
 		fmt.Println("Number of records updated in database:", num)
-
 		return true
+	} else {
+		logs.Println(lib.FuncName(), err)
 	}
 	return false
 }

models/Device/DeviceClassList.go

@@ -2,6 +2,7 @@ package Device
 
 import (
 	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	orm2 "github.com/beego/beego/v2/client/orm"
 
@@ -23,7 +24,7 @@ type DeviceClassList struct {
 	T_id    int    `orm:"size(20);null"`  // 设备id
 	T_sn    string `orm:"size(256);null"` // 设备序列号 KF开头，环境监测主机。 YD开头，温途监测主机
 
-	T_State    int       `orm:"size(2);1"`                                             // 0 删除   1 正常
+	T_State    int       `orm:"size(2);default(1)"`                                    // 0 删除   1 正常
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
 }
@@ -57,7 +58,7 @@ func Redis_DeviceClassList_Set(key string, r DeviceClassList) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	err = redisCache_DeviceClassList.Put(key, str, 24*time.Hour)
@@ -93,7 +94,7 @@ func Read_DeviceClassList_ById(id int) (r DeviceClassList, is bool) {
 	r = DeviceClassList{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -109,6 +110,7 @@ func Read_DeviceClassList(T_sn string) (r DeviceClassList, is bool) {
 	qs := o.QueryTable(new(DeviceClassList))
 	err := qs.Filter("T_sn", T_sn).One(&r)
 	if err != nil {
+		logs.Println(lib.FuncName(), err)
 		return r, false
 	}
 
@@ -122,6 +124,7 @@ func Read_DeviceClassList_T_class_T_sn(T_class int, T_sn string) (r DeviceClassL
 	qs := o.QueryTable(new(DeviceClassList))
 	err := qs.Filter("T_sn", T_sn).Filter("T_class", T_class).Filter("T_State", 1).One(&r)
 	if err != nil {
+		logs.Println(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -142,7 +145,7 @@ func Add_DeviceClassList(r DeviceClassList) (id int64, is bool) {
 
 	id, err := o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return 0, false
 	}
 
@@ -156,6 +159,7 @@ func Delete_DeviceClassList(v DeviceClassList) bool {
 	if num, err := o.Delete(&v); err == nil {
 		logs.Println("Number of records deleted in database:", num)
 	} else {
+		logs.Println(lib.FuncName(), err)
 		return false
 	}
 
@@ -170,6 +174,7 @@ func Delete_DeviceClassList_(v DeviceClassList) bool {
 	if num, err := o.Update(&v, "T_State"); err == nil {
 		fmt.Println("Number of records updated in database:", num)
 	} else {
+		logs.Println(lib.FuncName(), err)
 		return false
 	}
 
@@ -184,6 +189,8 @@ func Update_DeviceClassList(m DeviceClassList, cols ...string) bool {
 		fmt.Println("Number of records updated in database:", num)
 		Redis_DeviceClassList_Set(m.T_sn, m)
 		return true
+	} else {
+		logs.Println(lib.FuncName(), err)
 	}
 	return false
 }

models/Device/DeviceData.go

@@ -3,6 +3,7 @@ package Device
 import (
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
 
 	"encoding/json"
 	"fmt"
@@ -58,7 +59,7 @@ func DeviceData_Set(key string) (err error) {
 }
 
 // ---------------- Redis -------------------
-//Redis_Set(m.T_sn,m) // Redis 更新缓存
+// Redis_Set(m.T_sn,m) // Redis 更新缓存
 func RedisDeviceData_Set(key string, r DeviceData_New) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
@@ -74,16 +75,16 @@ func RedisDeviceData_Set(key string, r DeviceData_New) (err error) {
 	return
 }
 
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
+// if r,is :=Redis_Get(T_sn);is{
+// return r,nil
+// }
 func RedisDeviceData_Get(key string) (r DeviceData_New, is bool) {
 	v := redisCache_DeviceData.Get(key)
 	json.Unmarshal(v.([]byte), &r)
 	return r, true
 }
 
-//创建数据库  Device.CREATE_DeviceData("")
+// 创建数据库  Device.CREATE_DeviceData("")
 func CREATE_DeviceData(SN string) bool {
 	o := orm.NewOrm()
 
@@ -131,7 +132,7 @@ func CREATE_DeviceData(SN string) bool {
 //	_, err := o.Raw(sql).ValuesList(&maps_z)
 //
 //	if err != nil {
-//		fmt.Println(err)
+//		logs.Error(lib.FuncName(),err)
 //		return false
 //	}
 //	//fmt.Println("maps_z[0][0]:",maps_z[0][0])
@@ -146,7 +147,7 @@ func CREATE_DeviceData(SN string) bool {
 //	//fmt.Println(sql)
 //	res, err := o.Raw(sql).Exec()
 //	if err != nil {
-//		fmt.Println(err)
+//		logs.Error(lib.FuncName(),err)
 //		return false
 //	}
 //	res.RowsAffected()
@@ -169,7 +170,6 @@ type DeviceData_New struct {
 	T_time time.Time `orm:"column(t_time);type(timestamp);null;"` // 采集时间
 }
 
-//
 func Read_DeviceSensorData_ById_List(SN string, T_id int, Time_start_ string, Time_end_ string, page int, page_z int) ([]DeviceData_, int) {
 	o := orm.NewOrm()
 	var maps []DeviceData_
@@ -211,13 +211,16 @@ func Read_DeviceSensorData_ById_List(SN string, T_id int, Time_start_ string, Ti
 
 	fmt.Println(sql)
 	_, err = o.Raw(sql).QueryRows(&maps)
+	if err != nil {
+		logs.Println(lib.FuncName(), err)
+		return maps, 0
+	}
 
 	//value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", cnt), 64)
 	key, _ := strconv.Atoi(maps_z[0][0].(string))
 	return maps, key
 }
 
-//
 func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string, page int, page_z int) ([]DeviceData_, int) {
 	o := orm.NewOrm()
 	var maps []DeviceData_
@@ -257,13 +260,16 @@ func Read_DeviceSensorData_List(SN string, Time_start_ string, Time_end_ string,
 
 	fmt.Println(sql)
 	_, err = o.Raw(sql).QueryRows(&maps)
+	if err != nil {
+		logs.Println(lib.FuncName(), err)
+		return maps, 0
+	}
 
 	//value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", cnt), 64)
 	key, _ := strconv.Atoi(maps_z[0][0].(string))
 	return maps, key
 }
 
-//
 func Read_DeviceSensorData_List_z(SN string, Time_start_ string) int {
 	o := orm.NewOrm()
 	var maps_z []orm2.ParamsList
@@ -277,7 +283,11 @@ func Read_DeviceSensorData_List_z(SN string, Time_start_ string) int {
 
 	sql := "SELECT COUNT(ID) FROM z_device_data_" + SN + " " + sql_time
 	fmt.Println(sql)
-	o.Raw(sql).ValuesList(&maps_z)
+	_, err := o.Raw(sql).ValuesList(&maps_z)
+	if err != nil {
+		logs.Println(lib.FuncName(), err)
+		return 0
+	}
 
 	//value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", cnt), 64)
 	key, _ := strconv.Atoi(maps_z[0][0].(string))
@@ -303,7 +313,7 @@ func Read_DeviceSensorData_ById_New(SN string, T_id int) (DeviceData_New, bool)
 	fmt.Println(sql)
 	err := o.Raw(sql).QueryRow(&maps)
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return maps, false
 	}
 	fmt.Println("T_time:", maps.T_time)
@@ -347,7 +357,6 @@ func Read_DeviceSensorData_By_T_snid_List(T_snid string, Time_start_ string, Tim
 	return maps[offset:offset_z], maps_num
 }
 
-//
 func Read_DeviceData_ById_Year_List(SN string) []orm2.ParamsList {
 	o := orm.NewOrm()
 

models/Task/Task.go

@@ -176,7 +176,7 @@ func Redis_Task_Set(key string, r Task) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	err = redisCache_Task.Put(key, str, 24*time.Hour)
@@ -212,7 +212,7 @@ func Read_Task_ById(id int) (r Task, is bool) {
 	r = Task{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -253,10 +253,12 @@ func Add_Task(r Task) (string, bool) {
 
 	_, err := o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
+		return "", false
+	}
+	if !CREATE_TaskData(r.T_task_id) {
 		return "", false
 	}
-	CREATE_TaskData(r.T_task_id)
 	Redis_Task_Set(r.T_task_id, r)
 	return r.T_task_id, true
 }
@@ -267,6 +269,7 @@ func Delete_Task(v Task) bool {
 	if num, err := o.Delete(&v); err == nil {
 		logs.Println("Number of records deleted in database:", num)
 	} else {
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 
@@ -281,6 +284,7 @@ func Delete_Task_(v Task) bool {
 	if num, err := o.Update(&v, "T_State"); err == nil {
 		fmt.Println("Number of records updated in database:", num)
 	} else {
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 
@@ -296,7 +300,7 @@ func Update_Task(m Task, cols ...string) bool {
 		Redis_Task_Set(m.T_task_id, m)
 		return true
 	} else {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 	}
 	return false
 }
@@ -309,6 +313,8 @@ func Add_Task_Visit(m Task) bool {
 		fmt.Println("Number of records updated in database:", num)
 		Redis_Task_Set(m.T_task_id, m)
 		return true
+	} else {
+		logs.Error(lib.FuncName(), err)
 	}
 	return false
 }

models/Task/TaskData.go

@@ -1,6 +1,7 @@
 package Task
 
 import (
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"fmt"
 	_ "github.com/astaxie/beego/cache/redis"
@@ -31,7 +32,7 @@ func init() {
 
 }
 
-//创建数据库  Device.CREATE_TaskData("")
+// 创建数据库  Device.CREATE_TaskData("")
 func CREATE_TaskData(T_task_id string) bool {
 	o := orm.NewOrm()
 
@@ -69,7 +70,11 @@ func Truncate_TaskData(T_task_id string) bool {
 
 	sql := "truncate table z_task_data_" + T_task_id
 	logs.Println(sql)
-	o.Raw(sql).Exec()
+	_, err := o.Raw(sql).Exec()
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return false
+	}
 
 	return true
 }
@@ -88,7 +93,7 @@ func Import_TaskData(Sn string, T_id int, T_task_id string, Time_start string, T
 	logs.Println(sql)
 	res, err := o.Raw(sql).Exec()
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 
@@ -97,7 +102,11 @@ func Import_TaskData(Sn string, T_id int, T_task_id string, Time_start string, T
 	// 设备 ID
 	//sql = "UPDATE z_task_data_"+T_task_id+" SET `t_sn` = '"+Sn+"' WHERE `t_sn` IS NULL"
 	logs.Println(sql)
-	o.Raw(sql).Exec()
+	_, err = o.Raw(sql).Exec()
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return false
+	}
 
 	res.RowsAffected()
 	return true
@@ -116,7 +125,6 @@ type TaskDataClass_ struct {
 	T_id int    `orm:"column(t_id);size(10);null"`  // ID
 }
 
-//
 func Read_TaskData_ById_List(T_task_id string, SN string, T_id int, Time_start_ string, Time_end_ string, page int, page_z int) ([]TaskData_, int64) {
 	o := orm.NewOrm()
 	var maps []TaskData_
@@ -152,6 +160,7 @@ func Read_TaskData_ById_List(T_task_id string, SN string, T_id int, Time_start_
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {
+		logs.Error(lib.FuncName(), err)
 		return maps, 0
 	}
 	if len(maps_z) == 0 {
@@ -172,7 +181,6 @@ func Read_TaskData_ById_List(T_task_id string, SN string, T_id int, Time_start_
 	return maps, int64(key)
 }
 
-//
 func Read_TaskData_ById_List_(T_task_id string, SN string, T_id int) []TaskData_ {
 	o := orm.NewOrm()
 	var maps []TaskData_
@@ -191,7 +199,6 @@ func Read_TaskData_ById_List_(T_task_id string, SN string, T_id int) []TaskData_
 	return maps
 }
 
-//
 func Read_TaskData_ById_ClassList(T_task_id string) []TaskDataClass_ {
 	o := orm.NewOrm()
 	var maps []TaskDataClass_
@@ -223,7 +230,7 @@ func Add_TaskData(T_task_id string, T_sn string, T_id string, T_t string, T_rh s
 	//fmt.Println(sql)
 	//res, err := o.Raw(sql).Exec()
 	//if err != nil {
-	//	fmt.Println(err)
+	//	logs.Error(lib.FuncName(),err)
 	//	return false
 	//}
 	//res.RowsAffected()
@@ -234,7 +241,7 @@ func Add_TaskData(T_task_id string, T_sn string, T_id string, T_t string, T_rh s
 	fmt.Println(sql)
 	res, err := o.Raw(sql).Exec()
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	res.RowsAffected()
@@ -268,7 +275,7 @@ func Up_TaskData(T_task_id string, Id string, T_t string, T_rh string, T_time st
 	//fmt.Println(sql)
 	res, err := o.Raw(sql).Exec()
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	res.RowsAffected()
@@ -288,7 +295,7 @@ func Del_TaskData(T_task_id string, Id string) bool {
 	logs.Println(sql)
 	res, err := o.Raw(sql).Exec()
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	res.RowsAffected()
@@ -308,7 +315,7 @@ func Del_TaskData_t_id(T_task_id string, Id string) bool {
 	logs.Println(sql)
 	res, err := o.Raw(sql).Exec()
 	if err != nil {
-		fmt.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return false
 	}
 	res.RowsAffected()

models/Template/Template.go

@@ -2,6 +2,7 @@ package Template
 
 import (
 	"ColdVerify_server/conf"
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"encoding/json"
 	"fmt"
@@ -67,12 +68,12 @@ func TemplateToTemplate_R(T Template) (T_r Template_R) {
 }
 
 // ---------------- Redis -------------------
-//Redis_Set(m.T_sn,m) // Redis 更新缓存
+// Redis_Set(m.T_sn,m) // Redis 更新缓存
 func Redis_Template_Set(key string, r Template) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return
 	}
 	err = redisCache_Template.Put(key, str, 24*time.Hour)
@@ -82,9 +83,9 @@ func Redis_Template_Set(key string, r Template) (err error) {
 	return
 }
 
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
+// if r,is :=Redis_Get(T_sn);is{
+// return r,nil
+// }
 func Redis_Template_Get(key string) (r Template, is bool) {
 	if redisCache_Template.IsExist(key) {
 		logs.Println("找到key:", key)
@@ -108,7 +109,7 @@ func Read_Template_ById(id int) (r Template, is bool) {
 	r = Template{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -148,7 +149,7 @@ func Add_Template(r Template) (id int64, is bool) {
 
 	id, err := o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return 0, false
 	}
 

models/VerifyTemplate/VerifyTemplate.go

@@ -58,7 +58,7 @@ func Read_VerifyTemplate_ById(id int) (r VerifyTemplate, is bool) {
 	r = VerifyTemplate{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -94,7 +94,7 @@ func Add_VerifyTemplate(r VerifyTemplate) (id int64, is bool) {
 
 	id, err := o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return 0, false
 	}
 

models/VerifyTemplate/VerifyTemplateMap.go

@@ -34,8 +34,8 @@ type VerifyTemplateMap struct {
 
 	// 验证流程
 	T_flow_sort int `orm:"size(2);default(0)"` // 验证流程排序
-	T_max_time  int `orm:"size(256);"`         // 验证流程最大时间
-	T_min_time  int `orm:"size(256);"`         // 验证流程最小时间
+	T_max_time  int `orm:"size(256);null"`     // 验证流程最大时间
+	T_min_time  int `orm:"size(256);null"`     // 验证流程最小时间
 
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
@@ -88,7 +88,7 @@ func Read_VerifyTemplateMap_ById(id int) (r VerifyTemplateMap, is bool) {
 	r = VerifyTemplateMap{Id: id}
 	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return r, false
 	}
 	return r, true
@@ -124,7 +124,7 @@ func Add_VerifyTemplateMap(r VerifyTemplateMap) (id int64, is bool) {
 
 	id, err := o.Insert(&r)
 	if err != nil {
-		logs.Println(err)
+		logs.Error(lib.FuncName(), err)
 		return 0, false
 	}
 

models/VerifyTemplate/VerifyTemplateMapData.go

@@ -1,6 +1,7 @@
 package VerifyTemplate
 
 import (
+	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
@@ -87,7 +88,7 @@ func AddOrUpdate_VerifyTemplateMapData(List []VerifyTemplateMapData) (ids []int6
 		// 生成编号
 		id, err := o.InsertOrUpdate(&v, "T_task_id", "T_VerifyTemplate_id", "T_VerifyTemplateMap_id")
 		if err != nil {
-			logs.Println(err)
+			logs.Error(lib.FuncName(), err)
 			o.Rollback()
 			return ids, false
 		}

tests/default_test.go

@@ -1,6 +1,8 @@
 package test
 
 import (
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
 	"fmt"
 	"testing"
 	"time"
@@ -8,9 +10,9 @@ import (
 
 func TestBeego(t *testing.T) {
 	formatTimeStr := "2022-05-25 18:58"
-	formatTime,err:=time.Parse("2006-01-02 15:04",formatTimeStr)
-	if err!=nil{
-		fmt.Println(err)
+	formatTime, err := time.Parse("2006-01-02 15:04", formatTimeStr)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
 	}
 	fmt.Println(formatTime) //打印结果：2017-04-11 13:33:37 +0000 UTC
 	//// Read from docx file
@@ -47,6 +49,4 @@ func TestBeego(t *testing.T) {
 	////d.ReplaceImage("word/media/image1.png", "./new.png")
 	//docx3.WriteToFile("./new_result_3.docx")
 
-
-
-}
+}