feats

controllers/auth.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"errors"
 	"net/http"
-	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"strings"
@@ -19,14 +19,70 @@ func (c *BaseController) authenticate() {
 	// 客户端类型
 	clientType := utils.GetClientType(c.Ctx.Request)
 
+	switch clientType {
+	case utils.ClientAdmin:
+		c.authPCAdmin(serv)
+	case utils.ClientWechat:
+		c.authWechat(serv)
+	default:
+		c.ResponseError(
+			errors.New("暂不支持的 API 场景"),
+			http.StatusBadRequest,
+		)
+	}
+}
+
+// authPCAdmin PC管理端
+func (c *BaseController) authPCAdmin(serv *service.SysServ) {
+	if !c.needAuth() {
+		return
+	}
+
+	// 用户ID
+	userID := ""
+	userIDRaw := c.GetSession(SNUserID)
+	if userIDRaw != nil {
+		userID = userIDRaw.(string)
+	}
+
+	if userID == "" {
+		c.ResponseError(
+			errors.New("用户未登录"),
+			http.StatusUnauthorized,
+		)
+	}
+
+	if err := serv.SetUserProfile(userID); err != nil {
+		utils.LogError(err.Error())
+
+		c.ResponseError(
+			errors.New("内部错误, 请重试"),
+			http.StatusInternalServerError,
+		)
+	}
+
+	// 设置 Session
+	c.SetSession(SNUserID, userID)
+	// c.SetSession(SNUserType, userType)
+}
+
+func (c *BaseController) authWechat(serv *service.SysServ) {
 	// 用户类型, 此处与数据库定义的不是一个概念
 	// 此处主要用来区分是 系统用户, 还是 系统客户
-	userType := UserGuest
+	userType := ""
 	userTypeRaw := c.GetSession(SNUserType)
 	if userTypeRaw != nil {
 		userType = userTypeRaw.(string)
 	}
 
+	if userType == "" {
+		userType = models.USERMAP_CUSTOMER
+		identify := c.GetString("identify_type")
+		if identify == "admin" {
+			userType = models.USERMAP_USER
+		}
+	}
+
 	// 用户类型不同, 此处ID代表的内容也是不一样的
 	userID := ""
 	userIDRaw := c.GetSession(SNUserID)
@@ -34,52 +90,45 @@ func (c *BaseController) authenticate() {
 		userID = userIDRaw.(string)
 	}
 
-	// 用户映射表
-	var userMap *model.TaUserMapping
-
-	if clientType == utils.ClientWechat && userID == "" {
-		var err error
-		userMap, err = c.checkWechat(serv)
-		if err != nil {
-			utils.LogError("获取并校验微信信息失败: " + err.Error())
-		}
-
-		c.SetSession("openid", userMap.Openid)
+	// 用户微信信息
+	var wxDetail map[string]interface{}
+	detailRaw := c.GetSession("wechat_user")
+	if detailRaw != nil {
+		wxDetail = detailRaw.(map[string]interface{})
 	}
 
-	if !c.needAuth() {
-		return
+	if userID == "" && wxDetail == nil {
+		wxDetail = c.getWechatDetail()
+		c.SetSession("wechat_user", wxDetail)
 	}
 
-	// 如果是普通游客, 暂时没有任何设置
-	if userType == UserGuest {
-		return
+	// 用户映射
+	// 如果映射不存在, 则新建映射
+	userMap, err := serv.CheckWechatUserMapping(wxDetail, userType)
+	if err != nil {
+		c.ResponseError(
+			utils.LogError("获取人员映射账户失败: "+err.Error()),
+			http.StatusInternalServerError,
+		)
+
+		c.Context.Set("userMap", *userMap)
 	}
 
-	// 如果存在用户映射
-	mapUserID := c.getUserIDByUserMap(userMap, userID, userType)
-	if mapUserID != "" {
-		userID = mapUserID
+	if !c.needAuth() {
+		return
 	}
 
-	// 未登录状态
-	if userID == "" {
-		if clientType == utils.ClientWechat {
-			wxConf, ok := c.Configer[WeChatConf]
-			if ok {
-				c.ResponseData(
-					map[string]interface{}{
-						"appid": wxConf.String("appid"),
-					},
-					errors.New("用户未登录"),
-					http.StatusUnauthorized,
-				)
-			} else {
-				c.ResponseError(
-					errors.New("用户未登录"),
-					http.StatusUnauthorized,
-				)
-			}
+	// 未登录或者绑定, 返回 401
+	if userID == "" && userMap.UserId == "" {
+		wxConf, ok := c.Configer[WeChatConf]
+		if ok {
+			c.ResponseData(
+				map[string]interface{}{
+					"appid": wxConf.String("appid"),
+				},
+				errors.New("用户未登录"),
+				http.StatusUnauthorized,
+			)
 		} else {
 			c.ResponseError(
 				errors.New("用户未登录"),
@@ -88,26 +137,42 @@ func (c *BaseController) authenticate() {
 		}
 	}
 
-	// 设置 Session
-	c.SetSession(SNUserID, userID)
-	c.SetSession(SNUserType, userType)
+	// 人员微信账号绑定错误
+	if userID != "" && userMap.UserId != "" &&
+		(userID != userMap.UserId || userType != userMap.UserType) {
+		c.ResponseError(
+			errors.New("系统内部数据错误, 人员绑定不正确"),
+			http.StatusInternalServerError,
+		)
+	}
 
-	var err error
+	if userID == "" {
+		userID = userMap.UserId
+	}
 
-	// 设置 Context
-	// 放到 serv 的方法里面了
-	if userType == UserAdmin {
-		// 普通管理人员
-		err = serv.SetUserProfile(userID)
+	if userType == models.USERMAP_USER {
+		if err := serv.SetUserProfile(userID); err != nil {
+			utils.LogError(err.Error())
 
+			c.ResponseError(
+				errors.New("内部错误, 请重试"),
+				http.StatusInternalServerError,
+			)
+		}
 	} else {
-		// 系统客户
-		err = serv.SetCustomer(userID)
-	}
+		if err := serv.SetCustomer(userID); err != nil {
+			utils.LogError(err.Error())
 
-	if err != nil {
-		// 暂不处理
+			c.ResponseError(
+				errors.New("内部错误, 请重试"),
+				http.StatusInternalServerError,
+			)
+		}
 	}
+
+	// 设置 Session
+	c.SetSession(SNUserID, userID)
+	c.SetSession(SNUserType, userType)
 }
 
 func (c *BaseController) needAuth() bool {
@@ -122,63 +187,24 @@ func (c *BaseController) needAuth() bool {
 	return true
 }
 
-func (c *BaseController) checkWechat(serv *service.SysServ) (*model.TaUserMapping, error) {
-	// 确定客户端类型
-	adminClient := c.GetString("admin")
-	userType := service.USERTYPE_CUSTOMER
-	if adminClient != "" {
-		userType = service.USERTYPE_USER
-	}
-
-	openIDRaw := c.GetSession("openid")
-	if openIDRaw != nil {
-		openID := openIDRaw.(string)
-		wxUser := map[string]interface{}{
-			"openid": openID,
-		}
-		return serv.CheckWechatUserMapping(wxUser, userType)
-	}
-
+// getWechatDetail 获取微信个人信息详情
+func (c *BaseController) getWechatDetail() map[string]interface{} {
 	// 微信 code
 	code := c.GetString("code")
 	if code == "" {
-		return nil, errors.New("没有微信 code")
+		c.ResponseError(
+			errors.New("没有接收到微信 code"),
+			http.StatusBadRequest,
+		)
 	}
 
-	// 获取微信信息
-	wxUser, err := utils.GetWxUserInfo(code)
+	usr, err := utils.GetWxUserInfo(code)
 	if err != nil {
-		return nil, err
-	}
-
-	return serv.CheckWechatUserMapping(wxUser, userType)
-}
-
-// getUserIDByUserMap 校验用户映射是否与 Session 一致
-func (c *BaseController) getUserIDByUserMap(user *model.TaUserMapping, userID, userType string) string {
-	// 如果映射信息不存在
-	if user == nil {
-		return ""
-	}
-
-	// 如果 session 数据存在, 以 session 为准
-	if userID != "" {
-		return ""
-	}
-
-	// 如果是系统内置用户
-	if user.UserType == service.USERTYPE_USER {
-		if userType != UserAdmin {
-			return ""
-		}
-	}
-
-	// 如果是普通客户
-	if user.UserType == service.USERTYPE_CUSTOMER {
-		if userType != UserCustomer {
-			return ""
-		}
+		c.ResponseError(
+			utils.LogError("获取微信个人信息失败: "+err.Error()),
+			http.StatusInternalServerError,
+		)
 	}
 
-	return user.UserId
+	return usr
 }

controllers/context.go

@@ -11,6 +11,7 @@ import (
 * - 包含内容如下
 * user					用户基本信息
 * customer			会员基本信息
+* userMap				用户/会员 映射第三方账户
 * cases					用户所有案场信息
 * currentCase 	当前案场
 * org						用户当前组织

controllers/session.go

@@ -7,6 +7,6 @@ const (
 	// 用户类型
 	SNUserType = "userType"
 
-	// 内置 openid
-	// 请勿使用 openid 作为 session 的key
+	// 内置 wechat_user
+	// 请勿使用 wechat_user 作为 session 的key
 )

controllers/types.go

@@ -1,12 +1,5 @@
 package controllers
 
-// 用户类型列表
-const (
-	UserGuest    = "guest"
-	UserAdmin    = "admin"
-	UserCustomer = "customer"
-)
-
 // JSONMessage 主要用于 Response 返回
 type JSONMessage struct {
 	Code    int         `json:"code"`

controllers/user/user.go

@@ -1,10 +1,14 @@
 package user
 
 import (
+	"errors"
+	"net/http"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+	"time"
 )
 
 // UserController 用户
@@ -127,3 +131,84 @@ func (c *UserController) GetUserCustomer() {
 	}
 	c.ResponseJSON(customers)
 }
+
+// SignIn 用户登录
+func (c *UserController) SignIn() {
+	userName := c.GetString("username")
+	userPassword := c.GetString("userpassword")
+	token := c.GetString("token")
+	doRemember, _ := c.GetInt("doremember")
+
+	if token != "" {
+		tokenMap, err := utils.PareseToken(token)
+		if err != nil {
+			utils.LogError("解析用户 token 失败: " + err.Error())
+
+			c.ResponseError(
+				errors.New("登录失败, 用户名或者密码不正确"),
+				http.StatusBadRequest,
+			)
+		}
+
+		userName = tokenMap["user"].(string)
+		userPassword = tokenMap["password"].(string)
+	}
+
+	user, err := c.dao.CheckUserSignIn(userName, userPassword)
+	if err != nil {
+		utils.LogError("用户登录失败: " + err.Error())
+		c.ResponseError(
+			errors.New("登录失败, 用户名或者密码不正确"),
+			http.StatusBadRequest,
+		)
+	}
+
+	// 成功之后, 设置 session
+	c.SetSession(controllers.SNUserID, user.UserId)
+	c.SetSession(controllers.SNUserType, service.USERTYPE_USER)
+
+	if token == "" && doRemember != 0 {
+		var err error
+		token, err = utils.CreateToken(map[string]interface{}{
+			"user":     userName,
+			"password": userPassword,
+			"exp":      time.Now().Local().Add(7 * 24 * time.Hour), // 有效期是 7 天
+		})
+
+		if err != nil {
+			utils.LogError("生成 用户登录 token 失败: " + err.Error())
+		}
+	}
+
+	c.ResponseJSON(map[string]interface{}{
+		token: token,
+	})
+}
+
+// SignOut 用户登出
+func (c *UserController) SignOut() {
+	c.DestroySession()
+	c.ResponseJSON("ok")
+}
+
+// WechatSignIn 微信登录
+func (c *UserController) WechatSignIn() {
+	phone := c.GetString("phone")
+	captcha := c.GetString("captcha")
+
+	if !utils.ValidCaptcha(phone, captcha) {
+		c.ResponseError(errors.New("手机号或验证码不正确"))
+	}
+
+	userMapping := c.Context.Get("userMap").(model.TaUserMapping)
+
+	user, err := c.dao.BindWechatUser(&userMapping, phone)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.SetSession(controllers.SNUserID, user.UserId)
+	c.SetSession(controllers.SNUserType, service.USERTYPE_USER)
+
+	c.ResponseJSON("ok")
+}

models/constant.go

@@ -17,3 +17,9 @@ const (
 	ACCMAP_WECHAT = "wechat"
 	ACCMAP_MINI   = "mini"
 )
+
+// 映射表用户类型
+const (
+	USERMAP_USER     = "user"
+	USERMAP_CUSTOMER = "customer"
+)

models/customer/customer.go

@@ -0,0 +1,73 @@
+package customer
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/utils"
+
+	"github.com/go-xorm/xorm"
+)
+
+// CustomerDAO 当前数据库操作对象
+type CustomerDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewCustomerDAO New Inst
+func NewCustomerDAO(ctx *utils.Context) *CustomerDAO {
+	return &CustomerDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// CustWithWXList 客户列表
+func (m *CustomerDAO) CustWithWXList(phone string, page ...int) ([]CustWithWX, error) {
+	if phone == "" {
+		phone = "%"
+	} else {
+		phone = "%" + phone + "%"
+	}
+
+	pageNum := 10
+	if m.ctx.Get("pageNum") != nil {
+		pageNum = m.ctx.Get("pageNum").(int)
+	}
+
+	pg := 1
+	if len(page) > 0 {
+		pg = page[0]
+	}
+	offset := (pg - 1) * pageNum
+	if offset < 0 {
+		offset = 0
+	}
+
+	query := `
+		SELECT *
+		FROM
+			ta_customer t
+		LEFT JOIN ta_user_mapping s ON t.customer_id = s.user_id
+			AND s.user_type = '` + models.USERMAP_CUSTOMER + `'
+			AND s.account_type = '` + models.ACCMAP_WECHAT + `'
+		WHERE
+			t.tel like ?
+		AND t.status > ?
+		ORDER BY
+			t.create_date DESC
+		LIMIT ? OFFSET ?	
+	`
+
+	var cust []CustWithWX
+	if err := m.db.SQL(
+		query,
+		phone,
+		models.STATUS_DEL,
+		pageNum,
+		offset,
+	).Find(&cust); err != nil {
+		return nil, err
+	}
+
+	return cust, nil
+}

models/customer/types.go

@@ -0,0 +1,11 @@
+package customer
+
+import (
+	"spaceofcheng/services/models/model"
+)
+
+// CustWithWX 客户及微信相关信息
+type CustWithWX struct {
+	model.TaCustomer    `xorm:"extends"`
+	model.TaUserMapping `xorm:"extends"`
+}

models/system/user.go

@@ -1,6 +1,7 @@
 package system
 
 import (
+	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -328,3 +329,45 @@ func (m *UserDAO) GetUserCustomer(userid string, page int, pageSize int) ([]mode
 	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("recommend_id=?", userid).Limit(pageSize, page*pageSize).Desc("create_date").Find(&customers)
 	return customers, err
 }
+
+// GetUserByName 依据账户获取人员信息
+func (m *UserDAO) GetUserByName(userName string) (*model.SysUser, error) {
+	user := model.SysUser{}
+
+	has, err := m.db.Where("user_name=?", userName).Get(&user)
+	if err != nil {
+		return nil, err
+	}
+
+	if !has {
+		return nil, nil
+	}
+
+	return &user, nil
+}
+
+// GetUserByPhone 依据手机号获取人员信息
+func (m *UserDAO) GetUserByPhone(phone string) (*model.SysUser, error) {
+	user := model.SysUser{}
+
+	has, err := m.db.Where("phone=?", phone).Get(&user)
+	if err != nil {
+		return nil, err
+	}
+
+	if !has {
+		return nil, nil
+	}
+
+	return &user, nil
+}
+
+// UpdateUserMapping 更新用户映射
+func (m *UserDAO) UpdateUserMapping(userMap *model.TaUserMapping, cols []string) error {
+	if userMap.MappingId == "" {
+		return errors.New("用户映射信息不存在")
+	}
+
+	_, err := m.db.Where("mapping_id=?", userMap.MappingId).Cols(cols...).Update(&userMap)
+	return err
+}

service/user.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"errors"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
@@ -9,11 +10,6 @@ import (
 	"github.com/yl10/kit/encrypt"
 )
 
-const (
-	USERTYPE_USER     = "user"
-	USERTYPE_CUSTOMER = "customer"
-)
-
 // UserServ 系统处理
 type UserServ struct {
 	ctx     *utils.Context
@@ -244,3 +240,57 @@ func (s *UserServ) GetUserCustomer(userid string, page int, pageSize int) ([]mod
 	customers, err := s.dao.GetUserCustomer(userid, page, pageSize)
 	return customers, err
 }
+
+// CheckUserSignIn 校验用户登录
+func (s *UserServ) CheckUserSignIn(userName, userPassword string) (*model.SysUser, error) {
+	user, err := s.dao.GetUserByName(userName)
+	if err != nil {
+		return nil, err
+	}
+
+	if user == nil {
+		return nil, errors.New("账户不存在")
+	}
+
+	if user.Status != models.STATUS_NORMAL {
+		return nil, errors.New("用户账户异常")
+	}
+
+	if !s.dao.ValidatePassword(user, userPassword) {
+		return nil, errors.New("用户密码不正确")
+	}
+
+	return user, nil
+}
+
+// BindWechatUser 绑定微信用户
+func (s *UserServ) BindWechatUser(userMap *model.TaUserMapping, phone string) (*model.SysUser, error) {
+	user, err := s.dao.GetUserByPhone(phone)
+	if err != nil {
+		return nil, err
+	}
+
+	if user == nil {
+		return nil, errors.New("手机号对应用户不存在")
+	}
+
+	if user.Status != models.STATUS_NORMAL {
+		return nil, errors.New("用户状态不正确")
+	}
+
+	if user.UserId == userMap.UserId {
+		return user, nil
+	}
+
+	if userMap.UserId != "" {
+		return nil, errors.New("内部错误, 用户映射信息有误")
+	}
+
+	userMap.UserId = user.UserId
+	if err := s.dao.UpdateUserMapping(userMap, []string{"user_id"}); err != nil {
+		utils.LogError("更新用户映射信息失败:" + err.Error())
+		return nil, errors.New("映射用户信息失败")
+	}
+
+	return user, nil
+}

utils/captcha.go

@@ -0,0 +1,11 @@
+package utils
+
+// SendCaptcha 发送验证码
+func SendCaptcha(k string) error {
+	return nil
+}
+
+// ValidCaptcha 验证 验证码
+func ValidCaptcha(k, cap string) bool {
+	return true
+}

utils/jwt.go

@@ -0,0 +1,34 @@
+package utils
+
+import (
+	"errors"
+
+	jwt "github.com/dgrijalva/jwt-go"
+)
+
+var tokenSignedKey = []byte(`Yansen is so handsome!`)
+
+// CreateToken 获取token
+func CreateToken(info map[string]interface{}) (string, error) {
+	claims := jwt.MapClaims(info)
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	return token.SignedString(tokenSignedKey)
+}
+
+// PareseToken 解析 token
+func PareseToken(token string) (map[string]interface{}, error) {
+	tk, err := jwt.Parse(token, func(t *jwt.Token) (interface{}, error) {
+		return tokenSignedKey, nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if claims, ok := tk.Claims.(jwt.MapClaims); ok && tk.Valid {
+		info := map[string]interface{}(claims)
+		return info, nil
+	}
+
+	return nil, errors.New("Token 解析 未知错误")
+}