Merge branch 'working' into 'master'

唯一化客户端初始化

See merge request !213

src/main/java/com/zhiwei/searchhotcrawler/run/HotSearchRun.java

@@ -6,6 +6,7 @@ import com.zhiwei.network.cynomys.consumer.CynomysConsumer;
 import com.zhiwei.network.cynomys.consumer.CynomysConsumerFactory;
 import com.zhiwei.searchhotcrawler.config.ProxyConfig;
 import com.zhiwei.searchhotcrawler.timer.*;
+import com.zhiwei.searchhotcrawler.util.HttpClientUtils;
 import com.zhiwei.tools.tools.ZhiWeiTools;
 import lombok.extern.log4j.Log4j2;
 import org.apache.dubbo.config.ApplicationConfig;
@@ -23,31 +24,7 @@ public class HotSearchRun {
 //        SimpleConfig simpleConfig = SimpleConfig.builder().registry(ProxyConfig.registry)
 //                .group(ProxyConfig.group).appId(10000013).appName("hotsearch").build();
 //        ProxyFactory.init(simpleConfig);
-        ApplicationConfig applicationConfig = new ApplicationConfig();
-        applicationConfig.setName("hot_search-project");
-        RegistryConfig registryConfig = new RegistryConfig();
-        ConsumerConfig consumerConfig = new ConsumerConfig();
-        String username = null;
-        String password = null;
-        if (ProxyConfig.isLocal) {
-            registryConfig.setAddress(ProxyConfig.localRegistry);
-            // 设置分组
-            consumerConfig.setGroup(ProxyConfig.localGroup);
-            username = ProxyConfig.localUsername;
-            password = ProxyConfig.localPassword;
-        } else {
-            registryConfig.setAddress(ProxyConfig.hangzhouRegistry);
-            // 设置分组
-            consumerConfig.setGroup(ProxyConfig.hangzhouGroup);
-            username = ProxyConfig.hangzhouUsername;
-            password = ProxyConfig.hangzhouPassword;
-        }
-        // 创建 consumer，applicationConfig 非必需参数
-        CynomysConsumer consumer = CynomysConsumerFactory.create(applicationConfig, registryConfig, consumerConfig, username, password);
-
-        // 初始化 http-boot 桥接
-        CynomysFactory.init(consumer);
-        log.info("http-boot 桥接 成功");
+//        HttpClientUtils.init();
 
         new UpdateWechatUserRun().start();
         ZhiWeiTools.sleep(10000);

src/main/java/com/zhiwei/searchhotcrawler/util/HttpClientUtils.java

@@ -2,11 +2,18 @@ package com.zhiwei.searchhotcrawler.util;
 
 import com.zhiwei.http.boot.HttpBoot;
 import com.zhiwei.http.boot.Response;
+import com.zhiwei.http.proxy.CynomysFactory;
 import com.zhiwei.http.util.RequestUtils;
+import com.zhiwei.network.cynomys.consumer.CynomysConsumer;
+import com.zhiwei.network.cynomys.consumer.CynomysConsumerFactory;
+import com.zhiwei.searchhotcrawler.config.ProxyConfig;
 import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.ConsumerConfig;
+import org.apache.dubbo.config.RegistryConfig;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -26,6 +33,39 @@ public final class HttpClientUtils {
 
     //private static final HttpBoot httpBoot = new HttpBoot.Builder().throwException(false).retryTimes(2).build();
     public static final HttpBoot httpBoot = HttpBoot.newBuilder().retryTimes(2).build();
+
+    static {
+        init();
+    }
+
+    public static void init(){
+        ApplicationConfig applicationConfig = new ApplicationConfig();
+        applicationConfig.setName("hot_search-project");
+        RegistryConfig registryConfig = new RegistryConfig();
+        ConsumerConfig consumerConfig = new ConsumerConfig();
+        String username = null;
+        String password = null;
+        if (ProxyConfig.isLocal) {
+            registryConfig.setAddress(ProxyConfig.localRegistry);
+            // 设置分组
+            consumerConfig.setGroup(ProxyConfig.localGroup);
+            username = ProxyConfig.localUsername;
+            password = ProxyConfig.localPassword;
+        } else {
+            registryConfig.setAddress(ProxyConfig.hangzhouRegistry);
+            // 设置分组
+            consumerConfig.setGroup(ProxyConfig.hangzhouGroup);
+            username = ProxyConfig.hangzhouUsername;
+            password = ProxyConfig.hangzhouPassword;
+        }
+        // 创建 consumer，applicationConfig 非必需参数
+        CynomysConsumer consumer = CynomysConsumerFactory.create(applicationConfig, registryConfig, consumerConfig, username, password);
+
+        // 初始化 http-boot 桥接
+        CynomysFactory.init(consumer);
+        LOGGER.info("http-boot 桥接 成功");
+    }
+
     public static String sendPost(String url, String jsonParam){
         return sendPost(url, jsonParam, null, Charset.forName("UTF-8"));
     }