From 678115e978e2eac37874363d89d6db1d9a12f4ec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 18:29:31 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java | 2
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 6 -
server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 31 +++----
server/web/src/main/java/com/doumee/api/web/ApiController.java | 36 ++++++--
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 36 ++++++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java | 3
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java | 9 ++
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 2
server/service/src/main/java/com/doumee/service/business/UsersService.java | 2
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 8 +
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 22 +----
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/service/src/main/java/com/doumee/service/business/InitService.java | 1
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTVideoInfoResponse.java | 2
server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java | 4
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 16 +--
server/service/src/main/java/com/doumee/service/business/MemberService.java | 2
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 6 +
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTZbDecoInfoResponse.java | 2
20 files changed, 118 insertions(+), 76 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
index ae3bc9a..c00a5f4 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -67,7 +67,7 @@
*/
@Override
public ZTSysuserGetTokenResponse getSysuserToken(String mobile){
- ZTBaseResponse<ZTSysuserGetTokenResponse> result = sendHttpRequest(
+ ZTBaseResponse<ZTSysuserGetTokenResponse> result = sendSysHttpRequest(
ZTConstants.IntegerUrl.USER_MOBILE_FASTLOGIN_URL+"?mobile="+mobile,
ZTConstants.IntegerName.USER_MOBILE_FASTLOGIN_NAME,
null,
@@ -672,6 +672,40 @@
}
return null;
}
+
+ public <T> ZTBaseResponse<T> sendSysHttpRequest(String url,String name,String token,String userType,String param,TypeReference<ZTBaseResponse<T>> typeReference){
+ log.info("銆�"+name+"銆�================寮�濮�===="+ JSONObject.toJSONString(param));
+ String res = null;
+ int success = 0;
+ try {
+ Map<String,String> headers = new HashMap<>();
+ if(StringUtils.equals(userType,ZTConstants.CUSTOMER)){
+ //濡傛灉鏄疌绔鎴�
+ headers.put(ZTConstants.HEADER_TOKEN,token);
+ }else{
+ //濡傛灉鏄疊绔敤鎴�
+ headers.put(ZTConstants.HEADER_SYSUSER_TOKEN,token);
+ }
+ headers.put(ZTConstants.HEADER_USERTYPE,userType);
+ String index = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_ZHONGTAI_SYS_API_URL);
+ res = HttpsUtil.postJsonWithHeaders(index+url,param,headers);
+ ZTBaseResponse<T> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,name);
+ if(Constants.equalsInteger(result.getCode(),ZTConstants.CODE_SUCCESS)){
+ return result;
+ }else{
+ success =1;
+ }
+ }catch (Exception e){
+ success = 1;
+ log.error("銆�"+name+"銆�================澶辫触===="+ JSONObject.toJSONString(param));
+ }finally {
+ saveInterfaceLog(url,name,param,success,res);
+ }
+ return null;
+ }
+
+
public void saveInterfaceLog(String url,String name,String param,Integer success,String respone){
if(interfaceLogMapper ==null){
return;
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
index 297e7e1..6f09b0e 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCaseInfoResponse.java
@@ -28,7 +28,7 @@
/**
* 鏄惁鏀惰棌 true:鏀惰棌 false:鏈敹钘�
*/
- private boolean isCollection;
+ private Boolean isCollection;
private String layoutUlr;
private String panorama;
/**
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java
index da2b41d..36123be 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCollectLikeInfoResponse.java
@@ -33,6 +33,15 @@
@ApiModelProperty(value = "鏀惰棌閲�")
private Integer collectCount;
+ @ApiModelProperty(value = "鍠滄閲�")
+ private Integer likeCount;
+
+ @ApiModelProperty(value = "鏄惁鍠滄")
+ private Boolean isLike;
+
+ @ApiModelProperty(value = "鏄惁鏀惰棌")
+ private Boolean isCollection;
+
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
index bdf7ff7..4ba6d46 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
@@ -25,8 +25,7 @@
/**
* 鏄惁鏀惰棌 true:鏀惰棌 false:鏈敹钘�
*/
- @ApiModelProperty(value = "鏄惁鏀惰棌 true:鏀惰棌 false:鏈敹钘�")
- private boolean isCollection;
+ private Boolean isCollection;
/**
* 鍙戝竷鏃ユ湡
*/
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTVideoInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTVideoInfoResponse.java
index 6cae997..04273c8 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTVideoInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTVideoInfoResponse.java
@@ -28,7 +28,7 @@
/**
* 鏄惁鏀惰棌
*/
- private boolean isCollection;
+ private Boolean isCollection;
private String langCode;
/**
* 鍠滄鏁伴噺
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTZbDecoInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTZbDecoInfoResponse.java
index 5994dae..a1982b7 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTZbDecoInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTZbDecoInfoResponse.java
@@ -32,7 +32,7 @@
/**
* 鏄惁鏀惰棌
*/
- private boolean isCollection;
+ private Boolean isCollection;
private String langCode;
private long likeCount;
private String publishDepartment;
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java b/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
index 6b1c79b..44d2bd0 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
@@ -50,12 +50,12 @@
public class JwtTokenUtil {
//Header 鍚嶇О
public static final String HEADER_KEY = "token";
- //Header 鍚嶇О
- public static final String BUSINESS_HEADER_KEY = "business_token";
//鍙栧�煎悕绉�
public static final String UserId_Name = "AppUserId";
//鍙栧�煎悕绉�
public static final String UserType = "UserType";
+ //鍙栧�煎悕绉�
+ public static final String UserInfo = "UserInfo";
//鍔犲瘑瀵嗛挜
private final static String jwtSecret = "MhAjU9poLf8ko54K25XBDtonaL33vtt1";
//杩囨湡鏃堕棿(s) 86400L=1澶� 604800L=7澶�
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index f7d6ad6..c5872f9 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -66,30 +66,19 @@
Class<?> beanType = handlerMethod.getBeanType();
Boolean checkFlag = false;
- if(!(
- beanType.isAnnotationPresent(LoginRequired.class) || handlerMethod.hasMethodAnnotation(LoginRequired.class)
- || beanType.isAnnotationPresent(UserLoginRequired.class) || handlerMethod.hasMethodAnnotation(UserLoginRequired.class))
+ if(!( handlerMethod.hasMethodAnnotation(LoginRequired.class) || handlerMethod.hasMethodAnnotation(UserLoginRequired.class))
){
return true;
}
- // 鏈� @LoginRequired 娉ㄨВ锛岄渶瑕佺櫥褰曡璇� 瀹㈡埛绔娇鐢�
- if (!checkFlag && (beanType.isAnnotationPresent(LoginRequired.class) || handlerMethod.hasMethodAnnotation(LoginRequired.class))) {
- String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
- if(StringUtils.isBlank(token)){
- throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
- }
- if (StringUtils.isNotBlank(token)) {
- checkFlag = checkLogin(request,response,token);
- }
+ String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
+ if(StringUtils.isBlank(token)){
+ throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
- if(!checkFlag && (beanType.isAnnotationPresent(UserLoginRequired.class) || handlerMethod.hasMethodAnnotation(UserLoginRequired.class))){
- String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
- if(StringUtils.isBlank(token)){
- throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
- }
- if (StringUtils.isNotBlank(token)) {
+ if (handlerMethod.hasMethodAnnotation(LoginRequired.class)) {
+ checkFlag = checkLogin(request,response,token);
+ }
+ if(!checkFlag && handlerMethod.hasMethodAnnotation(UserLoginRequired.class)){
checkFlag = checkPersonnelLogin(request,response,token);
- }
}
if(!checkFlag){
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
@@ -120,6 +109,8 @@
}
request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
request.setAttribute(JwtTokenUtil.UserType, ZTConstants.CUSTOMER);
+ request.setAttribute(JwtTokenUtil.HEADER_KEY, ZTConstants.CUSTOMER+"_"+token);
+ request.setAttribute(JwtTokenUtil.UserInfo, tokenRedis);
return true;
} catch (IllegalArgumentException | JwtException e) {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
@@ -145,6 +136,8 @@
}
request.setAttribute(JwtTokenUtil.UserId_Name, userId);
request.setAttribute(JwtTokenUtil.UserType, ZTConstants.BUSINESS);
+ request.setAttribute(JwtTokenUtil.HEADER_KEY, ZTConstants.CUSTOMER+"_"+token);
+ request.setAttribute(JwtTokenUtil.UserInfo, tokenRedis);
return true;
} catch (IllegalArgumentException | JwtException e) {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 04d4d45..5f0fdd1 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -349,6 +349,7 @@
public static final String WX_PLATFORM = "WX_PLATFORM";
public static final String ZBOM_ZHONGTAI_API_URL = "ZBOM_ZHONGTAI_API_URL";
+ public static final String ZBOM_ZHONGTAI_SYS_API_URL = "ZBOM_ZHONGTAI_SYS_API_URL";
public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
public static final String ZBOM_ENCODE_URL = "ZBOM_ENCODE_URL";
public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
@@ -385,6 +386,7 @@
String ZBOM_ENCODE_URL ="ZBOM_ENCODE_URL";
String ZBOM_SMS_API_KEY ="ZBOM_SMS_API_KEY";
String ZBOM_ZHONGTAI_API_URL ="ZBOM_ZHONGTAI_API_URL";
+ String ZBOM_ZHONGTAI_SYS_API_URL ="ZBOM_ZHONGTAI_SYS_API_URL";
String ZBOM_CRM_POSTCUS_API_KEY ="ZBOM_CRM_POSTCUS_API_KEY";
String ZBOM_AREA_REDIS_KEY ="ZBOM_AREA_REDIS_KEY";
String ZBOM_SMS_API_URL ="ZBOM_SMS_API_URL";
diff --git a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
index f49b3f8..27a41e1 100644
--- a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
+++ b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
@@ -14,7 +14,7 @@
public interface GetZhongTaiDataService {
- ZSZXCatalogResponse getZSZXCatalogs(Long userId);
+ ZSZXCatalogResponse getZSZXCatalogs(Long userId,String userType);
/**
* 鍒嗙被鏁版嵁
diff --git a/server/service/src/main/java/com/doumee/service/business/InitService.java b/server/service/src/main/java/com/doumee/service/business/InitService.java
index 8dc8c81..99f6a97 100644
--- a/server/service/src/main/java/com/doumee/service/business/InitService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InitService.java
@@ -42,6 +42,7 @@
redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_SMS_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_SMS_API_URL).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_SMS_API_KEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_SMS_API_KEY).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_ZHONGTAI_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_ZHONGTAI_API_URL).getCode());
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_ZHONGTAI_SYS_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_ZHONGTAI_SYS_API_URL).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_ENCODE_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_ENCODE_URL).getCode());
}
@PostConstruct
diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index 5e9279f..b04ac69 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -135,6 +135,6 @@
* 鐢ㄦ埛娉ㄩ攢
* @param memberId
*/
- ZTBaseRequst logOff(Long memberId);
+ ZTBaseRequst logOff(Long memberId,String token);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/UsersService.java b/server/service/src/main/java/com/doumee/service/business/UsersService.java
index 49ff950..d7fbd06 100644
--- a/server/service/src/main/java/com/doumee/service/business/UsersService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UsersService.java
@@ -121,7 +121,7 @@
String getContentShareImg(Users loginUserInfo, ContentShareImgDto param);
- ZTBaseRequst logOff(Long userId);
+ ZTBaseRequst logOff(Long userId,String token);
AccountResponse getWxMiniPhoneLogin(WxPhoneRequest wxPhoneRequest);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 31182ba..8cee3a7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -9,6 +9,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.IamInterfaceLogMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
@@ -26,6 +27,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -54,11 +56,11 @@
private RedisTemplate<String, Object> redisTemplate;
@Override
- public ZSZXCatalogResponse getZSZXCatalogs(Long userId){
+ public ZSZXCatalogResponse getZSZXCatalogs(Long userId,String userType){
ZSZXCatalogResponse response = new ZSZXCatalogResponse();
ZTCatalogListRequest param = new ZTCatalogListRequest();
param.setUserId(userId.toString());
- param.setUserType(ZTConstants.CUSTOMER);
+ param.setUserType(userType);
param.setCatalogCode(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU);
List<ZTCatalogInfoResponse> cataList = getCatalogList(param);
if(cataList!=null ){
@@ -208,7 +210,9 @@
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ System.out.println("寮�濮嬫椂闂�========================銆�"+DateUtil.getLongDate(new Date()));
ZTBasePageResponse<ZTProductInfoResponse> response = zbomZhongTaiService.pageProductList(ztContentListRequest);
+ System.out.println("缁撴潫鏃堕棿========================銆�"+DateUtil.getLongDate(new Date()));
return response;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index efb2eb7..b4d1738 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -2,6 +2,7 @@
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -313,10 +314,7 @@
this.saveCustomerUser(users,member.getId());
member = this.getMemberInfo(member.getId());
}
- //鍒涘缓token
- JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
- String token = JwtTokenUtil.generateToken(payLoad);
- redisTemplate.opsForValue().set(ZTConstants.CUSTOMER+"_"+member.getId(),token);
+ String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setSessionKey(session.getSessionKey());
@@ -494,8 +492,6 @@
// .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Member::getId,member.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(member.getToken());
@@ -508,11 +504,6 @@
ztBaseInfoResponse.setUserType(ZTConstants.BUSINESS);
ztBaseInfoResponse.setOpenId(users.getOpenid());
if(Objects.isNull(users.getTokenDate()) || users.getTokenDate().getTime()<=System.currentTimeMillis() ){
- ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
- //鏌ヨAPPID
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
- param.setAppId(appId);
- param.setOpenId(users.getOpenid());
ZTSysuserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getSysuserToken(users.getPhone());
if(Objects.nonNull(ztUserGetTokenResponse)){
users.setToken(ztUserGetTokenResponse.getToken());
@@ -522,27 +513,22 @@
.eq(Users::getId,users.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
return ztBaseInfoResponse;
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(users.getToken());
-// return ztBaseInfoResponse;
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒");
}
return ztBaseInfoResponse;
}
@Override
- public ZTBaseRequst logOff(Long memberId){
+ public ZTBaseRequst logOff(Long memberId,String token){
Member member = memberMapper.selectById(memberId);
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(StringUtils.isBlank(member.getPhone())){
- redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
+ redisTemplate.delete(token);
return null;
}
//鏍￠獙鐢ㄦ埛token淇℃伅
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 226d393..b5d2af7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -367,7 +367,7 @@
// JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
// String token = JwtTokenUtil.generateToken(payLoad);
// redisTemplate.opsForValue().set(ZTConstants.BUSINESS+"_"+users.getId(),token);
- String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,users.getId()+"",redisTemplate);
+ String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,JSONObject.toJSON(users).toString(),redisTemplate);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setUsers(users);
@@ -399,9 +399,7 @@
users.setOpenid(openId);
usersMapper.updateById(users);
//鍒涘缓token
- JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
- String token = JwtTokenUtil.generateToken(payLoad);
- redisTemplate.opsForValue().set(ZTConstants.BUSINESS+"_"+users.getId(),token);
+ String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,users.getId()+"",redisTemplate);
accountResponse.setToken(token);
getUsersDetail(users);
accountResponse.setSessionKey(session.getSessionKey());
@@ -431,10 +429,8 @@
return accountResponse;
}
accountResponse.setUsers(users);
- //鍒涘缓token
- JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ZERO);
- String token = JwtTokenUtil.generateToken(payLoad);
- redisTemplate.opsForValue().set(ZTConstants.BUSINESS+"_"+users.getId(),token);
+ String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,users.getId()+"",redisTemplate);
+ accountResponse.setToken(token);
return accountResponse;
} catch (Exception e) {
e.printStackTrace();
@@ -871,13 +867,13 @@
@Override
- public ZTBaseRequst logOff(Long userId){
+ public ZTBaseRequst logOff(Long userId,String token){
Users users = usersMapper.selectById(userId);
if(Objects.isNull(users)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(StringUtils.isBlank(users.getOpenid())){
- redisTemplate.delete(ZTConstants.BUSINESS+"_"+ users.getId());
+ redisTemplate.delete(token);
return null;
}
//鏍￠獙鐢ㄦ埛token淇℃伅
diff --git a/server/web/src/main/java/com/doumee/api/web/ApiController.java b/server/web/src/main/java/com/doumee/api/web/ApiController.java
index 52287ca..6efbc98 100644
--- a/server/web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/web/src/main/java/com/doumee/api/web/ApiController.java
@@ -1,5 +1,6 @@
package com.doumee.api.web;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -8,6 +9,7 @@
import com.doumee.service.business.MemberService;
import com.doumee.service.business.UsersService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.ptg.MemAreaPtg;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -54,6 +56,10 @@
return obj != null ? (Long) obj : null;
}
+ protected String getToken() {
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.HEADER_KEY);
+ return obj != null ? (String) obj : null;
+ }
protected Long getUserId() {
@@ -64,25 +70,35 @@
return obj != null ? (Long) obj : null;
}
protected Users getLoginUserInfo() {
- Long userId = getUserId();
- if(userId== null){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鏈櫥褰�");
- }
- Users user = usersService.findById(userId);
- return user;
+ Long userId = getUserId();
+ if(userId== null){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鏈櫥褰�");
+ }
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserInfo);
+ String userInfo = obj != null ? (String) obj : null;
+ Users user = new Users();
+ if(StringUtils.isNotBlank(userInfo)){
+ user = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),Users.class);
+ }
+ return user;
}
protected Member getLoginMemberInfo() {
Long userId = getMemberId();
if(userId== null){
return null;
}
- Member user = memberService.findById(userId);
- return user;
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserInfo);
+ String userInfo = obj != null ? (String) obj : null;
+ Member member = new Member();
+ if(StringUtils.isNotBlank(userInfo)){
+ member = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),Member.class);
+ }
+ return member;
}
- protected Long getUserType() {
+ protected String getUserType() {
Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserType);
- return obj != null ? (Long) obj : null;
+ return obj != null ? (String) obj : null;
}
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index 10b0573..3ebcca5 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -93,8 +93,6 @@
}
-
-
@LoginRequired
@ApiOperation(value = "鑾峰彇鎵嬫満鍙�", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getWxMiniPhone")
@@ -210,7 +208,7 @@
@ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/logOff")
public ApiResponse logOff() {
- ZTBaseRequst ztBaseRequst = memberService.logOff(getUserId());
+ ZTBaseRequst ztBaseRequst = memberService.logOff(getUserId(),getToken());
if(Objects.nonNull(ztBaseRequst)){
getZhongTaiDataService.userLogout(ztBaseRequst);
}
@@ -511,8 +509,8 @@
@LoginRequired
- @ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getProductNewsInfo")
+ @ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
index 4a534ad..b1b50b4 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
@@ -52,11 +52,15 @@
public GetZhongTaiDataService getZhongTaiDataService;
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "銆怌绔皬绋嬪簭銆戣幏鍙栭椤靛織璇磋淇洓涓ā鍧楃被鐩暟鎹�", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁锛岃儗鏅浘鏆傛椂鍐欐锛屽弬鑰僓I")
@PostMapping("/getZSZXCatalogs")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
- return ApiResponse.success(getZhongTaiDataService.getZSZXCatalogs(getMemberId()));
+ return ApiResponse.success(getZhongTaiDataService.getZSZXCatalogs(getMemberId(),getUserType()));
}
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index 4ac665b..887bfb4 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -231,7 +231,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse logOff() {
- ZTBaseRequst ztBaseRequst = usersService.logOff(getUserId());
+ ZTBaseRequst ztBaseRequst = usersService.logOff(getUserId(),getToken());
if(Objects.nonNull(ztBaseRequst)){
getZhongTaiDataService.userLogout(ztBaseRequst);
}
--
Gitblit v1.9.3