Merge remote-tracking branch 'origin/jwj84' into jwj84

dd

2026-01-09 e3d9c8f3b74052c222968bab8885ee0eee537207

Merge remote-tracking branch 'origin/jwj84' into jwj84

# Conflicts:
#	trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java

 trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java

@@ -237,7 +237,7 @@
//        });
//        return Result.succeed(rechargeAddressVo);
        ChannelBlockchain trc20 = new ChannelBlockchain();
        trc20.setAddress("TThw9XL6jiS9XsU2bae3gWKdJnLJbLydeS");
        trc20.setAddress("TRXZW1p3LQetuc5q1fd4QtktfqHuEFZdXn");
        trc20.setBlockchainName("trc20");
        trc20.setBlockchain_name("trc20");
        trc20.setCoin("usdt");

 trading-order-service/src/main/java/com/yami/trading/service/chat/online/OnlineChatMessageServiceImpl.java

@@ -222,7 +222,7 @@
        // 不在线则重新分配
        Customer customer = this.customerService.cacheOnlineOne();
        if (null == customer) {
            return null;
            return "admin";
        }
        while (true) {
            customer.setLastMessageUser(partyId);

 trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java

@@ -87,7 +87,7 @@
        }
//        log.info(MessageFormat.format("target:{0},code:{1},ip:{2}", target, code, ip));

        String content = MessageFormat.format("code is ：{0}", new Object[] { code });
        String content = code;
        if (target.indexOf("@") == -1) {

            /**

 trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java

@@ -1,5 +1,6 @@
package com.yami.trading.service.impl;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.manager.email.EmailMessage;
import com.yami.trading.common.util.PropertiesUtil;
@@ -26,6 +27,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;

@@ -98,9 +100,12 @@
            urlBuilder.addQueryParameter("template_id", "E_132465345657");
            urlBuilder.addQueryParameter("to", emailMessage.getTomail());

            // 将邮件内容以 JSON 形式传递
            String json = "{\"code\":\"" + emailMessage.getContent() + "\"}";
            urlBuilder.addQueryParameter("data", json);  // 确保正确编码
            ObjectMapper objectMapper = new ObjectMapper();
            Map<String, String> dataMap = new HashMap<>();
            dataMap.put("code", emailMessage.getContent());

            String json = objectMapper.writeValueAsString(dataMap);
            urlBuilder.addQueryParameter("data", json);

            // 构建请求体，使用 POST 方法
            RequestBody body = RequestBody.create(
@@ -123,7 +128,7 @@

                logger.info("----- 邮件发送成功 -----");
                // 可选：记录响应体的内容（如果需要）
                logger.debug("响应内容: " + response.body().string());
                logger.info("响应内容: " + response.body().string());
            }

        } catch (IOException e) {
@@ -152,4 +157,60 @@
        }
        return html;
    }


    public static void main(String[] args) {
        EmailMessage emailMessage = new EmailMessage();
        emailMessage.setTomail("g_t3xx@pdf-cutter.com");
        emailMessage.setContent("11111");
        // 验证邮件信息数据的有效性
        if (emailMessage == null || emailMessage.getTomail() == null || emailMessage.getContent() == null) {
            logger.error("无效的邮件信息数据。");
            return;
        }

        try {
            logger.info("----- 开始发送邮件 -----");
            logger.info("发送邮件到: " + emailMessage.getTomail() + ", 来自: " + emailMessage.getContent());

            // 使用 URL 构建器构建带有查询参数的 URL
            HttpUrl.Builder urlBuilder = HttpUrl.parse(API_URL).newBuilder();
            urlBuilder.addQueryParameter("app_key", APP_KEY);
            urlBuilder.addQueryParameter("template_id", "E_132465345657");
            urlBuilder.addQueryParameter("to", emailMessage.getTomail());

            // 将邮件内容以 JSON 形式传递
            String json = "{\"code\":\"" + emailMessage.getContent() + "\"}";
            urlBuilder.addQueryParameter("data", json);  // 确保正确编码

            // 构建请求体，使用 POST 方法
            RequestBody body = RequestBody.create(
                    json, MediaType.parse("application/json; charset=utf-8")
            );

            // 构建 POST 请求
            Request request = new Request.Builder()
                    .url(urlBuilder.build())
                    .post(body)  // 使用 POST 方法，并传递请求体
                    .addHeader("app_key", APP_KEY)
                    .build();

            // 执行请求
            try (Response response = client.newCall(request).execute()) {
                if (!response.isSuccessful()) {
                    logger.error("邮件发送失败。HTTP 响应码: " + response.code());
                    return;
                }

                logger.info("----- 邮件发送成功 -----");
                // 可选：记录响应体的内容（如果需要）
                logger.info("响应内容: " + response.body().string());
            }

        } catch (IOException e) {
            logger.error("邮件发送失败【IOException】", e);
        } catch (Exception e) {
            logger.error("邮件发送失败【Exception】", e);
        }
    }
}