diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/entity/KingSoftFileSaveVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/entity/KingSoftFileSaveVo.java index 2498a4e..9ad551b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/entity/KingSoftFileSaveVo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/entity/KingSoftFileSaveVo.java @@ -21,4 +21,10 @@ public class KingSoftFileSaveVo { * 文件内容,base64编码 */ public String fileBody; + + /** + * token + */ + public String token; + } 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 534980f..e31f7d7 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 @@ -500,7 +500,7 @@ public class WpsServiceImpl implements WpsService { public String getKSWpsUrl(WpsClientInVo in){ KingSoftWpsVo vo = new KingSoftWpsVo(); - vo.setSrcId(1); + vo.setSrcId(7); vo.setStaffCode("ebtp"); vo.setFileKey(in.getFileId()); String fileName = in.getFileName(); @@ -593,6 +593,21 @@ public class WpsServiceImpl implements WpsService { return fileId; } + private String getSaveDownloadEncrypt(String fileId){ + String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); + //fileId+ebtp+token+time md5加密 + String mdKey = MdConstants.getSha256(time+appName+fileId); + log.info("mdKey:"+mdKey); + //fileId|token|yyyyMMddHHmmss|md5加密 + String rsaKey = fileId+"_"+time+"_"+mdKey; + log.info("rsaKey:"+rsaKey); + //RSA加密 + String key = RSA.encrypt(rsaKey,kswpublicKey); + log.info("key:"+key); + + return key; + } + @Override public byte[] getKSWpsFile(String key){ @@ -618,6 +633,7 @@ public class WpsServiceImpl implements WpsService { @Override public Map saveKSFile(KingSoftFileSaveVo vo){ + log.info("KingSoftFileSaveVo:"+vo.getFileKey()); Map map = new HashMap<>(); map.put("code","0"); @@ -654,10 +670,10 @@ public class WpsServiceImpl implements WpsService { public static void main(String args[]) throws UnsupportedEncodingException { WpsServiceImpl wpsService = new WpsServiceImpl(); -// wpsService.kswpublicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtUm+H78uT39TOsgS5XdbIuC0BRLiktqbuI3F9VFbPWDcX15Ptb2u2yTCSOB0Gl+yI+hqpClyV9nyjnu0LgoWpsIDZSLVLdrltYKz9N8jwXKhybomT2EuYU7hzWT1Ea4fkIBfYMCl+BQYSkXD6eqObg4mq2/wUFUVX/+/vjsMShwIDAQAB"; + 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 key = wpsService.getDownloadEncrypt("1679764839191080961","3a1f5aae-3cd2-4599-87b0-712e40625c7c"); + wpsService.appName = "biz-service-ebtp-extend"; + String key = wpsService.getDownloadEncrypt("1679764839191080961","3a1f5aae-3cd2-4599-87b0-712e40625c7c"); //加解密 // String key = URLDecoder.decode( "FkvDifsfK8frde0ywRzdPMmOlR4%2FO8C4VORaw%2FwshgBt%2B49Z2%2B0al4KwyQ97Js8Yh24%2ByMT%2Fln4Aqx%2BVZNkGqOh0OxP1H3qj%2BP%2BlP1Sybvs5I0q%2BtFpW9nMQcGAsenFNLgcFtUtsQAJG4ALG4cH34TnDnSjuivM9tmA1Gt%2BzsJU%3D","utf-8"); // String val = RSA.decrypt(key,wpsService.kswprivateKey); @@ -685,10 +701,10 @@ public class WpsServiceImpl implements WpsService { // CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("令牌时间戳错误",true); // } - KingSoftWpsVo vo = new KingSoftWpsVo(); - vo.setSrcId(1); - vo.setModifier("2222"); - System.out.println(JSON.toJSONString(vo)); +// KingSoftWpsVo vo = new KingSoftWpsVo(); +// vo.setSrcId(1); +// vo.setModifier("2222"); +// System.out.println(JSON.toJSONString(vo)); //System.out.println(URLEncoder.encode("hVLFkQhQkXI8w4RFE25zvCP9TKRZwT8Dqhxmi/PgDalGayE5SIjtyFBRpu6wuEqr7HvAIHm2Kc8+ahIUF7l8sc1PHYeCuEmgYEwzeosl1pT1yDyQ+KV6Q8REiufarAbZ1W9LEx70SBrtTXPKnEPi82njSv+CVrYqZCf6XZ/BINU=","utf-8"));