Compare commits

...

2 Commits

Author SHA1 Message Date
hoteas 8afd00ff86 修复登录bug 2022-08-11 10:41:35 +08:00
hoteas 8992fd6d3a 解决BUG 2022-08-11 10:18:48 +08:00
2 changed files with 25 additions and 13 deletions
+14 -2
View File
@@ -675,11 +675,15 @@ var TptProject = Proj{
where := Map{"name": name} where := Map{"name": name}
if that.MakeCodeRouter[hotimeName].TableColumns[fileConfig.GetString("table")]["phone"] != nil { if that.MakeCodeRouter[hotimeName].TableColumns[fileConfig.GetString("table")]["phone"] != nil {
where["phone"] = name where["phone"] = name
where = Map{"AND": Map{"OR": where, "password": Md5(password)}} where = Map{"OR": where, "password": Md5(password)}
} else { } else {
where["password"] = Md5(password) where["password"] = Md5(password)
} }
if len(where) > 1 {
where = Map{"AND": where}
}
user := that.Db.Get(fileConfig.GetString("table"), "*", where) user := that.Db.Get(fileConfig.GetString("table"), "*", where)
if user == nil { if user == nil {
@@ -776,6 +780,12 @@ var TptProject = Proj{
name = v2.GetString("table") name = v2.GetString("table")
} }
if v2["auth"] != nil { if v2["auth"] != nil {
if linkAuth[name] == nil {
linkAuth[name] = v2["auth"]
} else {
newAuth := Slice{} newAuth := Slice{}
for k3, _ := range linkAuth.GetSlice(name) { for k3, _ := range linkAuth.GetSlice(name) {
v3 := linkAuth.GetSlice(name).GetString(k3) v3 := linkAuth.GetSlice(name).GetString(k3)
@@ -784,10 +794,12 @@ var TptProject = Proj{
} }
} }
linkAuth[name] = newAuth linkAuth[name] = newAuth
} continue
} }
} }
}
}
for k1, _ := range menus { for k1, _ := range menus {
v1 := menus.GetMap(k1) v1 := menus.GetMap(k1)
+3 -3
View File
@@ -23,9 +23,9 @@
], ],
"db": { "db": {
"mysql": { "mysql": {
"host": "192.168.6.253", "host": "192.168.2.20",
"name": "dgs-cms", "name": "gov_crawler",
"password": "dasda8454456", "password": "fh22y8b882d",
"port": "3306", "port": "3306",
"prefix": "", "prefix": "",
"user": "root" "user": "root"