fix

controller/auth.go

@@ -134,19 +134,21 @@ func (a *AuthController) Register(c *gin.Context) {
 		resp.Fail("验证码错误,请重新输入", c)
 		return
 	}
+	userId := 0
 	password := utils.MD5(req.Password+utils.KEY)
 	if emailItem != nil {
 		if emailItem.Status == 1 && emailItem.Password == "" {
 			//已经是正式用户，更新密码即可
 			emailItem.Password = password
 			emailItem.ModifyTime = time.Now()
-
-			err = emailItem.Update([]string{"Password", "ModifyTime"})
+			emailItem.RegisterTime = time.Now()
+			err = emailItem.Update([]string{"Password", "ModifyTime","RegisterTime"})
 			if err != nil {
 				resp.FailMsg("修改密码失败", "修改密码失败，Err:"+err.Error(), c)
 				return
 			}
 			resp.Ok("注册成功", c)
+			userId = int(emailItem.Id)
 		} else if emailItem.Status == 2 {
 			resp.Registered("邮箱已注册.", c)
 			return
@@ -154,29 +156,31 @@ func (a *AuthController) Register(c *gin.Context) {
 			resp.Expired("试用权限超期", c)
 			return
 		}
-	}
-
-	//状态为临时
-	user := english_report_email.Email{
-		Name:        req.Name,
-		CompanyName: req.CompanyName,
-		Email:       req.Email,
-		Password:    password,
-		Enable:      1,
-		Status:      2,
-	}
-	user.Set()
+	} else {
+		//状态为临时
+		user := english_report_email.Email{
+			Name:        req.Name,
+			CompanyName: req.CompanyName,
+			Email:       req.Email,
+			Password:    password,
+			Enable:      1,
+			Status:      2,
+			RegisterTime: time.Now(),
+		}
+		user.Set()
 
-	err = user.Add()
-	if err != nil {
-		resp.FailData("新增用户信息失败", "Err:"+err.Error(), c)
-		return
+		err = user.Add()
+		if err != nil {
+			resp.FailData("新增用户信息失败", "Err:"+err.Error(), c)
+			return
+		}
+		userId = int(user.Id)
 	}
 
 	account := utils.MD5(req.Email)
 	token, err := utils.GenToken(account)
 	sysSession := new(session.EnglishYbSession)
-	sysSession.UserId = int(user.Id)
+	sysSession.UserId = userId
 	//现在要求永不过期
 	sysSession.ExpireTime = time.Now().AddDate(99, 0, 0)
 	sysSession.CreatedTime = time.Now()

controller/english_report/english_report.go

@@ -10,6 +10,7 @@ import (
 	"hongze/hongze_yb_en_api/models/english_classify"
 	"hongze/hongze_yb_en_api/models/english_report"
 	"hongze/hongze_yb_en_api/models/english_video"
+	"hongze/hongze_yb_en_api/services"
 	elasticService "hongze/hongze_yb_en_api/services/elastic"
 	english_report_service "hongze/hongze_yb_en_api/services/english_report"
 	"hongze/hongze_yb_en_api/utils"
@@ -280,7 +281,7 @@ func (er *EnglishReportController) Detail(c *gin.Context) {
 		resp.FailData("参数解析失败", errs.Translate(global.Trans), c)
 		return
 	}
-
+	userinfo := services.GetInfoByClaims(c)
 	reportItem := new(english_report.Report)
 	reportItem, err = reportItem.GetEnglishReportByCode(req.ReportCode)
 	if err != nil {

models/english_report_email/email.go

@@ -15,6 +15,7 @@ type Email struct {
 	Email        string    `gorm:"column:email" json:"email"`                   //邮箱地址
 	ViewTotal    uint      `gorm:"column:view_total" json:"view_total"`         //累计点击量/阅读量
 	LastViewTime time.Time `gorm:"column:last_view_time" json:"last_view_time"` //最后阅读时间
+	RegisterTime time.Time `gorm:"column:register_time" json:"register_time"`   //注册时间
 	IsDeleted    uint8     `gorm:"column:is_deleted" json:"is_deleted"`         //删除状态：0-正常；1-已删除
 	AdminId      uint      `gorm:"column:admin_id" json:"admin_id"`             //创建人ID
 	AdminName    string    `gorm:"column:admin_name" json:"admin_name"`         //创建人名称