登录注册接口开发

weiliwhereareyou@163.com
1 parent 5f944c8a
Showing 14 changed files with 90 additions and 55 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/Constant.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/SendVeriCodeReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/SendVeriCodeResp.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-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/impl/SellerUserServiceImpl.java
mobsite-getway-web/pom.xml
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/base/version/VersionController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/UserController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/filter/LoginTimeoutInterceptor.java
mobsite-getway-web/src/main/resources/mybatis/sqlmap/RegisterNoMapperDao.xml
mobsite-getway-web/src/main/resources/spring-web.xml
@@ -170,8 +170,8 @@ public class Constant {
 	/**
 	 * 代购订单使用
 	 */
-	public static final Long OPERATOR_ROLE_BUYER = 10L; //操作人角色  10买家
-    public static final Long OPERATOR_ROLE_SELLER = 20L; //操作人角色  20卖家
+	public static final Integer OPERATOR_ROLE_BUYER = 10; //操作人角色  10买家
+    public static final Integer OPERATOR_ROLE_SELLER = 20; //操作人角色  20卖家
     /** 是否选择代找物流:1-是，2-否*/
     public static final Integer QUERYPARAM_ISAGENTLOGISTICS_YES = 1;
     public static final Integer QUERYPARAM_ISAGENTLOGISTICS_NO = 0;
@@ -37,7 +37,7 @@ public class SendVeriCodeReq extends BaseReq {
     /**
      * 消息类型
      */
-    @ApiModelProperty(value = "消息类型:1登录，2注册，3找回密码",required = true)
+    @ApiModelProperty(value = "消息类型:1验证码登录，2注册，3找回密码",required = true)
     private Integer msgType;
@@ -30,11 +30,14 @@ public class SendVeriCodeResp extends BaseResp {
      */
     @ApiModelProperty(value = "发送结果:1成功")
     private Integer sendCode = SEND_CODE_ERROR;
-    ///**
-    // * 万能验证码
-    // */
-    //@ApiModelProperty(value = "万能验证码")
-    //private String passKey;
+    /**
+     * 验证码
+     */
+    @ApiModelProperty(value = "验证码（测试用）")
+    private String passKey;
+
+
+
     /**
      * get value of SendVeriCodeResp.sendCode
@@ -59,4 +62,11 @@ public class SendVeriCodeResp extends BaseResp {
     }
+    public String getPassKey() {
+        return passKey;
+    }
+
+    public void setPassKey(String passKey) {
+        this.passKey = passKey;
+    }
 }
@@ -7,6 +7,7 @@ import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
+import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.rpc.base.BaseService;
@@ -31,9 +32,9 @@ public interface PassportRPC extends BaseService {
     BuyerInfoOutput buyerLogin(LoginReq req);
-    boolean sendVeriCodeOfSeller(String mobile,Integer msgType);
+    BaseOutput<String> sendVeriCodeOfSeller(String mobile, Integer msgType);
-    boolean sendVeriCodeOfBuyer(String mobile,Integer msgType);
+    BaseOutput<String> sendVeriCodeOfBuyer(String mobile,Integer msgType);
     boolean verifySellerSmsCode(String mobile, String veriCode);
@@ -54,12 +54,9 @@ import java.util.Map;
         }
         int code = request.code();
-        if (code != 200) {
-            output.setCode(code);
-            output.setResult(request.message());
-        } else {
-            output.setCode(code);
-            output.setResult(request.message());
+        output.setCode(code);
+        output.setResult(request.message());
+        if (code == 200) {
             String result = request.body();
             if (type != null) {
                 output = JSON.parseObject(result, type);
@@ -72,6 +69,9 @@ import java.util.Map;
     //将javabean实体类转为map类型，然后返回一个map类型的值
     public static Map<String, Object> beanToMap(Object obj) {
+        if(obj==null){
+            return null;
+        }
         if(obj instanceof Map){
             return (Map<String, Object>)obj;
         }
@@ -93,4 +93,6 @@ import java.util.Map;
         }
         return params;
     }
+
+
 }
@@ -201,7 +201,7 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     @Override
-    public boolean sendVeriCodeOfSeller(String mobile,Integer msgType) {
+    public BaseOutput<String> sendVeriCodeOfSeller(String mobile,Integer msgType) {
         BaseOutput<String> output = null;
         TypeReference<BaseOutput<Integer>> type = new TypeReference<BaseOutput<Integer>>() {
         };
@@ -232,22 +232,24 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
             throw new ServiceException(output.getCode(),output.getResult());
         }
-        return output.getCode().equals(com.b2c.myapp.common.utils.ResultCode.OK);
+        System.out.println("验证码 = " + output.getData());
+
+        return output;
     }
     @Override
-    public boolean sendVeriCodeOfBuyer(String mobile,Integer msgType) {
+    public BaseOutput<String> 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);
+                output = super.httpGet("/api/login/sendSMS/"+mobile, null, new TypeReference<BaseOutput<String>>(){});
             }
             if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
-                output = super.httpGet("/api/register/sendBuyerRegisterSMS/"+mobile, null, null);
+                output = super.httpGet("/api/register/sendBuyerRegisterSMS/"+mobile, null, new TypeReference<BaseOutput<String>>(){});
             }
             if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
-                output = super.httpGet("/api/forgot/sendBuyerForgotPasswordSMS/"+mobile, null, null);
+                output = super.httpGet("/api/forgot/sendBuyerForgotPasswordSMS/"+mobile, null, new TypeReference<BaseOutput<String>>(){});
             }
         } catch (Exception e) {
@@ -278,7 +280,8 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
             throw new ServiceException(output.getCode(),output.getResult());
         }
-        return output.getCode().equals(com.b2c.myapp.common.utils.ResultCode.OK);
+        System.out.println("验证码（买家） = " + output.getData());
+        return output;
     }
     @Override
@@ -16,6 +16,7 @@ import com.diligrp.mobsite.getway.domain.protocol.user.model.RegisterNoPlatform;
 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
 import com.diligrp.mobsite.getway.rpc.PassportRPC;
 import com.diligrp.mobsite.getway.rpc.UserRPC;
+import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.service.buyer.user.UserService;
 import com.diligrp.website.util.redis.impl.RedisUtilImpl;
 import com.diligrp.website.util.security.Validator;
@@ -69,6 +70,7 @@ public class UserServiceImpl implements UserService {
         //缓存用户信息
         cacheUserInfo(userInfo.getId(),req.getDeviceId());
+
         if (Validator.isEmpty(req.getRegisterNo())){
             logger.error("卖家登录激光推送id为空[userId=]",userInfo.getId());
         }else{
@@ -201,9 +203,10 @@ public class UserServiceImpl implements UserService {
                 throw new ServiceException(ErrorMessage.USER_MOBILE_EXIST);
             }
         }
-        passportRPC.sendVeriCodeOfBuyer(mobile,req.getMsgType());
+        BaseOutput<String> out = passportRPC.sendVeriCodeOfBuyer(mobile, req.getMsgType());
         SendVeriCodeResp resp = new SendVeriCodeResp();
         resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+        resp.setPassKey(out.getData());
         return resp;
     }
@@ -19,6 +19,7 @@ import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
 import com.diligrp.mobsite.getway.rpc.PassportRPC;
 import com.diligrp.mobsite.getway.rpc.SellerRPC;
 import com.diligrp.mobsite.getway.rpc.ShopRPC;
+import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.service.seller.SellerUserService;
 import com.diligrp.website.util.redis.impl.RedisUtilImpl;
 import com.diligrp.website.util.security.Validator;
@@ -191,9 +192,10 @@ public class SellerUserServiceImpl implements SellerUserService {
 				throw new ServiceException(ErrorMessage.USER_MOBILE_EXIST);
 			}
 		}
-		passportRPC.sendVeriCodeOfSeller(mobile,req.getMsgType());
+		BaseOutput<String> out = passportRPC.sendVeriCodeOfSeller(mobile, req.getMsgType());
 		SendVeriCodeResp resp = new SendVeriCodeResp();
 		resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+		resp.setPassKey(out.getData());
 		return resp;
 	}
@@ -37,7 +37,7 @@
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<version>2.2</version>
 				<configuration>
-					<port>8082</port>
+					<port>8080</port>
 					<url>http://10.28.11.181:8080/manager</url>
                     <username>gateway</username>
 					<password>123456</password>
@@ -26,7 +26,7 @@ import javax.annotation.Resource;
  */
 @Controller
 @RequestMapping("/mobsiteApp/version/")
-@Api(value = "mobsiteApp/version", description = "版本接口")
+@Api(value = "mobsiteApp-version", description = "版本接口")
 public class VersionController extends BaseApiController{
 	@Resource
@@ -147,7 +147,7 @@ public class UserController extends BaseApiController {
     @ApiOperation(value = "发送验证码到手机", httpMethod = "POST" , notes = "发送验证码到手机",response = SendVeriCodeResp.class)
     @RequestMapping(value = "/sendAuthCode",method = RequestMethod.POST)
     @ResponseBody
-    public void sendAuthCode(@RequestBody   SendVeriCodeReq temp){
+    public void sendAuthCode(@RequestBody SendVeriCodeReq temp){
         SendVeriCodeReq req= super.getRequest(SendVeriCodeReq.class);
         try {
             BeanValidator.validator(req);
 package com.diligrp.mobsite.getway.web.filter;
-import com.diligrp.mobsite.getway.domain.common.*;
-import com.diligrp.mobsite.getway.domain.protocol.*;
+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.protocol.BaseReq;
+import com.diligrp.mobsite.getway.domain.protocol.Token;
 import com.diligrp.mobsite.getway.web.utils.WebContent;
 import com.diligrp.website.util.redis.RedisUtil;
 import com.diligrp.website.util.security.Validator;
 import org.nutz.json.Json;
-import org.slf4j.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 /**
  * <B>Description</B> 验证用户超时检测 <br />
@@ -49,9 +55,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);
     }
@@ -83,10 +89,18 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
             return false;
         }
-        //登录redisKey=userId-deviceId
-//        String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, userId + Constant.COMMON_DASH + baseReq.getDeviceId());
+
+        String regularStr = "";
+        if (token.getUserRole() == Constant.OPERATOR_ROLE_BUYER){
+            regularStr = Constant.USER_ROLE_SIGN_BUYER;
+        }else if (token.getUserRole() == Constant.OPERATOR_ROLE_SELLER){
+            regularStr = Constant.USER_ROLE_SIGN_SELLER;
+        }else {
+            log.error("请求参数userRole异常");
+            return false;
+        }
         //登录排斥验证
-        String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, token.getUserRole()+String.valueOf(userId));
+        String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, regularStr+String.valueOf(userId));
         String loginValue = redisUtil.getString(loginKey);
         if(Validator.isEmpty(loginValue) || !loginValue.equals(String.valueOf(userId))) {
             log.error("用户没有登录请重新登录[userId={}]",userId);
@@ -95,7 +109,7 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
         }
         //登录设备排斥验证
-        String loginDevicedKey = redisUtil.makeKey(RedisKey.USER_DEVICEID, token.getUserRole()+String.valueOf(userId));
+        String loginDevicedKey = redisUtil.makeKey(RedisKey.USER_DEVICEID, regularStr+String.valueOf(userId));
         String loginDevicedValue = redisUtil.getString(loginDevicedKey);
         if (!Validator.isNull(baseReq.getDeviceId())) {
             if(Validator.isEmpty(loginDevicedValue) || !loginDevicedValue.equals(baseReq.getDeviceId())) {
@@ -106,7 +120,7 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
         }
         //登录延时
-        logoutDelay(userId,baseReq.getDeviceId(),token.getUserRole());
+        logoutDelay(userId,baseReq.getDeviceId(),regularStr);
         return true;
     }
@@ -115,10 +129,10 @@ public class LoginTimeoutInterceptor extends HandlerInterceptorAdapter {
      * 延迟登录超时时间
      * @param userId 用户ID
      */
-    private void logoutDelay(long userId,String deviceId,Integer userRole) {
+    private void logoutDelay(long userId,String deviceId,String regularStr) {
         try {
             //cookievalue的rediskey
-        	String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, userRole+String.valueOf(userId));
+        	String loginKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, regularStr+String.valueOf(userId));
             //缓存cookievalue
             redisUtil.setStringByExpire(loginKey, String.valueOf(userId), loginExpireTime);
@@ -92,7 +92,7 @@
             and userid = #{param.userid}
             </if>
             <if test="param.userType != null and param.userType != ''">
-                and userType = #{param.userType}
+                and user_type = #{param.userType}
             </if>
             <if test="param.registerNo != null and param.registerNo != ''">
             and register_no = #{param.registerNo}
@@ -133,7 +133,7 @@
                     and userid = #{param.userid}
                 </if>
                 <if test="param.userType != null and param.userType != ''">
-                    and userType = #{param.userType}
+                    and user_type = #{param.userType}
                 </if>
                 <if test="param.registerNo != null and param.registerNo != ''">
                     and register_no = #{param.registerNo}
@@ -180,7 +180,7 @@
                 and userid = #{param.userid}
             </if>
             <if test="param.userType != null and param.userType != ''">
-                and userType = #{param.userType}
+                and user_type = #{param.userType}
             </if>
             <if test="param.registerNo != null and param.registerNo != ''">
                 and register_no = #{param.registerNo}
@@ -225,7 +225,7 @@
 			</foreach>
 		</if>
         <if test="param.userType != null and param.userType != ''">
-            and userType = #{param.userType}
+            and user_type = #{param.userType}
         </if>
 		<if test="device_type != null and device_type != ''">
 			and device_type = #{device_type}
@@ -104,15 +104,15 @@
 			<!--卖家-->
-			<mvc:exclude-mapping path="/mobsiteApp/user/buyerLogin"/>
-			<mvc:exclude-mapping path="/mobsiteApp/user/buyerLogins"/>
-			<mvc:exclude-mapping path="/mobsiteApp/user/sendAuthCode"/>
-			<mvc:exclude-mapping path="/mobsiteApp/user/checkAuthCode"/>
-			<mvc:exclude-mapping path="/mobsiteApp/user/buyerRegister"/>
-			<mvc:exclude-mapping path="/mobsiteApp/user/buyerRegisters"/>
-			<mvc:exclude-mapping path="/mobsiteApp/user/loginForAuth"/>
-			<mvc:exclude-mapping path="/mobsiteApp/user/logout"/>
-			<mvc:exclude-mapping path="/mobsiteApp/user/modifyPwd"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/sellerLogin"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/sellerLogins"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/sendAuthCode"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/checkAuthCode"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/checkMobile"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/sellerRegister"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/sellerRegisters"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/logout"/>
+			<mvc:exclude-mapping path="/mobsiteApp/seller/user/modifyPwd"/>
              <bean class="com.diligrp.mobsite.getway.web.filter.LoginTimeoutInterceptor"/>
         </mvc:interceptor>
  <!--       <mvc:interceptor>