finish

service/user/user.go

@@ -2,13 +2,15 @@ package user
 
 import (
 	"fmt"
-	"github.com/golang-jwt/jwt/v4"
-	"github.com/google/uuid"
 	"nCovTrack-Backend/global"
 	"nCovTrack-Backend/models"
+	"nCovTrack-Backend/service/notify"
 	"nCovTrack-Backend/utils"
 	"strings"
 	"time"
+
+	"github.com/golang-jwt/jwt/v4"
+	"github.com/google/uuid"
 )
 
 const (
@@ -50,6 +52,15 @@ func Register(user map[string]interface{}) bool {
 	user["approver"] = 0
 	colMap := models.MapJ2c[models.BackUser](user, false)
 	ok, rowsAffected := models.Upsert[models.BackUser](colMap)
+	var sendRegion string
+	if int(user["role"].(float64)) == global.ROLE_ID_MAP["ADMIN"] {
+		sendRegion = strings.Split(user["region"].(string), " ")[0]
+	} else {
+		sendRegion = user["region"].(string)
+	}
+	notification := models.BackNotification{Time: time.Now(), Kind: "审批", Content: "有新的注册待审批"}
+	sendInfo := models.SendInfo{Region: []string{sendRegion}, Channel: []int{0}, Notification: notification}
+	notify.SendNotify(sendInfo)
 	if !ok || rowsAffected == 0 {
 		return false
 	}
@@ -95,7 +106,7 @@ func ApproveRegister(claims models.TokenClaims, email string, pass bool) bool {
 	} else {
 		approver = -claims.ID
 	}
-	updateMap := map[string]interface{}{"approver": approver}
+	updateMap := map[string]interface{}{"approver": approver, "modify_time": time.Now()}
 	ok, rowsAffected := models.Update[models.BackUser](queryMap, updateMap)
 	if !ok || rowsAffected == 0 {
 		return false
@@ -111,11 +122,12 @@ func ChangePassword(changePwd map[string]interface{}) bool {
 	}
 	newPassword := utils.PasswordEncrypt(changePwd["newPassword"].(string))
 	colMap := map[string]interface{}{
-		"id":       1,
+		"id":       1.0,
 		"password": newPassword,
 	}
 	models.BeforeSave(colMap, -1)
 	delete(colMap, "id")
+	delete(colMap, "modify_user")
 	rowAffected := global.Db.Model(models.BackUser{}).Where("email = ?", changePwd["email"]).Updates(colMap).RowsAffected
 	if rowAffected == 0 {
 		return false