diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java index b49e411af..19cb2bb1b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java @@ -27,7 +27,7 @@ import java.util.Map; @RequestMapping("/ningxia") public class NingXiaController extends ThirdPartyBaseController { - private final String platformName = "内蒙古平台"; + private final String platformName = "宁夏平台"; @Autowired @Qualifier("ninaXiaPlatformServiceImpl") diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java index 5b4171274..6031c9593 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java @@ -21,7 +21,7 @@ public enum ThirdPlatformTypeEnum { NEI_MENG_GU_PLATFORM("10", "内蒙古平台", ""), QING_HAI_PLATFORM("11", "青海平台", "630000000"), DIAN_XING_PLATFORM("12", "宁波点行停车平台", ""), - NING_XIA_PLATFORM("13", "宁夏平台", ""), + NING_XIA_PLATFORM("13", "宁夏平台", "MA01H3BQ9"), SHEN_ZHEN_PLATFORM("14", "深圳平台", ""), ; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java index 47b5a4682..dd89f84dc 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java @@ -126,7 +126,7 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService { failReason = 1; succStat = 1; } else { - String theirOperatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); + String ourOperatorSecret = thirdPartySecretInfoVO.getOurOperatorSecret(); String dataSecret = thirdPartySecretInfoVO.getOurDataSecret(); String dataSecretIv = thirdPartySecretInfoVO.getOurDataSecretIv(); // 解密data 获取参数中的OperatorSecret @@ -136,18 +136,18 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService { inputOperatorSecret = JSON.parseObject(decrypt).getString("OperatorSecret"); } // 对比密钥 - if (!StringUtils.equals(theirOperatorSecret, inputOperatorSecret)) { + if (!StringUtils.equals(ourOperatorSecret, inputOperatorSecret)) { failReason = 1; succStat = 1; } else { // 生成token - String token = JWTUtils.createToken(operatorId, theirOperatorSecret, JWTUtils.ttlMillis); + String token = JWTUtils.createToken(operatorId, ourOperatorSecret, JWTUtils.ttlMillis); vo.setAccessToken(token); vo.setTokenAvailableTime((int) (JWTUtils.ttlMillis / 1000)); } } // 组装返回参数 - vo.setPlatformId(operatorId); + vo.setOperatorID(operatorId); vo.setFailReason(failReason); vo.setSuccStat(succStat);