v5.9.2

Author: 839536

bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java

@@ -96,7 +96,7 @@ public interface CentralProcessor {
     /**
      * 获取系统范围的CPU负载滴答计数器。返回具有七个元素的数组
      * 表示在User(0)，Nice(1)，System(2)，Idle(3)IOwait(4)，IOwait(IRQ)(5)
-     * 软件中断/DPC中花费的毫秒数(SoftIRQ(6)或Steal(7)状态。使用 {@link CentralProcessor.TickType＃getIndex()}
+     * 软件中断/DPC中花费的毫秒数(SoftIRQ(6)或Steal(7)状态。使用 {@link CentralProcessor.TickType#getIndex()}
      * 来检索适当的索引。通过测量一个时间间隔内的滴答之间的差异，可以计算该间隔内的CPU负载。
      * <p> 请注意，虽然滴答计数器以毫秒为单位，但它们可能会与(取决于平台的)时钟滴答一起以更大的增量前进
      * 。例如，默认情况下，Windows时钟滴答是1/64秒(约15或16 *毫秒)，而Linux滴答则取决于发行和配置

bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java

@@ -24,7 +24,6 @@
  ********************************************************************************/
 package org.aoju.bus.office.bridge;
 
-import org.aoju.bus.http.Httpx;
 import org.aoju.bus.office.metric.RequestBuilder;
 
 /**
@@ -36,26 +35,17 @@
  */
 public class OnlineOfficeBridgeFactory implements OnlineOfficeContextAware {
 
-    private final Httpx httpx;
     private final RequestBuilder requestBuilder;
 
     /**
      * 使用指定的客户端和URL构造新连接.
      *
-     * @param httpx          用于与LibreOffice在线服务器通信的HTTP客户机(已初始化).
      * @param requestBuilder 转换的请求配置.
      */
-    public OnlineOfficeBridgeFactory(final Httpx httpx,
-                                     final RequestBuilder requestBuilder) {
-        this.httpx = httpx;
+    public OnlineOfficeBridgeFactory(final RequestBuilder requestBuilder) {
         this.requestBuilder = requestBuilder;
     }
 
-    @Override
-    public Httpx getHttp() {
-        return httpx;
-    }
-
     @Override
     public RequestBuilder getRequestBuilder() {
         return requestBuilder;

bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java

@@ -24,7 +24,6 @@
  ********************************************************************************/
 package org.aoju.bus.office.bridge;
 
-import org.aoju.bus.http.Httpx;
 import org.aoju.bus.office.Context;
 import org.aoju.bus.office.metric.RequestBuilder;
 
@@ -37,13 +36,6 @@
  */
 public interface OnlineOfficeContextAware extends Context {
 
-    /**
-     * 获取负责向office服务器执行请求的HTTP客户端.
-     *
-     * @return 将发送转换请求的客户端.
-     */
-    Httpx getHttp();
-
     /**
      * 获取请求配置.
      *

bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java

@@ -25,31 +25,21 @@
 package org.aoju.bus.office.bridge;
 
 import org.aoju.bus.core.lang.Assert;
-import org.aoju.bus.core.lang.Http;
 import org.aoju.bus.core.lang.Symbol;
 import org.aoju.bus.core.lang.exception.InstrumentException;
 import org.aoju.bus.core.utils.ClassUtils;
 import org.aoju.bus.core.utils.StringUtils;
-import org.aoju.bus.http.Httpx;
 import org.aoju.bus.office.builtin.MadeInOffice;
 import org.aoju.bus.office.metric.AbstractOfficeEntryManager;
 import org.aoju.bus.office.metric.RequestBuilder;
 
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.security.*;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
 
 /**
  * 负责执行通过不依赖于office安装的{@link OnlineOfficePoolManager}提交的任务。
@@ -106,32 +96,6 @@ private static File getFile(final String resourceLocation) throws FileNotFoundEx
         }
     }
 
-    /**
-     * Https SSL证书
-     *
-     * @param X509TrustManager 证书信息
-     * @return SSLSocketFactory 安全套接字
-     */
-    private static SSLSocketFactory createTrustAllSSLFactory(X509TrustManager X509TrustManager) {
-        try {
-            SSLContext sc = SSLContext.getInstance(Http.TLS);
-            sc.init(null, new TrustManager[]{X509TrustManager}, new SecureRandom());
-            return sc.getSocketFactory();
-        } catch (Exception ignored) {
-            ignored.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * 获取 HostnameVerifier
-     *
-     * @return the object
-     */
-    private static HostnameVerifier createTrustAllHostnameVerifier() {
-        return (hostname, session) -> true;
-    }
-
     private String buildUrl(final String connectionUrl) throws MalformedURLException {
         final URL url = new URL(connectionUrl);
         final String path = url.toExternalForm().toLowerCase();
@@ -151,7 +115,7 @@ protected void doExecute(final MadeInOffice task) throws InstrumentException {
                             buildUrl(connectionUrl),
                             Math.toIntExact(config.getTaskExecutionTimeout()),
                             Math.toIntExact(config.getTaskExecutionTimeout()));
-            task.execute(new OnlineOfficeBridgeFactory(new Httpx(), requestBuilder));
+            task.execute(new OnlineOfficeBridgeFactory(requestBuilder));
 
         } catch (IOException ex) {
             throw new InstrumentException("Unable to create the HTTP client", ex);
@@ -168,50 +132,4 @@ protected void doStop() throws InstrumentException {
         // Nothing to stop here.
     }
 
-    private KeyStore loadStore(
-            final String store,
-            final String storePassword,
-            final String storeType,
-            final String storeProvider)
-            throws NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException,
-            NoSuchProviderException {
-
-        if (store != null) {
-            Assert.notNull(storePassword, "The password of store {0} must not be null", store);
-
-            KeyStore keyStore;
-
-            final String type = storeType == null ? KeyStore.getDefaultType() : storeType;
-            if (storeProvider == null) {
-                keyStore = KeyStore.getInstance(type);
-            } else {
-                keyStore = KeyStore.getInstance(type, storeProvider);
-            }
-
-            try (FileInputStream instream = new FileInputStream(getFile(store))) {
-                keyStore.load(instream, storePassword.toCharArray());
-            }
-
-            return keyStore;
-        }
-        return null;
-    }
-
-    private static class X509TrustManager implements javax.net.ssl.X509TrustManager {
-
-        @Override
-        public void checkClientTrusted(X509Certificate[] chain, String authType) {
-        }
-
-        @Override
-        public void checkServerTrusted(X509Certificate[] chain, String authType) {
-        }
-
-        @Override
-        public X509Certificate[] getAcceptedIssuers() {
-            return new X509Certificate[0];
-        }
-
-    }
-
 }

bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java

@@ -28,7 +28,7 @@
 import org.aoju.bus.core.lang.Symbol;
 import org.aoju.bus.core.lang.exception.InstrumentException;
 import org.aoju.bus.core.utils.StringUtils;
-import org.aoju.bus.http.Request;
+import org.aoju.bus.http.Httpz;
 import org.aoju.bus.http.bodys.MultipartBody;
 import org.aoju.bus.http.bodys.RequestBody;
 import org.aoju.bus.logger.Logger;
@@ -130,8 +130,12 @@ public void execute(final Context context) throws InstrumentException {
                         target.getFormat().getStoreProperties(source.getFormat().getInputFamily()),
                         Builder.STORE_PROPERTIES_PREFIX_PARAM);
 
-                Request request = new Request.Builder().url(urlBuilder.toString()).post(requestBody.build()).tag(context).build();
-                ((OnlineOfficeContextAware) context).getHttp().newCall(request).execute();
+                Httpz.post()
+                        .url(urlBuilder.toString())
+                        .multipartBody(requestBody.build())
+                        .tag(context)
+                        .build().execute();
+
                 // onComplete on target将把临时文件复制到/ OutputStream中，如果输出是OutputStream，则删除临时文件
                 target.onComplete(targetFile);