diff --git a/src/main/java/love/sola/netsupport/util/Redirect.java b/src/main/java/love/sola/netsupport/util/Redirect.java index 47e17e8..294092b 100644 --- a/src/main/java/love/sola/netsupport/util/Redirect.java +++ b/src/main/java/love/sola/netsupport/util/Redirect.java @@ -3,6 +3,8 @@ package love.sola.netsupport.util; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import static love.sola.netsupport.config.Lang.lang; + /** * *********************************************** * Created by Sola on 2015/12/6. @@ -11,7 +13,7 @@ import java.io.IOException; */ public class Redirect { - public static final String REDIRECT_PAGE = "http://topaz.sinaapp.com/nm/result.html"; + public static final String REDIRECT_PAGE = lang("RESULT_PAGE"); public static void message(HttpServletResponse response, int type, String message) throws IOException { response.sendRedirect( diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index 2977462..d3a93e0 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -40,6 +40,7 @@ Submit_Desc: "在网维工作人员上门解决您的问题之前,您可以尝 User_Register_Link: "您尚未进行微信绑定, 请点击这里进行微信绑定操作。" User_Query_Link: 'http://topaz.sinaapp.com/nm/v1/query.php?wechatid={0}' User_Submit_Link: 'http://topaz.sinaapp.com/nm/v1/submit.php?wechatid={0}' +Result_Page: 'http://topaz.sinaapp.com/nm/v1/result.html' #Localized #Status diff --git a/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java b/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java index e5779d4..992a594 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java +++ b/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java @@ -14,14 +14,7 @@ public class TestEncrypt { @Test public void test() { String hash = BCrypt.hashpw("mypasswordhere", BCrypt.gensalt()); - System.out.println("hash = " + hash); - System.out.println("BCrypt.checkpw(\"mypasswordhere\",hash) = " + BCrypt.checkpw("mypasswordhere", hash)); - } - - @Test - public void testChk() { - String hash = "$2a$10$RCXxfEygwHQeF4BKjx5Uwu/C72HqoCN.jKpNSNdwizcy7m301C9Am"; - System.out.println("BCrypt.checkpw(\"mypasswordhere\",hash) = " + BCrypt.checkpw("mypasswordhere", hash)); + assert BCrypt.checkpw("mypasswordhere", hash); } } diff --git a/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java b/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java index fbfbe59..3f8f340 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java +++ b/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java @@ -14,7 +14,6 @@ public class TestMessageFormat { @Test public void testLang() { assert Lang.messages != null; - System.out.println(Lang.messages); } } diff --git a/src/test/java/love/sola/netsupport/wechat/TestReflection.java b/src/test/java/love/sola/netsupport/wechat/TestReflection.java index b5fbb78..aa05a93 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestReflection.java +++ b/src/test/java/love/sola/netsupport/wechat/TestReflection.java @@ -13,7 +13,7 @@ public class TestReflection { @Test public void testBlock() { - System.out.println(Block.inverseMap); + assert Block.inverseMap != null; } } diff --git a/src/test/java/love/sola/netsupport/wechat/TestRegex.java b/src/test/java/love/sola/netsupport/wechat/TestRegex.java index 26bf430..ec1e351 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestRegex.java +++ b/src/test/java/love/sola/netsupport/wechat/TestRegex.java @@ -14,8 +14,8 @@ public class TestRegex { @Test public void testStudentId() { - System.out.println("2011130201233".matches(STUDENT_ID_REGEX)); - System.out.println("2015130201233".matches(STUDENT_ID_REGEX)); + assert !"2011130201233".matches(STUDENT_ID_REGEX); + assert "2015130201233".matches(STUDENT_ID_REGEX); } }