Fix proxy bug on MAC OS

Add zh-TW language
Fix pdown.js bug on safari

Author: monkeyWie

front/src/i18n/zh-TW.js

@@ -1,7 +1,7 @@
 export default {
   nav: {
     tasks: '任務管理',
-    extension: '擴充功能管理',
+    extension: '擴充管理',
     setting: '軟體設定',
     about: '關於專案',
     support: '支援我們'

front/src/views/Setting.vue

@@ -64,6 +64,7 @@
             prop="appConfig.locale">
             <Select v-model="form.appConfig.locale">
               <Option value="zh-CN">中文(简体)</Option>
+              <Option value="zh-TW">中文(繁體)</Option>
               <Option value="en-US">English(USA)</Option>
             </Select>
           </FormItem>

main/pom.xml

@@ -41,27 +41,6 @@
         <environment>prd</environment>
       </properties>
     </profile>
-    <profile>
-      <id>windows</id>
-      <properties>
-        <osType>windows</osType>
-      </properties>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-    </profile>
-    <profile>
-      <id>mac</id>
-      <properties>
-        <osType>mac</osType>
-      </properties>
-    </profile>
-    <profile>
-      <id>linux</id>
-      <properties>
-        <osType>linux</osType>
-      </properties>
-    </profile>
   </profiles>
 
   <dependencies>
@@ -103,7 +82,6 @@
           <exclude>application-prd.yml</exclude>
           <exclude>logback-dev.xml</exclude>
           <exclude>logback-prd.xml</exclude>
-          <exclude>tool/mac-tool.so</exclude>
         </excludes>
       </resource>
       <resource>
@@ -113,7 +91,6 @@
           <include>logback-${environment}.xml</include>
           <include>application-${environment}.yml</include>
           <include>application.yml</include>
-          <include>tool/${osType}-tool.so</include>
         </includes>
       </resource>
     </resources>
@@ -124,7 +101,7 @@
         <artifactId>maven-resources-plugin</artifactId>
         <configuration>
           <nonFilteredFileExtensions>
-            <nonFilteredFileExtension>so</nonFilteredFileExtension>
+            <nonFilteredFileExtension>bin</nonFilteredFileExtension>
             <nonFilteredFileExtension>css</nonFilteredFileExtension>
             <nonFilteredFileExtension>js</nonFilteredFileExtension>
             <nonFilteredFileExtension>eot</nonFilteredFileExtension>

main/src/main/java/org/pdown/gui/DownApplication.java

@@ -87,7 +87,7 @@ public void start(Stage primaryStage) throws Exception {
     Platform.setImplicitExit(false);
     //load config
     initConfig();
-    initMacTool();
+    initMacMITMTool();
     initEmbedHttpServer();
     initExtension();
     initTray();
@@ -148,10 +148,10 @@ private void initExtension() {
   public static int macToolPort;
 
   //加载mac tool
-  private void initMacTool() {
+  private void initMacMITMTool() {
     if (OsUtil.isMac()) {
       new Thread(() -> {
-        String toolUri = "tool/mac-tool.so";
+        String toolUri = "mac/mitm-tool.bin";
         Path toolPath = Paths.get(PathUtil.ROOT_PATH + File.separator + toolUri);
         try {
           if (!toolPath.toFile().exists()) {
@@ -168,18 +168,18 @@ private void initMacTool() {
             }
           }
           //取一个空闲端口来运行mac tool
-          macToolPort = OsUtil.getFreePort(9393);
+          macToolPort = OsUtil.getFreePort();
           //程序退出监听
           Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             try {
               ExecUtil.httpGet("http://127.0.0.1:" + macToolPort + "/quit");
             } catch (IOException e) {
             }
           }));
-          ExecUtil.execSyncWithAdmin("'" + toolPath.toFile().getPath() + "' " + macToolPort);
+          ExecUtil.execBlockWithAdmin("'" + toolPath.toFile().getPath() + "' " + macToolPort);
         } catch (Exception e) {
-          LOGGER.error("initMacTool error", e);
-          alertAndExit("initMacTool error：" + e.getMessage());
+          LOGGER.error("initMacMITMTool error", e);
+          alertAndExit("Init mitm-tool error：" + e.getMessage());
         }
         System.exit(0);
       }).start();

main/src/main/java/org/pdown/gui/extension/mitm/util/ExtensionCertUtil.java

@@ -24,7 +24,6 @@
 public class ExtensionCertUtil {
 
 
-
   /**
    * 在指定目录生成一个ca证书和私钥
    */
@@ -49,7 +48,7 @@ public static void buildCert(String path, String subjectName) throws Exception {
   public static void installCert(File file) throws IOException {
     String path = file.getPath();
     if (OsUtil.isWindows()) {
-      ExecUtil.execSync("certutil",
+      ExecUtil.execBlock("certutil",
           "-addstore",
           "-user",
           "root",
@@ -98,7 +97,7 @@ public static void uninstallCert(String subjectName) throws IOException {
       Matcher matcher = pattern.matcher(certList);
       while (matcher.find()) {
         String hash = matcher.group(1).replaceAll("\\s", "");
-        ExecUtil.execSync("certutil",
+        ExecUtil.execBlock("certutil",
             "-delstore",
             "-user",
             "root",
@@ -125,13 +124,14 @@ private static String findCertList(String subjectName) throws IOException {
           "root",
           subjectName);
     } else if (OsUtil.isMac()) {
-      return ExecUtil.exec("/bin/bash",
-          "security find-certificate "
-              + "-a "
-              + "-c " + subjectName + " "
-              + "-p "
-              + "-Z "
-              + "/Library/Keychains/System.keychain");
+      return ExecUtil.exec("security",
+          "find-certificate",
+          "-a",
+          "-c",
+          subjectName,
+          "-p",
+          "-Z",
+          "/Library/Keychains/System.keychain");
     }
     return null;
   }

main/src/main/java/org/pdown/gui/extension/mitm/util/ExtensionProxyUtil.java

@@ -49,7 +49,7 @@ public static void enabledPACProxy(String url) throws IOException {
       refreshOptions(list);
     } else if (OsUtil.isMac()) {
       String networkService = disabledProxy();
-      ExecUtil.httpGet("http://127.0.0.1:" + DownApplication.macToolPort + "/proxy/enabledHTTP"
+      ExecUtil.httpGet("http://127.0.0.1:" + DownApplication.macToolPort + "/proxy/enabledPAC"
           + "?ns=" + networkService
           + "&url=" + url);
     }

main/src/main/java/org/pdown/gui/http/controller/NativeController.java

@@ -137,9 +137,9 @@ public FullHttpResponse showFile(Channel channel, FullHttpRequest request) throw
       if (!file.exists() || OsUtil.isUnix()) {
         Desktop.getDesktop().open(file.getParentFile());
       } else if (OsUtil.isWindows()) {
-        ExecUtil.execSync("explorer.exe", "/select,", file.getPath());
+        ExecUtil.execBlock("explorer.exe", "/select,", file.getPath());
       } else if (OsUtil.isMac()) {
-        ExecUtil.execSync("open", "-R", file.getPath());
+        ExecUtil.execBlock("open", "-R", file.getPath());
       }
     }
     return new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK);

main/src/main/java/org/pdown/gui/util/ExecUtil.java

@@ -35,7 +35,7 @@ public static String exec(String... shell) throws IOException {
   /**
    * 同步执行shell，阻塞当前线程
    */
-  public static void execSync(String... shell) throws IOException {
+  public static void execBlock(String... shell) throws IOException {
     Process process = Runtime.getRuntime().exec(shell);
     try (
         InputStream inputStream = process.getInputStream()
@@ -52,7 +52,7 @@ public static void execSync(String... shell) throws IOException {
   /**
    * 以管理员权限，同步执行shell，阻塞当前线程
    */
-  public static void execSyncWithAdmin(String shell) throws IOException {
+  public static void execBlockWithAdmin(String shell) throws IOException {
     //osascript -e "do shell script \"shell\" with administrator privileges"
     Process process = Runtime.getRuntime().exec(new String[]{
         "osascript",

main/src/main/resources/tool/mac-tool.so renamed to main/src/main/resources/mac/mitm-tool.bin

@@ -59,7 +59,7 @@
       }
       return xhr
     },
-    proxySend(async, method, url, data, onSuccess, onError) {
+    proxySend: function (async, method, url, data, onSuccess, onError) {
       var xhr = this.buildXHR();
       xhr.open('post', '/', async)
       var data = {method: method, url: url, data: data}