diff --git a/mbus-client/e/10.gif b/mbus-client/e/10.gif new file mode 100644 index 0000000..20ab33e Binary files /dev/null and b/mbus-client/e/10.gif differ diff --git a/mbus-client/e/11.gif b/mbus-client/e/11.gif new file mode 100644 index 0000000..6fb9046 Binary files /dev/null and b/mbus-client/e/11.gif differ diff --git a/mbus-client/e/8.gif b/mbus-client/e/8.gif new file mode 100644 index 0000000..e9118df Binary files /dev/null and b/mbus-client/e/8.gif differ diff --git a/mbus-client/e/9.gif b/mbus-client/e/9.gif new file mode 100644 index 0000000..7fe23f7 Binary files /dev/null and b/mbus-client/e/9.gif differ diff --git a/mbus-client/e/SendMessageDesk.bak b/mbus-client/e/SendMessageDesk.bak index 289a6f2..1491b79 100644 Binary files a/mbus-client/e/SendMessageDesk.bak and b/mbus-client/e/SendMessageDesk.bak differ diff --git a/mbus-client/e/SendMessageDesk.e b/mbus-client/e/SendMessageDesk.e index 784e62e..057bf29 100644 Binary files a/mbus-client/e/SendMessageDesk.e and b/mbus-client/e/SendMessageDesk.e differ diff --git a/mbus-model/.idea/workspace.xml b/mbus-model/.idea/workspace.xml index 35c5209..f1cb601 100644 --- a/mbus-model/.idea/workspace.xml +++ b/mbus-model/.idea/workspace.xml @@ -46,11 +46,11 @@ - + - - + + @@ -63,11 +63,11 @@ - + - - + + @@ -93,10 +93,10 @@ @@ -127,8 +127,8 @@ + - @@ -166,7 +166,7 @@ + @@ -474,17 +384,17 @@ - - - - + - + + + + - @@ -682,19 +593,19 @@ - + - + - + @@ -703,13 +614,12 @@ - + - @@ -734,11 +644,23 @@ @@ -792,13 +714,6 @@ - - - - - - - @@ -1441,13 +1356,6 @@ - - - - - - - @@ -1458,13 +1366,6 @@ - - - - - - - @@ -1521,13 +1422,6 @@ - - - - - - - @@ -1556,61 +1450,82 @@ - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + - + - - + + - - + + + + + + + + + + - - + + - @@ -1622,26 +1537,19 @@ - - - - - - - - - + + - + - + - + @@ -1674,26 +1582,42 @@ - + - - + + - + - - + + + + + + + + + + - - + + + + + + + + + + diff --git a/mbus-site/pom.xml b/mbus-site/pom.xml index 9bfd8be..21b178a 100644 --- a/mbus-site/pom.xml +++ b/mbus-site/pom.xml @@ -85,7 +85,7 @@ - website-1.2.0 + website-1.2.2 org.apache.maven.plugins diff --git a/mbus-site/site-common/src/main/java/org/wade/mbus/site/common/encoding/UrlUtil.java b/mbus-site/site-common/src/main/java/org/wade/mbus/site/common/encoding/UrlUtil.java new file mode 100644 index 0000000..ecf3508 --- /dev/null +++ b/mbus-site/site-common/src/main/java/org/wade/mbus/site/common/encoding/UrlUtil.java @@ -0,0 +1,64 @@ +package org.wade.mbus.site.common.encoding; + +import java.io.UnsupportedEncodingException; +/** + * url转码、解码 + * + * @author lifq + * @date 2015-3-17 下午04:09:35 + */ +public class UrlUtil { + private final static String ENCODE = "GBK"; + /** + * URL 解码 + * + * @return String + * @author lifq + * @date 2015-3-17 下午04:09:51 + */ + public static String getURLDecoderString(String str) { + String result = ""; + if (null == str) { + return ""; + } + try { + result = java.net.URLDecoder.decode(str, ENCODE); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return result; + } + /** + * URL 转码 + * + * @return String + * @author lifq + * @date 2015-3-17 下午04:10:28 + */ + public static String getURLEncoderString(String str) { + String result = ""; + if (null == str) { + return ""; + } + try { + result = java.net.URLEncoder.encode(str, ENCODE); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return result; + } + + /** + * + * @return void + * @author lifq + * @date 2015-3-17 下午04:09:16 + */ + public static void main(String[] args) { + String str = "测试1"; + System.out.println(getURLEncoderString(str)); + System.out.println(getURLDecoderString(str)); + + } + +} \ No newline at end of file diff --git a/mbus-site/site-common/target/classes/org/wade/mbus/site/common/encoding/UrlUtil.class b/mbus-site/site-common/target/classes/org/wade/mbus/site/common/encoding/UrlUtil.class new file mode 100644 index 0000000..5fc6677 Binary files /dev/null and b/mbus-site/site-common/target/classes/org/wade/mbus/site/common/encoding/UrlUtil.class differ diff --git a/mbus-site/site-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mbus-site/site-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 00decd5..b46c095 100644 --- a/mbus-site/site-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/mbus-site/site-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,3 +1,4 @@ +org\wade\mbus\site\common\encoding\UrlUtil.class org\wade\mbus\site\common\base64\Base64Util.class org\wade\mbus\site\common\rabbitmq\RabbitSource.class org\wade\mbus\site\common\rabbitmq\RabbitUtil.class diff --git a/mbus-site/site-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mbus-site/site-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 5edadab..2c2f8d7 100644 --- a/mbus-site/site-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/mbus-site/site-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,4 @@ +F:\repository\mbus\mbus-site\site-common\src\main\java\org\wade\mbus\site\common\encoding\UrlUtil.java F:\repository\mbus\mbus-site\site-common\src\main\java\org\wade\mbus\site\common\rabbitmq\RabbitUtil.java F:\repository\mbus\mbus-site\site-common\src\main\java\org\wade\mbus\site\common\base64\Base64Util.java F:\repository\mbus\mbus-site\site-common\src\main\java\org\wade\mbus\site\common\rabbitmq\RabbitSource.java diff --git a/mbus-site/site-common/target/website-1.2.0.jar b/mbus-site/site-common/target/website-1.2.2.jar similarity index 56% rename from mbus-site/site-common/target/website-1.2.0.jar rename to mbus-site/site-common/target/website-1.2.2.jar index 8eebf9f..f4ebe21 100644 Binary files a/mbus-site/site-common/target/website-1.2.0.jar and b/mbus-site/site-common/target/website-1.2.2.jar differ diff --git a/mbus-site/site-model/target/website-1.2.0.jar b/mbus-site/site-model/target/website-1.2.0.jar deleted file mode 100644 index ad6cd7b..0000000 Binary files a/mbus-site/site-model/target/website-1.2.0.jar and /dev/null differ diff --git a/mbus-site/site-model/target/website-1.2.2.jar b/mbus-site/site-model/target/website-1.2.2.jar new file mode 100644 index 0000000..147eb50 Binary files /dev/null and b/mbus-site/site-model/target/website-1.2.2.jar differ diff --git a/mbus-site/site-repository/target/website-1.2.0.jar b/mbus-site/site-repository/target/website-1.2.2.jar similarity index 62% rename from mbus-site/site-repository/target/website-1.2.0.jar rename to mbus-site/site-repository/target/website-1.2.2.jar index b617d92..52fd873 100644 Binary files a/mbus-site/site-repository/target/website-1.2.0.jar and b/mbus-site/site-repository/target/website-1.2.2.jar differ diff --git a/mbus-site/site-service/src/main/java/org/wade/mbus/site/service/IMessageService.java b/mbus-site/site-service/src/main/java/org/wade/mbus/site/service/IMessageService.java index 44c8bb9..29d15ef 100644 --- a/mbus-site/site-service/src/main/java/org/wade/mbus/site/service/IMessageService.java +++ b/mbus-site/site-service/src/main/java/org/wade/mbus/site/service/IMessageService.java @@ -3,8 +3,10 @@ import org.wade.mbus.model.CallMsgReq; import org.wade.mbus.site.model.HttpResp; +import java.io.UnsupportedEncodingException; + public interface IMessageService { - HttpResp upload(byte[] bytes, Integer type); + HttpResp upload(byte[] bytes, Integer type) throws UnsupportedEncodingException; HttpResp uploadAsync(byte[] bytes, Integer type); HttpResp getResult(String ticket); HttpResp update(CallMsgReq callMsgReq); diff --git a/mbus-site/site-service/src/main/java/org/wade/mbus/site/service/impl/MessageServiceImpl.java b/mbus-site/site-service/src/main/java/org/wade/mbus/site/service/impl/MessageServiceImpl.java index 8e6a1d9..5741007 100644 --- a/mbus-site/site-service/src/main/java/org/wade/mbus/site/service/impl/MessageServiceImpl.java +++ b/mbus-site/site-service/src/main/java/org/wade/mbus/site/service/impl/MessageServiceImpl.java @@ -1,5 +1,6 @@ package org.wade.mbus.site.service.impl; +import org.apache.http.client.utils.URLEncodedUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; @@ -10,10 +11,13 @@ import org.wade.mbus.model.CallMsgReq; import org.wade.mbus.model.enums.ValidateCodeType; import org.wade.mbus.site.common.base64.Base64Util; +import org.wade.mbus.site.common.encoding.UrlUtil; import org.wade.mbus.site.model.HttpResp; import org.wade.mbus.site.repository.IMessageRepository; import org.wade.mbus.site.service.IMessageService; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -35,13 +39,13 @@ public MessageServiceImpl(IMessageRepository messageRepository, RedisTemplate re private String socketRoutingKey; @Override - public HttpResp upload(byte[] bytes, Integer type) { + public HttpResp upload(byte[] bytes, Integer type) throws UnsupportedEncodingException { // 生成票据等身份认证信息 UUID ticket = UUID.randomUUID(); String mid = messageRepository.pub(ticket, type, bytes); // 设置超时时间并且开始轮询验证码 final Long startTime = System.currentTimeMillis(); - final Long overtime = 30 * 1000L; + final Long overtime = 60 * 1000L; while (true) { // 判断是否超过了预设的时间 Long nowTime = System.currentTimeMillis(); @@ -55,6 +59,7 @@ public HttpResp upload(byte[] bytes, Integer type) { } if (code != null && code != "null"){ redisTemplate.delete(ticket.toString()); + System.out.println(code); return new HttpResp(0, code); }else if(code != null && code == "null"){ redisTemplate.delete(ticket.toString()); diff --git a/mbus-site/site-service/target/classes/org/wade/mbus/site/service/IMessageService.class b/mbus-site/site-service/target/classes/org/wade/mbus/site/service/IMessageService.class index ec18c0c..df3e4dc 100644 Binary files a/mbus-site/site-service/target/classes/org/wade/mbus/site/service/IMessageService.class and b/mbus-site/site-service/target/classes/org/wade/mbus/site/service/IMessageService.class differ diff --git a/mbus-site/site-service/target/classes/org/wade/mbus/site/service/impl/MessageServiceImpl.class b/mbus-site/site-service/target/classes/org/wade/mbus/site/service/impl/MessageServiceImpl.class index ee53517..54ec828 100644 Binary files a/mbus-site/site-service/target/classes/org/wade/mbus/site/service/impl/MessageServiceImpl.class and b/mbus-site/site-service/target/classes/org/wade/mbus/site/service/impl/MessageServiceImpl.class differ diff --git a/mbus-site/site-service/target/website-1.2.0.jar b/mbus-site/site-service/target/website-1.2.0.jar deleted file mode 100644 index e6211c7..0000000 Binary files a/mbus-site/site-service/target/website-1.2.0.jar and /dev/null differ diff --git a/mbus-site/site-service/target/website-1.2.2.jar b/mbus-site/site-service/target/website-1.2.2.jar new file mode 100644 index 0000000..684571b Binary files /dev/null and b/mbus-site/site-service/target/website-1.2.2.jar differ diff --git a/mbus-site/site-web/src/main/resources/static/10.gif b/mbus-site/site-web/src/main/resources/static/10.gif new file mode 100644 index 0000000..20ab33e Binary files /dev/null and b/mbus-site/site-web/src/main/resources/static/10.gif differ diff --git a/mbus-site/site-web/src/main/resources/static/11.gif b/mbus-site/site-web/src/main/resources/static/11.gif new file mode 100644 index 0000000..6fb9046 Binary files /dev/null and b/mbus-site/site-web/src/main/resources/static/11.gif differ diff --git a/mbus-site/site-web/src/main/resources/static/8.gif b/mbus-site/site-web/src/main/resources/static/8.gif new file mode 100644 index 0000000..e9118df Binary files /dev/null and b/mbus-site/site-web/src/main/resources/static/8.gif differ diff --git a/mbus-site/site-web/src/main/resources/static/9.gif b/mbus-site/site-web/src/main/resources/static/9.gif new file mode 100644 index 0000000..7fe23f7 Binary files /dev/null and b/mbus-site/site-web/src/main/resources/static/9.gif differ diff --git a/mbus-site/site-web/src/main/resources/static/assets/css/responsive.css b/mbus-site/site-web/src/main/resources/static/assets/css/responsive.css index 1d0a1f3..66adaeb 100644 --- a/mbus-site/site-web/src/main/resources/static/assets/css/responsive.css +++ b/mbus-site/site-web/src/main/resources/static/assets/css/responsive.css @@ -12,7 +12,7 @@ padding-top: 300px; } .courusel-container { - padding: 180px 0; + /* padding: 180px 0; */ } .first-section { padding: 243px 0 0; diff --git a/mbus-site/site-web/src/main/resources/static/assets/css/style.css b/mbus-site/site-web/src/main/resources/static/assets/css/style.css index 707da70..fa154ef 100644 --- a/mbus-site/site-web/src/main/resources/static/assets/css/style.css +++ b/mbus-site/site-web/src/main/resources/static/assets/css/style.css @@ -1122,7 +1122,7 @@ footer .footer-social-wrapper { .courusel-container { padding: 232px 0 135px; position: relative; - margin-bottom: 86px; + margin-bottom: 40px; background: url(../img/calculator-bg-straight.png) no-repeat center; background-size: cover; } diff --git a/mbus-site/site-web/src/main/resources/static/multi_thread.gif b/mbus-site/site-web/src/main/resources/static/multi_thread.gif new file mode 100644 index 0000000..f55021f Binary files /dev/null and b/mbus-site/site-web/src/main/resources/static/multi_thread.gif differ diff --git a/mbus-site/site-web/src/main/resources/templates/blog.html b/mbus-site/site-web/src/main/resources/templates/blog.html index 4210d47..c25e788 100644 --- a/mbus-site/site-web/src/main/resources/templates/blog.html +++ b/mbus-site/site-web/src/main/resources/templates/blog.html @@ -56,7 +56,7 @@
 
-

开发文档临时版

+

开发文档

@@ -74,12 +74,15 @@
wade-zh
-

目前支持识别英数图像验证码类型, 建议先下载Demo测试识别率

+

目前支持识别汉英图像验证码类型, 建议先下载Demo测试识别率

这是一个公益性的免费项目，您可以不需经过权限认证即可快速接入

-

由于我个人时间不是太充足，有心要整理出来一个能够基本覆盖互联网验证码类型的模型，英数、汉字、行为、答题等等，但是这个进度可能会很慢，如果您有兴趣，欢迎您fork！

为了快速的实现识别多种类型的验证码，我借用了不同作者训练好的神经网络模型，每一份文件目录下我都注明了是哪个作者的作品，如果您不同意请联系我删除！

+

感谢兴国软件网、红叶分享的英数、汉字训练模型

+

现已支持多线程模型异步返回验证码结果，平均响应在0s ~ 2s之间

+
+

识别成功返回内容(JSON)：

        {
             "error": 0,
@@ -104,9 +107,19 @@ 
类型字段 (Type)：

         T_DEFAULT = 0,
 
         /**
-         * 英数类型,可识别纯数字/字母或组合字符
+         * 英数类型,支持多线程调用, 速度快, 识别率一般
+         */
+        T_EN_XG = 1,
+
+        /**
+         * 英数类型,不支持多线程, 速度慢, 识别率高
          */
-        T_EN = 1
+        T_EN_HY = 2,
+
+         /**
+         * 汉字类型,支持多线程调用, 速度快, 识别率一般
+         */
+        T_ZH_XG = 3

支持验证码类型(不局限于以下几种):
@@ -116,6 +129,12 @@

类型字段 (Type)：

+

仅支持的汉字验证码类型:
+ + + + +

上传答题：http://139.199.211.96:8090/api/upload

diff --git a/mbus-site/site-web/src/main/resources/templates/index.html b/mbus-site/site-web/src/main/resources/templates/index.html index c1da658..26340b6 100644 --- a/mbus-site/site-web/src/main/resources/templates/index.html +++ b/mbus-site/site-web/src/main/resources/templates/index.html @@ -57,7 +57,7 @@