From 97f58032a606561ee8ab4a09bed98c0e9eb2d3d7 Mon Sep 17 00:00:00 2001
From: lsy <18332763730@163.com>
Date: Thu, 14 Dec 2017 20:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/validate/code/ImageCodeProperties.java     | 12 +-----------
 .../param/validate/code/SmsCodeProperties.java       | 11 +++++++++++
 .../validate/code/ValidateCodeController.java        |  2 +-
 boot-starter/boot-starter-ssm/README.md              |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ImageCodeProperties.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ImageCodeProperties.java
index 8671ad3..822cb2e 100644
--- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ImageCodeProperties.java
+++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/ImageCodeProperties.java
@@ -20,10 +20,7 @@ public class ImageCodeProperties extends SmsCodeProperties{
         setLength(4);
     }
 
-    /**
-     * 需要进行验证码校验的url
-     */
-    private String url = "/user/login";
+
 
     public int getWidth() {
         return width;
@@ -41,11 +38,4 @@ public class ImageCodeProperties extends SmsCodeProperties{
         this.height = height;
     }
 
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
 }
diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/SmsCodeProperties.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/SmsCodeProperties.java
index 95b21c9..433dd3b 100644
--- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/SmsCodeProperties.java
+++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/config/param/validate/code/SmsCodeProperties.java
@@ -10,7 +10,18 @@ public class SmsCodeProperties {
    * 验证码的有效时间
    */
   private int expireIn = 60;
+  /**
+   * 需要进行验证码校验的url
+   */
+  private String url = "/user/login";
 
+  public String getUrl() {
+    return url;
+  }
+
+  public void setUrl(String url) {
+    this.url = url;
+  }
 
   public int getLength() {
     return length;
diff --git a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/controller/validate/code/ValidateCodeController.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/controller/validate/code/ValidateCodeController.java
index 609230e..120efaa 100644
--- a/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/controller/validate/code/ValidateCodeController.java
+++ b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/controller/validate/code/ValidateCodeController.java
@@ -55,7 +55,7 @@ public class ValidateCodeController {
         ValidateCode validateCode = smsCodeUtil.createValidateCode(new ServletWebRequest(request));
         //将验证码对象写入session中
         sessionStrategy.setAttribute(new ServletWebRequest(request), ValidateCodeConst.SESSION_KEY_IMAGE_CODE,validateCode);
-        //获取phone,请求中必须包含
+        //获取phone,请求中必须包含用户的手机号
         String phone = ServletRequestUtils.getRequiredStringParameter(request, "phone");
         //发送验证码的逻辑
         sendSmsCode.sendCode(phone,validateCode.getCode());
diff --git a/boot-starter/boot-starter-ssm/README.md b/boot-starter/boot-starter-ssm/README.md
index 77c0eb2..895d97a 100644
--- a/boot-starter/boot-starter-ssm/README.md
+++ b/boot-starter/boot-starter-ssm/README.md
@@ -9,7 +9,7 @@
 - `jdbc.master.password`　密码是使用common模块中的AESUtil加密过后的(必要参数)
 - `jdbc.master.url`　　　　数据库连接的url(必要参数)
 - `jdbc.master.driverClass` 数据库连接驱动类(必要参数)
-- `druid.master.servletInitParams`　druid数据连接池的servlet的初始化参数,默认的druid账号密码是root,studyj2e.如果需要自定义可以传入自己的配
+- `druid.master.servletInitParams`　druid数据连接池的servlet的初始化参数,默认的druid账号密码是micro,fast.如果需要自定义可以传入自己的配
 置，使用key:value的数组的形式.
 - `druid.master.servletUrl`　druid数据库连接池的访问路径，默认访问路径是/druid/*
 - `druid.master.beanNames`  druid要监控的bean的名字，多个使用逗号分割
@@ -19,7 +19,7 @@
 - `druid.master.minIdle`连接池的最小空闲数量,默认是10
 - `druid.master.maxWait`　当连接池中连接已经用完了，等待建立一个新连接的最大毫秒数,默认是1000
 - `druid.master.minEvictableIdleTimeMillis`　等待到达多长时间释放连接池，默认是3600000
-- `mybatis.typeAliasesPackage`　pojo包所在的位置(必要参数)
+- `mybatis.typeAliasesPackage`　pojo包所在的位置(必要参数),如果要指定多个包的话使用逗号分割
 - `mybatis.mappers`　mapper映射文件所在的路径(必要参数)
 - `mybatis.pageHelperProperties`　pagehelper分页插件的properties配置形式是key:value数组的形式，默认方言是mysql,如果需要自定义可以传入自己的配置，使用key:value的数
      组的形式.