autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-05 14:38:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Guoqs
2024-05-28 11:54:09 +08:00
parent 2274aee0ef 0cf8b64581
commit 9370274859
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java vendored
View File

@@ -27,7 +27,7 @@ import java.util.Map;
@RequestMapping("/ningxia") @RequestMapping("/ningxia")
public class NingXiaController extends ThirdPartyBaseController { public class NingXiaController extends ThirdPartyBaseController {
private final String platformName = "内蒙古平台"; private final String platformName = "宁夏平台";
@Autowired @Autowired
@Qualifier("ninaXiaPlatformServiceImpl") @Qualifier("ninaXiaPlatformServiceImpl")

2
jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java vendored
View File

@@ -21,7 +21,7 @@ public enum ThirdPlatformTypeEnum {
NEI_MENG_GU_PLATFORM("10", "内蒙古平台", ""), NEI_MENG_GU_PLATFORM("10", "内蒙古平台", ""),
QING_HAI_PLATFORM("11", "青海平台", "630000000"), QING_HAI_PLATFORM("11", "青海平台", "630000000"),
DIAN_XING_PLATFORM("12", "宁波点行停车平台", ""), DIAN_XING_PLATFORM("12", "宁波点行停车平台", ""),
NING_XIA_PLATFORM("13", "宁夏平台", ""), NING_XIA_PLATFORM("13", "宁夏平台", "MA01H3BQ9"),
SHEN_ZHEN_PLATFORM("14", "深圳平台", ""), SHEN_ZHEN_PLATFORM("14", "深圳平台", ""),
; ;

8
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java vendored
View File

@@ -126,7 +126,7 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
failReason = 1; failReason = 1;
succStat = 1; succStat = 1;
} else { } else {
String theirOperatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); String ourOperatorSecret = thirdPartySecretInfoVO.getOurOperatorSecret();
String dataSecret = thirdPartySecretInfoVO.getOurDataSecret(); String dataSecret = thirdPartySecretInfoVO.getOurDataSecret();
String dataSecretIv = thirdPartySecretInfoVO.getOurDataSecretIv(); String dataSecretIv = thirdPartySecretInfoVO.getOurDataSecretIv();
// 解密data 获取参数中的OperatorSecret // 解密data 获取参数中的OperatorSecret
@@ -136,18 +136,18 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
inputOperatorSecret = JSON.parseObject(decrypt).getString("OperatorSecret"); inputOperatorSecret = JSON.parseObject(decrypt).getString("OperatorSecret");
} }
// 对比密钥 // 对比密钥
if (!StringUtils.equals(theirOperatorSecret, inputOperatorSecret)) { if (!StringUtils.equals(ourOperatorSecret, inputOperatorSecret)) {
failReason = 1; failReason = 1;
succStat = 1; succStat = 1;
} else { } else {
// 生成token // 生成token
String token = JWTUtils.createToken(operatorId, theirOperatorSecret, JWTUtils.ttlMillis); String token = JWTUtils.createToken(operatorId, ourOperatorSecret, JWTUtils.ttlMillis);
vo.setAccessToken(token); vo.setAccessToken(token);
vo.setTokenAvailableTime((int) (JWTUtils.ttlMillis / 1000)); vo.setTokenAvailableTime((int) (JWTUtils.ttlMillis / 1000));
} }
} }
// 组装返回参数 // 组装返回参数
vo.setPlatformId(operatorId); vo.setOperatorID(operatorId);
vo.setFailReason(failReason); vo.setFailReason(failReason);
vo.setSuccStat(succStat); vo.setSuccStat(succStat);