Merge branch 'master' into jxstore

.gitignore

@@ -5,4 +5,5 @@ debug
 .DS_Store
 *.log
 *.bak
-OFF/
+OFF/
+param_parser.go

business/jxcallback/auth/auth.go

@@ -0,0 +1,79 @@
+package auth
+
+import (
+	"errors"
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+const (
+	DefTokenDuration = 7 * 24 * time.Hour // 7天
+)
+
+type IAuther interface {
+	Login(id, secret string) error
+	Logout(id string) error
+}
+
+var (
+	authers map[string]IAuther
+)
+
+var (
+	ErrLoginTypeNotSupported = errors.New("不支持指定的登录类型")
+)
+
+type LoginInfo struct {
+	ID        string
+	LoginType string
+	ExpiresIn int64
+	Token     string
+}
+
+func init() {
+	authers = make(map[string]IAuther)
+}
+
+func RegisterAuther(loginType string, handler IAuther) {
+	authers[loginType] = handler
+}
+
+func Login(id, loginType, secret string) (loginInfo *LoginInfo, err error) {
+	if handler := authers[loginType]; handler != nil {
+		if err = handler.Login(id, secret); err == nil {
+			token := utils.GetUUID()
+			loginInfo = &LoginInfo{
+				ID:        id,
+				LoginType: loginType,
+				ExpiresIn: time.Now().Add(DefTokenDuration).Unix(),
+				Token:     token,
+			}
+			globals.Cacher.Set(token, loginInfo, DefTokenDuration)
+			return loginInfo, nil
+		}
+	} else {
+		err = ErrLoginTypeNotSupported
+	}
+	return nil, err
+}
+
+func Logout(token string) (err error) {
+	loginInfo := new(LoginInfo)
+	if err = globals.Cacher.GetAs(token, loginInfo); err == nil {
+		if handler := authers[loginInfo.LoginType]; handler != nil {
+			err = handler.Logout(loginInfo.ID)
+		}
+		globals.Cacher.Del(token)
+	}
+	return err
+}
+
+func GetUserInfo(token string) (loginInfo *LoginInfo, err error) {
+	loginInfo = new(LoginInfo)
+	if err = globals.Cacher.GetAs(token, loginInfo); err == nil {
+		return loginInfo, nil
+	}
+	return nil, err
+}

business/jxcallback/auth/weixin/weixin.go

@@ -0,0 +1,70 @@
+package weixin
+
+import (
+	"errors"
+	"fmt"
+	"time"
+
+	"git.rosy.net.cn/baseapi/platformapi/weixinsnsapi"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/auth"
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
+)
+
+const (
+	LoginType               = "weixinsns"
+	DefTempPasswordDuration = 5 * time.Minute // 登录时间限制在5分钟内
+)
+
+var (
+	ErrLoginFailed  = errors.New("登录失败")
+	StrStateIsWrong = "state:%s状态不对"
+)
+
+type Auther struct {
+}
+
+type UserInfoExt struct {
+	weixinsnsapi.UserInfo
+	TempPassword string `json:"tempPassword"` // 一段时间有效的登录密码
+}
+
+func init() {
+	auth.RegisterAuther(LoginType, new(Auther))
+}
+
+func GetUserInfo(code string, state string) (token *UserInfoExt, err error) {
+	if state == "" {
+		wxapi := weixinsnsapi.New(api.WeixinAPI.GetAppID(), api.WeixinAPI.GetSecret())
+		token, err2 := wxapi.RefreshToken(code)
+		if err = err2; err == nil {
+			wxUserinfo, err2 := wxapi.GetUserInfo(token.OpenID)
+			if err = err2; err == nil {
+				pwd := utils.GetUUID()
+				globals.Cacher.Set(wxUserinfo.OpenID, pwd, DefTempPasswordDuration)
+				return &UserInfoExt{
+					UserInfo:     *wxUserinfo,
+					TempPassword: pwd,
+				}, nil
+			}
+		}
+	} else {
+		err = fmt.Errorf(StrStateIsWrong, state)
+	}
+	return nil, err
+}
+
+func (a *Auther) Login(openid, password string) error {
+	if value := globals.Cacher.Get(openid); value != nil {
+		if password == value.(string) {
+			globals.Cacher.Del(openid)
+			return nil
+		}
+	}
+	return ErrLoginFailed
+}
+
+func (a *Auther) Logout(openid string) error {
+	return globals.Cacher.Del(openid)
+}

business/jxutils/cache/cache.go

@@ -0,0 +1,13 @@
+package cache
+
+import (
+	"time"
+)
+
+type ICacher interface {
+	FlushAll() error
+	Set(key string, value interface{}, expiration time.Duration) error
+	Del(key string) error
+	Get(key string) interface{}
+	GetAs(key string, ptr interface{}) error
+}

business/jxutils/cache/redis/redis.go

@@ -0,0 +1,60 @@
+package redis
+
+import (
+	"fmt"
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"github.com/go-redis/redis"
+)
+
+type Cacher struct {
+	client *redis.Client
+}
+
+func New(host string, port int, password string) *Cacher {
+	if port == 0 {
+		port = 6379
+	}
+	return &Cacher{
+		client: redis.NewClient(&redis.Options{
+			Addr:     fmt.Sprintf("%s:%d", host, port),
+			Password: password,
+		},
+		),
+	}
+}
+
+func (c *Cacher) FlushAll() error {
+	return c.client.FlushAll().Err()
+}
+
+func (c *Cacher) Set(key string, value interface{}, expiration time.Duration) error {
+	strValue := string(utils.MustMarshal(value))
+	return c.client.Set(key, strValue, expiration).Err()
+}
+
+func (c *Cacher) Del(key string) error {
+	return c.client.Del(key).Err()
+}
+
+func (c *Cacher) Get(key string) interface{} {
+	result, err := c.client.Get(key).Result()
+	if err == nil {
+		var retVal interface{}
+		if err = utils.UnmarshalUseNumber([]byte(result), &retVal); err == nil {
+			return retVal
+		}
+	}
+	return nil
+}
+
+func (c *Cacher) GetAs(key string, ptr interface{}) error {
+	result, err := c.client.Get(key).Result()
+	if err == nil {
+		if err = utils.UnmarshalUseNumber([]byte(result), ptr); err == nil {
+			return nil
+		}
+	}
+	return err
+}

business/jxutils/cache/redis/redis_test.go

@@ -0,0 +1,48 @@
+package redis
+
+import (
+	"testing"
+
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
+	"git.rosy.net.cn/jx-callback/globals/beegodb"
+	"github.com/astaxie/beego"
+)
+
+func init() {
+	//E:/goprojects/src/git.rosy.net.cn/jx-callback/conf/app.conf
+	///Users/xujianhua/go/src/git.rosy.net.cn/jx-callback/conf/app.conf
+	beego.InitBeegoBeforeTest("/Users/xujianhua/go/src/git.rosy.net.cn/jx-callback/conf/app.conf")
+	beego.BConfig.RunMode = "dev" // InitBeegoBeforeTest会将runmode设置为test
+
+	globals.Init()
+	beegodb.Init()
+	api.Init()
+}
+
+type FuckYou struct {
+	Key string `json:"key"`
+}
+
+func TestIt(t *testing.T) {
+	cacher := New("localhost", 6379, "")
+	cacher.FlushAll()
+	if cacher.Get("key") != nil {
+		t.Fatal("should get nothing")
+	}
+	if err := cacher.Set("key", map[string]interface{}{
+		"key": "value",
+	}, 0); err != nil {
+		t.Fatal(err)
+	}
+
+	if cacher.Get("key") == nil {
+		t.Fatal("should not get nothing")
+	}
+
+	result := new(FuckYou)
+	cacher.GetAs("key", result)
+	if result.Key != "value" {
+		t.Fatal("should get value")
+	}
+}

controllers/auth_controller.go

@@ -0,0 +1,103 @@
+package controllers
+
+import (
+	"encoding/base64"
+	"fmt"
+	"net/http"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/auth"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/auth/weixin"
+	"git.rosy.net.cn/jx-callback/globals"
+	"github.com/astaxie/beego"
+)
+
+type WeixinCallbackResult struct {
+	Code int         `json:"code"`
+	Msg  string      `json:"msg"`
+	Data interface{} `json:"data"`
+}
+
+// 认证相关API
+type AuthController struct {
+	beego.Controller
+}
+
+var (
+	ErrParameterIsIllegal = "参数不全或不合法"
+)
+
+// @Title 给微信用的回调接口
+// @Description 给微信用的回调接口，自己不能直接调用
+// @Param	code		query		string		true	"门店ID"
+// @Param	block		query		string		true	"门店所属的厂商ID"
+// @Param	state		query		string		false	"门店所属的厂商ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetWeiXinUserInfo [get]
+func (c *AuthController) GetWeiXinUserInfo() {
+	retVal := &WeixinCallbackResult{}
+	var err error
+	code := c.GetString("code")
+	block := c.GetString("block")
+	state := c.GetString("state")
+	if block != "" {
+		if code != "" {
+			result, err2 := weixin.GetUserInfo(code, state)
+			if err = err2; err == nil {
+				retVal.Code = 1
+				retVal.Msg = "微信登录成功"
+				retVal.Data = result
+			} else {
+				retVal.Msg = err.Error()
+			}
+		} else {
+			retVal.Msg = "code为空"
+		}
+	} else {
+		retVal.Msg = "没有block"
+	}
+	c.Redirect(fmt.Sprintf("%s?info=%s", block, base64.StdEncoding.EncodeToString(utils.MustMarshal(retVal))), http.StatusTemporaryRedirect)
+}
+
+// @Title 登录接口
+// @Description 登录接口
+// @Param	id		query		string		true	"登录ID"
+// @Param	type	query		string		true	"登录类型，当前支持[weixinsns,password]"
+// @Param	secret	query		string		true	"不同登录类型的登录秘密"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /Login [post]
+func (c *AuthController) Login() {
+	c.callLogin(func(params *tAuthLoginParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = auth.Login(params.Id, params.Type, params.Secret)
+		return retVal, "", err
+	})
+}
+
+// @Title 登出接口
+// @Description 登出接口
+// @Param	token			header		string	true	"认证token"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /Logout [delete]
+func (c *AuthController) Logout() {
+	c.callLogout(func(params *tAuthLogoutParams) (retVal interface{}, errCode string, err error) {
+		err = auth.Logout(params.Token)
+		globals.SugarLogger.Debug(err)
+		return nil, "", err
+	})
+}
+
+// @Title 得到用户信息
+// @Description 得到用户信息（从token中）
+// @Param	token			header		string	true	"认证token"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetUserInfo [get]
+func (c *AuthController) GetUserInfo() {
+	c.callGetUserInfo(func(params *tAuthGetUserInfoParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = auth.GetUserInfo(params.Token)
+		return retVal, "", err
+	})
+}

controllers/jx_order.go

@@ -6,6 +6,7 @@ import (
 	"github.com/astaxie/beego"
 )
 
+// 订单相关API
 type OrderController struct {
 	beego.Controller
 }

deploy/ansible.yml

@@ -26,5 +26,13 @@
         owner: ubuntu
         group: ubuntu
         mode: 0555
+    - name: copy swagger files to dest
+      copy:
+        src: ../swagger
+        dest: /jxdata/jx-callback/
+        owner: ubuntu
+        group: ubuntu
+        mode: 0555
+
     - name: shell
       shell: cd /jxdata/jx-callback/conf && sed -i 's/runmode\s*=\s*.*/runmode = {{ runmode }}/' app.conf && sudo systemctl restart jx-callback

gen_param_parser.sh

@@ -1,2 +1,3 @@
+rm controllers/param_parser.go
 bee generate docs
 cp swagger/param_parser.go.txt controllers/param_parser.go

globals/globals.go

@@ -2,6 +2,8 @@ package globals
 
 import (
 	"git.rosy.net.cn/baseapi"
+	"git.rosy.net.cn/jx-callback/business/jxutils/cache"
+	"git.rosy.net.cn/jx-callback/business/jxutils/cache/redis"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/logs"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
@@ -23,6 +25,8 @@ var (
 	JxorderskuTableName string
 	ElemeorderTableName string
 	JdorderTableName    string
+
+	Cacher cache.ICacher
 )
 
 func init() {
@@ -47,4 +51,6 @@ func Init() {
 	JxorderskuTableName = "jxordersku"
 	ElemeorderTableName = "elemeorder"
 	JdorderTableName = "jdorder"
+
+	Cacher = redis.New(beego.AppConfig.DefaultString("redisHost", "localhost"), beego.AppConfig.DefaultInt("redisPort", 0), beego.AppConfig.DefaultString("redisPassword", ""))
 }

main.go

@@ -94,7 +94,7 @@ func main() {
 			beego.Handler("/admin/*", mux)
 		}
 
-		if beego.BConfig.RunMode == "dev" {
+		if beego.BConfig.RunMode != "prod" {
 			beego.BConfig.WebConfig.DirectoryIndex = true
 			beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 		}

routers/commentsRouter_controllers.go

@@ -7,6 +7,38 @@ import (
 
 func init() {
 
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"],
+		beego.ControllerComments{
+			Method: "GetUserInfo",
+			Router: `/GetUserInfo`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams: param.Make(),
+			Params: nil})
+
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"],
+		beego.ControllerComments{
+			Method: "GetWeiXinUserInfo",
+			Router: `/GetWeiXinUserInfo`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams: param.Make(),
+			Params: nil})
+
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"],
+		beego.ControllerComments{
+			Method: "Login",
+			Router: `/Login`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams: param.Make(),
+			Params: nil})
+
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:AuthController"],
+		beego.ControllerComments{
+			Method: "Logout",
+			Router: `/Logout`,
+			AllowHTTPMethods: []string{"delete"},
+			MethodParams: param.Make(),
+			Params: nil})
+
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
 		beego.ControllerComments{
 			Method: "CreateWaybillOnProviders",

routers/router.go

@@ -31,6 +31,11 @@ func init() {
 				&controllers.StoreController{},
 			),
 		),
+		beego.NSNamespace("/auth",
+			beego.NSInclude(
+				&controllers.AuthController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)