marge: 合并代码

lib/core/mml_client/send.go

@@ -12,20 +12,20 @@ func MMLSendMsg(ip, msg string) (string, error) {
 	// 创建MMLClient实例
 	client, err := NewMMLClient(ip)
 	if err != nil {
-		return "", fmt.Errorf("创建MMLClient实例失败：%v", err)
+		return "", fmt.Errorf("failed to create MMLClient instance: %v", err)
 	}
 	defer client.Close()
 
 	// 发送数据
 	err = client.Send(msg)
 	if err != nil {
-		return "", fmt.Errorf("发送数据失败：%v", err)
+		return "", fmt.Errorf("sending data failed: %v", err)
 	}
 
 	// 接收数据
 	data, err := client.Receive()
 	if err != nil {
-		return "", fmt.Errorf("接收数据失败：%v", err)
+		return "", fmt.Errorf("failed to receive data: %v", err)
 	}
 
 	return data, nil
@@ -41,15 +41,16 @@ func MMLSendMsgToString(ip, msg string) (string, error) {
 		return "", err
 	}
 
+	str = strings.ToLower(str)
+
 	// 截断
 	index := strings.Index(str, "\n")
 	if index != -1 {
 		str = str[:index]
-		str = strings.ToLower(str)
 	}
 
 	// 命令成功
-	if strings.Contains(str, "ok") || strings.Contains(str, "OK") {
+	if strings.Contains(str, "ok") || strings.Contains(str, "success") {
 		return str, nil
 	}
 
@@ -89,10 +90,10 @@ func MMLSendMsgToMap(ip, msg string) (map[string]string, error) {
 
 		if strings.Contains(item, "=") {
 			// 按照分隔符"="进行拆分键值对
-			pair = strings.Split(item, "=")
+			pair = strings.SplitN(item, "=", 2)
 		} else if strings.Contains(item, ":") {
 			// 按照分隔符":"进行拆分键值对
-			pair = strings.Split(item, ":")
+			pair = strings.SplitN(item, ":", 2)
 		}
 
 		if len(pair) == 2 {

lib/core/utils/ctx/ctx.go

@@ -128,7 +128,7 @@ func LoginUser(r *http.Request) (vo.LoginUser, error) {
 	if v != nil {
 		return v.(vo.LoginUser), nil
 	}
-	return vo.LoginUser{}, fmt.Errorf("无用户信息")
+	return vo.LoginUser{}, fmt.Errorf("No user information")
 }
 
 // LoginUserToUserID 登录用户信息-用户ID