111

services/login_service.go

@@ -8,6 +8,7 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"log"
 	"net/http"
 	"strconv"
@@ -50,6 +51,8 @@ func NewLoginService() LoginService {
 func (s *loginService) ValidRule(ctx iris.Context) (viewmodels.Login, error) {
 	loginVaild := viewmodels.Login{}
 	err := ctx.ReadJSON(&loginVaild)
+
+	fmt.Println(loginVaild)
 	if err != nil {
 		log.Println("ReadForm转换异常, error=", err)
 		return loginVaild, err

web/api/project_account_api.go

@@ -8,9 +8,12 @@ package api
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/dgrijalva/jwt-go"
 	"github.com/kataras/iris/v12"
+	"go.mod/comm"
+	"go.mod/conf"
 	"go.mod/services"
 )
 
@@ -37,20 +40,22 @@ func (c *ProjectAccountApi) Get() {
 	// }
 
 	userInfo := c.Ctx.Values().Get("jwt").(*jwt.Token).Claims.(jwt.MapClaims)
-	fmt.Println(userInfo)
+	accountId := userInfo["identity"].(string)
+	aid, err := comm.AesDecrypt(accountId, conf.CookieSecret)
+	id, err := strconv.Atoi(aid)
 	// 获得项目ID
 	// projectIdInt, err := utils.GetProjectId(c.Ctx)
-	// if err != nil {
-	// 	c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
-	// 	return
-	// }
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+		return
+	}
 
 	// 获得登陆用户
-	// AccountData := c.ServiceProjectAccount.Get(projectAccountIdInt)
+	AccountData := c.ServiceProjectAccount.Get(id)
 
 	c.Ctx.JSON(iris.Map{
 		"code": 0,
 		"msg":  "",
-		// "data": AccountData,
+		"data": AccountData,
 	})
 }

web/routes/routes.go

@@ -41,7 +41,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 
 	// 合同管理
 	apiContract := mvc.New(b.Party("/api/contract"))
-	apiContract.Router.Use(middleware.JwtAuth().Serve)
+	// apiContract.Router.Use(middleware.JwtAuth().Serve)
 	apiContract.Register(ContractService)
 	// 中间件
 	apiContract.Handle(new(api.ContractApi))

web/viewmodels/login.go

@@ -16,9 +16,8 @@ type Login struct {
 }
 
 func (l Login) Validate() error {
-	return validation.ValidateStruct(&l)// Code cannot be empty, and the length must between 5 and 50
+	return validation.ValidateStruct(&l, validation.Field(&l.Account, validation.Required.Error("账号不能为空"), validation.Length(2, 50).Error("账号最少要输入 3 个字符")),
+		validation.Field(&l.Password, validation.Required.Error("密码不能为空"), validation.Length(2, 50).Error("密码最少要输入 6 个字符"))) // Code cannot be empty, and the length must between 5 and 50
 	// validation.Field(&l.Code, validation.Required.Error("项目编号不能为空"), validation.Length(3, 50).Error("项目编号最少要输入 3 个字符")),
-	// validation.Field(&l.Account, validation.Required.Error("账号不能为空"), validation.Length(2, 50).Error("账号最少要输入 3 个字符")),
-	// validation.Field(&l.Password, validation.Required.Error("密码不能为空"), validation.Length(6, 50).Error("密码最少要输入 6 个字符")),
 
 }