b2c / gateway · Commits

Commit e2b6c603c57eaf0f35bb47a829b74a6703ac748a

Authored by weiliwhereareyou@163.com
1 parent 278c7082
build: skipped

初始化工程-接口定义

Inline Side-by-side
Showing 40 changed files with 63 additions and 177 deletions
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/CmsRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/CmsRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.diligrp.cms.domain.*; 3 import com.diligrp.cms.domain.*;
4 4
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/ConfigRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ConfigRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.diligrp.website.web.interfaces.domain.output.*; 3 import com.diligrp.website.web.interfaces.domain.output.*;
4 4
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/GoodsRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/GoodsRPC.java
  View file @e2b6c60
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 * @date: 2014年8月14日 上午11:20:17 7 * @date: 2014年8月14日 上午11:20:17
8 * @version: V1.0 8 * @version: V1.0
9 */ 9 */
10 -package com.diligrp.mobsite.getway.rpc.buyer; 10 +package com.diligrp.mobsite.getway.rpc;
11 11
12 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper; 12 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
13 import com.diligrp.titan.sdk.domain.Attribute; 13 import com.diligrp.titan.sdk.domain.Attribute;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/MarketRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/MarketRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.diligrp.mobsite.getway.domain.protocol.Market; 3 import com.diligrp.mobsite.getway.domain.protocol.Market;
4 import com.diligrp.mobsite.getway.domain.protocol.market.GetDeliveryByCodeReq; 4 import com.diligrp.mobsite.getway.domain.protocol.market.GetDeliveryByCodeReq;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/MessageRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/MessageRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 /** 3 /**
4 * <B>Description</B> <br /> 4 * <B>Description</B> <br />
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/OrderRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/OrderRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.b2c.orders.domain.client.dto.request.OrderListRequestDto; 3 import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
4 import com.b2c.orders.domain.client.dto.response.OrderListResponseDto; 4 import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/PassportRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/PassportRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq; 3 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
4 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq; 4 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/SellerRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/SellerRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.seller; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput; 3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
4 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput; 4 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/ShopRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ShopRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory; 3 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
4 import com.diligrp.mobsite.getway.domain.protocol.ShopIntroduction; 4 import com.diligrp.mobsite.getway.domain.protocol.ShopIntroduction;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/StationMsgRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/StationMsgRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.diligrp.mobsite.getway.domain.protocol.msg.*; 3 import com.diligrp.mobsite.getway.domain.protocol.msg.*;
4 import com.diligrp.mobsite.getway.rpc.base.BaseService; 4 import com.diligrp.mobsite.getway.rpc.base.BaseService;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/StoreRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/StoreRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.diligrp.mobsite.getway.domain.protocol.common.UploadFileResp; 3 import com.diligrp.mobsite.getway.domain.protocol.common.UploadFileResp;
4 4
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/UserRPC.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/UserRPC.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer; 1 +package com.diligrp.mobsite.getway.rpc;
2 2
3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput; 3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
4 import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct; 4 import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/CmsRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/CmsRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.diligrp.cms.domain.*; 4 import com.diligrp.cms.domain.*;
5 import com.diligrp.cms.sdk.CmsClient; 5 import com.diligrp.cms.sdk.CmsClient;
6 import com.diligrp.mobsite.getway.domain.except.ServiceException; 6 import com.diligrp.mobsite.getway.domain.except.ServiceException;
7 -import com.diligrp.mobsite.getway.rpc.buyer.CmsRPC; 7 +import com.diligrp.mobsite.getway.rpc.CmsRPC;
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
9 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/ConfigRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ConfigRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.diligrp.mobsite.getway.domain.common.Constant; 3 import com.diligrp.mobsite.getway.domain.common.Constant;
4 import com.diligrp.mobsite.getway.domain.common.RedisKey; 4 import com.diligrp.mobsite.getway.domain.common.RedisKey;
5 import com.diligrp.mobsite.getway.domain.except.ServiceException; 5 import com.diligrp.mobsite.getway.domain.except.ServiceException;
6 -import com.diligrp.mobsite.getway.rpc.buyer.ConfigRPC; 6 +import com.diligrp.mobsite.getway.rpc.ConfigRPC;
7 import com.diligrp.website.util.redis.RedisUtil; 7 import com.diligrp.website.util.redis.RedisUtil;
8 import com.diligrp.website.util.security.Validator; 8 import com.diligrp.website.util.security.Validator;
9 import com.diligrp.website.web.interfaces.WebsiteClient; 9 import com.diligrp.website.web.interfaces.WebsiteClient;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/GoodsRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/GoodsRPCImpl.java
  View file @e2b6c60
@@ -7,14 +7,14 @@ @@ -7,14 +7,14 @@
7 * @date: 2014年8月14日 上午11:21:21 7 * @date: 2014年8月14日 上午11:21:21
8 * @version: V1.0 8 * @version: V1.0
9 */ 9 */
10 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 10 +package com.diligrp.mobsite.getway.rpc.impl;
11 11
12 import com.diligrp.mobsite.getway.domain.common.ErrorMessage; 12 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
13 import com.diligrp.mobsite.getway.domain.common.RedisKey; 13 import com.diligrp.mobsite.getway.domain.common.RedisKey;
14 import com.diligrp.mobsite.getway.domain.common.ResultCode; 14 import com.diligrp.mobsite.getway.domain.common.ResultCode;
15 import com.diligrp.mobsite.getway.domain.except.ServiceException; 15 import com.diligrp.mobsite.getway.domain.except.ServiceException;
16 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper; 16 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
17 -import com.diligrp.mobsite.getway.rpc.buyer.GoodsRPC; 17 +import com.diligrp.mobsite.getway.rpc.GoodsRPC;
18 import com.diligrp.titan.sdk.TitanClient; 18 import com.diligrp.titan.sdk.TitanClient;
19 import com.diligrp.titan.sdk.domain.Attribute; 19 import com.diligrp.titan.sdk.domain.Attribute;
20 import com.diligrp.titan.sdk.domain.Category; 20 import com.diligrp.titan.sdk.domain.Category;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/MarketRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/MarketRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.diligrp.mobsite.getway.domain.protocol.Market; 3 import com.diligrp.mobsite.getway.domain.protocol.Market;
4 import com.diligrp.mobsite.getway.domain.protocol.market.GetDeliveryByCodeReq; 4 import com.diligrp.mobsite.getway.domain.protocol.market.GetDeliveryByCodeReq;
5 import com.diligrp.mobsite.getway.domain.protocol.order.model.MarketInfo; 5 import com.diligrp.mobsite.getway.domain.protocol.order.model.MarketInfo;
6 -import com.diligrp.mobsite.getway.rpc.buyer.MarketRPC; 6 +import com.diligrp.mobsite.getway.rpc.MarketRPC;
7 import com.diligrp.website.web.interfaces.domain.input.PickupTypeEnum; 7 import com.diligrp.website.web.interfaces.domain.input.PickupTypeEnum;
8 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp; 8 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp;
9 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/MessageRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/MessageRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.diligrp.messageCenter.sdk.MessageProducerClient; 3 import com.diligrp.messageCenter.sdk.MessageProducerClient;
4 import com.diligrp.messageCenter.sdk.domain.sms.SMSType; 4 import com.diligrp.messageCenter.sdk.domain.sms.SMSType;
5 import com.diligrp.mobsite.getway.domain.except.ServiceException; 5 import com.diligrp.mobsite.getway.domain.except.ServiceException;
6 -import com.diligrp.mobsite.getway.rpc.buyer.MessageRPC; 6 +import com.diligrp.mobsite.getway.rpc.MessageRPC;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 8 import org.slf4j.LoggerFactory;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/OrderRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/OrderRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.b2c.orders.domain.client.dto.request.OrderListRequestDto; 3 import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
4 import com.b2c.orders.domain.client.dto.response.OrderListResponseDto; 4 import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
5 import com.diligrp.mobsite.getway.domain.protocol.ProductAppraise; 5 import com.diligrp.mobsite.getway.domain.protocol.ProductAppraise;
6 -import com.diligrp.mobsite.getway.rpc.buyer.OrderRPC; 6 +import com.diligrp.mobsite.getway.rpc.OrderRPC;
7 import com.diligrp.titan.sdk.output.PageOutput; 7 import com.diligrp.titan.sdk.output.PageOutput;
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
9 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/PassportRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PassportRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 -import com.diligrp.mobsite.getway.domain.common.Constant;  
5 -import com.diligrp.mobsite.getway.domain.common.ErrorMessage;  
6 import com.diligrp.mobsite.getway.domain.common.RedisKey; 4 import com.diligrp.mobsite.getway.domain.common.RedisKey;
7 import com.diligrp.mobsite.getway.domain.common.ResultCode; 5 import com.diligrp.mobsite.getway.domain.common.ResultCode;
8 import com.diligrp.mobsite.getway.domain.except.ServiceException; 6 import com.diligrp.mobsite.getway.domain.except.ServiceException;
@@ -11,9 +9,9 @@ import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp; @@ -11,9 +9,9 @@ import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
11 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq; 9 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
12 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp; 10 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
13 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp; 11 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
  12 +import com.diligrp.mobsite.getway.rpc.PassportRPC;
14 import com.diligrp.mobsite.getway.rpc.base.BaseOutput; 13 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
15 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl; 14 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl;
16 -import com.diligrp.mobsite.getway.rpc.buyer.PassportRPC;  
17 import com.diligrp.website.util.redis.RedisUtil; 15 import com.diligrp.website.util.redis.RedisUtil;
18 import com.diligrp.website.util.security.Validator; 16 import com.diligrp.website.util.security.Validator;
19 import org.slf4j.Logger; 17 import org.slf4j.Logger;
@@ -93,12 +91,8 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC { @@ -93,12 +91,8 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
93 resp.setToken(jsonBody.getString("token")); 91 resp.setToken(jsonBody.getString("token"));
94 JSONObject jsonUser = jsonBody.getJSONObject("accountInfo"); 92 JSONObject jsonUser = jsonBody.getJSONObject("accountInfo");
95 resp.setAccountId(jsonUser.getLong("accountId")); 93 resp.setAccountId(jsonUser.getLong("accountId"));
96 - resp.setEmail(jsonUser.getString("email"));  
97 resp.setMobile(jsonUser.getString("mobile")); 94 resp.setMobile(jsonUser.getString("mobile"));
98 - resp.setAccountState(jsonUser.getInteger("accountState"));  
99 - resp.setUserType(jsonUser.getInteger("userType"));  
100 resp.setAccountName(jsonUser.getString("accountName")); 95 resp.setAccountName(jsonUser.getString("accountName"));
101 - resp.setRealName(jsonUser.getString("realName"));  
102 resp.setMsg(msg); 96 resp.setMsg(msg);
103 resp.setHeadImg(jsonUser.getString("face")); 97 resp.setHeadImg(jsonUser.getString("face"));
104 if (Validator.isNull(jsonUser.getString("city"))){ 98 if (Validator.isNull(jsonUser.getString("city"))){
@@ -107,23 +101,23 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC { @@ -107,23 +101,23 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
107 resp.setInfoCompleteFlag(LoginResp.USER_INFOCOMPLETEFLAG_YES); 101 resp.setInfoCompleteFlag(LoginResp.USER_INFOCOMPLETEFLAG_YES);
108 } 102 }
109 103
110 - //TODO 提示信息  
111 - if (Constant.USER_STATE_LOCKED == jsonUser.getInteger("accountState")) {  
112 - resp.setMsg(ErrorMessage.USER_STATE_LOCKED);  
113 - resp.setCode(PASSPORT_LOGIN_CODE_LOCKED);  
114 - } 104 + //if (Constant.USER_STATE_LOCKED == jsonUser.getInteger("accountState")) {
  105 + //resp.setMsg(ErrorMessage.USER_STATE_LOCKED);
  106 + //resp.setCode(PASSPORT_LOGIN_CODE_LOCKED);
  107 + //}
115 108
116 - if (Validator.isNull(resp.getAccountState())  
117 - || resp.getAccountState()!= LoginResp.ACCOUNT_STATE_NORMAL) {  
118 - throw new ServiceException(ResultCode.BUSINESS_FAILED,resp.getMsg());  
119 - } 109 + //if (Validator.isNull(resp.getAccountState())
  110 + // || resp.getAccountState()!= LoginResp.ACCOUNT_STATE_NORMAL) {
  111 + // throw new ServiceException(ResultCode.BUSINESS_FAILED,resp.getMsg());
  112 + //}
120 113
121 //登录redisKey=userId-deviceId 114 //登录redisKey=userId-deviceId
122 115
123 //String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, resp.getAccountId()+Constant.COMMON_DASH+req.getDeviceId()); 116 //String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, resp.getAccountId()+Constant.COMMON_DASH+req.getDeviceId());
124 String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(resp.getAccountId())); 117 String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(resp.getAccountId()));
125 redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getAccountId()), loginExpireTime); 118 redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getAccountId()), loginExpireTime);
126 - //TODO 去掉登录设备排斥验证 119 +
  120 + // 去掉登录设备排斥验证
127 //if (!Validator.isNull(req.getDeviceId())) { 121 //if (!Validator.isNull(req.getDeviceId())) {
128 // String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID, String.valueOf(resp.getAccountId())); 122 // String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID, String.valueOf(resp.getAccountId()));
129 // redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime); 123 // redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/impl/SellerRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/SellerRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.seller.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput; 3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
4 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput; 4 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
@@ -9,8 +9,8 @@ import com.diligrp.mobsite.getway.domain.common.ResultCode; @@ -9,8 +9,8 @@ import com.diligrp.mobsite.getway.domain.common.ResultCode;
9 import com.diligrp.mobsite.getway.domain.except.ServiceException; 9 import com.diligrp.mobsite.getway.domain.except.ServiceException;
10 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo; 10 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
11 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq; 11 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
12 -import com.diligrp.mobsite.getway.rpc.buyer.GoodsRPC;  
13 -import com.diligrp.mobsite.getway.rpc.seller.SellerRPC; 12 +import com.diligrp.mobsite.getway.rpc.GoodsRPC;
  13 +import com.diligrp.mobsite.getway.rpc.SellerRPC;
14 import com.diligrp.website.util.redis.RedisUtil; 14 import com.diligrp.website.util.redis.RedisUtil;
15 import com.diligrp.website.util.security.Validator; 15 import com.diligrp.website.util.security.Validator;
16 import com.diligrp.website.web.interfaces.WebsiteClient; 16 import com.diligrp.website.web.interfaces.WebsiteClient;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/ShopRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ShopRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory; 3 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
4 import com.diligrp.mobsite.getway.domain.protocol.ShopIntroduction; 4 import com.diligrp.mobsite.getway.domain.protocol.ShopIntroduction;
5 import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo; 5 import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
6 -import com.diligrp.mobsite.getway.rpc.buyer.ShopRPC; 6 +import com.diligrp.mobsite.getway.rpc.ShopRPC;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 8 import org.slf4j.LoggerFactory;
9 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/StationMsgRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/StationMsgRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONArray; 4 import com.alibaba.fastjson.JSONArray;
@@ -10,7 +10,7 @@ import com.diligrp.mobsite.getway.domain.protocol.msg.model.HomeMsgInfo; @@ -10,7 +10,7 @@ import com.diligrp.mobsite.getway.domain.protocol.msg.model.HomeMsgInfo;
10 import com.diligrp.mobsite.getway.domain.protocol.msg.model.StationMsg; 10 import com.diligrp.mobsite.getway.domain.protocol.msg.model.StationMsg;
11 import com.diligrp.mobsite.getway.rpc.base.BaseOutput; 11 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
12 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl; 12 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl;
13 -import com.diligrp.mobsite.getway.rpc.buyer.StationMsgRPC; 13 +import com.diligrp.mobsite.getway.rpc.StationMsgRPC;
14 import com.diligrp.website.util.security.Validator; 14 import com.diligrp.website.util.security.Validator;
15 import org.slf4j.Logger; 15 import org.slf4j.Logger;
16 import org.slf4j.LoggerFactory; 16 import org.slf4j.LoggerFactory;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/StoreRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/StoreRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.diligrp.mobsite.getway.domain.except.ServiceException; 5 import com.diligrp.mobsite.getway.domain.except.ServiceException;
6 import com.diligrp.mobsite.getway.domain.protocol.common.UploadFileResp; 6 import com.diligrp.mobsite.getway.domain.protocol.common.UploadFileResp;
7 -import com.diligrp.mobsite.getway.rpc.buyer.StoreRPC; 7 +import com.diligrp.mobsite.getway.rpc.StoreRPC;
8 import com.diligrp.store.api.upload.DiliStoreUpload; 8 import com.diligrp.store.api.upload.DiliStoreUpload;
9 import org.slf4j.Logger; 9 import org.slf4j.Logger;
10 import org.slf4j.LoggerFactory; 10 import org.slf4j.LoggerFactory;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/UserRPCImpl.java renamed to mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/UserRPCImpl.java
  View file @e2b6c60
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl; 1 +package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput; 3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
4 import com.b2c.myapp.common.utils.BaseOutput; 4 import com.b2c.myapp.common.utils.BaseOutput;
@@ -9,8 +9,8 @@ import com.diligrp.mobsite.getway.domain.except.ServiceException; @@ -9,8 +9,8 @@ import com.diligrp.mobsite.getway.domain.except.ServiceException;
9 import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct; 9 import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct;
10 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo; 10 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
11 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq; 11 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
12 -import com.diligrp.mobsite.getway.rpc.buyer.GoodsRPC;  
13 -import com.diligrp.mobsite.getway.rpc.buyer.UserRPC; 12 +import com.diligrp.mobsite.getway.rpc.GoodsRPC;
  13 +import com.diligrp.mobsite.getway.rpc.UserRPC;
14 import com.diligrp.website.util.redis.RedisUtil; 14 import com.diligrp.website.util.redis.RedisUtil;
15 import com.diligrp.website.util.security.Validator; 15 import com.diligrp.website.util.security.Validator;
16 import com.diligrp.website.web.interfaces.WebsiteClient; 16 import com.diligrp.website.web.interfaces.WebsiteClient;
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/SellerOrderRPC.java deleted 100644 → 0
  View file @278c708
1 -package com.diligrp.mobsite.getway.rpc.seller;  
2 -  
3 -/**  
4 - * <B>Description</B> 订单 <br />  
5 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
6 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
7 - * <B>Company</B> 地利集团  
8 - * @createTime 2014年9月1日 下午6:30:54  
9 - * @author duanyugen  
10 - */  
11 -public interface SellerOrderRPC {  
12 -  
13 - }  
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/SellerProductRPC.java deleted 100644 → 0
  View file @278c708
1 -package com.diligrp.mobsite.getway.rpc.seller;  
2 -  
3 -/**  
4 - * <B>Description</B> 验证rpc <br />  
5 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
6 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
7 - * <B>Company</B> 地利集团  
8 - *  
9 - * @author duanyugen  
10 - */  
11 -public interface SellerProductRPC {  
12 -  
13 -  
14 -}  
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/SellerShopRPC.java deleted 100644 → 0
  View file @278c708
1 -package com.diligrp.mobsite.getway.rpc.seller;  
2 -  
3 -  
4 -/**  
5 - * <B>Description</B> 验证rpc <br />  
6 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
7 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
8 - * <B>Company</B> 地利集团  
9 - *  
10 - * @author duanyugen  
11 - */  
12 -public interface SellerShopRPC {  
13 -  
14 -}  
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/impl/SellerOrderRPCImpl.java deleted 100644 → 0
  View file @278c708
1 -package com.diligrp.mobsite.getway.rpc.seller.impl;  
2 -  
3 -import com.diligrp.mobsite.getway.rpc.seller.SellerOrderRPC;  
4 -import org.springframework.stereotype.Service;  
5 -  
6 -  
7 -/**  
8 - * <B>Description</B> 订单rpc <br />  
9 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
10 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
11 - * <B>Company</B> 地利集团  
12 - *  
13 - * @author duanyugen  
14 - * @createTime 2014年9月1日 下午6:31:13  
15 - */  
16 -@Service("sellerOrderRPC")  
17 -public class SellerOrderRPCImpl implements SellerOrderRPC {  
18 -  
19 -  
20 -}  
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/impl/SellerProductRPCImpl.java deleted 100644 → 0
  View file @278c708
1 -package com.diligrp.mobsite.getway.rpc.seller.impl;  
2 -  
3 -import com.diligrp.mobsite.getway.rpc.seller.SellerProductRPC;  
4 -import org.springframework.stereotype.Service;  
5 -  
6 -  
7 -/**  
8 - * <B>Description</B> 搜索 <br />  
9 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
10 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
11 - * <B>Company</B> 地利集团  
12 - * @createTime 2014年8月22日 上午11:41:33  
13 - */  
14 -@Service("sellerProductRPC")  
15 -public class SellerProductRPCImpl implements SellerProductRPC {  
16 -  
17 -}  
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/impl/SellerShopRPCImpl.java deleted 100644 → 0
  View file @278c708
1 -package com.diligrp.mobsite.getway.rpc.seller.impl;  
2 -  
3 -import com.diligrp.mobsite.getway.rpc.seller.SellerShopRPC;  
4 -import org.springframework.stereotype.Service;  
5 -  
6 -  
7 -/**  
8 - * <B>Description</B> 订单rpc <br />  
9 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />  
10 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
11 - * <B>Company</B> 地利集团  
12 - *  
13 - * @author duanyugen  
14 - * @createTime 2014年9月1日 下午6:31:13  
15 - */  
16 -@Service("sellerShopRPC")  
17 -public class SellerShopRPCImpl implements SellerShopRPC {  
18 -  
19 -  
20 -}  
21 \ No newline at end of file 0 \ No newline at end of file
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/home/impl/TopicServiceImpl.java
  View file @e2b6c60
@@ -12,8 +12,8 @@ import com.diligrp.mobsite.getway.domain.protocol.topic.model.HomeStatisticsTopi @@ -12,8 +12,8 @@ import com.diligrp.mobsite.getway.domain.protocol.topic.model.HomeStatisticsTopi
12 import com.diligrp.mobsite.getway.domain.protocol.topic.model.PicInfo; 12 import com.diligrp.mobsite.getway.domain.protocol.topic.model.PicInfo;
13 import com.diligrp.mobsite.getway.domain.protocol.topic.model.TopicCategory; 13 import com.diligrp.mobsite.getway.domain.protocol.topic.model.TopicCategory;
14 import com.diligrp.mobsite.getway.domain.protocol.topic.model.TopicDetail; 14 import com.diligrp.mobsite.getway.domain.protocol.topic.model.TopicDetail;
15 -import com.diligrp.mobsite.getway.rpc.buyer.CmsRPC;  
16 -import com.diligrp.mobsite.getway.rpc.buyer.impl.CmsRPCImpl; 15 +import com.diligrp.mobsite.getway.rpc.CmsRPC;
  16 +import com.diligrp.mobsite.getway.rpc.impl.CmsRPCImpl;
17 import com.diligrp.mobsite.getway.service.buyer.home.TopicService; 17 import com.diligrp.mobsite.getway.service.buyer.home.TopicService;
18 import com.diligrp.mobsite.getway.service.common.utils.DateUtils; 18 import com.diligrp.mobsite.getway.service.common.utils.DateUtils;
19 import com.diligrp.website.util.security.Validator; 19 import com.diligrp.website.util.security.Validator;
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/settle/impl/ConsigneeServiceImpl.java
  View file @e2b6c60
@@ -5,7 +5,7 @@ import com.diligrp.mobsite.getway.domain.common.ResultCode; @@ -5,7 +5,7 @@ import com.diligrp.mobsite.getway.domain.common.ResultCode;
5 import com.diligrp.mobsite.getway.domain.except.ServiceException; 5 import com.diligrp.mobsite.getway.domain.except.ServiceException;
6 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo; 6 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
7 import com.diligrp.mobsite.getway.domain.protocol.cart.*; 7 import com.diligrp.mobsite.getway.domain.protocol.cart.*;
8 -import com.diligrp.mobsite.getway.rpc.buyer.UserRPC; 8 +import com.diligrp.mobsite.getway.rpc.UserRPC;
9 import com.diligrp.mobsite.getway.service.buyer.settle.ConsigneeService; 9 import com.diligrp.mobsite.getway.service.buyer.settle.ConsigneeService;
10 import com.diligrp.website.util.security.Validator; 10 import com.diligrp.website.util.security.Validator;
11 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/OrderServiceImpl.java
  View file @e2b6c60
@@ -2,9 +2,7 @@ package com.diligrp.mobsite.getway.service.buyer.user.impl; @@ -2,9 +2,7 @@ package com.diligrp.mobsite.getway.service.buyer.user.impl;
2 2
3 3
4 import com.diligrp.mobsite.getway.domain.protocol.order.*; 4 import com.diligrp.mobsite.getway.domain.protocol.order.*;
5 -import com.diligrp.mobsite.getway.rpc.buyer.*;  
6 -import com.diligrp.mobsite.getway.rpc.seller.SellerOrderRPC;  
7 -import com.diligrp.mobsite.getway.rpc.seller.SellerShopRPC; 5 +import com.diligrp.mobsite.getway.rpc.*;
8 import com.diligrp.mobsite.getway.service.buyer.user.OrderService; 6 import com.diligrp.mobsite.getway.service.buyer.user.OrderService;
9 import com.diligrp.website.util.redis.RedisUtil; 7 import com.diligrp.website.util.redis.RedisUtil;
10 import com.diligrp.website.web.interfaces.WebsiteClient; 8 import com.diligrp.website.web.interfaces.WebsiteClient;
@@ -46,11 +44,7 @@ public class OrderServiceImpl implements OrderService { @@ -46,11 +44,7 @@ public class OrderServiceImpl implements OrderService {
46 44
47 @Resource 45 @Resource
48 private ShopRPC shopRPC; 46 private ShopRPC shopRPC;
49 - @Resource  
50 - private SellerShopRPC sellerShopRPC;  
51 47
52 - @Resource  
53 - private SellerOrderRPC sellerOrderRPC;  
54 48
55 49
56 @Resource 50 @Resource
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
  View file @e2b6c60
@@ -11,7 +11,7 @@ import com.diligrp.mobsite.getway.domain.protocol.login.*; @@ -11,7 +11,7 @@ import com.diligrp.mobsite.getway.domain.protocol.login.*;
11 import com.diligrp.mobsite.getway.domain.protocol.register.*; 11 import com.diligrp.mobsite.getway.domain.protocol.register.*;
12 import com.diligrp.mobsite.getway.domain.protocol.user.*; 12 import com.diligrp.mobsite.getway.domain.protocol.user.*;
13 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager; 13 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
14 -import com.diligrp.mobsite.getway.rpc.buyer.*; 14 +import com.diligrp.mobsite.getway.rpc.*;
15 import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil; 15 import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil;
16 import com.diligrp.mobsite.getway.service.buyer.user.UserService; 16 import com.diligrp.mobsite.getway.service.buyer.user.UserService;
17 import com.diligrp.mobsite.getway.service.common.utils.PassportUtils; 17 import com.diligrp.mobsite.getway.service.common.utils.PassportUtils;
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/common/impl/CommonServiceImpl.java
  View file @e2b6c60
@@ -8,8 +8,8 @@ import com.diligrp.mobsite.getway.domain.protocol.City; @@ -8,8 +8,8 @@ import com.diligrp.mobsite.getway.domain.protocol.City;
8 import com.diligrp.mobsite.getway.domain.protocol.common.*; 8 import com.diligrp.mobsite.getway.domain.protocol.common.*;
9 import com.diligrp.mobsite.getway.domain.protocol.common.model.UnitInfo; 9 import com.diligrp.mobsite.getway.domain.protocol.common.model.UnitInfo;
10 import com.diligrp.mobsite.getway.domain.protocol.user.MemberInfo; 10 import com.diligrp.mobsite.getway.domain.protocol.user.MemberInfo;
11 -import com.diligrp.mobsite.getway.rpc.buyer.ConfigRPC;  
12 -import com.diligrp.mobsite.getway.rpc.buyer.StoreRPC; 11 +import com.diligrp.mobsite.getway.rpc.ConfigRPC;
  12 +import com.diligrp.mobsite.getway.rpc.StoreRPC;
13 import com.diligrp.mobsite.getway.service.common.CommonService; 13 import com.diligrp.mobsite.getway.service.common.CommonService;
14 import com.diligrp.website.util.security.Validator; 14 import com.diligrp.website.util.security.Validator;
15 import com.diligrp.website.web.interfaces.domain.output.CityResp; 15 import com.diligrp.website.web.interfaces.domain.output.CityResp;
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/common/impl/VersionUpdateServiceImpl.java
  View file @e2b6c60
@@ -15,7 +15,7 @@ import com.diligrp.mobsite.getway.domain.protocol.version.model.AppPatch; @@ -15,7 +15,7 @@ import com.diligrp.mobsite.getway.domain.protocol.version.model.AppPatch;
15 import com.diligrp.mobsite.getway.manager.common.AppPatchManager; 15 import com.diligrp.mobsite.getway.manager.common.AppPatchManager;
16 import com.diligrp.mobsite.getway.manager.common.FeedBackManager; 16 import com.diligrp.mobsite.getway.manager.common.FeedBackManager;
17 import com.diligrp.mobsite.getway.manager.common.VersionUpdateManager; 17 import com.diligrp.mobsite.getway.manager.common.VersionUpdateManager;
18 -import com.diligrp.mobsite.getway.rpc.buyer.UserRPC; 18 +import com.diligrp.mobsite.getway.rpc.UserRPC;
19 import com.diligrp.mobsite.getway.service.common.VersionUpdateService; 19 import com.diligrp.mobsite.getway.service.common.VersionUpdateService;
20 import com.diligrp.website.util.dao.BaseQuery; 20 import com.diligrp.website.util.dao.BaseQuery;
21 import com.diligrp.website.util.security.Validator; 21 import com.diligrp.website.util.security.Validator;
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerGoodsServiceImpl.java
  View file @e2b6c60
@@ -3,10 +3,9 @@ package com.diligrp.mobsite.getway.service.seller.impl; @@ -3,10 +3,9 @@ package com.diligrp.mobsite.getway.service.seller.impl;
3 import com.diligrp.mobsite.getway.domain.protocol.product.*; 3 import com.diligrp.mobsite.getway.domain.protocol.product.*;
4 import com.diligrp.mobsite.getway.domain.protocol.saler.SellerUpdateProductReq; 4 import com.diligrp.mobsite.getway.domain.protocol.saler.SellerUpdateProductReq;
5 import com.diligrp.mobsite.getway.domain.protocol.saler.product.*; 5 import com.diligrp.mobsite.getway.domain.protocol.saler.product.*;
6 -import com.diligrp.mobsite.getway.rpc.buyer.ConfigRPC;  
7 -import com.diligrp.mobsite.getway.rpc.buyer.GoodsRPC;  
8 -import com.diligrp.mobsite.getway.rpc.buyer.UserRPC;  
9 -import com.diligrp.mobsite.getway.rpc.seller.SellerProductRPC; 6 +import com.diligrp.mobsite.getway.rpc.ConfigRPC;
  7 +import com.diligrp.mobsite.getway.rpc.GoodsRPC;
  8 +import com.diligrp.mobsite.getway.rpc.UserRPC;
10 import com.diligrp.mobsite.getway.service.seller.SellerGoodsService; 9 import com.diligrp.mobsite.getway.service.seller.SellerGoodsService;
11 import com.yqyw.filter.client.KeyWordsClient; 10 import com.yqyw.filter.client.KeyWordsClient;
12 import org.apache.log4j.Logger; 11 import org.apache.log4j.Logger;
@@ -30,8 +29,6 @@ public class SellerGoodsServiceImpl implements SellerGoodsService { @@ -30,8 +29,6 @@ public class SellerGoodsServiceImpl implements SellerGoodsService {
30 private UserRPC userRPC; 29 private UserRPC userRPC;
31 @Autowired 30 @Autowired
32 private ConfigRPC configRpc; 31 private ConfigRPC configRpc;
33 - @Resource  
34 - private SellerProductRPC sellerProductRPC;  
35 32
36 @Resource 33 @Resource
37 private GoodsRPC goodsRPC; 34 private GoodsRPC goodsRPC;
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerUserServiceImpl.java
  View file @e2b6c60
@@ -13,8 +13,7 @@ import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginReq; @@ -13,8 +13,7 @@ import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginReq;
13 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp; 13 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
14 import com.diligrp.mobsite.getway.domain.protocol.user.*; 14 import com.diligrp.mobsite.getway.domain.protocol.user.*;
15 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager; 15 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
16 -import com.diligrp.mobsite.getway.rpc.buyer.*;  
17 -import com.diligrp.mobsite.getway.rpc.seller.SellerRPC; 16 +import com.diligrp.mobsite.getway.rpc.*;
18 import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil; 17 import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil;
19 import com.diligrp.mobsite.getway.service.common.utils.PassportUtils; 18 import com.diligrp.mobsite.getway.service.common.utils.PassportUtils;
20 import com.diligrp.mobsite.getway.service.seller.SellerUserService; 19 import com.diligrp.mobsite.getway.service.seller.SellerUserService;
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/base/CommonController.java
  View file @e2b6c60
@@ -2,7 +2,7 @@ package com.diligrp.mobsite.getway.web.api.base; @@ -2,7 +2,7 @@ package com.diligrp.mobsite.getway.web.api.base;
2 2
3 import com.diligrp.mobsite.getway.domain.except.ServiceException; 3 import com.diligrp.mobsite.getway.domain.except.ServiceException;
4 import com.diligrp.mobsite.getway.domain.protocol.common.*; 4 import com.diligrp.mobsite.getway.domain.protocol.common.*;
5 -import com.diligrp.mobsite.getway.rpc.buyer.impl.StoreRPCImpl; 5 +import com.diligrp.mobsite.getway.rpc.impl.StoreRPCImpl;
6 import com.diligrp.mobsite.getway.service.common.CommonService; 6 import com.diligrp.mobsite.getway.service.common.CommonService;
7 import com.diligrp.website.util.security.Validator; 7 import com.diligrp.website.util.security.Validator;
8 import io.swagger.annotations.Api; 8 import io.swagger.annotations.Api;
mobsite-getway-web/src/main/resources/spring-rpc.xml
  View file @e2b6c60
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 </bean> 33 </bean>
34 34
35 <bean id="passportRPC" 35 <bean id="passportRPC"
36 - class="com.diligrp.mobsite.getway.rpc.buyer.impl.PassportRPCImpl"> 36 + class="com.diligrp.mobsite.getway.rpc.impl.PassportRPCImpl">
37 <constructor-arg name="token" value="${website.passport.token}"/> 37 <constructor-arg name="token" value="${website.passport.token}"/>
38 <constructor-arg name="baseUrl" value="${website.passport.baseUrl}"/> 38 <constructor-arg name="baseUrl" value="${website.passport.baseUrl}"/>
39 </bean> 39 </bean>
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 96
97 97
98 <bean id="stationMsgRPC" 98 <bean id="stationMsgRPC"
99 - class="com.diligrp.mobsite.getway.rpc.buyer.impl.StationMsgRPCImpl"> 99 + class="com.diligrp.mobsite.getway.rpc.impl.StationMsgRPCImpl">
100 <constructor-arg name="token" value="${website.stationmsg.token}"/> 100 <constructor-arg name="token" value="${website.stationmsg.token}"/>
101 <constructor-arg name="baseUrl" value="${website.stationmsg.baseUrl}"/> 101 <constructor-arg name="baseUrl" value="${website.stationmsg.baseUrl}"/>
102 </bean> 102 </bean>