Browse Source

UPDATE:优化日志

zoie 1 year ago
parent
commit
32e17a96b7
48 changed files with 272 additions and 87 deletions
  1. 3 3
      Nats/Nats.go
  2. 17 17
      Nats/NatsServer/NatsMqtt.go
  3. 2 2
      Nats/NatsServer/NatsProduct.go
  4. 4 4
      Nats/NatsServer/NatsQiniu.go
  5. 2 2
      Nats/NatsServer/NatsWx.go
  6. 17 1
      conf/app.conf
  7. 1 1
      controllers/Data.go
  8. 1 1
      controllers/DeviceReal.go
  9. 7 7
      controllers/User.go
  10. 1 1
      controllers/Warning.go
  11. 2 2
      controllers/lib/Qiniu.go
  12. 1 1
      controllers/lib/wxpay.go
  13. 4 0
      go.mod
  14. 9 0
      go.sum
  15. 84 0
      initialize/db.go
  16. 71 0
      initialize/log.go
  17. 5 5
      logs/LogPrintln.go
  18. 1 0
      main.go
  19. 1 1
      models/Account/Admin.go
  20. 1 1
      models/Account/Company.go
  21. 1 1
      models/Account/Menu.go
  22. 1 1
      models/Account/Power.go
  23. 1 1
      models/Account/Tokey.go
  24. 1 1
      models/Account/UserDevice.go
  25. 1 1
      models/Company/CompanyBill.go
  26. 1 1
      models/Company/CompanyClass.go
  27. 5 5
      models/Company/CompanyNotice.go
  28. 1 1
      models/Company/CompanyPayOrder.go
  29. 1 1
      models/DataSource/DataSource.go
  30. 1 1
      models/Device/Device.go
  31. 1 1
      models/Device/DeviceParameter.go
  32. 1 1
      models/Device/DeviceReal.go
  33. 1 1
      models/Device/DeviceSensor.go
  34. 1 1
      models/Device/DeviceSensorParameter.go
  35. 2 2
      models/Device/DeviceSensorType.go
  36. 1 1
      models/Device/DeviceTask.go
  37. 2 2
      models/Product/ProductType.go
  38. 1 1
      models/Product/ProductUpgrade.go
  39. 1 1
      models/RawSql/RawSql.go
  40. 1 1
      models/RawSql/SqlLogs.go
  41. 1 1
      models/System/Logs.go
  42. 1 1
      models/System/UserLogs.go
  43. 1 1
      models/Warning/Warning.go
  44. 1 1
      models/Warning/WarningHandle.go
  45. 1 1
      models/Warning/WarningRate.go
  46. 2 2
      models/Warning/WarningSand.go
  47. 3 3
      models/Warning/WarningType.go
  48. 2 2
      routers/filter.go

+ 3 - 3
Nats/Nats.go

@@ -3,7 +3,7 @@ package Nats
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"Cold_Api/models/Account"
 	"Cold_Api/models/Device"
 	"Cold_Api/models/System"
@@ -20,7 +20,7 @@ var redisCache_NatsServer cache.Cache
 
 func init() {
 
-	logs.Println("============Nats init============")
+	logs.Info("============Nats init============")
 	var err error
 	// 连接Nats服务器
 	lib.Nats, err = nats.Connect("nats://" + conf.NatsServer_Url)
@@ -28,7 +28,7 @@ func init() {
 		fmt.Println("nats 连接失败!")
 		panic(err)
 	}
-	logs.Println("nats OK!")
+	logs.Info("nats OK!")
 
 	go NatsInit()
 

+ 17 - 17
Nats/NatsServer/NatsMqtt.go

@@ -2,29 +2,29 @@ package NatsServer
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"Cold_Api/models/Device"
 	"github.com/vmihailenco/msgpack/v5"
 )
 
 func Read_DeviceParameter(T_SN, T_mqttid string) {
-	logs.Println("Nats =>", lib.FuncName(), T_SN)
+	logs.Info("Nats =>", lib.FuncName(), T_SN)
 	err := lib.Nats.Publish("Read_DeviceParameter"+T_mqttid, []byte(T_SN))
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 
 }
 func Read_DeviceSensorParameter(T_SN, T_mqttid string) {
-	logs.Println("Nats =>", lib.FuncName(), T_SN)
+	logs.Info("Nats =>", lib.FuncName(), T_SN)
 	err := lib.Nats.Publish("Read_DeviceSensorParameter"+T_mqttid, []byte(T_SN))
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 }
 
 func Pu_DeviceParameter(v Device.DeviceParameter, T_mqttid string) {
-	logs.Println("Nats =>", lib.FuncName(), v)
+	logs.Info("Nats =>", lib.FuncName(), v)
 	b, err := msgpack.Marshal(&v)
 	if err != nil {
 		panic(err)
@@ -32,12 +32,12 @@ func Pu_DeviceParameter(v Device.DeviceParameter, T_mqttid string) {
 
 	err = lib.Nats.Publish("Pu_DeviceParameter"+T_mqttid, b)
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 
 }
 func Pu_DeviceParameter_Sensor(v Device.DeviceSensorParameter, T_mqttid string) {
-	logs.Println("Nats =>", lib.FuncName(), v)
+	logs.Info("Nats =>", lib.FuncName(), v)
 	b, err := msgpack.Marshal(&v)
 	if err != nil {
 		panic(err)
@@ -45,11 +45,11 @@ func Pu_DeviceParameter_Sensor(v Device.DeviceSensorParameter, T_mqttid string)
 
 	err = lib.Nats.Publish("Pu_DeviceParameter_Sensor"+T_mqttid, b)
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 }
 func Set_DeviceTask(v Device.Device_task, T_mqttid string) {
-	logs.Println("Nats =>", lib.FuncName(), v)
+	logs.Info("Nats =>", lib.FuncName(), v)
 	b, err := msgpack.Marshal(&v)
 	if err != nil {
 		panic(err)
@@ -57,13 +57,13 @@ func Set_DeviceTask(v Device.Device_task, T_mqttid string) {
 
 	err = lib.Nats.Publish("Set_DeviceTask"+T_mqttid, b)
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 
 }
 
 func Set_RestartShutdown(v Device.Device_task, T_mqttid string) {
-	logs.Println("Nats =>", lib.FuncName(), v)
+	logs.Info("Nats =>", lib.FuncName(), v)
 	b, err := msgpack.Marshal(&v)
 	if err != nil {
 		panic(err)
@@ -71,13 +71,13 @@ func Set_RestartShutdown(v Device.Device_task, T_mqttid string) {
 
 	err = lib.Nats.Publish("Set_RestartShutdown"+T_mqttid, b)
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 
 }
 
 func Del_DeviceSensor(v Device.DeviceSensor_Del, T_mqttid string) {
-	logs.Println("Nats =>", lib.FuncName(), v)
+	logs.Info("Nats =>", lib.FuncName(), v)
 	b, err := msgpack.Marshal(&v)
 	if err != nil {
 		panic(err)
@@ -85,15 +85,15 @@ func Del_DeviceSensor(v Device.DeviceSensor_Del, T_mqttid string) {
 
 	err = lib.Nats.Publish("Del_DeviceSensor"+T_mqttid, b)
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 
 }
 
 func Get_Device_Realtime(v string, T_mqttid string) {
-	//logs.Println("Nats =>", lib.FuncName(),T_mqttid, v)
+	//logs.Info("Nats =>", lib.FuncName(),T_mqttid, v)
 	err := lib.Nats.Publish("Get_Device_Realtime"+T_mqttid, []byte(v))
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 }

+ 2 - 2
Nats/NatsServer/NatsProduct.go

@@ -2,7 +2,7 @@ package NatsServer
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"Cold_Api/models/Product"
 	"github.com/vmihailenco/msgpack/v5"
 )
@@ -17,7 +17,7 @@ func Up_ProductUpgrade(T_sn, T_version, T_file, T_mqttid string) {
 
 	err := lib.Nats.Publish("Up_ProductUpgrade"+T_mqttid, b)
 	if err != nil {
-		logs.Println("Nats =>", lib.FuncName(), err)
+		logs.Info("Nats =>", lib.FuncName(), err)
 	}
 
 }

+ 4 - 4
Nats/NatsServer/NatsQiniu.go

@@ -2,7 +2,7 @@ package NatsServer
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"context"
 	"fmt"
 	"github.com/qiniu/go-sdk/v7/auth/qbox"
@@ -39,7 +39,7 @@ func Qiniu_UploadToken(T_suffix string, T_MimeLimit string) (string, bool) {
 }
 
 //func Qiniu_UploadFile(localFile string, name string) (string, bool) {
-//	logs.Println("Nats =>", lib.FuncName(), localFile, name)
+//	logs.Info("Nats =>", lib.FuncName(), localFile, name)
 //	type Qiniu_UploadFile struct {
 //		File string
 //		Name string
@@ -64,7 +64,7 @@ func Qiniu_UploadToken(T_suffix string, T_MimeLimit string) (string, bool) {
 //}
 
 func Qiniu_UploadFile(localFile string, name string) (string, bool) {
-	logs.Println("Qiniu_UploadFile =>", localFile, name)
+	logs.Info("Qiniu_UploadFile =>", localFile, name)
 
 	// 获取 七牛云的 配置信息
 	msg, err := lib.Nats.Request("Qiniu_Token", []byte(""), 3*time.Second)
@@ -106,7 +106,7 @@ func Qiniu_UploadFile(localFile string, name string) (string, bool) {
 	}
 	err = formUploader.PutFile(context.Background(), &ret, upToken, name, localFile, &putExtra)
 	if err != nil {
-		logs.Println("七牛云", "上传文件失败 "+localFile, err.Error())
+		logs.Info("七牛云", "上传文件失败 "+localFile, err.Error())
 		return "", false
 	}
 	fmt.Println(ret.Bucket, ret.Key, ret.Fsize, ret.Hash, ret.Name)

+ 2 - 2
Nats/NatsServer/NatsWx.go

@@ -2,13 +2,13 @@ package NatsServer
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"fmt"
 	"time"
 )
 
 func Wx_GenerateQRCode(T_uuid string) (string, bool) {
-	logs.Println(" => Nats", lib.FuncName(), T_uuid)
+	logs.Info(" => Nats", lib.FuncName(), T_uuid)
 
 	// 请求-响应, 向 test3 发布一个 `help me` 请求数据,设置超时间3秒,如果有多个响应,只接收第一个收到的消息
 	msg, err := lib.Nats.Request("Wx_GenerateQR", []byte(T_uuid), 3*time.Second)

+ 17 - 1
conf/app.conf

@@ -18,6 +18,7 @@ MysqlServer_MaxIdleConnections = 100
 MysqlServer_MaxOpenConnections = 200
 MysqlServer_Debug = true
 
+
 # Redis
 Redis_address = "127.0.0.1:43379"
 Redis_password = ""
@@ -73,4 +74,19 @@ MqttIds = mqttjxit,mqttlodr,mqttyuht
 MqttServer_id = "mqttjxit"
 
 Weixin_PwdKey = "7Nt9sJb1Xy0PoQrEl3Df5Zv2Cg6AhRkT"
-Weixin_Notify = "https://cold.coldbaozhida.com/api/WxPay/Notify"
+Weixin_Notify = "https://cold.coldbaozhida.com/api/WxPay/Notify"
+
+
+# 日志配置
+# 0-控制台输出 1-文件输出 2-文件和控制台输出
+adapter_type = 2
+# 文件最多保存多少天
+maxdays = 7
+# 日志级别 (0-紧急 1-报警 2-严重错误 3-错误 4-警告 5-注意 6-信息 7-调试)
+level = 7
+# SQL日志级别 (1-静音 2-错误 3-警告 4-信息). 注意: sql日志只在level大于等于5级别才会输出。
+sqlloglevel = 4
+# 慢SQL阈值(毫秒)。慢SQL会在sqlloglevel大于等于3时输出。
+slow_threshold = 200
+# 每个文件保存的最大行数
+maxlines = 10000

+ 1 - 1
controllers/Data.go

@@ -4,7 +4,7 @@ import (
 	"Cold_Api/Nats/NatsServer"
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"Cold_Api/models/Account"
 	"Cold_Api/models/Device"
 	"encoding/base64"

+ 1 - 1
controllers/DeviceReal.go

@@ -66,7 +66,7 @@ func DeviceRealTime() {
 
 		lib.DeviceRealSnMap.Range(func(k, v interface{}) bool {
 
-			//logs.Println("=================", k)
+			//logs.Info("=================", k)
 			sn := strings.Split(k.(string), "|")[0]
 			mqttid := strings.Split(k.(string), "|")[1]
 

+ 7 - 7
controllers/User.go

@@ -4,7 +4,7 @@ import (
 	"Cold_Api/Nats/NatsServer"
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"Cold_Api/models/Account"
 	"Cold_Api/models/Company"
 	"Cold_Api/models/Device"
@@ -660,7 +660,7 @@ func (c *UserController) User_Edit() {
 
 	if len(T_name) > 0 {
 		if is = Company.Update_CompanyNotice_Bind_By_T_uuid(T_uuid, T_name); !is {
-			logs.Println("修改用户 => 修改用户关联报警通知失败", T_uuid, T_name)
+			logs.Info("修改用户 => 修改用户关联报警通知失败", T_uuid, T_name)
 		}
 	}
 
@@ -691,7 +691,7 @@ func (c *UserController) User_Del() {
 	}
 
 	if is := Company.Delete_CompanyNotice_Bind_By_T_uuid(T_uuid); !is {
-		logs.Println("删除用户 => 删除用户关联报警通知失败", T_uuid)
+		logs.Info("删除用户 => 删除用户关联报警通知失败", T_uuid)
 	}
 
 	System.Add_UserLogs_T(c.Admin_r.T_uuid, "用户管理", "删除", T_uuid)
@@ -988,7 +988,7 @@ func (c *UserController) Admin_Edit() {
 
 	if len(T_name) > 0 {
 		if is = Company.Update_CompanyNotice_Bind_By_T_uuid(T_uuid, "内管-"+T_name); !is {
-			logs.Println("修改内部用户 => 修改内部用户关联报警通知失败", T_uuid, T_name)
+			logs.Info("修改内部用户 => 修改内部用户关联报警通知失败", T_uuid, T_name)
 		}
 	}
 
@@ -1024,7 +1024,7 @@ func (c *UserController) Admin_Del() {
 	}
 
 	if is := Company.Delete_CompanyNotice_Bind_By_T_uuid(T_uuid); !is {
-		logs.Println("删除内部用户 => 删除内部用户关联报警通知失败", T_uuid)
+		logs.Info("删除内部用户 => 删除内部用户关联报警通知失败", T_uuid)
 	}
 
 	System.Add_UserLogs_T(c.Admin_r.T_uuid, "内部用户管理", "删除", T_uuid)
@@ -1195,7 +1195,7 @@ func (c *UserController) AdminCompanyBind_Del() {
 		return
 	}
 	if is := Company.Delete_CompanyNotice_Bind_By_T_uuid_T_pid(T_uuid, T_pids); !is {
-		logs.Println("删除内部用户公司绑定 => 删除内部用户绑定的公司关联报警通知失败", T_uuid)
+		logs.Info("删除内部用户公司绑定 => 删除内部用户绑定的公司关联报警通知失败", T_uuid)
 	}
 
 	System.Add_UserLogs(c.Admin_r.T_uuid, "内部用户管理", "公司绑定删除", T_uuid+"-"+strconv.Itoa(T_pid))
@@ -1432,7 +1432,7 @@ func (c *UserController) User_Menu_List() {
 		c.ServeJSON()
 		return
 	}
-	//logs.Println("登录用户 菜单 pid 为:", c.T_pid)
+	//logs.Info("登录用户 菜单 pid 为:", c.T_pid)
 	ret := Account.Read_Menu_Bind_List(power.Id, power.T_menu, c.T_pid)
 	r_jsons.Data = ret.Menu
 	r_jsons.Permission = ret.Permission

+ 1 - 1
controllers/Warning.go

@@ -4,12 +4,12 @@ import (
 	"Cold_Api/Nats/NatsServer"
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"Cold_Api/models/Account"
 	"Cold_Api/models/Device"
 	"Cold_Api/models/System"
 	"Cold_Api/models/Warning"
 	"fmt"
+	"github.com/beego/beego/v2/core/logs"
 	"github.com/robfig/cron/v3"
 	"github.com/xuri/excelize/v2"
 	"math"

+ 2 - 2
controllers/lib/Qiniu.go

@@ -3,7 +3,7 @@ package lib
 // 存储相关功能的引入包只有这两个,后面不再赘述
 import (
 	"Cold_Api/conf"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"context"
 	"github.com/qiniu/go-sdk/v7/auth/qbox"
 	"github.com/qiniu/go-sdk/v7/storage"
@@ -64,7 +64,7 @@ func Pload_qiniu(localFile string, name string) bool {
 		logs.Error("Pload_qiniu", err)
 		return false
 	}
-	logs.Println("七牛云", ret.Bucket, ret.Key, ret.Fsize, ret.Hash, ret.Name)
+	logs.Info("七牛云", ret.Bucket, ret.Key, ret.Fsize, ret.Hash, ret.Name)
 	return true
 }
 

+ 1 - 1
controllers/lib/wxpay.go

@@ -2,7 +2,7 @@ package lib
 
 import (
 	"Cold_Api/conf"
-	"Cold_Api/logs"
+	"github.com/beego/beego/v2/core/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/go-resty/resty/v2"

+ 4 - 0
go.mod

@@ -17,6 +17,8 @@ require (
 	github.com/signintech/gopdf v0.15.1
 	github.com/vmihailenco/msgpack/v5 v5.3.5
 	github.com/xuri/excelize/v2 v2.7.0
+	gorm.io/driver/mysql v1.5.6
+	gorm.io/gorm v1.25.9
 )
 
 require (
@@ -24,6 +26,8 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect

+ 9 - 0
go.sum

@@ -169,6 +169,10 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -636,6 +640,11 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=
+gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.9 h1:wct0gxZIELDk8+ZqF/MVnHLkA1rvYlBWUMv2EdsK1g8=
+gorm.io/gorm v1.25.9/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

+ 84 - 0
initialize/db.go

@@ -0,0 +1,84 @@
+package initialize
+
+import (
+	"Cold_Api/conf"
+	_ "github.com/go-sql-driver/mysql"
+
+	"fmt"
+	"log"
+	"time"
+
+	"gorm.io/gorm/logger"
+
+	"github.com/beego/beego/v2/core/logs"
+	beego "github.com/beego/beego/v2/server/web"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+)
+
+var DB *gorm.DB
+
+var Err error
+
+// 重写gorm日志的Writer
+type Writer struct {
+}
+
+func (w Writer) Printf(format string, args ...interface{}) {
+	// log.Infof(format, args...)
+	logs.Notice(format, args...)
+}
+
+// 设置psql
+func init() {
+	log.Println("连接数据库...")
+
+	sqlloglevel, err := beego.AppConfig.Int("sqlloglevel")
+	if err != nil {
+		log.Fatalf("无法获取sqlloglevel: %v", err)
+	}
+	slow_threshold, err := beego.AppConfig.Int("slow_threshold")
+	if err != nil {
+		log.Fatalf("无法获取slow_threshold: %v", err)
+	}
+
+	dataSource := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local",
+		conf.MysqlServer_Username,
+		conf.MysqlServer_Password,
+		conf.MysqlServer_UrlPort,
+		conf.MysqlServer_Database,
+	)
+
+	//设置gorm日志规则
+	newLogger := logger.New(
+		// log.New(os.Stdout, "\r\n", log.LstdFlags), // io writer 单独设置grom日志输出
+		Writer{}, // beego日志info输出
+		logger.Config{
+			SlowThreshold:             time.Duration(slow_threshold) * time.Millisecond, // Slow SQL threshold
+			LogLevel:                  logger.LogLevel(sqlloglevel),                     // Log level
+			IgnoreRecordNotFoundError: true,                                             // Ignore ErrRecordNotFound error for logger
+			Colorful:                  true,                                             // Disable color
+		},
+	)
+
+	DB, Err = gorm.Open(mysql.Open(dataSource), &gorm.Config{
+		DisableForeignKeyConstraintWhenMigrating: true,
+		Logger:                                   newLogger,
+		DisableAutomaticPing:                     true,
+	})
+
+	if Err != nil {
+		log.Fatalf("连接数据库失败: %v", Err)
+	}
+
+	SqlDB, err2 := DB.DB()
+	if err2 != nil {
+		log.Fatalf("连接数据库失败: %v", err2)
+	}
+
+	SqlDB.SetMaxIdleConns(conf.MysqlServer_MaxIdleConnections)
+	SqlDB.SetMaxOpenConns(conf.MysqlServer_MaxOpenConnections)
+	SqlDB.SetConnMaxLifetime(time.Hour)
+
+	log.Println("连接数据库完成...")
+}

+ 71 - 0
initialize/log.go

@@ -0,0 +1,71 @@
+package initialize
+
+import (
+	"encoding/json"
+	"github.com/beego/beego/v2/core/logs"
+	beego "github.com/beego/beego/v2/server/web"
+	"log"
+)
+
+func init() {
+	log.SetFlags(log.Lshortfile | log.Ltime | log.Ldate)
+	log.Println("系统日志初始化...")
+
+	maxdays, err := beego.AppConfig.Int("maxdays")
+	if err != nil {
+		log.Println("无法获取maxdays:", err)
+	}
+
+	level, err := beego.AppConfig.Int("level")
+	if err != nil {
+		log.Println("无法获取level:", err)
+	}
+
+	maxlines, err := beego.AppConfig.Int("maxlines")
+	if err != nil {
+		log.Println("无法获取maxlines:", err)
+	}
+
+	dataSource := &struct {
+		Filename string `json:"filename"`
+		Level    int    `json:"level"`
+		Maxlines int    `json:"maxlines"`
+		Maxsize  int    `json:"maxsize"`
+		Daily    bool   `json:"daily"`
+		Maxdays  int    `json:"maxdays"`
+		Color    bool   `json:"color"`
+	}{
+		Filename: "logs/logx/logx.log",
+		Level:    level,
+		Maxlines: maxlines,
+		Maxsize:  0,
+		Daily:    true,
+		Maxdays:  maxdays,
+		Color:    true,
+	}
+	dataSourceBytes, err := json.Marshal(dataSource)
+	if err != nil {
+		log.Println("无法创建dataSource:", err)
+	}
+	logs.SetLevel(level)
+	adapter_type, err := beego.AppConfig.Int("adapter_type")
+	if err != nil {
+		log.Println("无法获取adapter_type:", err)
+	}
+	// 日志输出选择
+	switch adapter_type {
+	case 0:
+		logs.SetLogger(logs.AdapterConsole)
+	case 1:
+		logs.Reset()
+		logs.SetLogger(logs.AdapterFile, string(dataSourceBytes))
+	case 2:
+		logs.SetLogger(logs.AdapterFile, string(dataSourceBytes))
+	default:
+		logs.SetLogger(logs.AdapterConsole)
+	}
+	// 是否记录日志的调用层级 默认是logs.SetLogFuncCallDepth(2)
+	logs.EnableFuncCallDepth(true)
+	logs.Async()
+	log.Println("系统日志初始化完成")
+}

+ 5 - 5
logs/LogPrintln.go

@@ -19,7 +19,7 @@ func init() {
 	}
 }
 
-func Println(format string, v ...interface{}) {
+func PPrintln(format string, v ...interface{}) {
 	for _, _ = range v {
 		format += " %v"
 	}
@@ -27,7 +27,7 @@ func Println(format string, v ...interface{}) {
 }
 
 // Debug Log DEBUG level message.
-func Debug(format string, v ...interface{}) {
+func DDebug(format string, v ...interface{}) {
 	for _, _ = range v {
 		format += " %v"
 	}
@@ -35,7 +35,7 @@ func Debug(format string, v ...interface{}) {
 }
 
 // Info Log ERROR level message.
-func Info(format string, v ...interface{}) {
+func IInfo(format string, v ...interface{}) {
 	for _, _ = range v {
 		format += " %v"
 	}
@@ -43,7 +43,7 @@ func Info(format string, v ...interface{}) {
 }
 
 // Error Log ERROR level message.
-func Error(format string, v ...interface{}) {
+func EError(format string, v ...interface{}) {
 	for _, _ = range v {
 		format += " %v"
 	}
@@ -52,7 +52,7 @@ func Error(format string, v ...interface{}) {
 }
 
 // Warning Log WARNING level message.
-func Warning(format string, v ...interface{}) {
+func WWarning(format string, v ...interface{}) {
 	for _, _ = range v {
 		format += " %v"
 	}

+ 1 - 0
main.go

@@ -4,6 +4,7 @@ import (
 	_ "Cold_Api/Nats"
 	"Cold_Api/conf"
 	"Cold_Api/controllers"
+	_ "Cold_Api/initialize"
 	"Cold_Api/models/Device"
 	"Cold_Api/models/Product"
 	"Cold_Api/models/Warning"

+ 1 - 1
models/Account/Admin.go

@@ -3,13 +3,13 @@ package Account
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"strings"

+ 1 - 1
models/Account/Company.go

@@ -3,13 +3,13 @@ package Account
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"sync"

+ 1 - 1
models/Account/Menu.go

@@ -3,13 +3,13 @@ package Account
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"strconv"
 	"time"
 )

+ 1 - 1
models/Account/Power.go

@@ -3,12 +3,12 @@ package Account
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"strconv"
 	"strings"
 	"time"

+ 1 - 1
models/Account/Tokey.go

@@ -2,10 +2,10 @@ package Account
 
 import (
 	"Cold_Api/conf"
-	"Cold_Api/logs"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
+	"github.com/beego/beego/v2/core/logs"
 	uuid "github.com/satori/go.uuid"
 	"log"
 	"strconv"

+ 1 - 1
models/Account/UserDevice.go

@@ -3,11 +3,11 @@ package Account
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 1 - 1
models/Company/CompanyBill.go

@@ -2,9 +2,9 @@ package Company
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 1 - 1
models/Company/CompanyClass.go

@@ -3,7 +3,6 @@ package Company
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"Cold_Api/models/Account"
 	"encoding/json"
 	"fmt"
@@ -11,6 +10,7 @@ import (
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"time"

+ 5 - 5
models/Company/CompanyNotice.go

@@ -3,13 +3,13 @@ package Company
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"strings"
@@ -23,7 +23,7 @@ type CompanyNotice struct {
 
 	T_Notice_wx        string `orm:"type(text);null"` //w微信公众号  appid/名字|
 	T_Notice_wx2       string `orm:"type(text);null"` //w微信公众号  appid/名字|
-	T_Notice_app      string `orm:"type(text);null"` //app
+	T_Notice_app       string `orm:"type(text);null"` //app
 	T_Notice_phone     string `orm:"type(text);null"` //p手机  1111111|
 	T_Notice_message   string `orm:"type(text);null"` //m短信   1111111|
 	T_Notice_mailbox   string `orm:"type(text);null"` //e邮箱    1111111|
@@ -354,7 +354,7 @@ func Update_CompanyNotice_Bind_By_T_uuid(T_uuid, T_name string) bool {
 		v.T_Notice_phone = Replice_T_Notice_Bind(T_uuid, v.T_Notice_phone, T_uuid_name)
 		v.T_Notice_message = Replice_T_Notice_Bind(T_uuid, v.T_Notice_message, T_uuid_name)
 		v.T_Notice_mailbox = Replice_T_Notice_Bind(T_uuid, v.T_Notice_mailbox, T_uuid_name)
-		_, err = o.Update(&v, "T_Notice_wx", "T_Notice_wx2","T_Notice_app", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
+		_, err = o.Update(&v, "T_Notice_wx", "T_Notice_wx2", "T_Notice_app", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
 		if err != nil {
 			logs.Error(lib.FuncName(), err)
 			o.Rollback()
@@ -401,7 +401,7 @@ func Delete_CompanyNotice_Bind_By_T_uuid(T_uuid string) bool {
 		v.T_Notice_phone = Replice_T_Notice_Bind(T_uuid, v.T_Notice_phone, "")
 		v.T_Notice_message = Replice_T_Notice_Bind(T_uuid, v.T_Notice_message, "")
 		v.T_Notice_mailbox = Replice_T_Notice_Bind(T_uuid, v.T_Notice_mailbox, "")
-		_, err := o.Update(&v, "T_Notice_wx", "T_Notice_wx2","T_Notice_app", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
+		_, err := o.Update(&v, "T_Notice_wx", "T_Notice_wx2", "T_Notice_app", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
 		if err != nil {
 			logs.Error(lib.FuncName(), err)
 			o.Rollback()
@@ -449,7 +449,7 @@ func Delete_CompanyNotice_Bind_By_T_uuid_T_pid(T_uuid string, T_pids []int) bool
 		v.T_Notice_phone = Replice_T_Notice_Bind(T_uuid, v.T_Notice_phone, "")
 		v.T_Notice_message = Replice_T_Notice_Bind(T_uuid, v.T_Notice_message, "")
 		v.T_Notice_mailbox = Replice_T_Notice_Bind(T_uuid, v.T_Notice_mailbox, "")
-		_, err := o.Update(&v, "T_Notice_wx", "T_Notice_wx2", "T_Notice_app","T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
+		_, err := o.Update(&v, "T_Notice_wx", "T_Notice_wx2", "T_Notice_app", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism")
 		if err != nil {
 			logs.Error(lib.FuncName(), err)
 			o.Rollback()

+ 1 - 1
models/Company/CompanyPayOrder.go

@@ -2,9 +2,9 @@ package Company
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 1 - 1
models/DataSource/DataSource.go

@@ -2,9 +2,9 @@ package DataSource
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 1 - 1
models/Device/Device.go

@@ -3,7 +3,6 @@ package Device
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"Cold_Api/models/Account"
 	"Cold_Api/models/Product"
 	"encoding/json"
@@ -11,6 +10,7 @@ import (
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 
 	"github.com/beego/beego/v2/adapter/orm"
 	_ "github.com/go-sql-driver/mysql"

+ 1 - 1
models/Device/DeviceParameter.go

@@ -2,8 +2,8 @@ package Device
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"time"

+ 1 - 1
models/Device/DeviceReal.go

@@ -3,11 +3,11 @@ package Device
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 1 - 1
models/Device/DeviceSensor.go

@@ -3,7 +3,6 @@ package Device
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"Cold_Api/models/Account"
 	"encoding/json"
 	"fmt"
@@ -11,6 +10,7 @@ import (
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"strings"

+ 1 - 1
models/Device/DeviceSensorParameter.go

@@ -3,7 +3,6 @@ package Device
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"Cold_Api/models"
 	"encoding/json"
 	"fmt"
@@ -11,6 +10,7 @@ import (
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"sync"

+ 2 - 2
models/Device/DeviceSensorType.go

@@ -2,8 +2,8 @@ package Device
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"sync"
 	"time"
@@ -65,7 +65,7 @@ func Read_DeviceSensorType_List_All() (r []DeviceSensorType) {
 func Read_DeviceSensorTypeAll_Map() {
 	time.Sleep(2 * time.Second)
 
-	logs.Println("=========== 初始化传感器类型类型 =========")
+	logs.Info("=========== 初始化传感器类型类型 =========")
 
 	o := orm.NewOrm()
 	for true {

+ 1 - 1
models/Device/DeviceTask.go

@@ -2,9 +2,9 @@ package Device
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"time"
 )

+ 2 - 2
models/Product/ProductType.go

@@ -2,9 +2,9 @@ package Product
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"sync"
 	"time"
@@ -63,7 +63,7 @@ func Read_ProductType_All() (r []ProductType) {
 func Read_ProductType_All_Map() {
 	time.Sleep(2 * time.Second)
 
-	logs.Println("=========== 初始化产品类型 =========")
+	logs.Info("=========== 初始化产品类型 =========")
 
 	o := orm.NewOrm()
 	for true {

+ 1 - 1
models/Product/ProductUpgrade.go

@@ -2,13 +2,13 @@ package Product
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"time"

+ 1 - 1
models/RawSql/RawSql.go

@@ -3,9 +3,9 @@ package RawSql
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"time"
 )

+ 1 - 1
models/RawSql/SqlLogs.go

@@ -3,9 +3,9 @@ package RawSql
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 1 - 1
models/System/Logs.go

@@ -2,10 +2,10 @@ package System
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 1 - 1
models/System/UserLogs.go

@@ -2,11 +2,11 @@ package System
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"encoding/json"
 	"fmt"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 1 - 1
models/Warning/Warning.go

@@ -3,7 +3,6 @@ package Warning
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"Cold_Api/models/Account"
 	"encoding/json"
 	"fmt"
@@ -11,6 +10,7 @@ import (
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/gomodule/redigo/redis"
 	"strconv"

+ 1 - 1
models/Warning/WarningHandle.go

@@ -2,8 +2,8 @@ package Warning
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 type WarningHandle struct {

+ 1 - 1
models/Warning/WarningRate.go

@@ -2,9 +2,9 @@ package Warning
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	"time"
 )
 

+ 2 - 2
models/Warning/WarningSand.go

@@ -2,11 +2,11 @@ package Warning
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"Cold_Api/models/Account"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"strings"
@@ -178,7 +178,7 @@ func Get_WarningSandNum(TABLE_name string, Pid, Ntype int, StartTine, EndTime st
 	num, err := o.Raw("SELECT count(ID) AS count FROM " + TABLE_name + " WHERE `t_pid` = " + strconv.Itoa(Pid) + " AND `t__ntype` = " + strconv.Itoa(Ntype) + " AND `create_time` >= '" + StartTine + "' AND `create_time` <= '" + EndTime + "'").Values(&maps)
 	if err == nil && num > 0 {
 		intx, _ := strconv.Atoi(lib.To_string(maps[0]["count"]))
-		logs.Println("Get_WarningSandNum:", TABLE_name, Pid, Ntype, StartTine, EndTime, intx) // slene
+		logs.Info("Get_WarningSandNum:", TABLE_name, Pid, Ntype, StartTine, EndTime, intx) // slene
 		return intx
 	}
 	logs.Error("执行错误!!!", "Get_WarningSandNum:", TABLE_name, Pid, Ntype, StartTine, EndTime, maps) // slene

+ 3 - 3
models/Warning/WarningType.go

@@ -2,9 +2,9 @@ package Warning
 
 import (
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/core/logs"
 	_ "github.com/go-sql-driver/mysql"
 	"strconv"
 	"strings"
@@ -103,7 +103,7 @@ func WarningTypeToWarningType_(r WarningType) (v WarningType_) {
 
 // 获取全部
 func Read_WarningType_All_T_Notice_mechanism() string {
-	logs.Println("=========== 初始化报警规则 =========")
+	logs.Info("=========== 初始化报警规则 =========")
 	time.Sleep(3 * time.Second)
 	o := orm.NewOrm()
 	var r []WarningType
@@ -189,7 +189,7 @@ func Read_WarningType_All_Power_T_Warning(T_warning string) (r []WarningType_R)
 func Read_WarningType_All_Maps() {
 	time.Sleep(2 * time.Second)
 
-	logs.Println("=========== 初始化报警类型 =========")
+	logs.Info("=========== 初始化报警类型 =========")
 
 	o := orm.NewOrm()
 

+ 2 - 2
routers/filter.go

@@ -3,9 +3,9 @@ package routers
 import (
 	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
-	"Cold_Api/logs"
 	"Cold_Api/models/Account"
 	"fmt"
+	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web/context"
 	"strings"
 )
@@ -18,7 +18,7 @@ var (
 
 func init() {
 	//初始化配置 不鉴权的URL和只鉴权登录的URL
-	logs.Println("=========== 初始化路由筛选信息 =========")
+	logs.Info("=========== 初始化路由筛选信息 =========")
 
 	excludeUrl := conf.FilterExcludeURL
 	if len(excludeUrl) > 0 {