合并分支 'dev' 到 'test'

Dev 查看合并请求 !16

合并分支 'dev' 到 'test'
Dev 查看合并请求 !16
陈志颖
deploy/k8s/dev/partner.yaml
deploy/k8s/prd/partner.yaml
deploy/k8s/test/partner.yaml
main.go
pkg/application/auth/auth.go
pkg/constant/common.go
pkg/infrastructure/domain_service/pg_auth_services.go
pkg/infrastructure/svr/httplib_ucenter_service_gateway.go
pkg/log/logger.go
pkg/port/appsvr/controllers/auth.go
pkg/port/appsvr/controllers/user.go
pkg/port/appsvr/routers/router.go
pkg/port/sarama/messageHandler/ucenterMessageCommand.go
pkg/port/sarama/sarama.go
pkg/protocol/user.go
--- a/deploy/k8s/dev/partner.yaml
查看文件 @688f339
+++ b/deploy/k8s/dev/partner.yaml
查看文件 @688f339
@@ -66,6 +66,8 @@ spec:
               value: "31543"
             - name: LOG_LEVEL
               value: "debug"
+            - name: LOG_PREFIX
+              value: "[partner_dev]"
             - name: ERROR_BASE_CODE
               value: "1"
             - name: ERROR_BASE_CODE_MULTIPLE
--- a/deploy/k8s/prd/partner.yaml
查看文件 @688f339
+++ b/deploy/k8s/prd/partner.yaml
查看文件 @688f339
@@ -66,6 +66,8 @@ spec:
               value: "15432"
             - name: LOG_LEVEL
               value: "debug"
+            - name: LOG_PREFIX
+              value: "[partner_prd]"
             - name: ERROR_BASE_CODE
               value: "1"
             - name: ERROR_BASE_CODE_MULTIPLE
--- a/deploy/k8s/test/partner.yaml
查看文件 @688f339
+++ b/deploy/k8s/test/partner.yaml
查看文件 @688f339
@@ -66,6 +66,8 @@ spec:
               value: "31543"
             - name: LOG_LEVEL
               value: "debug"
+            - name: LOG_PREFIX
+              value: "[partner_test]"
             - name: ERROR_BASE_CODE
               value: "1"
             - name: ERROR_BASE_CODE_MULTIPLE
--- a/main.go
查看文件 @688f339
+++ b/main.go
查看文件 @688f339
@@ -8,6 +8,8 @@ import (
 	_ "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/pg"
 	_ "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/redis"
 	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/log"
+	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/port/sarama"
+
 	//"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/port/ginsvr"
 	_ "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/port/appsvr"
 )
@@ -23,5 +25,8 @@ func main() {
 	//注册事件
 	event.InitEventCenter()
+	//启动kafaka消息订阅
+	go sarama.Run()
+
 	beego.Run()
 }
--- a/pkg/application/auth/auth.go
查看文件 @688f339
+++ b/pkg/application/auth/auth.go
查看文件 @688f339
@@ -301,6 +301,48 @@ func UCenterRevoke(header *protocol.RequestHeader, userId int64) (rsp *protocol.
 	return
 }
+// 企业平台-密码校验
+func PasswordLogin(header *protocol.RequestHeader, request *protocol.LoginRequest) (v interface{}, err error) {
+	var (
+		transactionContext, _ = factory.CreateTransactionContext(nil)
+		loginSvr              = domain_service.NewPgLoginService(transactionContext)
+	)
+
+	if err = transactionContext.StartTransaction(); err != nil {
+		log.Error(err)
+		return nil, err
+	}
+
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+
+	// loginSvr 初始化
+	loginSvr.Init(request.Phone)
+
+	if len(loginSvr.Users) == 0 && len(loginSvr.PartnerInfo) == 0 {
+		v = map[string]interface{}{}
+		err = protocol.NewErrWithMessage(10001)
+		return
+	}
+
+	if len(request.Password) == 0 {
+		v = map[string]interface{}{}
+		err = protocol.NewCustomMessage(1, "密码不能为空！")
+		return
+	}
+
+	if loginSvr.ManagerLogin(request.Phone, request.Password) != nil && loginSvr.PartnerLogin(request.Phone, request.Password) != nil {
+		v = map[string]interface{}{}
+		err = protocol.NewCustomMessage(1, "密码输入有误！")
+		return
+	}
+
+	v = map[string]interface{}{}
+	err = transactionContext.CommitTransaction()
+	return
+}
+
 // 企业平台-多公司登录
 func CompaniesLogin(header *protocol.RequestHeader, request *protocolx.CenterCompanysRequest) (v interface{}, err error) {
 	var (
--- a/pkg/constant/common.go
查看文件 @688f339
+++ b/pkg/constant/common.go
查看文件 @688f339
@@ -9,6 +9,7 @@ const SERVICE_NAME = "partner"
 var LOG_LEVEL = "debug"
 var LOG_File = "app.log"
+var LOG_PREFIX = "[partner_dev]"
 var MMM_SMS_SERVICE_HOST = "https://sms.fjmaimaimai.com:9897"
 var UCENTER_SERVICE_HOST = "https://suplus-ucenter-test.fjmaimaimai.com"
@@ -28,6 +29,9 @@ func init() {
 	if os.Getenv("LOG_LEVEL") != "" {
 		LOG_LEVEL = os.Getenv("LOG_LEVEL")
 	}
+	if os.Getenv("LOG_PREFIX") != "" {
+		LOG_PREFIX = os.Getenv("LOG_PREFIX")
+	}
 	if os.Getenv("UCENTER_SERVICE_HOST") != "" {
 		UCENTER_SERVICE_HOST = os.Getenv("UCENTER_SERVICE_HOST")
 	}
--- a/pkg/infrastructure/domain_service/pg_auth_services.go
查看文件 @688f339
+++ b/pkg/infrastructure/domain_service/pg_auth_services.go
查看文件 @688f339
@@ -21,8 +21,8 @@ func NewPgAuthService(ctx *transaction.TransactionContext) *PgAuthService {
 }
 func (s *PgAuthService) ChangeUserPhone(userId int64, newPhone, oldPhone string) (err error) {
-	errPartner := s.partner.ChangeUserPhone(userId, newPhone, oldPhone)
-	errManager := s.manager.ChangeUserPhone(userId, newPhone, oldPhone)
+	errPartner := s.partner.ChangeUserPhone(userId, newPhone, oldPhone) // 合伙人修改手机号
+	errManager := s.manager.ChangeUserPhone(userId, newPhone, oldPhone) // 高管修改手机号
 	return errResolve(errPartner, errManager)
 }
 func (s *PgAuthService) ChangeUserPassword(userId int64, newPwd, oldPwd, phone string) (err error) {
--- a/pkg/infrastructure/svr/httplib_ucenter_service_gateway.go
查看文件 @688f339
+++ b/pkg/infrastructure/svr/httplib_ucenter_service_gateway.go
查看文件 @688f339
@@ -81,6 +81,7 @@ func (serviceGateway *HttplibUCenterApiServiceGateway) ChangePassword(phone, new
 	}
 	return serviceGateway.handlerError(response)
 }
+
 func (serviceGateway *HttplibUCenterApiServiceGateway) ChangePhone(newPhone, oldPhone string) (int, error) {
 	url := strings.Join([]string{serviceGateway.baseURL, "user", "change-phone"}, "/")
 	request := serviceGateway.createRequest(url, "post")
--- a/pkg/log/logger.go
查看文件 @688f339
+++ b/pkg/log/logger.go
查看文件 @688f339
@@ -39,6 +39,7 @@ func NewBeegoLogger(conf LoggerConfig) *logs.BeeLogger {
 	log.SetLevel(ilv)
 	log.EnableFuncCallDepth(true)
 	log.SetLogFuncCallDepth(5)
+	log.SetPrefix(constant.LOG_PREFIX)
 	return log
 }
--- a/pkg/port/appsvr/controllers/auth.go
查看文件 @688f339
+++ b/pkg/port/appsvr/controllers/auth.go
查看文件 @688f339
@@ -272,3 +272,32 @@ func (this *AuthController) UCenterRevoke() {
 	}
 	msg = protocol.NewReturnResponse(auth.UCenterRevoke(nil, int64(uid)))
 }
+
+/**
+ * @Author SteveChan
+ * @Description //校验密码
+ * @Date 01:00 2021/1/8
+ * @Param
+ * @return
+ **/
+func (this *AuthController) CheckPassword() {
+	var msg *protocol.ResponseMessage
+	defer func() {
+		this.Resp(msg)
+	}()
+	var request *protocol.LoginRequest
+	if err := this.JsonUnmarshal(&request); err != nil {
+		msg = protocol.BadRequestParam(1)
+		return
+	}
+	if b, m := this.Valid(request); !b {
+		msg = m
+		return
+	}
+	header := this.GetRequestHeader(this.Ctx)
+	data, err := auth.PasswordLogin(header, request)
+	if err != nil {
+		log.Error(err)
+	}
+	msg = protocol.NewReturnResponse(data, err)
+}
--- a/pkg/port/appsvr/controllers/user.go
查看文件 @688f339
+++ b/pkg/port/appsvr/controllers/user.go
查看文件 @688f339
@@ -2,9 +2,11 @@ package controllers
 import (
 	"fmt"
+	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/application/auth"
 	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/application/user"
 	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/protocol"
 	"strings"
+	"time"
 )
 type UserController struct {
@@ -51,14 +53,25 @@ func (this *UserController) CheckSmsCode() {
 	msg = protocol.NewReturnResponse(user.CheckSmsCode(header, request))
 }
-//ChangePhone
-// @router /changePhone [post]
+/**
+ * @Author SteveChan
+ * @Description //TODO 修改手机号
+ * @Date 00:29 2021/1/8
+ * @Param
+ * @return
+ * @router /changePhone [post]
+ **/
 func (this *UserController) ChangePhone() {
 	var msg *protocol.ResponseMessage
+
 	defer func() {
 		this.Resp(msg)
 	}()
+
 	var request *protocol.ChangePhoneRequest
+
+	header := this.GetRequestHeader(this.Ctx)
+
 	if err := this.JsonUnmarshal(&request); err != nil {
 		msg = protocol.BadRequestParam(1)
 		return
@@ -67,20 +80,42 @@ func (this *UserController) ChangePhone() {
 		msg = m
 		return
 	}
-	if !CacheSms.IsExist(request.OldPhone) {
+
+	// 校验短信验证码
+	var authCheckSmsCodeRequest *protocol.AuthCheckSmsCodeRequest
+	if err := this.JsonUnmarshal(&authCheckSmsCodeRequest); err != nil {
+		msg = protocol.BadRequestParam(1)
+		return
+	}
+	if b, m := this.Valid(authCheckSmsCodeRequest); !b {
+		msg = m
+		return
+	}
+	rsp, err := auth.AuthCheckSmsCode(header, authCheckSmsCodeRequest)
+	if err != nil {
+		msg = protocol.NewReturnResponse(rsp, err)
+		return
+	}
+	err = CacheSms.Put(request.Phone, rsp.CaptchaCertificate, 5*time.Minute)
+	if err != nil {
+		msg = protocol.NewReturnResponse(rsp, err)
+		return
+	}
+
+	if !CacheSms.IsExist(request.Phone) {
 		msg = protocol.NewMesage(1009) //验证码失效
 		return
 	}
-	if v := CacheSms.Get(request.OldPhone); v != nil {
-		if !strings.EqualFold(fmt.Sprintf("%v", v), strings.TrimSpace(request.CaptchaCertificate)) {
-			msg = protocol.NewMesage(1012) //验证码不一致
-			return
-		}
+	if v := CacheSms.Get(request.Phone); v != nil {
+		//if !strings.EqualFold(fmt.Sprintf("%v", v), strings.TrimSpace(request.CaptchaCertificate)) {
+		//	msg = protocol.NewMesage(1012) //验证码不一致
+		//	return
+		//}
 	} else {
 		msg = protocol.NewMesage(1009) //验证码不一致
 		return
 	}
-	header := this.GetRequestHeader(this.Ctx)
+
 	data, err := user.ChangePhone(header, request)
 	if err == nil {
 		msg = protocol.NewResponseMessage(0, "修改手机号成功")
--- a/pkg/port/appsvr/routers/router.go
查看文件 @688f339
+++ b/pkg/port/appsvr/routers/router.go
查看文件 @688f339
@@ -8,6 +8,7 @@ import (
 func init() {
 	nsV1 := beego.NewNamespace("v1") //, beego.NSBefore(middleware.CheckJWTToken)
 	nsV1.Router("/auth/login", &controllers.AuthController{}, "Post:Login")
+	nsV1.Router("/auth/checkPassword", &controllers.AuthController{}, "Post:CheckPassword") // 校验密码
 	nsV1.Router("/auth/smsCode", &controllers.AuthController{}, "Post:SmsCode")
 	nsV1.Router("/auth/accessToken", &controllers.AuthController{}, "Post:AccessToken")
 	nsV1.Router("/auth/refreshToken", &controllers.AuthController{}, "Post:RefreshToken")
--- a/pkg/port/sarama/messageHandler/ucenterMessageCommand.go
查看文件 @688f339
+++ b/pkg/port/sarama/messageHandler/ucenterMessageCommand.go
查看文件 @688f339
@@ -2,10 +2,10 @@ package messageHandler
 import "github.com/Shopify/sarama"
-type UcenterMessageCommand struct {
+type UCenterMessageCommand struct {
 }
-func (c *UcenterMessageCommand) ChangePhoneHandler(message interface{}) error {
+func (c *UCenterMessageCommand) ChangePhoneHandler(message interface{}) error {
 	msg, ok := message.(*sarama.Message)
 	if !ok && msg == nil {
 		return nil
--- a/pkg/port/sarama/sarama.go
查看文件 @688f339
+++ b/pkg/port/sarama/sarama.go
查看文件 @688f339
 package sarama
 import (
+	"fmt"
 	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/constant"
 	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/message/kafkax"
+	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/message/models"
+	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/pg/transaction"
 	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/log"
 	"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/port/sarama/messageHandler"
 	//"suplus-message/pkg/constant"
 	//"suplus-message/pkg/port/sarama/messageHandler"
 )
+type PgMessageReceiverRepository struct {
+	transactionContext *transaction.TransactionContext
+}
+
+func NewPgMessageReceiverRepository(transactionContext *transaction.TransactionContext) *PgMessageReceiverRepository {
+	return &PgMessageReceiverRepository{
+		transactionContext: transactionContext,
+	}
+}
+
+func (repository *PgMessageReceiverRepository) ReceiveMessage(params map[string]interface{}) error {
+	var num int
+	checkSql := `select count(0) from sys_message_consume where "offset" =? and topic=?`
+	_, err := repository.transactionContext.PgDd.Query(&num, checkSql, params["offset"], params["topic"])
+	if err != nil {
+		return err
+	}
+	if num > 0 {
+		return fmt.Errorf("receive repeate message [%v]", params)
+	}
+
+	sql := `insert into sys_message_consume(topic,partition,"offset",key,value,msg_time,create_at,status)values(?,?,?,?,?,?,?,?)`
+	_, err = repository.transactionContext.PgDd.Exec(sql, params["topic"], params["partition"], params["offset"], params["key"], params["value"], params["msg_time"], params["create_at"], params["status"])
+	return err
+}
+
+func (repository *PgMessageReceiverRepository) ConfirmReceive(params map[string]interface{}) error {
+	fmt.Println(params)
+	_, err := repository.transactionContext.PgDd.Exec(`update sys_message_consume set status=? where "offset" =? and topic=?`, int(models.Finished), params["offset"], params["topic"])
+	return err
+}
+
 func Run() {
 	var (
-		ucenterMessage = &messageHandler.UcenterMessageCommand{}
+		uCenterMessage = &messageHandler.UCenterMessageCommand{}
 	)
 	saramaConsumer := kafkax.NewSaramaConsumer(constant.KAFKA_HOSTS, constant.SERVICE_NAME)
-	saramaConsumer.WithTopicHandler(constant.TOPIC_UCENT_USER_CHANGE_PHONE, ucenterMessage.ChangePhoneHandler)
+	saramaConsumer.WithTopicHandler(constant.TOPIC_UCENT_USER_CHANGE_PHONE, uCenterMessage.ChangePhoneHandler)
+	saramaConsumer.WithMessageReceiver(NewPgMessageReceiverRepository(nil)) // 持久化
 	err := saramaConsumer.StartConsume()
 	if err != nil {
--- a/pkg/protocol/user.go
查看文件 @688f339
+++ b/pkg/protocol/user.go
查看文件 @688f339
@@ -55,9 +55,10 @@ type ChangePhoneRequest struct {
 	Phone   string `json:"phone" valid:"Required"`
 	Captcha string `json:"captcha" valid:"Required"`
-	OldPhone           string `json:"oldPhone" valid:"Required"`
-	CaptchaCertificate string `json:"captchaCertificate" valid:"Required"`
+	OldPhone string `json:"oldPhone" valid:"Required"`
+	//CaptchaCertificate string `json:"captchaCertificate" valid:"Required"`
 }
+
 type ChangePhoneResponse struct {
 }