diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/shortmessage/utils/RSA.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/shortmessage/utils/RSA.java index a5fddca..c2e00d6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/shortmessage/utils/RSA.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/shortmessage/utils/RSA.java @@ -284,6 +284,7 @@ public class RSA { String target = new String(decodedData); return target; }catch (Exception e){ + log.error("解密异常",e); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("解密异常", true); } return ""; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java index 0acd4c5..b6e8569 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java @@ -139,7 +139,9 @@ public class WpsController { */ @ApiOperation("(金山)获得编辑或查看链接") @GetMapping("/kingSoft/getWpsUrl") - public void getWpsUrlBy(HttpServletRequest request, HttpServletResponse response, @RequestParam("key") String key) { + public void getWpsUrlBy(HttpServletRequest request, HttpServletResponse response, + @RequestParam("key") String key, + @RequestParam("fileName") String fileName) { //cookie传输token Optional cookie = Optional.ofNullable(request.getCookies()) .flatMap(cookies -> Stream.of(cookies) @@ -148,7 +150,7 @@ public class WpsController { if (cookie.isPresent()) { String authToken = cookie.get().getValue(); - WpsClientInVo in = this.wpsService.getKSWpsUrlDecrypt(key); + WpsClientInVo in = this.wpsService.getKSWpsUrlDecrypt(key,fileName); in.setUserToken(authToken); String str = this.wpsService.getKSWpsUrl(in); try { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/WpsService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/WpsService.java index 6af9cfd..351fad2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/WpsService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/WpsService.java @@ -20,7 +20,7 @@ public interface WpsService{ Object saveWpsFile(String token, String userId, String userName, String fileId, String fileName, File file); - WpsClientInVo getKSWpsUrlDecrypt(String key); + WpsClientInVo getKSWpsUrlDecrypt(String key,String fileName); String getKSWpsUrl(WpsClientInVo in); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/impl/WpsServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/impl/WpsServiceImpl.java index aa44494..ca79a90 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/impl/WpsServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/service/impl/WpsServiceImpl.java @@ -267,19 +267,18 @@ public class WpsServiceImpl implements WpsService { } @Override - public WpsClientInVo getKSWpsUrlDecrypt(String key){ + public WpsClientInVo getKSWpsUrlDecrypt(String key,String fileName){ String val = RSA.decrypt(key,kswprivateKey); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("请求参数无效",val.indexOf("_")<0); //fileId_yyyyMMddHHmmss_type_doc String[] value = val.split("_"); - CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("请求参数无效",value.length<5); + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("请求参数无效",value.length<4); String fileId = value[0]; String time = value[1]; String type = value[2]; String extension = value[3]; - String fileName = value[4]; SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss"); long newDateLong = System.currentTimeMillis(); @@ -750,10 +749,12 @@ public class WpsServiceImpl implements WpsService { wpsService.kswpublicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtUm+H78uT39TOsgS5XdbIuC0BRLiktqbuI3F9VFbPWDcX15Ptb2u2yTCSOB0Gl+yI+hqpClyV9nyjnu0LgoWpsIDZSLVLdrltYKz9N8jwXKhybomT2EuYU7hzWT1Ea4fkIBfYMCl+BQYSkXD6eqObg4mq2/wUFUVX/+/vjsMShwIDAQAB"; wpsService.kswprivateKey = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAK1Sb4fvy5Pf1M6yBLld1si4LQFEuKS2pu4jcX1UVs9YNxfXk+1va7bJMJI4HQaX7Ij6GqkKXJX2fKOe7QuChamwgNlItUt2uW1grP03yPBcqHJuiZPYS5hTuHNZPURrh+QgF9gwKX4FBhKRcPp6o5uDiarb/BQVRVf/7++OwxKHAgMBAAECgYA77iY8hdEJx7qo4es6QVVUQELnjmCeK74a18yVPoVp2qHqL5Op5P4EzRprZNW8gum6D2kKjFepTvqYBQsIENCwY3a6iKQf+8kwJ/GhVP+7uT3bnxdQFNXA99ujVu7Q2nFQZYAYJWiuMOQKGWrVJperlli0Ip3htCNmtTaviVfAcQJBANTAbX210K1zWe40nSxuuc6ONBqK/YF5hkqKpWB/XzfgFgQ4tPOfvWnnp0pt9rWUV9PzO6NYr2ya60yu2Y6aE+kCQQDQjhfdIid458UOYbjAixY5ONZOcswFQi77pk6MB5Cp8aHn8gHtapDnXt5DiHhqzJCya31FYYoqGtp/4fIntRzvAkA1N2Dr5fOpv0XKcLyz5YpyoV1lGkko/sXZlW6igZnGtzWqnqicm+NcP0a4NmNUriN978SGKmPO7b1XtBDVO7MpAkA/Q1sp0Tp4CpZUDoCkp4xOP1eC5H/O+IyX+ZLKF2Fiq9GZMmgzRKhABx8VDUi53OPnu4N8kGIA87RkJn32XZIxAkAtL+skd+5wkL71VZVnZafLIjWlJM/RKxqyaLbF8irT2sq2+ae8A19hfXj3zT7CeLn5xjKP1/cuGakeOBL8cNaw"; wpsService.appName = "biz-service-ebtp-extend"; -// String jm = RSA.encrypt("1679764839191080961_20231213145159_0_doc",wpsService.kswpublicKey); -// System.out.println(jm); -// String jem = RSA.decrypt(jm,wpsService.kswprivateKey); -// System.out.println(jem); + //String jm = RSA.encrypt("1538803364727304192_20231219095538_0_doc_客户端测试子项目1-XY926020101-服务费通知书-杭州安恒信息技术股份有限公司",wpsService.kswpublicKey); + + //System.out.println(jm); + String jm = "OYVWJe3COaiuwhNM4Op7K6ijEWEzY0PQUlceNRTX2xL/Ey7opbVA0pFkX/Ky89LjlsnA3kGJgg5l6gtCIsZGK3g/X3zp4amtDu78CmaBbZEmYSHBG4q98DSPVJUMmk0hKPAmhIP+Kclpc0j8V/d2Gg4DpVqDMTZ8HeYh37ai3A=="; + String jem = RSA.decrypt(jm,wpsService.kswprivateKey); + System.out.println(jem); //String key = wpsService.getDownloadEncrypt("1679764839191080961","3a1f5aae-3cd2-4599-87b0-712e40625c7c"); //加解密