Просмотр исходного кода

update:修改用户,日志为nats连接

zoie 2 лет назад
Родитель
Сommit
ae5ebd9e16
13 измененных файлов с 189 добавлено и 424 удалено
  1. 120 0
      Nats/Nats.go
  2. 4 8
      conf/app.conf
  3. 2 4
      conf/config.go
  4. 0 43
      controllers/Logs.go
  5. 12 15
      controllers/WorkOrder.go
  6. 11 4
      go.mod
  7. 21 22
      go.sum
  8. 0 26
      lib/lib.go
  9. 12 74
      models/Account/Admin.go
  10. 7 61
      models/Account/Company.go
  11. 0 78
      models/Account/Tokey.go
  12. 0 79
      models/System/UserLogs.go
  13. 0 10
      routers/Logs.go

+ 120 - 0
Nats/Nats.go

@@ -0,0 +1,120 @@
+package Nats
+
+import (
+	"Cold_WorkOrder/conf"
+	"Cold_WorkOrder/models/Account"
+	"fmt"
+	"github.com/nats-io/nats.go"
+	"github.com/vmihailenco/msgpack/v5"
+	"time"
+)
+
+var Nats *nats.Conn
+
+func init() {
+	fmt.Println("============Nats init============")
+	var err error
+	// 连接Nats服务器
+	Nats, err = nats.Connect("nats://" + conf.NatsServer_Url)
+	if err != nil {
+		fmt.Println("nats 连接失败!")
+		panic(err)
+	}
+	fmt.Println("nats OK!")
+
+}
+
+// 验证TOKEY
+func Verification(ToKey string) (bool, Account.User) {
+	// 请求-响应, 向 verification 发布一个 `ToKey` 请求数据,设置超时间3秒,如果有多个响应,只接收第一个收到的消息
+	msg, err := Nats.Request("Cold_User_verification", []byte(ToKey), 3*time.Second)
+	if err != nil {
+		return false, Account.User{}
+	}
+	fmt.Printf("verification : %s\n", string(msg.Data))
+	type T_R struct {
+		Code int16        `xml:"Code"`
+		Msg  string       `xml:"Msg"`
+		Data Account.User `xml:"Data"` // 泛型
+	}
+
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		return false, Account.User{}
+	}
+
+	return true, t_R.Data
+
+}
+
+func CompanyListAllByT_name(T_name string) (list []Account.Company) {
+	msg, err := Nats.Request("Cold_User_CompanyListAllByT_name", []byte(T_name), 3*time.Second)
+	if err != nil {
+		return list
+	}
+	fmt.Printf("CompanyListAllByT_name: %s\n", string(msg.Data))
+	type T_R struct {
+		Code int16             `xml:"Code"`
+		Msg  string            `xml:"Msg"`
+		Data []Account.Company `xml:"Data"` // 泛型
+	}
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		return list
+	}
+
+	return t_R.Data
+}
+
+func UserListAll() (list []Account.User) {
+	msg, err := Nats.Request("Cold_User_UserListAll", []byte(""), 3*time.Second)
+	if err != nil {
+		return list
+	}
+	fmt.Printf("UserListAll: %s\n", string(msg.Data))
+	type T_R struct {
+		Code int16          `xml:"Code"`
+		Msg  string         `xml:"Msg"`
+		Data []Account.User `xml:"Data"` // 泛型
+	}
+	var t_R T_R
+
+	err = msgpack.Unmarshal(msg.Data, &t_R)
+	if err != nil {
+		return list
+	}
+
+	return t_R.Data
+}
+
+// 添加系统日志
+func AddSysLogs(T_class, T_title string, T_txt interface{}) {
+
+	type T_S struct {
+		T_class string
+		T_title string
+		T_txt   interface{}
+	}
+	b, _ := msgpack.Marshal(&T_S{T_class: T_class, T_title: T_title, T_txt: T_txt})
+	// 发布-订阅 模式,向 test1 发布一个 `Hello World` 数据
+	_ = Nats.Publish("Cold_User_AddSysLogs", b)
+
+}
+
+// 添加用户日志
+func AddUserLogs(T_uuid, T_class, T_title string, T_txt interface{}) {
+
+	type T_S struct {
+		T_uuid  string
+		T_class string
+		T_title string
+		T_txt   interface{}
+	}
+	b, _ := msgpack.Marshal(&T_S{T_uuid: T_uuid, T_class: T_class, T_title: T_title, T_txt: T_txt})
+	// 发布-订阅 模式,向 test1 发布一个 `Hello World` 数据
+	_ = Nats.Publish("Cold_User_AddUserLogs", b)
+}

+ 4 - 8
conf/app.conf

@@ -1,5 +1,5 @@
-appname = Cold_WorkOrder6500
-HTTPPort = 6500
+appname = Cold_WorkOrder6240
+HTTPPort = 6240
 runmode = dev
 Graceful = true
 EnableDocs = true
@@ -14,9 +14,5 @@ MysqlServer_Password = "123456"
 MysqlServer_MaxIdleConnections = 100
 MysqlServer_MaxOpenConnections = 200
 
-# Redis
-Redis_address = "127.0.0.1:3379"
-Redis_password = ""
-Redis_dbNum = "2"
-
-
+# Nats 用户
+NatsServer_Url = "127.0.0.1:4222"

+ 2 - 4
conf/config.go

@@ -28,7 +28,5 @@ var MysqlServer_Password, _ = beego.AppConfig.String("MysqlServer_Password")
 var MysqlServer_MaxIdleConnections, _ = beego.AppConfig.Int("MysqlServer_MaxIdleConnections")
 var MysqlServer_MaxOpenConnections, _ = beego.AppConfig.Int("MysqlServer_MaxOpenConnections")
 
-// Redis
-var Redis_address, _ = beego.AppConfig.String("Redis_address")
-var Redis_password, _ = beego.AppConfig.String("Redis_password")
-var Redis_dbNum, _ = beego.AppConfig.String("Redis_dbNum")
+// Nats
+var NatsServer_Url, _ = beego.AppConfig.String("NatsServer_Url")

+ 0 - 43
controllers/Logs.go

@@ -1,43 +0,0 @@
-package controllers
-
-import (
-	"Cold_WorkOrder/conf"
-	"Cold_WorkOrder/lib"
-	"Cold_WorkOrder/models/System"
-	beego "github.com/beego/beego/v2/server/web"
-	"math"
-)
-
-type LogsController struct {
-	beego.Controller
-}
-
-// 列表 -
-func (c *LogsController) UserLogs() {
-	var log_jsons lib.LOG_JSONS
-	page, _ := c.GetInt("page")
-	if page < 1 {
-		page = 1
-	}
-	page_z, _ := c.GetInt("page_z")
-	if page_z < 1 {
-		page_z = conf.Page_size
-	}
-
-	Class_1 := c.GetString("Class_1")
-
-	var cnt int64
-	List, cnt := System.Read_UserLogs_ALL(page, page_z, Class_1)
-	page_size := math.Ceil(float64(cnt) / float64(page_z))
-	log_jsons.Class_1 = Class_1
-	log_jsons.Class_List = System.Read_UserLogs_Class()
-	log_jsons.List = List
-	log_jsons.Page = page
-	log_jsons.Page_size = int(page_size)
-	log_jsons.Pages = lib.Func_page(int64(page), int64(page_size))
-	log_jsons.Num = int(cnt)
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: log_jsons}
-	c.ServeJSON()
-	return
-}

+ 12 - 15
controllers/WorkOrder.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
+	"Cold_WorkOrder/Nats"
 	"Cold_WorkOrder/conf"
 	"Cold_WorkOrder/lib"
 	"Cold_WorkOrder/models/Account"
-	"Cold_WorkOrder/models/System"
 	"Cold_WorkOrder/models/WorkOrder"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
@@ -16,7 +16,7 @@ type WorkOrderController struct {
 
 // 列表 -
 func (c *WorkOrderController) List() {
-	b_, user_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	b_, user_r := Nats.Verification(c.Ctx.GetCookie("User_tokey"))
 	if !b_ {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -44,17 +44,14 @@ func (c *WorkOrderController) List() {
 	}
 	var CompanyIds []int
 	var Company_list []Account.Company
+	Company_list = Nats.CompanyListAllByT_name(Company_name)
 	if len(Company_name) > 0 {
-		Company_list = Account.Read_Company_List_All_ByT_name(Company_name)
 		for _, v := range Company_list {
 			CompanyIds = append(CompanyIds, v.Id)
 		}
 	}
-	if len(Company_list) == 0 {
-		Company_list = Account.Read_Company_List_All()
-	}
 	CompanyMap := Account.CompanyListToMap(Company_list)
-	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_All())
+	AdminMap := Account.AdminListToMap(Nats.UserListAll())
 	var cnt int64
 	List, cnt := WorkOrder.Read_WorkOrder_List(T_Status, page, page_z, CompanyIds, CompanyMap, AdminMap)
 
@@ -72,7 +69,7 @@ func (c *WorkOrderController) List() {
 
 // 列表 -
 func (c *WorkOrderController) User_List() {
-	b_, user_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	b_, user_r := Nats.Verification(c.Ctx.GetCookie("User_tokey"))
 	if !b_ {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -106,7 +103,7 @@ func (c *WorkOrderController) User_List() {
 
 // 标签修改-
 func (c *WorkOrderController) Get() {
-	b_, _ := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	b_, _ := Nats.Verification(c.Ctx.GetCookie("User_tokey"))
 	if !b_ {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -133,7 +130,7 @@ func (c *WorkOrderController) Get() {
 
 // 添加-
 func (c *WorkOrderController) Add() {
-	b_, user_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	b_, user_r := Nats.Verification(c.Ctx.GetCookie("User_tokey"))
 	if !b_ {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -157,7 +154,7 @@ func (c *WorkOrderController) Add() {
 		return
 	}
 
-	System.Add_UserLogs_T(user_r.T_uuid, "工单系统", "添加", var_)
+	Nats.AddUserLogs(user_r.T_uuid, "工单系统", "添加", var_)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
 	c.ServeJSON()
@@ -166,7 +163,7 @@ func (c *WorkOrderController) Add() {
 
 // 标签修改-
 func (c *WorkOrderController) Up() {
-	b_, user_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	b_, user_r := Nats.Verification(c.Ctx.GetCookie("User_tokey"))
 	if !b_ {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -207,7 +204,7 @@ func (c *WorkOrderController) Up() {
 		return
 	}
 
-	System.Add_UserLogs_T(user_r.T_uuid, "工单系统", "修改", r)
+	Nats.AddUserLogs(user_r.T_uuid, "工单系统", "修改", r)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
@@ -216,7 +213,7 @@ func (c *WorkOrderController) Up() {
 
 // 标签删除-
 func (c *WorkOrderController) Del() {
-	b_, user_r := lib.Verification(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	b_, user_r := Nats.Verification(c.Ctx.GetCookie("User_tokey"))
 	if !b_ {
 		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
 		c.ServeJSON()
@@ -242,7 +239,7 @@ func (c *WorkOrderController) Del() {
 		return
 	}
 
-	System.Add_UserLogs_T(user_r.T_uuid, "工单系统", "删除", r)
+	Nats.AddUserLogs(user_r.T_uuid, "工单系统", "删除", r)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()

+ 11 - 4
go.mod

@@ -6,9 +6,10 @@ require (
 	github.com/astaxie/beego v1.12.3
 	github.com/beego/beego/v2 v2.0.7
 	github.com/go-sql-driver/mysql v1.7.0
-	github.com/qiniu/go-sdk/v7 v7.14.0
+	github.com/nats-io/nats.go v1.22.1
 	github.com/satori/go.uuid v1.2.0
 	github.com/signintech/gopdf v0.15.0
+	github.com/vmihailenco/msgpack/v5 v5.3.5
 )
 
 require (
@@ -17,21 +18,27 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/nats-io/nats-server/v2 v2.9.10 // indirect
+	github.com/nats-io/nkeys v0.3.0 // indirect
+	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/phpdave11/gofpdi v1.0.11 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
-	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
-	golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 // indirect
+	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

+ 21 - 22
go.sum

@@ -92,12 +92,6 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.8.0/go.mod h1:9JhgTzTaE31GZDpH/HSvHiRJrJ3iKAgqqH0Bl/Ocjdk=
 github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
@@ -177,6 +171,7 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -189,13 +184,13 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.5 h1:J+gdV2cUmX7ZqL2B0lFcW0m+egaHC2V3lpO8nWxyYiQ=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -205,6 +200,15 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI=
+github.com/nats-io/nats-server/v2 v2.9.10 h1:LMC46Oi9E6BUx/xBsaCVZgofliAqKQzRPU6eKWkN8jE=
+github.com/nats-io/nats-server/v2 v2.9.10/go.mod h1:AB6hAnGZDlYfqb7CTAm66ZKMZy9DpfierY1/PbpvI2g=
+github.com/nats-io/nats.go v1.22.1 h1:XzfqDspY0RNufzdrB8c4hFR+R3dahkxlpWe5+IWJzbE=
+github.com/nats-io/nats.go v1.22.1/go.mod h1:tLqubohF7t4z3du1QDPYJIQQyhb4wl6DhjxEajSI7UA=
+github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
+github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
+github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
+github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
@@ -248,10 +252,6 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk=
-github.com/qiniu/go-sdk/v7 v7.14.0 h1:6icihMTKHoKMmeU1mqtIoHUv7c1LrLjYm8wTQaYDqmw=
-github.com/qiniu/go-sdk/v7 v7.14.0/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w=
-github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
@@ -280,6 +280,10 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
+github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -296,10 +300,9 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38=
-golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
+golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -380,8 +383,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -420,12 +421,10 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 h1:TyKJRhyo17yWxOMCTHKWrc5rddHORMlnZ/j57umaUd8=
-golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -439,6 +438,7 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -580,7 +580,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-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=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

+ 0 - 26
lib/lib.go

@@ -1,11 +1,9 @@
 package lib
 
 import (
-	"Cold_WorkOrder/models/Account"
 	"encoding/json"
 	"fmt"
 	"github.com/signintech/gopdf"
-	"log"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -64,30 +62,6 @@ type LOG_JSONS struct {
 	Pages      []Page_T
 }
 
-// 登录验证
-func Verification(GetCookie string, GetString string) (bool, Account.Admin) {
-	Run_My_Server = true // 运行当期服务
-	// 自适应 参数
-	User_tokey := GetCookie
-	if len(User_tokey) == 0 {
-		User_tokey = GetString
-	}
-	if len(User_tokey) == 0 {
-		return false, Account.Admin{}
-	}
-	tokey, is := Account.Redis_Tokey_Get(User_tokey)
-	if !is {
-		return false, Account.Admin{}
-	}
-	admin_r, err := Account.Read_Admin_ByUuid(tokey)
-	if err != nil {
-		is = false
-		return false, Account.Admin{}
-	}
-	log.Println("登录 Admin_name 为:", admin_r.T_name)
-	return is, admin_r
-}
-
 // 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

+ 12 - 74
models/Account/Admin.go

@@ -1,86 +1,24 @@
 package Account
 
 import (
-	"Cold_WorkOrder/conf"
-	"fmt"
-	"github.com/astaxie/beego/cache"
 	_ "github.com/astaxie/beego/cache/redis"
-	"github.com/beego/beego/v2/adapter/orm"
 	_ "github.com/go-sql-driver/mysql"
-	"time"
 )
 
-type Admin struct {
-	Id      int    `orm:"column(ID);size(11);auto;pk"`
-	T_uuid  string `orm:"size(256);null"` //  用户编号
-	T_pid   int    `orm:"size(200);null"` //  绑定公司 ( 只有创建公司用户时添加,内部人员 为0)
-	T_power int    `orm:"size(2);0"`      // 权限 (关联权限表)
-	T_user  string `orm:"size(256);null"` // 用户名 (唯一)
-	T_pass  string `orm:"size(256);null"` // MD5
-
-	T_name  string `orm:"size(256);null"` // 姓名
-	T_phone string `orm:"size(256);null"` // 电话
-	T_mail  string `orm:"size(200);null"` // 邮箱
-	T_wx    string `orm:"size(256);null"` // 微信
-
-	T_State    int       `orm:"size(200);1"`                                           //  0删除  1 正常
-	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
-	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now_add 第一次保存时才设置时间
-}
-
-func (t *Admin) TableName() string {
-	return "Admin" // 数据库名称   // ************** 替换 FormulaList **************
-}
-
-var redisCache_Admin cache.Cache
-
-func init() {
-	//注册模型
-	orm.RegisterModel(new(Admin))
-
-	config := fmt.Sprintf(`{"key":"%s","conn":"%s","dbNum":"%s","password":"%s"}`,
-		"redis_Admin", conf.Redis_address, conf.Redis_dbNum, conf.Redis_password)
-	fmt.Println(config)
-	var err error
-	redisCache_Admin, err = cache.NewCache("redis", config)
-	if err != nil || redisCache_Admin == nil {
-		errMsg := "failed to init redis"
-		fmt.Println(errMsg, err)
-	}
-
-}
-
-// ---------------- 特殊方法 -------------------
-// 获取 ByT_uuid
-func Read_Admin_ByUuid(T_uuid string) (r Admin, err error) {
-	if r, is := Redis_Admin_Get(T_uuid); is {
-		//println("Redis_Get  OK")
-		return r, nil
-	}
-	o := orm.NewOrm()
-	r = Admin{T_uuid: T_uuid, T_State: 1}
-	err = o.Read(&r, "T_uuid", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
-	if err != nil {
-		fmt.Println(err)
-	}
-	return r, err
-}
-
-// 获取列表
-func Read_Admin_List_All() (maps []Admin) {
-
-	o := orm.NewOrm()
-	// 也可以直接使用 Model 结构体作为表名
-	qs := o.QueryTable(new(Admin))
-	qs.All(&maps)
-
-	return maps
+type User struct {
+	T_uuid  string `xml:"T_uuid"`
+	T_pid   int    `xml:"T_pid"`
+	T_power int    `xml:"T_power"`
+	T_name  string `xml:"T_name"`
+	T_user  string `xml:"T_user"`
+	T_phone string `xml:"T_phone"`
+	T_mail  string `xml:"T_mail"`
+	T_wx    string `xml:"T_wx"`
 }
 
-// {"T_uuid":"T_name"}
-func AdminListToMap(C []Admin) map[string]string {
-	maps := make(map[string]string, len(C))
-	for _, v := range C {
+func AdminListToMap(A []User) map[string]string {
+	maps := make(map[string]string, len(A))
+	for _, v := range A {
 		maps[v.T_uuid] = v.T_name
 	}
 	return maps

+ 7 - 61
models/Account/Company.go

@@ -1,69 +1,15 @@
 package Account
 
-import (
-	_ "github.com/astaxie/beego/cache/redis"
-	"github.com/beego/beego/v2/adapter/orm"
-	orm2 "github.com/beego/beego/v2/client/orm"
-	_ "github.com/go-sql-driver/mysql"
-	"time"
-)
-
 type Company struct {
-	Id     int    `orm:"column(ID);size(11);auto;pk"`
-	T_mid  int    `orm:"size(200);null"` //  上一级 ID
-	T_name string `orm:"size(256);null"` // 公司名称
-	T_uids string `orm:"size(256);null"` // 绑定用户 Uid|  如:U1|U2|
-
-	T_State    int       `orm:"size(200);1"`                                           //  0删除  1 正常
-	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
-	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now_add 第一次保存时才设置时间
-}
-
-func (t *Company) TableName() string {
-	return "Company" // 数据库名称   // ************** 替换 FormulaList **************
-}
-
-func init() {
-	//注册模型
-	orm.RegisterModel(new(Company))
-}
-
-// ---------------- 特殊方法 -------------------
-// 获取列表
-func Read_Company_List_All() (maps []Company) {
-
-	o := orm.NewOrm()
-	// 也可以直接使用 Model 结构体作为表名
-	qs := o.QueryTable(new(Company))
-
-	//cond := orm.NewCondition()
-	//cond1 := cond.And("T_State", 1) // .AndNot("status__in", 1).Or("profile__age__gt", 2000)
-	//qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&maps)
-	//cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
-	qs.All(&maps)
-
-	return maps
-}
-
-// 获取列表
-func Read_Company_List_All_ByT_name(T_name string) (maps []Company) {
-
-	o := orm.NewOrm()
-	// 也可以直接使用 Model 结构体作为表名
-
-	qs := o.QueryTable(new(Company))
-
-	cond := orm.NewCondition()
-	cond1 := cond.And("T_name__icontains", T_name)
-
-	qs.SetCond((*orm2.Condition)(cond1)).All(&maps)
-	return maps
+	Id     int    `xml:"Id"`
+	T_mid  int    `xml:"T_mid"`  //  上一级 ID
+	T_name string `xml:"T_name"` // 公司名称
+	T_uids string `xml:"T_uids"` // 绑定用户 Uid|  如:U1|U2|
 }
 
-// {"Id":"T_name"}
-func CompanyListToMap(C []Company) map[int]string {
-	maps := make(map[int]string, len(C))
-	for _, v := range C {
+func CompanyListToMap(list []Company) map[int]string {
+	maps := make(map[int]string, len(list))
+	for _, v := range list {
 		maps[v.Id] = v.T_name
 	}
 	return maps

+ 0 - 78
models/Account/Tokey.go

@@ -1,78 +0,0 @@
-package Account
-
-import (
-	"Cold_WorkOrder/conf"
-	"encoding/json"
-	"fmt"
-	"github.com/astaxie/beego/cache"
-	_ "github.com/astaxie/beego/cache/redis"
-	uuid "github.com/satori/go.uuid"
-	"time"
-)
-
-var redisCache_Tokey cache.Cache
-
-func init() {
-	//注册模型
-	//orm.RegisterModel(new(Tokey))
-
-	config := fmt.Sprintf(`{"key":"%s","conn":"%s","dbNum":"%s","password":"%s"}`,
-		"redis_Tokey", conf.Redis_address, conf.Redis_dbNum, conf.Redis_password)
-	fmt.Println(config)
-	var err error
-	redisCache_Tokey, err = cache.NewCache("redis", config)
-	if err != nil || redisCache_Tokey == nil {
-		errMsg := "failed to init redis"
-		fmt.Println(errMsg, err)
-	}
-}
-
-// ---------------- Redis -------------------
-//Redis_Set(m.T_sn,m) // Redis 更新缓存
-func Add_Tokey_Set(Uuid string) string {
-	var Tokey string
-	for true {
-		Tokey = uuid.NewV4().String()
-		if !redisCache_Tokey.IsExist(Tokey) {
-			break
-		}
-		fmt.Print("申请 TOKEY 重复!重新生成。", Tokey)
-	}
-	redisCache_Tokey.Put(Tokey, Uuid, 2*time.Hour)
-
-	return Tokey
-}
-
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
-func Redis_Admin_Get(key string) (r Admin, is bool) {
-	if redisCache_Admin.IsExist(key) {
-		//println("找到key:",key)
-		v := redisCache_Admin.Get(key)
-
-		json.Unmarshal(v.([]byte), &r)
-		return r, true
-	}
-	//println("没有 找到key:",key)
-	return Admin{}, false
-}
-
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
-func Redis_Tokey_Get(Tokey string) (string, bool) {
-	if len(Tokey) < 10 {
-		return "", false
-	}
-	if redisCache_Tokey.IsExist(Tokey) {
-		//println("找到key:",key)
-		v := redisCache_Tokey.Get(Tokey)
-		value := string(v.([]byte)) //这里的转换很重要,Get返回的是interface
-
-		redisCache_Tokey.Put(Tokey, value, 2*time.Hour) //  重新计次
-		return value, true
-	}
-	//println("没有 找到key:",key)
-	return "", false
-}

+ 0 - 79
models/System/UserLogs.go

@@ -1,79 +0,0 @@
-package System
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/beego/beego/v2/adapter/orm"
-	orm2 "github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-type UserLogs struct {
-	Id         int    `orm:"column(ID);size(11);auto;pk"`
-	Logs_uuid  string `orm:"size(256);null"`  //
-	Logs_class string `orm:"size(256);null"`  //
-	Logs_Title string `orm:"size(256);null"`  // 标题
-	Logs_Txt   string `orm:"type(text);null"` // 详情
-
-	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
-	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now_add 第一次保存时才设置时间
-}
-
-func (t *UserLogs) TableName() string {
-	return "UserLogs" // 数据库名称   // ************** 替换 FormulaList **************
-}
-
-func init() {
-	//注册模型
-	orm.RegisterModel(new(UserLogs))
-
-}
-
-// 添加  System.Add_UserLogs(user_r.T_user,"登陆", "管理员登陆", "")
-func Add_UserLogs(Logs_uuid string, Logs_class string, Logs_Title string, Logs_Txt string) {
-	o := orm.NewOrm()
-	m := UserLogs{Logs_uuid: Logs_uuid, Logs_class: Logs_class, Logs_Title: Logs_Title, Logs_Txt: Logs_Txt}
-	o.Insert(&m)
-}
-func Add_UserLogs_T(Logs_uuid string, Logs_class string, Logs_Title string, Logs_Txt_T interface{}) {
-	o := orm.NewOrm()
-	jsonStu, err := json.Marshal(Logs_Txt_T)
-	if err != nil {
-		fmt.Println("Add_UserLogs_T JSON ,err=", err)
-	}
-	m := UserLogs{Logs_uuid: Logs_uuid, Logs_class: Logs_class, Logs_Title: Logs_Title, Logs_Txt: string(jsonStu)}
-	o.Insert(&m)
-}
-
-// 获取列表
-func Read_UserLogs_ALL(page, page_z int, Logs_class string) (r []UserLogs, cnt int64) {
-
-	o := orm.NewOrm()
-	// 也可以直接使用 Model 结构体作为表名
-
-	qs := o.QueryTable(new(UserLogs))
-	var offset int64
-	if page <= 1 {
-		offset = 0
-	} else {
-		offset = int64((page - 1) * page_z)
-	}
-
-	qs.Limit(page_z, offset).Filter("Logs_class__icontains", Logs_class).OrderBy("-Id").All(&r)
-	cnt, _ = qs.Filter("Logs_class__icontains", Logs_class).Count()
-
-	return r, cnt
-}
-
-// 获取列表
-func Read_UserLogs_Class() (lists orm2.ParamsList) {
-	o := orm.NewOrm()
-	var pl_lists orm2.ParamsList
-	num, err := o.Raw("SELECT DISTINCT logs_class FROM UserLogs LIMIT 0,1000").ValuesFlat(&pl_lists)
-	if err == nil {
-		fmt.Println("user nums: ", num)
-	}
-	fmt.Println(len(pl_lists))
-
-	return pl_lists
-}

+ 0 - 10
routers/Logs.go

@@ -1,10 +0,0 @@
-package routers
-
-import (
-	"Cold_WorkOrder/controllers"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-func init() {
-	beego.Router("/UserLogs/List", &controllers.LogsController{}, "*:UserLogs") //
-}