添加线程池
This commit is contained in:
@@ -49,38 +49,32 @@ func UserLogin(c *gin.Context) {
|
||||
fmt.Println("微信登录返回结果:", resp.Body)
|
||||
defer resp.Body.Close()
|
||||
|
||||
// 解析微信返回结果
|
||||
var wxResp usermodel.WxLoginResponse
|
||||
if err := json.NewDecoder(resp.Body).Decode(&wxResp); err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "解析微信登录响应失败: " + err.Error(), "code": "10026"})
|
||||
return
|
||||
}
|
||||
|
||||
// 检查微信返回的错误
|
||||
if wxResp.ErrCode != 0 {
|
||||
c.JSON(http.StatusBadRequest, gin.H{ // http.StatusBadRequest 对应 400
|
||||
c.JSON(http.StatusBadRequest, gin.H{
|
||||
"error": fmt.Sprintf("微信登录失败: %s (错误码: %d)", wxResp.ErrCode, wxResp.ErrMsg),
|
||||
"code": "10027",
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
//可选)使用session_key、encryptedData和iv解密用户信息
|
||||
// 步骤2:解密手机号(复用AES解密函数)
|
||||
phoneData, err := decryptWxData(wxResp.SessionKey, req.EncryptedData, req.Iv)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "解密失败: " + err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// 步骤3:解析为手机号结构体
|
||||
var phoneInfo usermodel.WxPhoneInfo
|
||||
if err := json.Unmarshal(phoneData, &phoneInfo); err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "解析手机号失败"})
|
||||
return
|
||||
}
|
||||
|
||||
// 验证水印(确保数据有效性)
|
||||
if phoneInfo.Watermark.AppID != config.Conf.WxID {
|
||||
c.JSON(http.StatusForbidden, gin.H{"error": "数据水印验证失败"})
|
||||
return
|
||||
@@ -89,11 +83,10 @@ func UserLogin(c *gin.Context) {
|
||||
fmt.Println("用户手机号为:", phoneInfo.PhoneNumber)
|
||||
|
||||
openid := wxResp.OpenID
|
||||
ctx := c.Request.Context() // 获取请求上下文,用于控制数据库操作超时
|
||||
ctx := c.Request.Context()
|
||||
|
||||
var username string
|
||||
|
||||
// 1. 查询用户是否存在
|
||||
var exists bool
|
||||
query := "SELECT EXISTS(SELECT 1 FROM user_info WHERE uid = ? LIMIT 1)"
|
||||
err = databaseInit.UserDB.QueryRowContext(ctx, query, openid).Scan(&exists)
|
||||
@@ -105,7 +98,6 @@ func UserLogin(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// 2. 如果用户不存在,插入新用户
|
||||
if !exists {
|
||||
username = generateUsername()
|
||||
now := time.Now()
|
||||
@@ -119,8 +111,8 @@ func UserLogin(c *gin.Context) {
|
||||
insertSQL,
|
||||
openid, // uid(使用微信 openid)
|
||||
2,
|
||||
now, // createdtime
|
||||
now, // updatedtime
|
||||
now,
|
||||
now,
|
||||
username,
|
||||
phoneInfo.PhoneNumber,
|
||||
)
|
||||
@@ -159,10 +151,8 @@ func UserLogin(c *gin.Context) {
|
||||
}
|
||||
|
||||
func generateUsername() string {
|
||||
// 初始化随机数种子(确保每次运行生成不同随机数)
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
// 生成8位随机数字(范围:10000000-99999999)
|
||||
randomNum := 10000000 + rand.Intn(90000000) // 8位随机数
|
||||
randomNum := 10000000 + rand.Intn(90000000)
|
||||
return "用户" + strconv.Itoa(randomNum)
|
||||
}
|
||||
|
||||
@@ -179,10 +169,9 @@ func decryptWxData(sessionKey, encryptedData, iv string) ([]byte, error) {
|
||||
mode := cipher.NewCBCDecrypter(block, ivBytes)
|
||||
mode.CryptBlocks(data, data)
|
||||
|
||||
return pkcs7Unpad(data), nil // 返回去除填充后的原始数据
|
||||
return pkcs7Unpad(data), nil
|
||||
}
|
||||
|
||||
// 去除PKCS#7填充(微信加密数据使用PKCS#7填充)
|
||||
func pkcs7Unpad(data []byte) []byte {
|
||||
if len(data) == 0 {
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user