Browse Source

bugs

master
LinskRuis.3.6hz 6 years ago
parent
commit
a44b5dc26f
  1. 2
      cloud/cloud.go
  2. 13
      cloud/sysCloud/comm.go
  3. 3
      cloud/sysCloud/user.go
  4. 4
      go.mod
  5. 2
      go.sum
  6. 1
      service/userService/role.go
  7. 1
      webs/sys/controller/user.go

2
cloud/sysCloud/cloud.go → cloud/cloud.go

@ -1,4 +1,4 @@
package sysCloud
package cloud
import gocloud "github.com/mgr9525/go-cloud"

13
cloud/sysCloud/comm.go

@ -1,6 +1,7 @@
package sysCloud
import (
"GoClouds/cloud"
"GoClouds/service/userService"
gocloud "github.com/mgr9525/go-cloud"
ruisUtil "github.com/mgr9525/go-ruisutil"
@ -14,7 +15,7 @@ func ClearCache(key string) (rb bool) {
pers := gocloud.GetNewMaps()
pers["key"] = key
code, _, err := SysCloudExec.ExecJSON("/comm/clearCache", &pers)
code, _, err := cloud.SysCloudExec.ExecJSON("/comm/clearCache", &pers)
if err != nil {
return false
}
@ -30,7 +31,7 @@ func ClearUserCache(uid string) (rb bool) {
pers := gocloud.GetNewMaps()
pers["uid"] = uid
code, _, err := SysCloudExec.ExecJSON("/comm/clearUserCache", &pers)
code, _, err := cloud.SysCloudExec.ExecJSON("/comm/clearUserCache", &pers)
if err != nil {
return false
}
@ -47,7 +48,7 @@ func CheckPermission(uid, perm string) (rb bool) {
pers := gocloud.GetNewMaps()
pers["uid"] = uid
pers["perm"] = perm
code, cont, err := SysCloudExec.ExecJSON("/comm/checkPermission", &pers)
code, cont, err := cloud.SysCloudExec.ExecJSON("/comm/checkPermission", &pers)
if err != nil {
return false
}
@ -71,7 +72,7 @@ func GetUserPerms(uid string) map[string]bool {
ret := make(map[string]bool)
pers := gocloud.GetNewMaps()
pers["uid"] = uid
err := SysCloudExec.ExecObjJSON("/comm/getUserPerms", &pers, &ret)
err := cloud.SysCloudExec.ExecObjJSON("/comm/getUserPerms", &pers, &ret)
if err != nil {
println("getUserPerms err:" + err.Error())
return ret
@ -83,7 +84,7 @@ func SendSms(phone, ips string) (int, string) {
pars := ruisUtil.NewMap()
pars.Set("phone", phone)
pars.Set("ips", ips)
code, conts, err := SysCloudExec.ExecJSON("/comm/sendSms", pars)
code, conts, err := cloud.SysCloudExec.ExecJSON("/comm/sendSms", pars)
if err != nil {
println("SendSms err:" + err.Error())
}
@ -94,7 +95,7 @@ func VaildSms(phone, codes string) (int, string) {
pars := ruisUtil.NewMap()
pars.Set("phone", phone)
pars.Set("code", codes)
code, conts, err := SysCloudExec.ExecJSON("/comm/vaildSms", pars)
code, conts, err := cloud.SysCloudExec.ExecJSON("/comm/vaildSms", pars)
if err != nil {
println("VaildSms err:" + err.Error())
}

3
cloud/sysCloud/user.go

@ -1,6 +1,7 @@
package sysCloud
import (
"GoClouds/cloud"
gocloud "github.com/mgr9525/go-cloud"
)
@ -8,7 +9,7 @@ func Login(name, pass string) (int, string) {
pers := gocloud.GetNewMaps()
pers["name"] = name
pers["pass"] = pass
code, uid, err := SysCloudExec.ExecJSON("/user/login", &pers)
code, uid, err := cloud.SysCloudExec.ExecJSON("/user/login", &pers)
if err != nil {
return 0, "网络错误"
}

4
go.mod

@ -6,9 +6,9 @@ require (
github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4
github.com/go-macaron/cache v0.0.0-20190810181446-10f7c57e2196
github.com/go-sql-driver/mysql v1.4.1
github.com/mgr9525/go-cloud v1.0.6-0.20191107091222-524f1218fb4e
github.com/mgr9525/go-cloud v1.0.6-0.20191115021000-e912b446b8a9
github.com/mgr9525/go-ruisutil v1.0.8-0.20191105071958-41a4e7d87b4f
github.com/satori/go.uuid v1.2.0 // indirect
github.com/satori/go.uuid v1.2.0
github.com/xormplus/builder v0.0.0-20190724032102-0ee351fedce9
github.com/xormplus/xorm v0.0.0-20190815102311-3995c60c8bb6
gopkg.in/macaron.v1 v1.3.4

2
go.sum

@ -106,6 +106,8 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
github.com/mgr9525/go-cloud v1.0.6-0.20191107091222-524f1218fb4e h1:A2GUbaNotiiQNMZ+1DnOByNbLaoGId1rvBhXIzOuPfk=
github.com/mgr9525/go-cloud v1.0.6-0.20191107091222-524f1218fb4e/go.mod h1:Wc25es8QefcN6HXFUroKShVuzvfjjkkaZDNVAc5q2sA=
github.com/mgr9525/go-cloud v1.0.6-0.20191115021000-e912b446b8a9 h1:B5IIZcHuFAO3m+0fd8v1fbgd4KxRfgtzsCSkdHPdijs=
github.com/mgr9525/go-cloud v1.0.6-0.20191115021000-e912b446b8a9/go.mod h1:Wc25es8QefcN6HXFUroKShVuzvfjjkkaZDNVAc5q2sA=
github.com/mgr9525/go-ruisutil v1.0.8-0.20191105071958-41a4e7d87b4f h1:OkBmLGM6QfRasXO2qR46H4rvIcDb6sfowY5mS0rePM4=
github.com/mgr9525/go-ruisutil v1.0.8-0.20191105071958-41a4e7d87b4f/go.mod h1:qXUWVKpHdwoxR0KERCkvL1JH2DETY6b5TMG9t6g9Pls=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=

1
service/userService/role.go

@ -4,6 +4,7 @@ import (
"GoClouds/core/comm"
"GoClouds/models"
"GoClouds/modeluis"
"GoClouds/service/sysService"
"encoding/json"
"fmt"
"github.com/go-macaron/cache"

1
webs/sys/controller/user.go

@ -1,6 +1,7 @@
package controller
import (
"GoClouds/cloud/sysCloud"
"GoClouds/core/comm"
"GoClouds/service/userService"
gocloud "github.com/mgr9525/go-cloud"

Loading…
Cancel
Save