diff --git a/business/jxcallback/auth/localpass/localpass.go b/business/jxcallback/auth/localpass/localpass.go deleted file mode 100644 index d9dde9716..000000000 --- a/business/jxcallback/auth/localpass/localpass.go +++ /dev/null @@ -1,38 +0,0 @@ -package localpass - -import ( - "crypto/md5" - "fmt" - - "git.rosy.net.cn/jx-callback/business/jxcallback/auth" - "git.rosy.net.cn/jx-callback/business/model/dao" - "git.rosy.net.cn/jx-callback/business/model/legacymodel" -) - -const ( - LoginType = "localpass" -) - -type Auther struct { -} - -func init() { - auth.RegisterAuther(LoginType, new(Auther)) -} - -func (a *Auther) Login(uname, password string) (userID, LoginType string, err error) { - user := &legacymodel.JxBackendUser{ - UName: uname, - } - if err = dao.GetEntity(nil, user, "UName"); err == nil { - if fmt.Sprintf("%x", md5.Sum([]byte(password))) == user.UPass { - return "", "", nil - } - err = auth.ErrUIDAndPassNotMatch - } - return "", "", err -} - -func (a *Auther) Logout(loginInfo *auth.LoginInfo) error { - return nil -} diff --git a/business/model/legacymodel/jxbackenduser.go b/business/model/legacymodel/jxbackenduser.go deleted file mode 100644 index 1989409b0..000000000 --- a/business/model/legacymodel/jxbackenduser.go +++ /dev/null @@ -1,20 +0,0 @@ -package legacymodel - -type JxBackendUser struct { - UID int `orm:"pk;column(uid)"` - UName string `orm:"column(uname);size(64);index"` - UPass string `orm:"column(upass);size(64)"` - Tel string `orm:"size(32);index"` - Position string `orm:"size(255)"` - Enabled int8 `orm:"default(1)"` - SkuWidget int `orm:"default(0)"` - StoreWidget int `orm:"default(0)"` - UserWidget int `orm:"default(0)"` - BillinfoWidget int `orm:"default(0)"` - GroupWidget int `orm:"default(0)"` - CategoryWidget int `orm:"default(0)"` -} - -func (*JxBackendUser) TableName() string { - return "jxbackenduser" -} diff --git a/controllers/auth_controller.go b/controllers/auth_controller.go index f56a7d40f..27cc404c4 100644 --- a/controllers/auth_controller.go +++ b/controllers/auth_controller.go @@ -8,7 +8,6 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/auth" - _ "git.rosy.net.cn/jx-callback/business/jxcallback/auth/localpass" // 加载本地用户密码 "git.rosy.net.cn/jx-callback/business/jxcallback/auth/mobile" "git.rosy.net.cn/jx-callback/business/jxcallback/auth/weixin" "git.rosy.net.cn/jx-callback/business/model" diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index ee1d158b5..e47be78e5 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -15,8 +15,9 @@ func Init() { orm.RegisterModel(new(legacymodel.BlackClient)) orm.RegisterModel(new(legacymodel.JxBadComments)) orm.RegisterModel(new(legacymodel.StoreBill)) - orm.RegisterModel(new(legacymodel.WeiXins), new(legacymodel.JxBackendUser)) - + if !globals.EnableWXAuth2 { + orm.RegisterModel(new(legacymodel.WeiXins)) + } orm.RegisterModel(new(model.GoodsOrder)) orm.RegisterModel(new(model.GoodsOrderOriginal)) orm.RegisterModel(new(model.TempGoodsOrderMobile))