Merge remote-tracking branch 'origin/dev' into dev

jiangchengyong
2 parents 47a22cf4 e148564e
Showing 15 changed files with 204 additions and 205 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Token.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/CheckVeriCodeReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/SendVeriCodeReq.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/PassportRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/base/impl/BaseServiceImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PassportRPCImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/SellerRPCImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/StationMsgRPCImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/SellerUserService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerUserServiceImpl.java
mobsite-getway-web/pom.xml
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/user/SellerUserController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/filter/LoginTimeoutInterceptor.java
mobsite-getway-web/src/main/resources/spring-rpc.xml
@@ -27,7 +27,7 @@ public class Token {
     /**
      * 终端与服务端协定的密文
      */
-	@ApiModelProperty("终端与服务端协定的密文")
+	@ApiModelProperty("终端与服务端协定的密文:__diligrp_mobsite_getway__")
     private String secretkey;
     /**
      * 设备ID
@@ -26,10 +26,7 @@ public class CheckVeriCodeReq extends BaseReq {
      */
     @ApiModelProperty(value = "手机号码",required = true)
     private String mobile;
-    /**
-     * 消息类型
-     */
-    private Integer msgType = SendVeriCodeReq.MSG_TYPE_DEFAULT;
+
     /**
      * get value of CheckVeriCodeReq.veriCode
@@ -73,12 +70,5 @@ public class CheckVeriCodeReq extends BaseReq {
         this.mobile = mobile;
     }
-	public Integer getMsgType() {
-		return msgType;
-	}
-
-	public void setMsgType(Integer msgType) {
-		this.msgType = msgType;
-	}
 }
@@ -17,12 +17,13 @@ public class SendVeriCodeReq extends BaseReq {
     /**
      * 
      * 发送校验码类别
+     * 1.登录
      * 2.注册
      * 3.找回密码
      * 4.修改新手机号
      * 5.验证旧的手机号
      */
-	public static final int MSG_TYPE_DEFAULT = 1;
+	public static final int MSG_TYPE_LOGIN = 1;
     public static final int MSG_TYPE_REGISTER = 2;
     public static final int MSG_TYPE_RETRIEVE_PASSWORD = 3;
     public static final int MSG_TYPE_MODIFY_NEW_MOBILE = 4;
@@ -36,7 +37,7 @@ public class SendVeriCodeReq extends BaseReq {
     /**
      * 消息类型
      */
-    @ApiModelProperty(value = "消息类型:1保留，2注册，3找回密码，4修改新电话号码，5验证旧电话号码",required = true)
+    @ApiModelProperty(value = "消息类型:1登录，2注册，3找回密码，4修改新电话号码，5验证旧电话号码",required = true)
     private Integer msgType;
@@ -31,4 +31,10 @@ public interface PassportRPC extends BaseService {
     SellerRegisterResp sellerRegister(SellerRegisterReq req);
     LoginResp buyerLogin(LoginReq req);
+
+    boolean sendVeriCodeOfSeller(String mobile,Integer msgType);
+
+    boolean sendVeriCodeOfBuyer(String mobile,Integer msgType);
+
+    boolean verifySellerSmsCode(String mobile, String veriCode);
 }
 package com.diligrp.mobsite.getway.rpc.base.impl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
-import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.rpc.base.BaseService;
 import com.github.kevinsawicki.http.HttpRequest;
+import org.apache.commons.beanutils.PropertyUtilsBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.beans.PropertyDescriptor;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * base
@@ -21,39 +24,42 @@ import com.github.kevinsawicki.http.HttpRequest;
 	@SuppressWarnings("unused")
     private String token="";
 	private String baseUrl;
-	
+
 	public BaseServiceImpl(String token,String baseUrl){
 		this.token = token;
 		this.baseUrl = baseUrl;
 		LOGGER = LoggerFactory.getLogger(this.getClass());
 	}
-	protected <T extends BaseOutput<?>>  T httpGet(String url, Object paramObj, TypeReference<T> type,String sign){
-	    return execute(url, paramObj, type, "GET",sign);
+	protected <T extends BaseOutput<?>>  T httpGet(String url, Object paramObj, TypeReference<T> type){
+	    return execute(url, paramObj, type, "GET");
 	}
-	protected <T extends BaseOutput<?>>  T httpPost(String url, Object paramObj, TypeReference<T> type,String sign){
-	    return execute(url, paramObj, type, "POST",sign);
+	protected <T extends BaseOutput<?>>  T httpPost(String url, Object paramObj, TypeReference<T> type){
+	    return execute(url, paramObj, type, "POST");
 	}
     @SuppressWarnings({ "unchecked", "rawtypes" })
-	private <T extends BaseOutput>  T execute(String url, Object paramObj, TypeReference<T> type,String httpMethod,String sign){
+	private <T extends BaseOutput>  T execute(String url, Object paramObj, TypeReference<T> type,String httpMethod){
         T output=  (T) new BaseOutput();
         HttpRequest request = null;
         if("POST".equalsIgnoreCase(httpMethod)){
             request = HttpRequest.post(baseUrl + url);
+            request.connectTimeout(TIMEOUT);
+            request.readTimeout(TIMEOUT * 10000);
+            request.header("Content-Type", "application/json;charset=utf-8");
+            //request.header("sign", sign);
+            String data=JSON.toJSONString(paramObj);
+            request.send(data);
         }else{
-            request = HttpRequest.get(baseUrl + url);
+            request = HttpRequest.get(baseUrl + url,beanToMap(paramObj),Boolean.TRUE);
         }
-        request.connectTimeout(TIMEOUT);
-        request.readTimeout(TIMEOUT * 10000);
-        request.header("Content-Type", "application/json;charset=utf-8");
-        request.header("sign", sign);
-        String data=JSON.toJSONString(paramObj);
-        request.send(data);
+
         int code = request.code();
         if (code != 200) {
-            output.setCode(ResultCode.BUSINESS_FAILED);
-            output.setResult("http code:"+code +";"+request.message());
+            output.setCode(code);
+            output.setResult(request.message());
         } else {
+            output.setCode(code);
+            output.setResult(request.message());
             String result = request.body();
             if (type != null) {
                 output = JSON.parseObject(result, type);
@@ -63,5 +69,28 @@ import com.github.kevinsawicki.http.HttpRequest;
         }
         return output;
 	}
-    
+
+    //将javabean实体类转为map类型，然后返回一个map类型的值
+    public static Map<String, Object> beanToMap(Object obj) {
+        if(obj instanceof Map){
+            return (Map<String, Object>)obj;
+        }
+        Map<String, Object> params = new HashMap<String, Object>(0);
+        try {
+            PropertyUtilsBean propertyUtilsBean = new PropertyUtilsBean();
+            PropertyDescriptor[] descriptors = propertyUtilsBean.getPropertyDescriptors(obj);
+            for (int i = 0; i < descriptors.length; i++) {
+                String name = descriptors[i].getName();
+                if (!"class".equals(name)) {
+                    Object value = propertyUtilsBean.getNestedProperty(obj, name);
+                    if(null != value){
+                        params.put(name, value);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return params;
+    }
 }
 package com.diligrp.mobsite.getway.rpc.impl;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.diligrp.mobsite.getway.domain.common.Constant;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
+import com.diligrp.mobsite.getway.domain.protocol.login.SendVeriCodeReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
@@ -66,7 +68,7 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         params.put("src", "zadeapp");
         BaseOutput<String> output = null;
         try {
-            output = super.httpPost("/api/login/login.html", params, null,passportSign);
+            output = super.httpPost("/api/login/login.html", params, null);
         } catch (Exception e) {
         	log.error("调用passport用户验证接口失败",e);
             throw new ServiceException();
@@ -128,7 +130,7 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         //    params.put("source", PASSPORT_REGIST_SOURCE_PNR);
         BaseOutput<String> output = null;
         try {
-        	output = super.httpPost("/api/register/buyerRegister.html", params,null, passportSign);
+        	output = super.httpPost("/api/register/buyerRegister.html", params,null);
         } catch (Exception e) {
         	log.error("调用passport注册接口失败",e);
@@ -156,7 +158,7 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     	BaseOutput<String> output = null;
         try {
-        	output = super.httpPost("/api/account/initAccountPwd.html", params,null, passportSign);
+        	output = super.httpPost("/api/forgot/updateSellerPasswordByPhoneNumber", params,null);
         } catch (Exception e) {
         	log.error("调用passport修改密码接口失败",e);
@@ -170,31 +172,33 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     }
     @Override
-    public SellerRegisterResp sellerRegister(SellerRegisterReq req) {
+    public SellerRegisterResp  sellerRegister(SellerRegisterReq req) {
         Map<String,String> params = new HashMap<String, String>();
-        params.put("mobile", req.getMobile());
-        params.put("password", req.getPassword());
-        //BaseOutput<String> output = null;
-        //try {
-        //    output = super.httpPost("/api/register/buyerRegister.html", params,null, passportSign);
-        //
-        //} catch (Exception e) {
-        //    log.error("调用passport注册接口失败",e);
-        //    throw new ServiceException();
-        //}
-        //
+        params.put("mobilePhone", req.getMobile());
+        params.put("accountPwd", req.getPassword());
+        params.put("validCode",req.getVeriCode());
+        params.put("appType",req.getAppType()+"");
+        BaseOutput<String> output = null;
+        try {
+            output = super.httpPost("/api/register/sellerRegister", params,null);
+
+        } catch (Exception e) {
+            log.error("调用passport注册接口失败",e);
+            throw new ServiceException();
+        }
+
         SellerRegisterResp resp = new SellerRegisterResp();
-        //JSONObject jsonBody = JSONObject.parseObject(output.getData());
-        //int code = jsonBody.getIntValue("code");
-        ////成功
-        //if(code == ResultCode.SUCCESS){
-        //    resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
-        //}else{
-        //    resp.setResultFlag(UserRegisterResp.RESULT_FLAG_FAILED);
-        //}
-        //resp.setMsg(jsonBody.getString("msg"));
-        //
-        //log.info("注册用户信息:msg={}"+jsonBody.getString("msg"));
+        JSONObject jsonBody = JSONObject.parseObject(output.getData());
+        int code = jsonBody.getIntValue("code");
+        //成功
+        if(code == ResultCode.SUCCESS){
+            resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
+        }else{
+            resp.setResultFlag(UserRegisterResp.RESULT_FLAG_FAILED);
+        }
+        resp.setMsg(jsonBody.getString("msg"));
+
+        log.info("注册用户信息:msg={}"+jsonBody.getString("msg"));
         return resp;
     }
@@ -208,7 +212,7 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         params.put("src", "zadeapp");
         BaseOutput<String> output = null;
         try {
-            output = super.httpPost("/api/login/login.html", params, null,passportSign);
+            output = super.httpPost("/api/login/login.html", params, null);
         } catch (Exception e) {
             log.error("调用passport用户验证接口失败",e);
             throw new ServiceException();
@@ -272,4 +276,78 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         return resp;
     }
+    @Override
+    public boolean sendVeriCodeOfSeller(String mobile,Integer msgType) {
+        BaseOutput<String> output = null;
+        TypeReference<BaseOutput<Integer>> type = new TypeReference<BaseOutput<Integer>>() {
+        };
+        try {
+            if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
+                output = super.httpGet("/api/register/sendSellerRegisterSMS/"+mobile, null, new TypeReference<BaseOutput<String>>(){} );
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
+                output = super.httpGet("/api/forgot/sendSellerForgotPasswordSMS/"+mobile,  null, new TypeReference<BaseOutput<String>>(){} );
+            }
+        } catch (Exception e) {
+            log.error("调用passport用户验证接口失败",e);
+            throw new ServiceException();
+        }
+
+        if (output.getCode()!= 200){
+            log.error("调用passport用户验证接口失败[mobile=,msg=]",mobile,output.getResult());
+            throw new ServiceException(output.getCode(),output.getResult());
+        }
+
+        return output.getCode().equals("200");
+    }
+
+
+    @Override
+    public boolean sendVeriCodeOfBuyer(String mobile,Integer msgType) {
+        BaseOutput<String> output = null;
+        try {
+            if (msgType== SendVeriCodeReq.MSG_TYPE_LOGIN){
+                output = super.httpGet("/api/login/sendSMS/"+mobile, null, null);
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
+                output = super.httpGet("/api/register/sendBuyerRegisterSMS/"+mobile, null, null);
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
+                output = super.httpGet("/api/forgot/sendBuyerForgotPasswordSMS/"+mobile, null, null);
+            }
+        } catch (Exception e) {
+            log.error("调用passport用户验证接口失败",e);
+            throw new ServiceException();
+        }
+
+        if (output.getCode()!= 200){
+            log.error("调用passport用户验证接口失败[mobile=,msg=]",mobile,output.getResult());
+            throw new ServiceException(output.getCode(),output.getResult());
+        }
+
+        return output.getCode().equals("200");
+    }
+
+    @Override
+    public boolean verifySellerSmsCode(String mobile, String veriCode) {
+        BaseOutput<String> output = null;
+        Map<String,String> params = new HashMap<String, String>();
+        params.put("phoneNumber", mobile);
+        params.put("code", veriCode);
+        try {
+            output = super.httpPost("/api/forgot/verifySellerSmsCode", params, null);
+        } catch (Exception e) {
+            log.error("调用passport用户验证接口失败",e);
+            throw new ServiceException();
+        }
+
+        if (output.getCode()!= 200){
+            log.error("调用passport用户验证接口失败[mobile=,msg=]",mobile,output.getResult());
+            throw new ServiceException(output.getCode(),output.getResult());
+        }
+
+        return output.getCode().equals("200");
+    }
+
+
 }
@@ -60,16 +60,11 @@ public class SellerRPCImpl implements SellerRPC {
             throw new ServiceException();
         }
-        if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+        if (output==null||!output.getCode().equals("200")){
             logger.error("手机号查询卖家接口失败：[userId={},code={},result={}]",new Object[]{mobile,output.getCode(),output.getResult()});
             throw new ServiceException();
         }
         flag = !Validator.isNull(output.getData());
-        if(flag){
-            logger.info("success：电话号码没有被注册：mobile={}",mobile);
-        }else {
-            logger.info("error:电话号码已经被注册：mobile={}",mobile);
-        }
         return flag;
     }
@@ -158,12 +153,12 @@ public class SellerRPCImpl implements SellerRPC {
         try {
             output = userClient.getSellerInfoService().getSellerInfoByMobilePhone(accountName);
         } catch (Exception e) {
-            logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
+            logger.error("调用手机号查询卖家接口挂掉：msg={}",e.getMessage());
             throw new ServiceException();
         }
         if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
-            logger.error("手机号查询买家接口失败：[userId={},code={},result={}]",new Object[]{accountName,output.getCode(),output.getResult()});
+            logger.error("手机号查询卖家接口失败：[userId={},code={},result={}]",new Object[]{accountName,output.getCode(),output.getResult()});
             throw new ServiceException();
         }
@@ -49,7 +49,7 @@ public class StationMsgRPCImpl extends BaseServiceImpl implements StationMsgRPC 
         params.put("userId", req.getUserId().toString());
         BaseOutput<String> output = null;
         try {
-        	output = super.httpPost("/messages/readAllByGroup.do", params, null,null);
+        	output = super.httpPost("/messages/readAllByGroup.do", params, null);
         } catch (Exception e) {
         	log.error("调用标识站内信息接口失败",e);
             throw new ServiceException();
@@ -90,7 +90,7 @@ public class StationMsgRPCImpl extends BaseServiceImpl implements StationMsgRPC 
 		params.put("groupCode",req.getGroupType());
         BaseOutput<String> output = null;
         try {
-        	output = super.httpPost("/messages.do", params, null,null);
+        	output = super.httpPost("/messages.do", params, null);
         } catch (Exception e) {
         	log.error("调用获取站内信列表接口失败",e);
             throw new ServiceException();
@@ -184,7 +184,7 @@ public class StationMsgRPCImpl extends BaseServiceImpl implements StationMsgRPC 
         params.put("userId", userid.toString());
         BaseOutput<String> output = null;
         try {
-        	output = super.httpPost("/messages/unRead.do", params, null,null);
+        	output = super.httpPost("/messages/unRead.do", params, null);
         } catch (Exception e) {
         	log.error("调用获取站内信未读信息接口失败",e);
             throw new ServiceException();
@@ -218,7 +218,7 @@ public class StationMsgRPCImpl extends BaseServiceImpl implements StationMsgRPC 
 		params.put("userId", req.getUserId().toString());
 		BaseOutput<String> output = null;
 		try {
-			output = super.httpPost("/groupedMessage.do", params, null,null);
+			output = super.httpPost("/groupedMessage.do", params, null);
 		} catch (Exception e) {
 			log.error("调用站内信首页分组接口失败",e);
 			throw new ServiceException("调用站内信首页分组失败");
@@ -143,7 +143,7 @@ public class UserServiceImpl implements UserService {
     public CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req) {
         CheckVeriCodeResp resp = new CheckVeriCodeResp();
-        checkVeriCode(req.getVeriCode(), req.getMobile(),req.getMsgType());
+        //checkVeriCode(req.getVeriCode(), req.getMobile(),req.getMsgType());
         return resp;
     }
@@ -168,7 +168,6 @@ public class UserServiceImpl implements UserService {
             redisUtil.setStringByExpire(redisKey, String.valueOf(veriCode), RedisKey.USER_SEND_VERICODE_EXPIRE_TIME);
         }
-        if (!Validator.isNull(msgType) && msgType != SendVeriCodeReq.MSG_TYPE_DEFAULT) {
             if (msgType==SendVeriCodeReq.MSG_TYPE_REGISTER) {
                 //注册，电话号码已经存在
                 if(existFlag){
@@ -203,11 +202,7 @@ public class UserServiceImpl implements UserService {
             }
             DataDictionaryResp dataDic = configRPC.getMessageTemplate(Constant.DIC_SMS_CONTENT);
             message = dataDic.getValueByCode(code).getRemark().replace("{code}", veriCode);
-        }else {
-            message = Constant.SMS_CONTENT_DEFAULT.replace("{code}", veriCode);
-        }
-        messageRPC.sendSMS(mobile, message);
         resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
@@ -31,6 +31,9 @@ public interface SellerUserService {
     SendVeriCodeResp sendVeriCode(SendVeriCodeReq req);
+
+
+
     CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req);
     CheckMobileResp checkMobile(CheckMobileReq req);
@@ -4,23 +4,23 @@ import com.alibaba.fastjson.JSONObject;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
 import com.diligrp.mobsite.getway.domain.RegisterNoMapper;
 import com.diligrp.mobsite.getway.domain.common.Constant;
-import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.login.*;
-import com.diligrp.mobsite.getway.domain.protocol.register.*;
+import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileReq;
+import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileResp;
+import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterReq;
+import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
 import com.diligrp.mobsite.getway.domain.protocol.user.*;
 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
 import com.diligrp.mobsite.getway.rpc.*;
 import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil;
-import com.diligrp.mobsite.getway.service.common.utils.PassportUtils;
 import com.diligrp.mobsite.getway.service.seller.SellerUserService;
 import com.diligrp.website.util.redis.impl.RedisUtilImpl;
 import com.diligrp.website.util.security.Validator;
-import com.diligrp.website.web.interfaces.domain.output.DataDictionaryResp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -139,68 +139,27 @@ public class SellerUserServiceImpl implements SellerUserService {
 		String mobile = req.getMobile();
 		boolean existFlag = !sellerRPC.checkMobile(mobile);
-
 		Integer msgType = req.getMsgType();
-		String code = null;
-		String message = null;
-
-		String redisKey = redisUtil.makeKey(RedisKey.USER_AUTH_CODE + String.valueOf(msgType), mobile);
-		String veriCode = redisUtil.getString(redisKey);
+		if (Validator.isNull(msgType)) {
-		if (Validator.isEmpty(veriCode)) {
-			//生成验证码
-			veriCode = PassportUtils.generateMobileRandomNumber();
-			redisUtil.setStringByExpire(redisKey, String.valueOf(veriCode), RedisKey.USER_SEND_VERICODE_EXPIRE_TIME);
 		}
-
-		if (!Validator.isNull(msgType) && msgType != SendVeriCodeReq.MSG_TYPE_DEFAULT) {
-			if (msgType==SendVeriCodeReq.MSG_TYPE_REGISTER) {
-				//注册，电话号码已经存在
-				if(existFlag){
-					throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_MOBILE_EXIST);
-				}
-				String passkey = configRPC.getSystemConfig(Constant.USER_REGISTER_PASS_KEY);
-				resp.setPassKey(passkey);
-
-				messageRPC.sendSMSMsg(mobile, veriCode, Constant.SMS_CONTENT_ACCOUNT_REGISTRATION);
-				resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
-				return resp;
-			}else if(msgType==SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD) {
-				//找回密码，电话号码没有存在
-				if (!existFlag) {
-					throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
-				}
-				messageRPC.sendSMSMsg(mobile, veriCode,Constant.SMS_CONTENT_RETRIEVE_PASSWORD);
-				resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
-				return resp;
-			}else if(msgType==SendVeriCodeReq.MSG_TYPE_MODIFY_NEW_MOBILE) {
-				//修改手机号，电话号码已经存在
-				if (existFlag) {
-					throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_EXIST);
-				}
-				code = Constant.SMS_CONTENT_MODIFY_OLD_PHONE;
-			}else if (msgType==SendVeriCodeReq.MSG_TYPE_CHECK_OLD_MOBILE) {
-				//验证旧的手机号，手机不存在
-				if (!existFlag) {
-					throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
-				}
-				code = Constant.SMS_CONTENT_MODIFY_OLD_PHONE;
-			}
-			DataDictionaryResp dataDic = configRPC.getMessageTemplate(Constant.DIC_SMS_CONTENT);
-			message = dataDic.getValueByCode(code).getRemark().replace("{code}", veriCode);
-		}else {
-			message = Constant.SMS_CONTENT_DEFAULT.replace("{code}", veriCode);
-		}
-
-		messageRPC.sendSMS(mobile, message);
-
+		passportRPC.sendVeriCodeOfSeller(req.getMobile(),req.getMsgType());
+		//验证旧的手机号，手机不存在
+		//if (!existFlag) {
+		//	throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
+		//}
 		resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
 		return resp;
 	}
+
+
 	@Override
 	public CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req) {
+		CheckVeriCodeResp resp = null;
+		boolean ispass = passportRPC.verifySellerSmsCode(req.getMobile(),req.getVeriCode());
+
 		return null;
 	}
@@ -223,7 +182,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 		Map<String,String> params = new HashMap<String, String>();
 		params.put("password", req.getPassword());
-		params.put("accountId", String.valueOf(userId));
+		params.put("phoneNumber", req.getAccountName());
 		String result = passportRPC.modifyPwd(params);
@@ -240,7 +199,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 			return resp;
 		}else {
 			//修改成功，退出所有账号信息
-			String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SELLER+String.valueOf(userId));
+			String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(userId));
 			redisUtil.deleteByKey(cookieRedisKey);
 		}
@@ -251,71 +210,11 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Override
 	public SellerRegisterResp sellerRegister(SellerRegisterReq req) {
-		SellerRegisterResp resp = new SellerRegisterResp();
-
-		//手机号码和账号验证、验证码
-		if (!checkRegisterInfo( req)) {
-		   return resp;
-		}
-
-		resp = passportRPC.sellerRegister(req);
+		SellerRegisterResp resp =  passportRPC.sellerRegister(req);
 		return resp;
 	}
-	/**
-	 * 检测注册信息是否正确
-	 * 1.电话号码
-	 * 2.账号，会员名
-	 * 3.验证码
-	 * @createTime 2014年10月31日 下午2:37:16
-	 * @author weili
-	 */
-	private boolean checkRegisterInfo(  SellerRegisterReq req){
-		if(!sellerRPC.checkMobile(req.getMobile())){
-			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_EXIST);
-		}
-		//验证万能验证码
-		String passkey = configRPC.getSystemConfig(Constant.USER_REGISTER_PASS_KEY);
-		if (req.getVeriCode().equals(passkey)) {
-			return true;
-		}
-
-		checkVeriCode(req.getVeriCode(), req.getMobile(),SendVeriCodeReq.MSG_TYPE_REGISTER);
-
-		return true;
-	}
-
-	/**
-	 * 根据验证码和电话号码，验证收到的验证码
-	 *
-	 * @param code
-	 * @param mobile
-	 * @return
-	 * @createTime 2014年8月28日 下午5:44:48
-	 * @author weili
-	 */
-	private void checkVeriCode(String code, String mobile,Integer msgType) {
-
-		String redisKey = redisUtil.makeKey(RedisKey.USER_AUTH_CODE + String.valueOf(msgType), mobile);
-
-		String redisCode = redisUtil.getString(redisKey);
-
-		if(Validator.isEmpty(code)){
-			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_EMPTY);
-		}
-
-		//验证码为空
-		if (Validator.isEmpty(redisCode)) {
-			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_OVERTIME);
-		}
-
-		//验证码不为空，并且和redis中的验证码相同
-		if (!code.equals(redisCode)) {
-			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_WRONG);
-		}
-
-	}
 	@Override
@@ -92,10 +92,13 @@
 				<project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>
 				<project.sms.webchina.userName>itly</project.sms.webchina.userName>
 				<project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>
-				
+				<website.websiteClient.baseUrl>http://manweb.zandeapp.com/</website.websiteClient.baseUrl>
+				<website.websiteClient.token>token</website.websiteClient.token>
+
+
 				<!-- interface stationmsg -->
 				<website.stationmsg.baseUrl>http://message.zandeapp.com/api</website.stationmsg.baseUrl>
 				<website.stationmsg.token>token</website.stationmsg.token>
@@ -151,7 +151,7 @@ public class SellerUserController extends BaseApiController {
      * @createTime 2014年8月24日 下午10:55:03
      * @author weili
      */
-    @ApiOperation(value = "验证手机号和验证码", httpMethod = "POST" , notes = "验证手机收到的验证码",response = CheckVeriCodeResp.class)
+    @ApiOperation(value = "忘记密码:验证手机号和验证码", httpMethod = "POST" , notes = "验证手机收到的验证码",response = CheckVeriCodeResp.class)
     @RequestMapping(value = "/checkAuthCode",method = RequestMethod.POST)
     @ResponseBody
     public void checkAuthCode(@RequestBody CheckVeriCodeReq temp){
@@ -49,9 +49,9 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
         }
         //检测token信息
-        if (!checkTokenInfo(body,request)) {
-            return false;
-        }
+        //if (!checkTokenInfo(body,request)) {
+        //    return false;
+        //}
         return super.preHandle(request, response, handler);
     }
@@ -23,8 +23,8 @@
     <bean id="myAppClient" class="com.b2c.myapp.sdk.MyAppClient">
-        <constructor-arg name="token" value="${website.user.token}"/>
-        <constructor-arg name="baseUrl" value="${website.user.baseUrl}"/>
+        <constructor-arg name="token" value="token"/>
+        <constructor-arg name="baseUrl" value="${project.shop.url}"/>
     </bean>
     <bean id="websiteClient" class="com.diligrp.website.web.interfaces.WebsiteClient">