Merge pull request #54 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0

* commit '5e8bbeef0aee8a8865092a91a488bc0ff0be7f6a':
  REPORT-6700 完善+远程设计过渡方案
  REPORT-6700 列表过滤

designer-base/src/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java

@@ -48,11 +48,8 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction {
             public void doOk() {
                 DesignAuthority[] authorities = managerPane.update();
                 if (!FRContext.getCurrentEnv().isLocalEnv()) {
-                    try {
+                    boolean success = ((RemoteEnv) FRContext.getCurrentEnv()).updateAuthorities(authorities);
-                        ((RemoteEnv) FRContext.getCurrentEnv()).updateAuthorities(authorities);
+                    FRContext.getLogger().info("update remote design authority: " + success);
-                    } catch (Exception exception) {
-                        FRContext.getLogger().error(exception.getMessage());
-                    }
                 }
             }
 

designer-base/src/com/fr/design/utils/DesignUtils.java

@@ -1,11 +1,11 @@
 package com.fr.design.utils;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.ServerConfig;
 import com.fr.base.Env;
 import com.fr.base.EnvException;
 import com.fr.base.FRContext;
 import com.fr.base.FeedBackInfo;
+import com.fr.base.ServerConfig;
 import com.fr.base.Utils;
 import com.fr.base.remote.RemoteDeziConstants;
 import com.fr.dav.DavXMLUtils;
@@ -23,6 +23,7 @@ import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.general.http.HttpClient;
+import com.fr.security.JwtUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CodeUtils;
 import com.fr.stable.EncodeConstants;
@@ -30,8 +31,11 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.start.StartServer;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
-import java.awt.*;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import java.awt.Desktop;
+import java.awt.Font;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -75,6 +79,7 @@ public class DesignUtils {
     /**
      * 通过端口是否被占用判断设计器有没有启动
      * s
+     *
      * @return 启动了返回true
      */
     public static boolean isStarted() {
@@ -121,6 +126,7 @@ public class DesignUtils {
 
     /**
      * 建立监听端口
+     *
      * @param startPort 端口
      * @param suffixs   文件后缀
      */
@@ -344,6 +350,9 @@ public class DesignUtils {
                     boolean isUserPrivilege = ((RemoteEnv) FRContext.getCurrentEnv()).writePrivilegeMap(time, postfixOfUri);
                     postfixOfUri = isUserPrivilege ? postfixOfUri + "&fr_check_url=" + time + "&id=" + FRContext.getCurrentEnv().getUserID() : postfixOfUri;
                 }
+                // 加参数给远程设计校验权限。
+                String design = JwtUtils.createDefaultJWT(FRContext.getCurrentEnv().getUser());
+                postfixOfUri = postfixOfUri + "&design=" + design;
 
                 String urlPath = getWebBrowserPath();
                 Desktop.getDesktop().browse(new URI(urlPath + postfixOfUri));

designer-base/src/com/fr/env/DesignAuthorityConfigurable.java

@@ -6,5 +6,5 @@ public interface DesignAuthorityConfigurable {
 
     DesignAuthority[] getAuthorities();
 
-    boolean updateAuthorities(DesignAuthority[] authorities) throws Exception;
+    boolean updateAuthorities(DesignAuthority[] authorities);
 }

designer-base/src/com/fr/env/RemoteEnvUtils.java

@@ -1,86 +1,238 @@
 package com.fr.env;
 
+import com.fr.base.EnvException;
 import com.fr.base.FRContext;
-import com.fr.general.IOUtils;
 import com.fr.report.DesignAuthority;
+import com.fr.report.util.AuthorityXMLUtils;
 import com.fr.stable.EncodeConstants;
-import com.fr.third.org.apache.http.HttpEntity;
+import com.fr.third.org.apache.commons.io.IOUtils;
-import com.fr.third.org.apache.http.client.methods.CloseableHttpResponse;
+import com.fr.third.org.apache.http.HttpResponse;
+import com.fr.third.org.apache.http.HttpStatus;
+import com.fr.third.org.apache.http.client.ClientProtocolException;
+import com.fr.third.org.apache.http.client.ResponseHandler;
 import com.fr.third.org.apache.http.client.methods.HttpUriRequest;
 import com.fr.third.org.apache.http.client.methods.RequestBuilder;
 import com.fr.third.org.apache.http.entity.ContentType;
 import com.fr.third.org.apache.http.entity.InputStreamEntity;
 import com.fr.third.org.apache.http.impl.client.CloseableHttpClient;
 import com.fr.third.org.apache.http.impl.client.HttpClients;
-import com.fr.third.org.apache.http.util.EntityUtils;
-import com.fr.web.utils.AuthorityXMLUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.Map;
 
 public class RemoteEnvUtils {
 
     private RemoteEnvUtils() {
     }
 
-    public static boolean updateAuthorities(DesignAuthority[] authorities, RemoteEnv env) {
+    private static ResponseHandler<InputStream> responseHandler = new ResponseHandler<InputStream>() {
+        @Override
+        public InputStream handleResponse(HttpResponse response) throws IOException {
+            int statusCode = response.getStatusLine().getStatusCode();
+            if (statusCode != HttpStatus.SC_OK) {
+                throw new ClientProtocolException("Method failed: " + response.getStatusLine().toString());
+            }
+            InputStream in = response.getEntity().getContent();
+            if (in == null) {
+                return null;
+            }
+            // 读取并返回
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            IOUtils.copy(in, out);
+            return new ByteArrayInputStream(out.toByteArray());
+        }
+    };
+
+    public static InputStream simulateRPCByHttpPost(byte[] bytes, Map<String, String> parameters, boolean isSignIn, RemoteEnv env) throws EnvException {
         String path = env.getPath();
-        String userID = env.getUserID();
+        RequestBuilder builder = RequestBuilder.post(path);
 
-        String res = null;
+        InputStream inputStream = null;
-        CloseableHttpClient httpClient = HttpClients.createDefault();
 
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        for (Map.Entry<String, String> entry : parameters.entrySet()) {
+            builder.addParameter(entry.getKey(), entry.getValue());
+        }
+        if (!isSignIn) {
+            builder.addParameter("id", env.getValidUserID());
+        }
+        InputStreamEntity reqEntity = new InputStreamEntity(new ByteArrayInputStream(bytes));
 
-        AuthorityXMLUtils.writeDesignAuthoritiesXML(authorities, outputStream);
+        try (CloseableHttpClient httpClient = HttpClients.createSystem()) {
+            HttpUriRequest request = builder
+                    .setEntity(reqEntity)
+                    .build();
+            inputStream = httpClient.execute(request, responseHandler);
+        } catch (IOException e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+        return inputStream;
+    }
+
+    public static InputStream simulateRPCByHttpPost(Map<String, String> parameters, boolean isSignIn, RemoteEnv env) throws EnvException {
+        String path = env.getPath();
+        RequestBuilder builder = RequestBuilder.post(path);
+
+        InputStream inputStream = null;
+
+        for (Map.Entry<String, String> entry : parameters.entrySet()) {
+            builder.addParameter(entry.getKey(), entry.getValue());
+        }
+        if (!isSignIn) {
+            builder.addParameter("id", env.getValidUserID());
+        }
+
+        try (CloseableHttpClient httpClient = HttpClients.createSystem()) {
+            HttpUriRequest request = builder
+                    .build();
+            inputStream = httpClient.execute(request, responseHandler);
+        } catch (IOException e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+        return inputStream;
+    }
+
+    public static InputStream simulateRPCByHttpGet(Map<String, String> parameters, boolean isSignIn, RemoteEnv env) throws EnvException {
+        String path = env.getPath();
+        RequestBuilder builder = RequestBuilder.get(path);
+
+        InputStream inputStream = null;
+
+        for (Map.Entry<String, String> entry : parameters.entrySet()) {
+            builder.addParameter(entry.getKey(), entry.getValue());
+        }
+        if (!isSignIn) {
+            builder.addParameter("id", env.getValidUserID());
+        }
+        try (CloseableHttpClient httpClient = HttpClients.createSystem()) {
+            HttpUriRequest request = builder.build();
+            inputStream = httpClient.execute(request, responseHandler);
+
+        } catch (IOException e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+        return inputStream;
+    }
 
 
+    public static InputStream headBeatConnection(RemoteEnv env) {
+        String path = env.getPath();
+        String username = env.getUser();
+
+        InputStream inputStream = null;
+        try (CloseableHttpClient httpClient = HttpClients.createSystem()) {
+            HttpUriRequest request = RequestBuilder.get(path)
+                    .addParameter("op", "fr_remote_design")
+                    .addParameter("cmd", "heart_beat")
+                    .addParameter("user", username)
+                    .addParameter("id", env.getValidUserID())
+                    .build();
+
+            inputStream = httpClient.execute(request, responseHandler);
+        } catch (IOException | EnvException e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+        return inputStream;
+    }
+
+
+    public static InputStream testConnection(boolean isSignIn, RemoteEnv env) throws EnvException {
+        String username = env.getUser();
+        String path = env.getPath();
+        String password = env.getPassword();
+
+        InputStream inputStream = null;
+
+        try (CloseableHttpClient httpClient = HttpClients.createSystem()) {
+            RequestBuilder builder = RequestBuilder.get(path);
+            if (!isSignIn) {
+                builder.addParameter("id", env.getValidUserID());
+            }
+            HttpUriRequest request = builder
+                    .addParameter("op", "fr_remote_design")
+                    .addParameter("cmd", "test_server_connection")
+                    .addParameter("user", username)
+                    .addParameter("password", URLEncoder.encode(password, EncodeConstants.ENCODING_UTF_8))
+                    .build();
+            inputStream = httpClient.execute(request, responseHandler);
+        } catch (IOException e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+        return inputStream;
+    }
+
+
+    public static InputStream updateAuthorities(DesignAuthority[] authorities, RemoteEnv env) throws EnvException {
+        String path = env.getPath();
+        // 远程设计临时用户id
+        String userID = env.getValidUserID();
+        InputStream inputStream = null;
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        AuthorityXMLUtils.writeDesignAuthoritiesXML(authorities, outputStream);
         InputStreamEntity reqEntity = new InputStreamEntity(new ByteArrayInputStream(outputStream.toByteArray()), ContentType.TEXT_XML);
 
+        try (CloseableHttpClient httpClient = HttpClients.createSystem()) {
             HttpUriRequest request = RequestBuilder.post(path)
                     .addParameter("id", userID)
                     .addParameter("op", "remote_design_authority")
                     .addParameter("cmd", "update_authorities")
                     .setEntity(reqEntity)
                     .build();
-
+            inputStream = httpClient.execute(request, responseHandler);
-        try {
-            CloseableHttpResponse response = httpClient.execute(request);
-            HttpEntity entity = response.getEntity();
-            res = IOUtils.inputStream2String(entity.getContent(), EncodeConstants.ENCODING_UTF_8);
-            EntityUtils.consume(entity);
         } catch (IOException e) {
             FRContext.getLogger().error(e.getMessage());
         }
 
-        return res != null && Boolean.valueOf(res);
+        return inputStream;
 
     }
 
-    public static DesignAuthority[] getAuthorities(RemoteEnv env) {
+    public static InputStream getAuthorities(RemoteEnv env) throws EnvException {
         String path = env.getPath();
-        String userID = env.getUserID();
+        // 远程设计临时用户id
-        DesignAuthority[] authorities = null;
+        String userID = env.getValidUserID();
-        CloseableHttpClient httpClient = HttpClients.createDefault();
+        InputStream inputStream = null;
 
+        try (CloseableHttpClient httpClient = HttpClients.createSystem();) {
             HttpUriRequest request = RequestBuilder.get(path)
                     .addParameter("id", userID)
                     .addParameter("op", "remote_design_authority")
                     .addParameter("cmd", "get_authorities")
                     .build();
+            inputStream = httpClient.execute(request, responseHandler);
+        } catch (IOException e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+        return inputStream;
+    }
 
-        try {
-            CloseableHttpResponse response = httpClient.execute(request);
-            HttpEntity entity = response.getEntity();
 
-            authorities = AuthorityXMLUtils.readDesignAuthoritiesXML(entity.getContent());
+    public static InputStream listFile(String pFilePath, boolean isWebReport, RemoteEnv env) throws EnvException {
-            EntityUtils.consume(entity);
+        String path = env.getPath();
-        } catch (Exception e) {
+        // 远程设计临时用户id
+        String userID = env.getValidUserID();
+        String username = env.getUser();
+
+        InputStream inputStream = null;
+        try (CloseableHttpClient httpClient = HttpClients.createSystem()) {
+            HttpUriRequest request = RequestBuilder.get(path)
+                    .addParameter("op", "fs_remote_design")
+                    .addParameter("cmd", "design_list_file")
+                    .addParameter("file_path", pFilePath)
+                    .addParameter("currentUserName", username)
+                    .addParameter("currentUserId", userID)
+                    .addParameter("id", userID)
+                    .addParameter("isWebReport", Boolean.toString(isWebReport))
+                    .build();
+            inputStream = httpClient.execute(request, responseHandler);
+        } catch (IOException e) {
             FRContext.getLogger().error(e.getMessage());
         }
-        return authorities;
+        return inputStream;
-
     }
 
 }