Merge pull request #123 from Raxcl/hotfix-qqName-fix

Naccl · web-flow · commit a54b6d419f25 · 2024-01-22T09:46:30.000+08:00
fix:QQ&#26165;&#31216;&#33719;&#21462;&#22833;&#25928;&#30340;&#38382;&#39064;&#20462;&#22797;
diff --git a/blog-api/src/main/java/top/naccl/model/vo/QqResultVO.java b/blog-api/src/main/java/top/naccl/model/vo/QqResultVO.java
@@ -0,0 +1,22 @@
+package cn.raxcl.model.vo;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author raxcl
+ * @date 2024-01-19 9:54:53
+ */
+@Data
+public class QqResultVO {
+    private String success;
+
+    private String msg;
+
+    private Map<String, Object> data;
+
+    private String time;
+
+    private  String api_vers;
+}
diff --git a/blog-api/src/main/java/top/naccl/model/vo/QqVO.java b/blog-api/src/main/java/top/naccl/model/vo/QqVO.java
@@ -0,0 +1,30 @@
+package cn.raxcl.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author raxcl
+ * @date 2024-01-19 9:54:53
+ */
+@Data
+public class QqVO {
+    /**
+     * qq&#21495;
+     */
+    private Long qq;
+
+    /**
+     * qq&#26165;&#31216;
+     */
+    private String name;
+
+    /**
+     * qq&#37038;&#31665;
+     */
+    private String email;
+
+    /**
+     * qq&#22836;&#20687;
+     */
+    private String avatar;
+}
diff --git a/blog-api/src/main/java/top/naccl/util/QQInfoUtils.java b/blog-api/src/main/java/top/naccl/util/QQInfoUtils.java
@@ -12,24 +12,21 @@
  */
 public class QQInfoUtils {
 	private static RestTemplate restTemplate = new RestTemplate();
-	private static final String QQ_NICKNAME_URL = "https://r.qzone.qq.com/fcg-bin/cgi_get_portrait.fcg?uins={1}";
+	// &#21407;&#25509;&#21475;&#21322;&#22833;&#25928;&#65292;&#38656;&#35201;&#25552;&#20379;cookie&#25165;&#21487;&#20351;&#29992;&#65292;&#26242;&#26102;&#26367;&#25442;&#20026;&#22791;&#29992;&#25509;&#21475;&#65292;&#24863;&#35874; &#33487;&#26195;&#26228; &#22823;&#20332;&#21451;&#24773;&#25552;&#20379;
+	private static final String QQ_NICKNAME_URL = "https://api.toubiec.cn/api/qqinfo_v4.php?qq={1}";
 	private static final String QQ_AVATAR_URL = "https://q.qlogo.cn/g?b=qq&nk=%s&s=100";
 
 	/**
 	 * &#33719;&#21462;QQ&#26165;&#31216;
 	 *
-	 * @param qq
-	 * @return
-	 * @throws UnsupportedEncodingException
+	 * @param qq qq
 	 */
-	public static String getQQNickname(String qq) throws UnsupportedEncodingException {
-		String res = restTemplate.getForObject(QQ_NICKNAME_URL, String.class, qq);
-		byte[] bytes = res.getBytes("iso-8859-1");
-		String nickname = new String(bytes, "gb18030").split(",")[6].replace("\"", "");
-		if ("".equals(nickname)) {
-			return "nickname";
+	public static String getQqNickname(String qq) {
+		QqResultVO qqResultVO = REST_TEMPLATE.getForObject(QQ_NICKNAME_URL, QqResultVO.class, qq);
+		if (qqResultVO != null) {
+			return new ObjectMapper().convertValue(qqResultVO.getData(), QqVO.class).getName();
 		}
-		return nickname;
+		return "nickname";
 	}
 
 	/**
