登录MIS模块测试通过

min/tpm/a41b583fa6bc918231cc5b98fe08b58c76606cb61d42765e40e3f9a939eb7a42.privkey

@@ -1,25 +0,0 @@
-MIIEpAIBAAKCAQEA7XRT3Mulk+z1Bly31evMcj6mpKIcuTI3N4pF6N/BNkgdADSQ
-Kpilrfyq2W1GGHfEi97wcz/y3bT0WiazHkHRQEMUETW8Hqsrx9ysDRj7Vy4yHP5s
-BLgBptOx1ZTSu928ZcgVSfaXx2XY5eE+8q5FL9mFb50xUaTs2Ej17xqEHsJBt931
-nnWYZ9ioqN5Lf2OLh1uqR++mNENvy5VfX4V5qbZVxIoC+X0t+CoJs0eC4O4m47y0
-jHqdteFdgIgAkLQSub3KiYFPF09Ejf0CQBEemiEMchY3H8fC2rXIFamjKH907X/O
-Ga/RV86ov/Vxmywq3ecOynML2TQyotSazaFKswIDAQABAoIBABKXN/WicA070Rc1
-bSMvees74nojQxJwzwfnKIAJ/KuOS873To43M0mC7bFmL8W8osO8qaCsUgxvnW3t
-d7qXtpVMaybJyTexeRUFvuarnQn/UOcaOETKTz7LdjHdm/4fZx+k4Z3P06RF4gxl
-bTM816feZOcPLIxS2EQ6uh6FOfDaaAGuB3myt4Q0wdMV2gQLvSNndHUeE5vqzOpO
-Iwcx4ic3u3++KmQxS/F2NztwokZNAyFGiVwmuEYwMhxsUjsLZlAIBra/gKDANu4H
-ZoXAud0kwxh2lzQtp+MzhILIsY5ek2lD8bTo5SdVwEW31U/N41MJ+K2brrIxiQQw
-EjgIjYECgYEA/XvsUhe2g6N+puy0d/MYxHknPk7QXwk0J0wkS/cb6qtqVqKBixS7
-Y8ldKTtDEV5xydoaElnVcSzJ3U0xoj/AS7cd+C5oVlpZw1hBxE9L0BTZw7uoltMC
-nbLqrllPoHW+Xp9ewmj2SEdQTfERlXquuI5cHNSaSqTqBmDZdmxwc/MCgYEA78+s
-uqPskpm6v1XmN3BDu8XH3KcFmMsLpj26809rov7NLugTCfY8K4kl82U25jZVxljU
-8ZfGIcNknsEC6j9PA3V17KkefbCX6/fl0qnPjcqMX6btXk2gEk2XhpY5KgK50FBB
-uhKvJ4/5dboUWqxUYNoUkEqL9Fm/aRdEtrXFPkECgYBBnAi/+tlH21KV3CCeB3L6
-r60jqHywjI5OOZwPeYdlRzb/85H6MMSMAHu3h1pFrZ9gMq6a31uqroAVYrydFUkt
-j9kW+tQQvdQMBtUG/ctOsYbn7bOmTjmYHc42kHFWxAMhNLjvMwHEFYlIk0QM37NH
-m7ll0PWaqnLUcc73ovu8VwKBgQCCssbK+ehHhe1XtnNAJ7lir0pcIdNVEOSKd/5Z
-+SEKtqARPn6R4VetypOaccFX+qkI7wUvnq5nXFyMgVkbXeGsWuooT4vEqOhDvNnO
-1Km/93JF925LBTeGgi9hNKJ3GQE4XWVVCjXX9Anbdcz+FgnutyyZ72cTh45gskPK
-6IpVgQKBgQDtdlDVYFBTcwPdxchz4+IxzAqsPx54m/zuw3Wi192uJOhk1BlaYp9d
-X+pAFWB930B7nwsnUN4D2xAn0P54az0xqfw7Dp/fb4QRBwH7zYuWaB5Vffz/uQ81
-QG+QRnkC7d3lLJTxM0YDQPpoAyoaV1MtyNTp9ti+8WV/Gi6hzDKBiQ==

min/tpm/dde6a4ba87e2e3af7ddda3a96d3fbf1535c6e49954512f1006b25222c81e8399.privkey

@@ -0,0 +1,25 @@
+MIIEowIBAAKCAQEAxPO+94TbzIip31OmzHn6Rc5f+TWlTWA9ROUnxzZoC+44wKI6
+mx3KNh2ZTCMKaVOxKGr5Efm8N4NbxzkOv6MnC9d+yvCVYfFPQ0i2XKet96zZLEL6
+HR0JyRqo4JQNnUCBjjXljtEr36vTmHLKvrwbazkkfDGZ8x3DUTGwTXkY4ZEyjms2
+vDZK4LUJ9s0C0FsudB66AT/C8ckHRFHA0uzScTor6TMipOsSuBSiavSobVvZr00X
+oKZUtbYRqcgen46waw1iCTmvj91j54DmuAKRhqpZWxOj2+SvoKbk4Hha8USouwa/
+VwDuQo4bFck8IYqJ8SdoiPlgp3Mv7o3FQ7jOFQIDAQABAoIBAAWept5NLjBh3eb/
+bgz7lgaT4u0reLICgv0KRN5MUR+2BmyItH9klDaDFbK0dUGYH7/1fXHj3FkBKIdA
+u4kAUMbnuTh1MO4AgrB6zKlMJ4yfo/q9VoGqKHNSjWsLDnBkPM4f/5LZqRTSxFDf
+RaW3nFis4rugdrIXMVGJx2wOfoVBIHWhHwaQxPXAmCKdK6A6qMKVGPhdiQONyU+r
+WskyeMUZctnU9RNWDwtD+GPK6Y/nIQjNmk7A08JJ8waFN8Dj8yiLhtgY9v0VrutE
+XolcfzKayTXMI8kHaesK6YkYQ+ZRfqVrIEI0I/ADHYHjhUEkUo/xCm21PAWuDdcC
+AHXxiykCgYEA/XaGvu/RVeH/ojNelc3d4gZ5ZY3MFkeYAzipVhRVBqsvfoZ/yfPV
+GUa/6B2UQFqcF6v0ukvLCAg22d92MPolEQ8TeU/ESLnhD2Z1sbPqbh3nWK82j+91
+Uv/vlvFMM+8vWx9oHbOYmlRVWP8zNcY1mVVJMEg64vXsNwF6nZT5IHMCgYEAxuxq
+ielx4/K4+uaSiL7SlnUOzYrt33Eh1qt2zCP/1+EeH6hFbgH5co2qv0NXdabHS738
+w67HyjKaJNWDLJrGbtRaXoIthKxGzWRkfeIAg+igh5LDZecRl/qudrqheZ1ordv+
+Ow5oTvs4Rr4CSrcclAeGR8G/n4TjTsC9zZxnXVcCgYAtwZLrrzF0NptGdc2Sb5qp
+rg+GRMXeE8iedEElmAANdyPYzIEPPSRwLrSAO67Cu1jIcTN52irp5Um5pTyZ9N5y
+KO2UDdFaa6v0csO2c8tTW7Si7uaDr2/Xrvpanm7qRTigU5ghHIXk/mp16YQeJg0R
+BDN1MuTmigy9lVfEUNt0fwKBgBlwUGuUlAD/oFJNvD2Kkam2DI+Sjbr+X8JxKP8Q
+N36nBlAsF7zqubjBjy1ocj3UdzYjdLidmGUuNXIyb9T7chboRypA4YtO8LsBdKx4
+g3JbBHRx+1UDyMczwq3iThYcYC+jq45n2EUJcXfygp6Fbj0r/SseBuBigSMoGN27
+e6h/AoGBAI9XbCbRgdho1ymshr9yZG3gOIwYz+CSPIeKTKEzOZBi0Jztti9bKoIg
+jEhVcmCw+6lU3HgsxAhLl0IhYdNV2t9GNQUWDtcYT30ZUDk/Q1AkaZ2vhGIrjVqO
+1kgB20PtCH3VrOv8RIdxu3rwL/O1gLGC5t0lfK60+uoukrr4D5gS

min/tpm/e16caa224df3aad88e032e03286988ab3dcfa99f83113a7b9f47d028ae7cc664.privkey

@@ -0,0 +1,25 @@
+MIIEowIBAAKCAQEAgt18/A6NHca9qEur0OQoQ6f+SodFoVo/D0dNGDlxURAGvDz9
+ynZAj7VUPapzp1fJSIKCWJTCRWMTN1bWnzmE3UjKLBqOzyVlseLH+ynQYBICf61K
+C4uM2KXaDU7uxPMYGHp7CW4WAiLhMYtNbFn7LuQaynh7pmuT3/4EsXU49BmsT+4S
+wUNZAZfVAcHV3a2CPnFzLudL3zrpKUP7dyAzFQQXI1T4v4G3v03AzhMlDYgzeZaS
+brru15tjAk98euIMP0BY5SpsJz9pC3m4nf4a4MLMxHJmGF7tUMLhW1q/j+V+dOkR
+hKGVyT1ue2K1AbaYIDxxBATSPQMhSJlo325WQQIDAQABAoIBAHzuwnFH2wTARTOz
++jWUe7QLX0L7XUgrBeSqJzmnLT08VZHDkG6G8h+/9spgPcVWk3y7y4CRk932NdQw
+/PhJS0SORyRPvmKXyzxFyrFHO/1bdDM71mKrOS1jOIZYAq7XfPtxgqCADla/wckw
+uhtk093yOnltCG7aaPQAZ66awGKX+mHKMT7qUED3PbS2zxZXx2SlHUGYhxT/elKO
+u9CQMdAG/sja2Bj/hcu1VZ9uzIeGfsn4Q5aGctQqQcTSEknqR5OGG34NI4kWWDX8
+mx8JIJYHlS0ydj42M9bQsdhkp3i3SWnXrrQubVZlHBXYaq+BGk3Xuv9XVIMvC2DD
+ci67gAECgYEAuGz8VQ91n4lTHzgq6qO2EJ8GBnydQI0hv/8kcdr41850ff/7VdW6
+3BOMwT/11INZUP/95ruCX99n8a/OAUJ9GcV7LAsRUHS88MSdG0nxxyErjE1qvPpY
+7mqy5xYrObvMEcxvCVwo1tNUUanjfTehhUuBEp+SnhRLP03IJq7L/wECgYEAtacr
+sxFpXf/JcQGrAGqnbZQTTn0fcnMGnKXgNHs7Z3v6hMUzvlguFoEUzHBRMn9R04nY
+HjsrwRDHgSLlSgnSDL67kFQE9EsjUQ138lBfcFpJ0OG1rICfdUAcIqirLprL3K8E
+1fQotNvk1KlprVoRwpTDMEZWk8u9pDqac2M5l0ECgYAn6XYmVmUnNInnnLk09F8H
+c9LS/o7tlF10dpwFg9UMpyJwzkAvUETTMevpOpVR+2cN74icMYJCi0+sb1aO0TvP
+ovxICNEjb1AgbvxtFnCbnqMVBwANi8RJPJAhEJwkL283ft2c0fQIoc2CqtiPlcV/
+2lpBlIUfbtbmCUhCjtuZAQKBgQCuQ3Qpsh9p/NOsJJR+rtJ1zeMDngdIDU8fggXn
+cv0XFpnLOz+bcA6uqiBgy7MphXjjPc7lmZAtA8LQgMCEWY13ipZ3LBMgpOB5hjk2
+baJRL1y3FYDqvu26Vslm+nZWHExMJl62Pie68WTCGs/1bH2zNHFX43J1ELSaU1oO
+Lfd2wQKBgDS9BX3/yRBpgjfu5ywF3mU4YNPSVhFzkX1T/Gt3KIvXojBeUycmoWcS
+zOMaSqO8NBpNqZ0MWfB6K9fcfII5wrVQ4/nui5b3PHZf51kAkRWGZfBUjwSaS74f
+GrSsZCz+uG8PVBHAokl56W8txjcQyX4i8Y4TAvCu4LFW3z5+AUht

mis_rsa_public.pem

@@ -0,0 +1,9 @@
+-----BEGIN RSA Public Key-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArQpGd3+hMWsc+Wbrt8Rn
+Md175NkLASAHjdq1W2mySrgzTEzo4wWegcxp/Jgau0Chu4Sy4vRXfqjv8hIuUqaT
+mdETkmwv4RM6lTM+neDCV+vWolE+KlLAaBEPRW54EdkinIbLGeK69OWDVvAnkKVx
+ma6WuZeVpbj6W76Cc90426OFEH8eHHWg8QlG1QX8Z+2AfO/SzRjL1UBvYNzMg3Yr
+1+5W/km8Zc/vj5zDBOh85dd9zvxh2lcRQeX0T9akdlygWyFc/MPwuka0Q24ie5EX
+C1z6KCJTa92cF8cj1Mnp7MLjosW5EqfN66wMpM5VMB7/0asufFP1u/B1rd0B7MJa
+DwIDAQAB
+-----END RSA Public Key-----

src/main/java/cn/minbrowser/util/MISUtil/MisUtil.java

@@ -1,6 +1,5 @@
 package cn.minbrowser.util.MISUtil;
 
-import cn.minoa.MainApp;
 import javafx.scene.control.Alert;
 import net.named_data.jndn.Face;
 import net.named_data.jndn.Interest;
@@ -17,10 +16,6 @@ import java.nio.channels.SocketChannel;
 public class MisUtil {
 
     private static String gatewayPrefix = null ;
-    private MainApp mainApp;
-    public MisUtil(MainApp mainApp_) {
-        this.mainApp = mainApp_;
-    }
     public static String getGateWayPrefix(String ip, String misIP, int misPort ){
 //        Face face = new Face(MainApp.NDNBlockChainIPAddress, MainApp.NDNBlockChainPortAddress);
         Face face = new Face(misIP, misPort);
@@ -163,55 +158,55 @@ public class MisUtil {
 //         return gatewayPrefix ;
     }
 
-    public void checkConnectStatus(){
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                // System.out.println("checkConnectStatus 1");
-                String prefix = "";
-                while(mainApp.loginerController == null){
-                    try {
-                        Thread.sleep(1000);
-                        // System.out.println("checkConnectStatus 2");
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                while (!mainApp.isNeedKnowLoginStatus) {
-                    // System.out.println("checkConnectStatus 3");
-                    String ip = MainApp.NDNBlockChainIPAddress;
-                    Integer port = MainApp.NDNBlockChainPortAddress;
-                    Boolean isConnected = isConnected(ip, port);
-
-                    if (!ip.equals(MainApp.NDNBlockChainIPAddress) || !port.equals(MainApp.NDNBlockChainPortAddress))
-                        continue;
-
-                    // 连接失败
-                    if (!isConnected) {
-                        mainApp.loginerController.setTextVisible();
-                        // mainApp.loginerController.setButtonDisable();
-                    }
-                    // 连接成功
-                    else {
-                        mainApp.loginerController.setTextInvisible();
-                        try {
-                            Thread.sleep(3000);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                        // mainApp.loginerController.setButtonEnable();
-                    }
-
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        },"checkConnectStatus").start();
-    }
+//    public void checkConnectStatus(){
+//        new Thread(new Runnable() {
+//            @Override
+//            public void run() {
+//                // System.out.println("checkConnectStatus 1");
+//                String prefix = "";
+//                while(mainApp.loginerController == null){
+//                    try {
+//                        Thread.sleep(1000);
+//                        // System.out.println("checkConnectStatus 2");
+//                    } catch (InterruptedException e) {
+//                        e.printStackTrace();
+//                    }
+//                }
+//
+//                while (!mainApp.isNeedKnowLoginStatus) {
+//                    // System.out.println("checkConnectStatus 3");
+//                    String ip = MainApp.NDNBlockChainIPAddress;
+//                    Integer port = MainApp.NDNBlockChainPortAddress;
+//                    Boolean isConnected = isConnected(ip, port);
+//
+//                    if (!ip.equals(MainApp.NDNBlockChainIPAddress) || !port.equals(MainApp.NDNBlockChainPortAddress))
+//                        continue;
+//
+//                    // 连接失败
+//                    if (!isConnected) {
+//                        mainApp.loginerController.setTextVisible();
+//                        // mainApp.loginerController.setButtonDisable();
+//                    }
+//                    // 连接成功
+//                    else {
+//                        mainApp.loginerController.setTextInvisible();
+//                        try {
+//                            Thread.sleep(3000);
+//                        } catch (InterruptedException e) {
+//                            e.printStackTrace();
+//                        }
+//                        // mainApp.loginerController.setButtonEnable();
+//                    }
+//
+//                    try {
+//                        Thread.sleep(1000);
+//                    } catch (InterruptedException e) {
+//                        e.printStackTrace();
+//                    }
+//                }
+//            }
+//        },"checkConnectStatus").start();
+//    }
 
     private static String getQueryStr(String mirip){
         JSONObject jsonObject = new JSONObject();

src/main/java/cn/minbrowser/util/MISUtil/NotificationUtil.java

@@ -1,24 +1,23 @@
 package cn.minbrowser.util.MISUtil;
 
-import cn.minoa.MainApp;
 import javafx.scene.control.Alert;
 
 import java.awt.*;
 
 public class NotificationUtil {
-    public static void notify(String title, String content){
-        String osName = OSUtil.osName;
-        // macOS
-        if(osName.contains("mac")){
-            String[] cmd = new String[]{"osascript", "-e", "display notification \"" + content + "\" with title \""+ title +"\""};
-            BashScript.run(cmd);
-        }
-
-        // windows or others
-        else{
-            MainApp.trayIcon.displayMessage(title,content, TrayIcon.MessageType.NONE);
-        }
-    }
+//    public static void notify(String title, String content){
+//        String osName = OSUtil.osName;
+//        // macOS
+//        if(osName.contains("mac")){
+//            String[] cmd = new String[]{"osascript", "-e", "display notification \"" + content + "\" with title \""+ title +"\""};
+//            BashScript.run(cmd);
+//        }
+//
+//        // windows or others
+//        else{
+//            MainApp.trayIcon.displayMessage(title,content, TrayIcon.MessageType.NONE);
+//        }
+//    }
 
 
     public static void alert(Alert.AlertType type, String title, String header, String content){

src/main/java/cn/minbrowser/view/TestMain.java

@@ -0,0 +1,12 @@
+package cn.minbrowser.view;
+
+import cn.minbrowser.view.login.LoginHandler;
+
+/*
+ * @author wefree
+ */
+public class TestMain {
+    public static void main(String[] args) {
+        LoginHandler.handleLogin("wangf","1");
+    }
+}