|
@ -67,7 +67,7 @@ public class DhDeviceUtil { |
|
|
* @author zhy |
|
|
* @author zhy |
|
|
* @date 2022/5/20 16:40 |
|
|
* @date 2022/5/20 16:40 |
|
|
*/ |
|
|
*/ |
|
|
public String getAccessToken() { |
|
|
public String getPublicKey() { |
|
|
String key = RedisKeys.getDhPublicKey(); |
|
|
String key = RedisKeys.getDhPublicKey(); |
|
|
Object obj = redisUtils.get(key); |
|
|
Object obj = redisUtils.get(key); |
|
|
if (null != obj) { |
|
|
if (null != obj) { |
|
@ -404,7 +404,13 @@ public class DhDeviceUtil { |
|
|
cardFormDTO.setCardStatus("ACTIVE"); |
|
|
cardFormDTO.setCardStatus("ACTIVE"); |
|
|
cardFormDTO.setStartDate(LocalDate.now().toString()); |
|
|
cardFormDTO.setStartDate(LocalDate.now().toString()); |
|
|
cardFormDTO.setEndDate(LocalDate.now().plusDays(1L).toString()); |
|
|
cardFormDTO.setEndDate(LocalDate.now().plusDays(1L).toString()); |
|
|
cardFormDTO.setCardPassword("0"); |
|
|
String pwd; |
|
|
|
|
|
try { |
|
|
|
|
|
pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456"); |
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "密码加密失败"); |
|
|
|
|
|
} |
|
|
|
|
|
cardFormDTO.setCardPassword(pwd); |
|
|
cardFormDTO.setSubSystems("1"); |
|
|
cardFormDTO.setSubSystems("1"); |
|
|
|
|
|
|
|
|
Map<String, String> paramsMap = new HashMap<>(4); |
|
|
Map<String, String> paramsMap = new HashMap<>(4); |
|
@ -497,7 +503,7 @@ public class DhDeviceUtil { |
|
|
* @date 2022/7/28 16:09 |
|
|
* @date 2022/7/28 16:09 |
|
|
*/ |
|
|
*/ |
|
|
private String getDhUrlParams() { |
|
|
private String getDhUrlParams() { |
|
|
DhToken token = getLoginPass(getAccessToken()); |
|
|
DhToken token = getLoginPass(getPublicKey()); |
|
|
return "?userId=" + token.getId() + "&username=" + token.getLoginName() + "&token=" + token.getToken(); |
|
|
return "?userId=" + token.getId() + "&username=" + token.getLoginName() + "&token=" + token.getToken(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -553,7 +559,7 @@ public class DhDeviceUtil { |
|
|
* @author yinzuomei |
|
|
* @author yinzuomei |
|
|
* @date 2020/2/27 16:09 |
|
|
* @date 2020/2/27 16:09 |
|
|
*/ |
|
|
*/ |
|
|
public static byte[] toByteArray(InputStream input) throws IOException { |
|
|
private byte[] toByteArray(InputStream input) throws IOException { |
|
|
ByteArrayOutputStream output = new ByteArrayOutputStream(); |
|
|
ByteArrayOutputStream output = new ByteArrayOutputStream(); |
|
|
byte[] buffer = new byte[1024 * 4]; |
|
|
byte[] buffer = new byte[1024 * 4]; |
|
|
int n = 0; |
|
|
int n = 0; |
|
@ -571,7 +577,7 @@ public class DhDeviceUtil { |
|
|
* @author zhy |
|
|
* @author zhy |
|
|
* @date 2022/7/29 9:47 |
|
|
* @date 2022/7/29 9:47 |
|
|
*/ |
|
|
*/ |
|
|
public static String generateNiceString(int len) { |
|
|
private String generateNiceString(int len) { |
|
|
StringBuilder sb = new StringBuilder(); |
|
|
StringBuilder sb = new StringBuilder(); |
|
|
for (int i = 0; i < len; i++) { |
|
|
for (int i = 0; i < len; i++) { |
|
|
sb.append(Integer.toHexString(new Random().nextInt(16))); |
|
|
sb.append(Integer.toHexString(new Random().nextInt(16))); |
|
|