From 38781eab8c124d77541f509c8a0fb5dd429c30bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A4=E9=B8=BF?=
 <31199914+wsczx@users.noreply.github.com>
Date: Thu, 6 Mar 2025 14:55:10 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=AF=86=E7=A0=81=E4=B8=BA=E5=AF=86=E6=96=87=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84Bug=20ps=EF=BC=9A=20=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E5=AF=86=E7=A0=81=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=88=B0=E6=97=A5=E5=BF=97=20=E9=82=AE=E4=BB=B6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=8F=91=E9=80=81=E6=98=8E=E6=96=87=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/admin/api_uploaduser.go | 1 +
 server/admin/api_user.go       | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/server/admin/api_uploaduser.go b/server/admin/api_uploaduser.go
index 68d48aa..2604140 100644
--- a/server/admin/api_uploaduser.go
+++ b/server/admin/api_uploaduser.go
@@ -110,6 +110,7 @@ func UploadUser(file string) error {
 		if err := dbdata.AddBatch(user); err != nil {
 			return fmt.Errorf("请检查第%d行数据是否导入有重复用户", index)
 		}
+		user.PinCode = row[4]
 		if user.SendEmail {
 			if err := userAccountMail(user); err != nil {
 				return err
diff --git a/server/admin/api_user.go b/server/admin/api_user.go
index 19a56f9..3949964 100644
--- a/server/admin/api_user.go
+++ b/server/admin/api_user.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/bjdgyc/anylink/base"
 	"github.com/bjdgyc/anylink/dbdata"
+	"github.com/bjdgyc/anylink/pkg/utils"
 	"github.com/bjdgyc/anylink/sessdata"
 	"github.com/skip2/go-qrcode"
 	mail "github.com/xhit/go-simple-mail/v2"
@@ -98,11 +99,17 @@ func UserSet(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if len(data.PinCode) < 6 {
+		data.PinCode = utils.RandomRunes(8)
+		base.Info("用户", data.Username, "随机密码为:", data.PinCode)
+	}
+	plainpwd := data.PinCode
 	err = dbdata.SetUser(data)
 	if err != nil {
 		RespError(w, RespInternalErr, err)
 		return
 	}
+	data.PinCode = plainpwd
 
 	// 发送邮件
 	if data.SendEmail {