Merge branch 'master_guanjia' into dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -174,6 +174,13 @@ public class AuthController {
         return data;
     }
 
+
+    @RequestMapping(value = "other/sendsms", method = RequestMethod.GET)
+    public JSONObject otherSendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type)throws Exception{
+        log.info(username+"----require sendsms...");
+        return appAuthService.sendsms(username,type);
+    }
+
     @RequestMapping(value = "/otherLogin", method = RequestMethod.POST)
     public JSONObject otherLogin(@RequestBody Map<String,Object> params)throws Exception{
         log.info("----require otherLogin...");