diff --git a/jap-mfa/pom.xml b/jap-mfa/pom.xml index b2b7334e68a6cca81ac1fc3fca60ce384ce1797e..d39f61a71b8d4bf86d32199a94554c95ee19f182 100644 --- a/jap-mfa/pom.xml +++ b/jap-mfa/pom.xml @@ -32,6 +32,17 @@ com.warrenstrange googleauth + + + httpclient + org.apache.httpcomponents + + + + + org.apache.httpcomponents + httpclient + 4.5.13 diff --git a/jap-mfa/src/main/java/com/fujieid/jap/sso/JapMfaAlgorithm.java b/jap-mfa/src/main/java/com/fujieid/jap/sso/JapMfaAlgorithm.java index 9b004b6ea54616988dc52d2a2c9d7bbdf27d46b9..fe13ebc70433fb22324b1504e0e097636eec0c3d 100644 --- a/jap-mfa/src/main/java/com/fujieid/jap/sso/JapMfaAlgorithm.java +++ b/jap-mfa/src/main/java/com/fujieid/jap/sso/JapMfaAlgorithm.java @@ -28,13 +28,13 @@ public enum JapMfaAlgorithm { /** * SHA1 */ - HMACSHA1, + HmacSHA1, /** * SHA256 */ - HMACSHA256, + HmacSHA256, /** * SHA512 */ - HMACSHA512 + HmacSHA512 } diff --git a/jap-mfa/src/main/java/com/fujieid/jap/sso/JapMfaConfig.java b/jap-mfa/src/main/java/com/fujieid/jap/sso/JapMfaConfig.java index 96af33c56aedd8e0d02ccb73164b6bd1c2fa6e2c..0e760e2dbca74a98cf803f844f115576f02f12ad 100644 --- a/jap-mfa/src/main/java/com/fujieid/jap/sso/JapMfaConfig.java +++ b/jap-mfa/src/main/java/com/fujieid/jap/sso/JapMfaConfig.java @@ -38,7 +38,7 @@ public class JapMfaConfig { /** * the crypto algorithm (HMACSHA1, HMACSHA256, HMACSHA512) */ - private JapMfaAlgorithm algorithm = JapMfaAlgorithm.HMACSHA1; + private JapMfaAlgorithm algorithm = JapMfaAlgorithm.HmacSHA1; private String qrcodeTempPath = System.getProperties().getProperty("user.home") + File.separator + "jap" + File.separator + "temp"; diff --git a/jap-mfa/src/test/java/com/fujieid/jap/sso/JapMfaTest.java b/jap-mfa/src/test/java/com/fujieid/jap/sso/JapMfaTest.java index bcae1af2ee23075b213d464aef5b3898cd9af48f..351aa88bd5487f3713e71f18771dd64147f2f199 100644 --- a/jap-mfa/src/test/java/com/fujieid/jap/sso/JapMfaTest.java +++ b/jap-mfa/src/test/java/com/fujieid/jap/sso/JapMfaTest.java @@ -46,8 +46,8 @@ public class JapMfaTest { private static void varifyCode(JapMfa japMfa) { String secretKey = japMfa.getSecretKey(username); - System.out.println("1. 你需要打开生成的文件(或者将 Base64 字符串直接粘贴到浏览器地址会回车)"); - System.out.println("2. 然后使用 OTP 工具扫描二维码"); + System.out.println("1. 点击上方打印的URL链接"); + System.out.println("2. 然后使用 OTP 工具扫描二维码(如果无法识别,请保存到本地后打开本地文件重新进行识别)"); System.out.println("3. 在控制台输入 code"); Scanner scanner = new Scanner(System.in); Integer consoleInput = null;