Commit 867e57b4 authored by jiaorz's avatar jiaorz

Merge branch 'master-captcha-branch' into dev

parents 4c583c52 f680f0d7
...@@ -65,8 +65,8 @@ public class AuthServiceImpl implements AuthService { ...@@ -65,8 +65,8 @@ public class AuthServiceImpl implements AuthService {
return jwtTokenUtil.generateToken(jwtTokenUtil.getInfoFromToken(oldToken)); return jwtTokenUtil.generateToken(jwtTokenUtil.getInfoFromToken(oldToken));
} }
@Override @Override
public JSONObject sendsms(String username, Integer type) throws Exception { public JSONObject sendsms(String username, Integer type, String pointList) throws Exception {
return userService.sendsms(username,type); return userService.sendsms(username,type, pointList);
} }
@Override @Override
public JSONObject register(String username, String mobilecode, String password,String code,Integer channel) throws Exception { public JSONObject register(String username, String mobilecode, String password,String code,Integer channel) throws Exception {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment