第三方商品服务-完善异常捕获

thirdPartyWares_service/src/main/java/com/bjtdba/thirdPartWares/controller/TaobaoCallback.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;
 import java.net.URLDecoder;
@@ -28,6 +29,8 @@ public class TaobaoCallback {
     private UserThirdDao userThirdDao;
     @Value("${TB.AUTH_REDIRECT_URI}")
     private String authRedirectUri;
+    @Value("${TB.AUTH_ERROR_REDIRECT_URI}")
+    private String authErrorRedirectUri;
 
     /**
      * 淘宝回调
@@ -37,12 +40,26 @@ public class TaobaoCallback {
     public ModelAndView getTaobaoAuthorizedLoginToken(String code, String state) throws IOException {
         String decodedState = "";
         if (state != null) {
+            System.err.println(state);
             decodedState = URLDecoder.decode(state, "UTF-8");
             // Base64 解码
             byte[] decodedBytes = Base64.getDecoder().decode(decodedState);
             decodedState = new String(decodedBytes, StandardCharsets.UTF_8);
         }
-        taobaoService.getTaobaoAuthorizedLoginToken(code, decodedState);
+        try {
+            taobaoService.getTaobaoAuthorizedLoginToken(code, decodedState);
+        } catch (RuntimeException e) {
+            // 1. 记录日志
+            System.err.println("淘宝API调用失败: " + e.getMessage());
+            // 2. 返回错误页面或错误信息
+            String redirectUrl = UriComponentsBuilder.fromUriString(authErrorRedirectUri)
+                    .queryParam("msg", e.getMessage())
+                    .build()
+                    .encode(StandardCharsets.UTF_8)
+                    .toUriString();
+
+            return new ModelAndView("redirect:" + redirectUrl);
+        }
         String viewName = "redirect:" + authRedirectUri;
 
         if (!decodedState.isEmpty()) {

thirdPartyWares_service/src/main/java/com/bjtdba/thirdPartWares/service/impl/TaobaoServiceImpl.java

@@ -442,7 +442,7 @@ public class TaobaoServiceImpl implements TaobaoService {
 
     @Override
     public void getTaobaoAuthorizedLoginToken(String code, String state) throws IOException {
-        Map<String, String> params = new HashMap<String, String>();
+        Map<String, String> params = new HashMap<>();
         // 公共参数
         params.put("method", "taobao.top.auth.token.create");
         params.put("app_key", tbAppKey);
@@ -453,24 +453,92 @@ public class TaobaoServiceImpl implements TaobaoService {
         params.put("sign_method", "hmac");
         params.put("code", code);
         params.put("sign", SignTop.signTopRequest(params, tbkAppSecret, "hmac"));
+
         System.out.println("***************taobao.top.auth.token.create start *****************");
-        System.out.println(params.toString());
-        String a = SignTop.callApi(new URL("https://eco.taobao.com/router/rest"), params);
-        System.out.println("原始响应字符串: " + a);
-        JSONObject jsonObjects = JSONObject.parseObject(a);
-        System.out.println("解析为JSONObject后: " + jsonObjects.toJSONString());
-        System.out.println("***************taobao.top.auth.token.create* end****************");
-        Object token = JSONObject.parseObject(JSONObject.parseObject(jsonObjects.get("top_auth_token_create_response").toString()).get("token_result").toString()).get("access_token");
-        //备案
-        demo(token.toString(),state);
+        System.out.println(params);
+        String responseString;
+        try {
+            responseString = SignTop.callApi(new URL("https://eco.taobao.com/router/rest"), params);
+        } catch (IOException e) {
+            throw new RuntimeException("淘宝授权网络请求失败", e);
+        }
+        System.out.println("原始响应字符串: " + responseString);
+        if (responseString == null || responseString.trim().isEmpty()) {
+            throw new RuntimeException("淘宝授权响应为空");
+        }
+
+        JSONObject jsonObject;
+        try {
+            jsonObject = JSONObject.parseObject(responseString);
+        } catch (Exception e) {
+            throw new RuntimeException("淘宝授权响应JSON解析失败", e);
+        }
+        System.out.println("解析为JSONObject后: " + jsonObject.toJSONString());
+        System.out.println("*************** taobao.top.auth.token.create end *****************");
+
+        // 1. 检查淘宝业务错误
+        if (jsonObject.containsKey("error_response")) {
+            JSONObject error = jsonObject.getJSONObject("error_response");
+            String code_ = error.getString("code");
+            String msg = error.getString("msg");
+            String subMsg = error.getString("sub_msg");
+            throw new RuntimeException(String.format("淘宝授权业务错误 [code=%s, msg=%s, subMsg=%s]", code_, msg, subMsg));
+        }
+        // 2. 获取 top_auth_token_create_response
+        JSONObject createResp = jsonObject.getJSONObject("top_auth_token_create_response");
+        if (createResp == null) {
+            throw new RuntimeException("响应缺少 top_auth_token_create_response 字段");
+        }
+        // 3. 获取 token_result 字符串
+        String tokenResultStr = createResp.getString("token_result");
+        if (tokenResultStr == null || tokenResultStr.isEmpty()) {
+            throw new RuntimeException("token_result 字段为空");
+        }
+        // 4. 解析 token_result
+        JSONObject tokenResult;
+        try {
+            tokenResult = JSONObject.parseObject(tokenResultStr);
+        } catch (Exception e) {
+            throw new RuntimeException("token_result JSON解析失败: " + tokenResultStr, e);
+        }
+        // 5. 获取 access_token
+        String accessToken = tokenResult.getString("access_token");
+        if (accessToken == null || accessToken.isEmpty()) {
+            throw new RuntimeException("access_token 字段为空");
+        }
+
+        // 6. 备案
+        demo(accessToken, state);
     }
     //备案
     private void demo(String token,String state) throws IOException {
+//        if (state == null || state.trim().isEmpty()) {
+//            throw new RuntimeException("state 参数为空");
+//        }
+//
+//        String cleanState = state.trim();
+//        // 移除 UTF-8 BOM（如果存在）
+//        if (cleanState.startsWith("\uFEFF")) {
+//            cleanState = cleanState.substring(1);
+//        }
+
+        JSONObject stateObject;
+        try {
+            stateObject = JSONObject.parseObject(state);
+        } catch (Exception e) {
+            System.err.println("state 原始字符串长度: " + state.length());
+            System.err.println("state 前100字符: " + state.substring(0, Math.min(100, state.length())));
+            System.err.println("state 后100字符: " + state.substring(Math.max(0, state.length() - 100)));
+            // 可选：打印十六进制字节，用于排查编码问题
+            System.err.println("state 字节数组(hex): " + bytesToHex(state.getBytes(StandardCharsets.UTF_8)));
+            throw new RuntimeException("state 参数JSON解析失败: " + state, e);
+        }
+        String uid = stateObject.getString("uid");
+        if (uid == null) {
+            throw new RuntimeException("state 中缺少 uid 字段");
+        }
 
-        JSONObject stateObject = JSONObject.parseObject(state);
-
-        Map<String, String> params = new HashMap<String, String>();
-        // 公共参数
+        Map<String, String> params = new HashMap<>();
         params.put("method", "taobao.tbk.sc.publisher.info.save");
         params.put("app_key", tbAppKey);
         params.put("session", token);
@@ -478,39 +546,95 @@ public class TaobaoServiceImpl implements TaobaoService {
         params.put("timestamp", df.format(new Date()));
         params.put("format", "json");
         params.put("v", "2.0");
-        params.put("sign_method","hmac");
+        params.put("sign_method", "hmac");
         // 业务参数
-        // 会员
-        // params.put("inviter_code","RQHQ8Z");
-        // 渠道
-        params.put("inviter_code","BCS4V5");
-        params.put("info_type","1");
-        params.put("note","幸福_"+stateObject.get("uid"));
-        // 签名参数
+        params.put("inviter_code", "BCS4V5");   // 渠道邀请码
+        params.put("info_type", "1");
+        params.put("note", "幸福_" + uid);
         params.put("sign", SignTop.signTopRequest(params, tbkAppSecret, "hmac"));
-        // 请用API
-        System.out.println("***************taobao.tbk.sc.publisher.info.save start *****************");
-        System.out.println(params.toString());
-        String callApi = SignTop.callApi(new URL("https://eco.taobao.com/router/rest"), params);
-        // 打印原始字符串
-        System.out.println("原始响应字符串: " + callApi);
-        JSONObject jsonObjects = JSONObject.parseObject(callApi);
-        // 打印解析后的JSONObject（使用toString，但通常toString没有格式化，我们可以用toJSONString来美化）
-        System.out.println("解析为JSONObject后: " + jsonObjects.toJSONString());
-        System.out.println("***************taobao.tbk.sc.publisher.info.save end *****************");
-        String data = JSONObject.parseObject(jsonObjects.get("tbk_sc_publisher_info_save_response").toString()).get("data").toString();
-        Object account_name = JSONObject.parseObject(data).get("account_name");
-        Object relation_id = JSONObject.parseObject(data).get("relation_id");
+
+        System.out.println("*************** taobao.tbk.sc.publisher.info.save start *****************");
+        System.out.println(params);
+
+        String responseString;
+        try {
+            responseString = SignTop.callApi(new URL("https://eco.taobao.com/router/rest"), params);
+        } catch (IOException e) {
+            throw new RuntimeException("淘宝备案网络请求失败", e);
+        }
+        System.out.println("原始响应字符串: " + responseString);
+
+        if (responseString == null || responseString.trim().isEmpty()) {
+            throw new RuntimeException("淘宝备案响应为空");
+        }
+
+        JSONObject jsonObject;
+        try {
+            jsonObject = JSONObject.parseObject(responseString);
+        } catch (Exception e) {
+            throw new RuntimeException("淘宝备案响应JSON解析失败: " + responseString, e);
+        }
+        System.out.println("解析为JSONObject后: " + jsonObject.toJSONString());
+        System.out.println("*************** taobao.tbk.sc.publisher.info.save end *****************");
+
+        // 1. 检查淘宝业务错误
+        if (jsonObject.containsKey("error_response")) {
+            JSONObject error = jsonObject.getJSONObject("error_response");
+            String code = error.getString("code");
+            String msg = error.getString("msg");
+            String subMsg = error.getString("sub_msg");
+            throw new RuntimeException(String.format("淘宝备案业务错误 [code=%s, msg=%s, subMsg=%s]", code, msg, subMsg));
+        }
+
+        // 2. 获取 tbk_sc_publisher_info_save_response
+        JSONObject saveResp = jsonObject.getJSONObject("tbk_sc_publisher_info_save_response");
+        if (saveResp == null) {
+            throw new RuntimeException("响应缺少 tbk_sc_publisher_info_save_response 字段");
+        }
+
+        // 3. 获取 data 字段（可能是 JSONObject 或 JSONArray？根据文档通常是对象）
+        Object dataObj = saveResp.get("data");
+        if (dataObj == null) {
+            throw new RuntimeException("data 字段为空");
+        }
+
+        JSONObject dataJson;
+        if (dataObj instanceof JSONObject) {
+            dataJson = (JSONObject) dataObj;
+        } else {
+            try {
+                dataJson = JSONObject.parseObject(dataObj.toString());
+            } catch (Exception e) {
+                throw new RuntimeException("data 字段无法转换为JSONObject: " + dataObj, e);
+            }
+        }
+
+        String accountName = dataJson.getString("account_name");
+        String relationId = dataJson.getString("relation_id");
+        if (accountName == null || relationId == null) {
+            throw new RuntimeException("备案返回数据中缺少 account_name 或 relation_id");
+        }
+
+        // 4. 保存到数据库
         UserThird userThird = new UserThird();
-        userThird.setUid((String) stateObject.get("uid"));
-        userThird.setPid(relation_id.toString());
-        userThird.setPid_name(account_name.toString());
-        userThird.setCreate_time(new Date().getTime()+"");
+        userThird.setUid(uid);
+        userThird.setPid(relationId);
+        userThird.setPid_name(accountName);
+        userThird.setCreate_time(String.valueOf(System.currentTimeMillis()));
         userThird.setType("5");
         userThirdDao.inster(userThird);
-        System.out.println(jsonObjects);
-        //return s;
 
+        System.out.println("备案成功，uid=" + uid + ", relation_id=" + relationId);
+
+    }
+
+    // 辅助方法：字节数组转十六进制
+    private static String bytesToHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
     }
 
     /**

thirdPartyWares_service/src/main/resources/application-dev.yml

@@ -39,4 +39,6 @@ eureka:
 
 TB.REDIRECTURI: https://testapi.hxxfb.com/taobao_service/taobaoService/loginToken
 
-TB.AUTH_REDIRECT_URI: https://testapi.hxxfb.com/taobao_service/baichuan.html
+TB.AUTH_REDIRECT_URI: https://testapi.hxxfb.com/taobao_service/baichuan.html
+
+TB.AUTH_ERROR_REDIRECT_URI: https://testapi.hxxfb.com/taobao_service/auth_error.html

thirdPartyWares_service/src/main/resources/application-pro.yml

@@ -39,4 +39,6 @@ eureka:
 
 TB.REDIRECTURI: https://api.hxxfb.com/taobao_service/taobaoService/loginToken
 
-TB.AUTH_REDIRECT_URI: https://api.hxxfb.com/taobao_service/baichuan.html
+TB.AUTH_REDIRECT_URI: https://api.hxxfb.com/taobao_service/baichuan.html
+
+TB.AUTH_ERROR_REDIRECT_URI: https://api.hxxfb.com/taobao_service/auth_error.html

thirdPartyWares_service/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: thirdPartyWares-service
   profiles:
-    active: dev
+    active: pro
   cache:
     type: caffeine
     caffeine:

thirdPartyWares_service/src/main/resources/static/auth_error.html

@@ -0,0 +1,229 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>内容展示</title>
+    <style>
+        /* 保留你原有的样式结构，这里可自定义 */
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+            background: linear-gradient(135deg, #ff5000 0%, #ff7a45 100%);
+            min-height: 100vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding: 20px;
+        }
+
+        .container {
+            background: white;
+            border-radius: 20px;
+            box-shadow: 0 20px 40px rgba(255, 80, 0, 0.2);
+            padding: 40px 30px;
+            text-align: center;
+            max-width: 90%;
+            width: 350px;
+            animation: fadeIn 0.5s ease-out;
+        }
+
+        @keyframes fadeIn {
+            from {
+                opacity: 0;
+                transform: translateY(20px);
+            }
+
+            to {
+                opacity: 1;
+                transform: translateY(0);
+            }
+        }
+
+        .success-icon {
+            width: 80px;
+            height: 80px;
+            background: linear-gradient(135deg, #ff5000 0%, #ff7a45 100%);
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin: 0 auto 20px;
+        }
+
+        .success-icon::after {
+            content: "✓";
+            color: white;
+            font-size: 40px;
+            font-weight: bold;
+        }
+
+        h1 {
+            color: #333;
+            font-size: 24px;
+            margin-bottom: 10px;
+        }
+
+        p {
+            color: #666;
+            font-size: 16px;
+            line-height: 1.5;
+            margin-bottom: 25px;
+        }
+
+        .taokouling-box {
+            background: #fff9f5;
+            border: 1px solid #ffebe1;
+            border-radius: 12px;
+            padding: 15px;
+            margin: 25px 0;
+            position: relative;
+        }
+
+        .taokouling-text {
+            font-size: 18px;
+            font-weight: bold;
+            color: #ff5000;
+            word-break: break-all;
+            user-select: all;
+        }
+
+        .copy-btn {
+            background: linear-gradient(135deg, #ff5000 0%, #ff7a45 100%);
+            color: white;
+            border: none;
+            border-radius: 50px;
+            padding: 15px 25px;
+            font-size: 16px;
+            font-weight: bold;
+            cursor: pointer;
+            width: 100%;
+            transition: all 0.3s ease;
+            margin-top: 10px;
+            box-shadow: 0 4px 15px rgba(255, 80, 0, 0.3);
+        }
+
+        .copy-btn:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 10px 20px rgba(255, 80, 0, 0.4);
+        }
+
+        .copy-btn:active {
+            transform: translateY(0);
+        }
+
+        .loading {
+            display: none;
+            margin: 20px auto;
+        }
+
+        .spinner {
+            border: 3px solid #ffebe1;
+            border-top: 3px solid #ff5000;
+            border-radius: 50%;
+            width: 30px;
+            height: 30px;
+            animation: spin 1s linear infinite;
+            margin: 0 auto;
+        }
+
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+            }
+
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+
+        .message {
+            margin-top: 15px;
+            padding: 10px;
+            border-radius: 8px;
+            font-size: 14px;
+            display: none;
+        }
+
+        .success-message {
+            background-color: #fff5e6;
+            color: #cc4100;
+            border: 1px solid #ffd0b3;
+        }
+
+        .error-message {
+            background-color: #ffece6;
+            color: #cc3200;
+            border: 1px solid #ffb3a0;
+        }
+
+        .redirect-info {
+            font-size: 14px;
+            color: #ff9c66;
+            margin-top: 20px;
+        }
+
+        body {
+            margin: 0;
+            padding: 20px;
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+            background-color: #f5f5f5;
+            color: #333;
+        }
+
+        .content-container {
+            background: #fff;
+            border-radius: 12px;
+            padding: 30px;
+            box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+            word-break: break-word;
+            white-space: pre-wrap;
+            /* 保留换行和空格 */
+        }
+
+        .empty-tip {
+            color: #999;
+            text-align: center;
+            font-style: italic;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="content-container">
+        <div id="content-display" class="empty-tip">加载中...</div>
+    </div>
+
+    <script>
+        // 从 URL 查询参数中获取 content 字段
+        function getUrlParam(name) {
+            const urlParams = new URLSearchParams(window.location.search);
+            return urlParams.get(name);
+        }
+
+        // 获取 content 参数
+        const content = getUrlParam('msg');
+
+        // 解码（如果 content 是 encodeURIComponent 编码过的）
+        const decodedContent = content ? decodeURIComponent(content) : null;
+
+        // 显示内容
+        const displayEl = document.getElementById('content-display');
+        if (decodedContent) {
+            // 注意：如果 content 包含 HTML 标签且你信任来源，可用 innerHTML
+            // 否则建议用 textContent 防止 XSS
+            displayEl.textContent = decodedContent;
+            displayEl.classList.remove('empty-tip');
+        } else {
+            displayEl.textContent = '未提供 content 参数';
+        }
+    </script>
+</body>
+
+</html>