日常保存

tangxvhui
go.mod
go.sum
pkg/application/auth/command/mobile_login.go
pkg/application/auth/service/auth.go
pkg/infrastructure/serviceGateway/httplib_ucenter_service_gateway.go
--- a/go.mod
查看文件 @32f22cb
+++ b/go.mod
查看文件 @32f22cb
@@ -5,6 +5,7 @@ go 1.16
 require (
 	github.com/Andrew-M-C/go.timeconv v0.4.0
 	github.com/Shopify/sarama v1.25.0
+	github.com/beego/beego v1.12.11
 	github.com/beego/beego/v2 v2.0.5
 	github.com/bwmarrin/snowflake v0.3.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
--- a/go.sum
查看文件 @32f22cb
+++ b/go.sum
查看文件 @32f22cb
@@ -61,6 +61,8 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
+github.com/beego/beego v1.12.11 h1:MWKcnpavb7iAIS0m6uuEq6pHKkYvGNw/5umIUKqL7jM=
+github.com/beego/beego v1.12.11/go.mod h1:QURFL1HldOcCZAxnc1cZ7wrplsYR5dKPHFjmk6WkLAs=
 github.com/beego/beego/v2 v2.0.1/go.mod h1:8zyHi1FnWO1mZLwTn62aKRIZF/aIKvkCBB2JYs+eqQI=
 github.com/beego/beego/v2 v2.0.5 h1:fa2TBWfKGDs35Ck9an9SVnpS0zM8sRTXlW8rFjpeYlE=
 github.com/beego/beego/v2 v2.0.5/go.mod h1:CH2/JIaB4ceGYVQlYqTAFft4pVk/ol1ZkakUrUvAyns=
@@ -102,10 +104,13 @@ github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
+github.com/couchbase/go-couchbase v0.0.0-20201216133707-c04035124b17/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A=
 github.com/couchbase/go-couchbase v0.1.0/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A=
 github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
+github.com/couchbase/gomemcached v0.1.2-0.20201224031647-c432ccf49f32/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo=
 github.com/couchbase/gomemcached v0.1.3/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo=
 github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
+github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
 github.com/couchbase/goutils v0.1.0/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
@@ -505,6 +510,7 @@ github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgq
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
+github.com/wendal/errors v0.0.0-20181209125328-7f31f4b264ec/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
@@ -566,6 +572,7 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
--- a/pkg/application/auth/command/mobile_login.go 0 → 100644
查看文件 @32f22cb
+++ b/pkg/application/auth/command/mobile_login.go 0 → 100644
查看文件 @32f22cb
+package command
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+
+	"github.com/beego/beego/validation"
+)
+
+type AuthorizeCommand struct {
+	Token string `json:"credentials" valid:"Required;"` //登录凭证
+	//ClientId string `json:"clientId"`                      //客户端密钥
+	Cuid int64 `json:"cuid" valid:"Required;"` //统一用户中心用户 UID
+	Cid  int64 `json:"cid" valid:"Required;"`  //统一用户中心公司 ID
+	Muid int64 `json:"muid" valid:"Required;"` //企业平台中的用户 UID
+}
+
+func (authorizeCommand *AuthorizeCommand) Valid(validation *validation.Validation) {
+
+}
+
+func (authorizeCommand *AuthorizeCommand) ValidateCommand() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(authorizeCommand)
+	if err != nil {
+		return err
+	}
+	if !b {
+		elem := reflect.TypeOf(authorizeCommand).Elem()
+		for _, validErr := range valid.Errors {
+			field, isExist := elem.FieldByName(validErr.Field)
+			if isExist {
+				return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1))
+			} else {
+				return fmt.Errorf(validErr.Message)
+			}
+		}
+	}
+	return nil
+}
--- a/pkg/application/auth/service/auth.go
查看文件 @32f22cb
+++ b/pkg/application/auth/service/auth.go
查看文件 @32f22cb
@@ -80,3 +80,29 @@ func (service *AuthService) Login(loginCommand *command.LoginCommand) (interface
 		},
 	}, nil
 }
+
+//手机端登录  ，来源于能力展示app
+
+func (service *AuthService) MobileLogin(param command.AuthorizeCommand) (map[string]interface{}, error) {
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if errStart := transactionContext.StartTransaction(); errStart != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, errStart.Error())
+	}
+	defer func() {
+		_ = transactionContext.RollbackTransaction()
+	}()
+
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	result := map[string]interface{}{
+		"access": map[string]interface{}{
+			"accessToken": "",
+			"expiresIn":   domain.JWTExpiresSecond,
+		},
+	}
+	return result, nil
+}
--- a/pkg/infrastructure/serviceGateway/httplib_ucenter_service_gateway.go
查看文件 @32f22cb
+++ b/pkg/infrastructure/serviceGateway/httplib_ucenter_service_gateway.go
查看文件 @32f22cb
@@ -3,11 +3,14 @@ package serviceGateway
 import (
 	"crypto/sha1"
 	"fmt"
-	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/constant"
-	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/infrastructure/serviceGateway/reply"
 	"net/http"
 	"net/url"
+	"strconv"
+	"strings"
 	"time"
+
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/constant"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/infrastructure/serviceGateway/reply"
 )
 type HttpLibUCenterApiServiceGateway struct {
@@ -27,7 +30,7 @@ func (serviceGateway *HttpLibUCenterApiServiceGateway) buildHeaders() map[string
 	}
 }
-// AuthCode PC端登录
+// AuthCode PC端登录, 为后台单点登录
 func (serviceGateway *HttpLibUCenterApiServiceGateway) AuthCode(code string) (*reply.UCenterAuthCode, error) {
 	authCodeReply := &reply.UCenterAuthCode{}
 	serviceGateway.CreateRequest(http.MethodPost, "/auth/serverLogin")
@@ -40,6 +43,21 @@ func (serviceGateway *HttpLibUCenterApiServiceGateway) AuthCode(code string) (*r
 	return authCodeReply, err
 }
+// AuthCode 手机应用端登录, 为token登录，app登录
+func (serviceGateway *HttpLibUCenterApiServiceGateway) AppAuthCode(tokenCode string, uid int, companyId int) (*reply.UCenterAuthCode, error) {
+	authCodeReply := &reply.UCenterAuthCode{}
+	serviceGateway.CreateRequest(http.MethodPost, "/auth/serverLogin")
+	serviceGateway.SetBody(map[string]interface{}{
+		"type":      2,
+		"token":     strings.TrimSpace(tokenCode),
+		"uid":       strconv.Itoa(uid),
+		"companyId": strconv.Itoa(companyId),
+	})
+	serviceGateway.SetHeaders(serviceGateway.buildHeaders())
+	err := serviceGateway.ToJson(authCodeReply)
+	return authCodeReply, err
+}
+
 func NewHttpLibUCenterApiServiceGateway() *HttpLibUCenterApiServiceGateway {
 	return &HttpLibUCenterApiServiceGateway{
 		httpLibBaseServiceGateway{baseURL: constant.UCENTER_SERVICE_HOST},