From 6a8e3cb4b0e696948ae52871cff6a7dc38b1b6f8 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 12 Aug 2019 17:56:50 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=8E=BB=E9=99=A4auth.localpass=EF=BC=88?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=A7=BB=E5=88=B0auth2.localpass=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/auth/localpass/localpass.go    | 38 -------------------
 business/model/legacymodel/jxbackenduser.go   | 20 ----------
 controllers/auth_controller.go                |  1 -
 globals/beegodb/beegodb.go                    |  5 ++-
 4 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 business/jxcallback/auth/localpass/localpass.go
 delete mode 100644 business/model/legacymodel/jxbackenduser.go

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))