Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving

puzhibing

2 天以前 0b4272657073faf38fc41e6f83518bd3d9ada276

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java

@@ -15,45 +15,7 @@
public class AppUserUtil {

   private static QYTConfig qytConfig = SpringContextsUtil.getBean(QYTConfig.class);
	

   /**
    * 发送短信验证码
    * @param phone
    * @return
    * @throws Exception
    */
   public static String queryCaptcha(String phone) throws Exception{
      HttpRequest post = HttpUtil.createPost(qytConfig.getChuxingUrl() + "/user-server/base/queryCaptcha");
      post.form("phone", phone);
      HttpResponse execute = post.execute();
      if(200 != execute.getStatus()){
         log.error("打车系统-发送验证码失败：{}", execute.body());
         return null;
      }
      return execute.body();
   }
	
   /**
    * 验证短信验证码
    * @param phone
    * @param code
    * @return
    * @throws Exception
    */
   public static Boolean checkCaptcha(String phone, String code) throws Exception{
      HttpRequest post = HttpUtil.createPost(qytConfig.getChuxingUrl() + "/user-server/base/user/checkCaptcha");
      post.header("device", "driving");
      post.form("phone", phone);
      post.form("code", code);
      HttpResponse execute = post.execute();
      if(200 != execute.getStatus()){
         log.error("打车系统-验证短信验证码：{}", execute.body());
         return null;
      }
      return Boolean.valueOf(execute.body());
   }
	
   
   /**
    * 添加用户
@@ -61,11 +23,12 @@
    * @return
    * @throws Exception
    */
   public static String addUser(String phone, String code, String areaCode) throws Exception{
   public static String addUser(String phone, String code, String areaCode, String onconUUID) throws Exception{
      HttpRequest post = HttpUtil.createPost(qytConfig.getChuxingUrl() + "/user-server/base/user/addAppUser");
      post.form("phone", phone);
      post.form("code", code);
      post.form("areaCode", areaCode);
      post.form("onconUUID", onconUUID);
      HttpResponse execute = post.execute();
      if(200 != execute.getStatus()){
         log.error("打车系统-注册用户失败：{}", execute.body());