diff --git a/car-base-common/src/main/java/com/god/base/domain/request/GetTopicReq.java b/car-base-common/src/main/java/com/god/base/domain/request/GetTopicReq.java index 8ad940a..c216b63 100644 --- a/car-base-common/src/main/java/com/god/base/domain/request/GetTopicReq.java +++ b/car-base-common/src/main/java/com/god/base/domain/request/GetTopicReq.java @@ -12,20 +12,20 @@ public class GetTopicReq { /** * 车辆VIN */ - private String vin; + private String vehicleVin; /** * 时间戳 */ - private String timeString; + private String timestamp; /** * 用户名 */ - private String userName; + private String username; /** * 随机字符串 */ - private String randomStr; + private String nonce; } diff --git a/car-base-server/src/main/java/com/god/base/server/service/impl/TopLineServiceImpl.java b/car-base-server/src/main/java/com/god/base/server/service/impl/TopLineServiceImpl.java index 36d93b5..e4db0d8 100644 --- a/car-base-server/src/main/java/com/god/base/server/service/impl/TopLineServiceImpl.java +++ b/car-base-server/src/main/java/com/god/base/server/service/impl/TopLineServiceImpl.java @@ -36,11 +36,11 @@ public class TopLineServiceImpl extends ServiceImpl i @Override public String getTopic(GetTopicReq getTopicReq) { try { - if (StringUtils.isEmpty(getTopicReq.getVin())){ + if (StringUtils.isEmpty(getTopicReq.getVehicleVin())){ throw new ServiceException("车辆vin不能为空"); } //根据车辆vinId查询车辆信息 - TopicCar topicCar = carMapper.selectById(getTopicReq.getVin()); + TopicCar topicCar = carMapper.selectById(getTopicReq.getVehicleVin()); if (StringUtils.isEmpty(new TopicCar[]{topicCar})){ throw new ServiceException("车辆信息不存在"); } diff --git a/car-base-server/src/main/java/com/god/base/server/util/Md5Util.java b/car-base-server/src/main/java/com/god/base/server/util/Md5Util.java index 2ec0528..d9c7e2f 100644 --- a/car-base-server/src/main/java/com/god/base/server/util/Md5Util.java +++ b/car-base-server/src/main/java/com/god/base/server/util/Md5Util.java @@ -14,7 +14,7 @@ public class Md5Util { public static String md5(GetTopicReq getTopicReq) { try { java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5"); - String str = getTopicReq.getTimeString() + getTopicReq.getUserName() + getTopicReq.getRandomStr() + getTopicReq.getVin(); + String str = getTopicReq.getTimestamp() + getTopicReq.getUsername() + getTopicReq.getNonce() + getTopicReq.getVehicleVin(); byte[] array = md.digest(str.getBytes()); StringBuffer sb = new StringBuffer(); for (int i = 0; i < array.length; ++i) {