Merge branch 'master-captcha-branch' into dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -67,6 +67,7 @@ public class AppAuthServiceImpl implements AuthService {
     }
     @Override
     public JSONObject sendsms(String username, Integer type, String pointList) throws Exception {
+        pointList = pointList == null ? "" : pointList;
         return userService.sendsms(username,type,pointList);
     }