CodeCow/campus-imaotai
1
0
Fork 0
mirror of https://github.com/oddfar/campus-imaotai.git synced 2026-06-03 21:00:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修正参数对应和请求json body

Browse Source
This commit is contained in:
oddfar 2024-07-20 18:50:52 +08:00
parent d48e100f45
commit 624254c491
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
campus-imt-sdk/src/main/java/com/oddfar/campus/imt/http/rest/ImtHttpClientImpl.java
View File

@ -7,6 +7,7 @@ import cn.hutool.http.Method;
import com.oddfar.campus.imt.http.domain.ImtHttpClient;
import com.oddfar.campus.imt.http.entity.ImtBaseRequest;
import com.oddfar.campus.imt.http.entity.ImtBaseResponse;
import com.oddfar.campus.imt.http.headenum.HeadEnum;
import com.oddfar.campus.imt.http.util.GsonUtil;
import java.util.HashMap;
@ -21,11 +22,15 @@ public class ImtHttpClientImpl implements ImtHttpClient {
HashMap<String, String> headMap = request.getHeadMap();
Map<String, Object> formMap = request.getFormMap();
HttpRequest httpRequest = HttpUtil.createRequest(method,url);
if (CollectionUtil.isNotEmpty(formMap)){
HttpRequest httpRequest = HttpUtil.createRequest(method, url);
if (CollectionUtil.isNotEmpty(formMap)) {
httpRequest.form(formMap);
}
httpRequest.headerMap(headMap,true);
//如果是json
if (HeadEnum.CONTENT_TYPE.getHeadValue().equals(headMap.get(HeadEnum.CONTENT_TYPE.getHeadeName()))) {
httpRequest.body(GsonUtil.toJson(request));
}
httpRequest.headerMap(headMap, true);
String body = httpRequest.execute().body();
return GsonUtil.fromJson(body, request.getResponseClass());
}

27
campus-modular/src/main/java/com/oddfar/campus/business/service/impl/IMTServiceImpl.java
View File

@ -19,8 +19,10 @@ import com.oddfar.campus.business.service.IUserService;
import com.oddfar.campus.common.core.RedisCache;
import com.oddfar.campus.common.exception.ServiceException;
import com.oddfar.campus.common.utils.StringUtils;
import com.oddfar.campus.imt.http.domain.ImtHttpClient;
import com.oddfar.campus.imt.http.entity.appointment.AppointmentRequest;
import com.oddfar.campus.imt.http.entity.appointment.AppointmentResponse;
import com.oddfar.campus.imt.http.entity.appointment.AppointmentResponse.DataInfo.ReservationItemVO;
import com.oddfar.campus.imt.http.entity.energyaward.EnergYawardRequest;
import com.oddfar.campus.imt.http.entity.energyaward.EnergYawardResponse;
import com.oddfar.campus.imt.http.entity.exchangerate.ExchangeRateInfoRequest;
@ -45,8 +47,6 @@ import com.oddfar.campus.imt.http.entity.xmtravelreward.XmTravelRewardRequest;
import com.oddfar.campus.imt.http.entity.xmtravelreward.XmTravelRewardResponse;
import com.oddfar.campus.imt.http.headenum.CookieEnum;
import com.oddfar.campus.imt.http.headenum.HeadEnum;
import com.oddfar.campus.imt.http.rest.ImtHttpClientImpl;
import com.oddfar.campus.imt.http.entity.appointment.AppointmentResponse.DataInfo.ReservationItemVO;
import com.oddfar.campus.imt.http.util.GsonUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -81,7 +81,7 @@ public class IMTServiceImpl implements IMTService {
@Autowired
private IShopService iShopService;
@Resource
private ImtHttpClientImpl imtHttpClient;
private ImtHttpClient imtHttpClient;
private final static String SALT = "2af72f100c356273d46284f6fd1dfc08";
@ -122,7 +122,6 @@ public class IMTServiceImpl implements IMTService {
redisCache.setCacheObject(IMTCacheConstants.MT_VERSION, mtVersion);
return mtVersion;
}
@Override
@ -136,13 +135,13 @@ public class IMTServiceImpl implements IMTService {
SendCodeRequest request = new SendCodeRequest();
request.setMobile(mobile);
long curTime = System.currentTimeMillis();
request.setMd5(signature(mobile,curTime));
request.setMd5(signature(mobile, curTime));
request.setTimestamp(String.valueOf(curTime));
HashMap<String, String> headMap = new HashMap<>();
headMap.put(HeadEnum.MT_DEVICE_ID.getHeadeName(), HeadEnum.MT_DEVICE_ID.getHeadValue());
headMap.put(HeadEnum.MT_APP_VERSION.getHeadeName(), HeadEnum.MT_APP_VERSION.getHeadValue());
headMap.put(HeadEnum.USER_AGENT.getHeadeName(), getMTVersion());
headMap.put(HeadEnum.MT_DEVICE_ID.getHeadeName(), deviceId);
headMap.put(HeadEnum.MT_APP_VERSION.getHeadeName(), getMTVersion());
headMap.put(HeadEnum.USER_AGENT.getHeadeName(), HeadEnum.USER_AGENT.getHeadValue());
headMap.put(HeadEnum.CONTENT_TYPE.getHeadeName(), HeadEnum.CONTENT_TYPE.getHeadValue());
request.setHeadMap(headMap);
SendCodeResponse response = imtHttpClient.execute(request);
@ -169,7 +168,7 @@ public class IMTServiceImpl implements IMTService {
Map<String, Object> formData = GsonUtil.objectToMap(request);
IUser iUser = iUserMapper.selectById(mobile);
if (ObjectUtil.isNotNull(iUser)){
if (ObjectUtil.isNotNull(iUser)) {
deviceId = iUser.getDeviceId();
}
@ -565,7 +564,7 @@ public class IMTServiceImpl implements IMTService {
request.setHeadMap(headMap);
AppointmentResponse response = imtHttpClient.execute(request);
log.info("查询申购结果回调: user->{},response->{}", iUser.getMobile(), response);
if (!"2000".equals(response.getCode())){
if (!"2000".equals(response.getCode())) {
String message = response.getMsg();
throw new ServiceException(message);
}
@ -576,7 +575,7 @@ public class IMTServiceImpl implements IMTService {
continue;
}
for (ReservationItemVO itemVO : itemVOS) {
if(Integer.valueOf(2).equals(itemVO.getStatus()) && DateUtil.between(itemVO.getReservationTime(), new Date(), DateUnit.HOUR) < 24){
if (Integer.valueOf(2).equals(itemVO.getStatus()) && DateUtil.between(itemVO.getReservationTime(), new Date(), DateUnit.HOUR) < 24) {
String logContent = DateUtil.formatDate(itemVO.getReservationTime()) + " 申购" + itemVO.getItemName() + "成功";
IMTLogFactory.reservation(iUser, logContent);
}
@ -616,9 +615,9 @@ public class IMTServiceImpl implements IMTService {
headMap.put(HeadEnum.MT_TOKEN.getHeadeName(), iUser.getToken());
headMap.put(HeadEnum.MT_INFO.getHeadeName(), HeadEnum.MT_INFO.getHeadValue());
headMap.put(HeadEnum.MT_LNG.getHeadeName(), iUser.getLng());
headMap.put(HeadEnum.MT_LAT.getHeadeName(), iUser.getLat());
headMap.put(HeadEnum.CONTENT_TYPE.getHeadeName(), HeadEnum.CONTENT_TYPE.getHeadValue());
headMap.put(HeadEnum.USER_ID.getHeadeName(), iUser.getUserId().toString());
headMap.put(HeadEnum.MT_LAT.getHeadeName(), iUser.getLat());
headMap.put(HeadEnum.CONTENT_TYPE.getHeadeName(), HeadEnum.CONTENT_TYPE.getHeadValue());
headMap.put(HeadEnum.USER_ID.getHeadeName(), iUser.getUserId().toString());
headMap.put(HeadEnum.USER_AGENT.getHeadeName(), HeadEnum.USER_AGENT.getHeadValue());
request.setHeadMap(headMap);