Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java

@@ -51,6 +51,7 @@ public class SendMqMsgUtils {
         try {
             int retryTime = 0;
             Result<String> result = null;
+            log.info("sendMsg url:{},param:{}", msg.getRequestUrl(), JSON.toJSONString(msg));
             do {
                 result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg));
                 log.info("sendMsg retryTime:{},result:{}", retryTime++, JSON.toJSONString(result));
@@ -76,6 +77,16 @@ public class SendMqMsgUtils {
         }
     }
 
+    public static void main(String[] args) {
+        mqConfig = new MqConfig();
+        mqConfig.setAppId("202007161443499985fa2d397436d10356542134c8f008c48");
+        mqConfig.setToken("52d9d9b0e7d0eb5b8b81c205b579e07c");
+        mqConfig.setHost("https://epmet-dev.elinkservice.cn/estos/");
+        String msg = "{\"eventClass\":\"resi_group\",\"eventTag\":\"shift_topic_to_issue\",\"msg\":\"[{\\\"actionFlag\\\":\\\"plus\\\",\\\"agencyId\\\":\\\"e9b55911549fe7b0d0427b557f7c5efc\\\",\\\"customerId\\\":\\\"45687aa479955f9d06204d415238f7cc\\\",\\\"eventClass\\\":\\\"resi_group\\\",\\\"eventTag\\\":\\\"topic_to_issue\\\",\\\"gridId\\\":\\\"708a3567b54ced7219666489f9d838ab\\\",\\\"groupId\\\":\\\"5b0bc6c3c409de4b7e2fdc5c13c43b1e\\\",\\\"isCommon\\\":false,\\\"remark\\\":\\\"支部测试1小组中发布的话题\\\\\\\"33\\\\\\\"被转为议题\\\",\\\"sourceId\\\":\\\"798f4081dbe94435a55c5004c7d01458\\\",\\\"sourceType\\\":\\\"issue\\\",\\\"userId\\\":\\\"3e12b2264da616f85def807e89dd7150\\\"},{\\\"actionFlag\\\":\\\"plus\\\",\\\"agencyId\\\":\\\"e9b55911549fe7b0d0427b557f7c5efc\\\",\\\"customerId\\\":\\\"45687aa479955f9d06204d415238f7cc\\\",\\\"eventTag\\\":\\\"shift_topic_to_issue\\\",\\\"gridId\\\":\\\"708a3567b54ced7219666489f9d838ab\\\",\\\"groupId\\\":\\\"5b0bc6c3c409de4b7e2fdc5c13c43b1e\\\",\\\"isCommon\\\":false,\\\"remark\\\":\\\"将话题\\\\\\\"33\\\\\\\"转为议题\\\",\\\"sourceId\\\":\\\"798f4081dbe94435a55c5004c7d01458\\\",\\\"sourceType\\\":\\\"issue\\\",\\\"userId\\\":\\\"3e12b2264da616f85def807e89dd7150\\\"}]\"}";
+        MqBaseMsgDTO mqBaseMsgDTO = JSON.parseObject(msg, MqBaseMsgDTO.class);
+        Result<String> stringResult = sendMsg(mqBaseMsgDTO);
+    }
+
 
     /**
      * desc:发送mq消息

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java

@@ -48,6 +48,7 @@ public class OkHttpUtil {
         //支持HTTPS请求，跳过证书验证
         clientBuilder.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager())
                 .hostnameVerifier(SSLSocketClient.getHostnameVerifier());
+        clientBuilder.followRedirects(false).followSslRedirects(false);
         //clientBuilder.sslSocketFactory(createSSLSocketFactory());
         /*clientBuilder.hostnameVerifier(new HostnameVerifier() {
             @Override