diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java index 7db14c2c..e0f4b4a6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java @@ -92,21 +92,49 @@ public class PayResearchProjectController extends JeroController getToken() { + JSONObject pageList = payResearchProjectService.getToken(); + return Result.OK(pageList); + } + /** + * 第三方合同 + * + * @param + * @param + * @return + */ + @AutoLog(value = "第三方合同-刷新token") + @ApiOperation(value="第三方合同-刷新token", notes="第三方合同-刷新token") + @PostMapping(value = "/refreshToken") + public Result refreshToken(@RequestParam(value = "refresh_token") String refresh_token) { + JSONObject pageList = payResearchProjectService.refreshToken(refresh_token); + return Result.OK(pageList); + } /** - * 第三方合同 - * - * @param thereContract - * @param - * @return - */ - @AutoLog(value = "第三方合同-分页列表查询") - @ApiOperation(value="第三方合同-分页列表查询", notes="第三方合同-分页列表查询") - @PostMapping(value = "/pageForThreeContractPage") - public Result pageForThreeContractPage(@RequestBody ThereContract thereContract - ) { - JSONObject pageList = payResearchProjectService.pageForThreeContract(thereContract); - return Result.OK(pageList); - } + * 第三方合同 + * + * @param thereContract + * @param + * @return + */ + @AutoLog(value = "第三方合同-分页列表查询") + @ApiOperation(value="第三方合同-分页列表查询", notes="第三方合同-分页列表查询") + @PostMapping(value = "/pageForThreeContractPage") + public Result pageForThreeContractPage(@RequestBody ThereContract thereContract + ) { + JSONObject pageList = payResearchProjectService.pageForThreeContract(thereContract); + return Result.OK(pageList); + } /** * 第三方合同 * @@ -129,7 +157,7 @@ public class PayResearchProjectController extends JeroController oneForThreeContract(@RequestParam(name="id",required = true) String id diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java index 20b55a48..753c6fd1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java @@ -35,4 +35,8 @@ public interface IPayResearchProjectService extends IService JSONObject oneForThreeContract(String id); + JSONObject getToken(); + + JSONObject refreshToken(String refresh_token); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java index 712db4f2..8391a207 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java @@ -56,7 +56,9 @@ public class PayResearchProjectServiceImpl extends ServiceImpl map2 = new HashMap<>(); @@ -222,7 +224,7 @@ public class PayResearchProjectServiceImpl extends ServiceImpl map2 = new HashMap<>(); map2.put("Authorization",access_token); @@ -266,7 +268,7 @@ public class PayResearchProjectServiceImpl extends ServiceImpl map2 = new HashMap<>(); map2.put("Authorization",access_token); @@ -278,14 +280,31 @@ public class PayResearchProjectServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("appid", "asri"); map.put("secret", "QyYjBQ5LyJkxktvMoKqdUOUtYgkk2VW4DgaKjgVIjCoVz7R5bgNoS"); String s = JSONObject.toJSONString(map); String s1 = HttpUtil.post(URL_TOKEN, s); JSONObject jsonObject = JSONObject.parseObject(s1); - return jsonObject.getJSONObject("data").getString("access_token"); + return jsonObject; + } + + @Override + public JSONObject refreshToken( String refresh_token) { +// HashMap map = new HashMap<>(); +// map.put("refresh_token",refresh_token); +// String s = JSONObject.toJSONString(map); +// String s1 = HttpUtil.post(URL_REFRESH_TOKEN, s); +// JSONObject jsonObject = JSONObject.parseObject(s1); + + + HashMap map2 = new HashMap<>(); + map2.put("refresh_token",refresh_token); + String post = HttpUtil.post(URL_REFRESH_TOKEN, map2); + JSONObject jsonObject = JSONObject.parseObject(post); + return jsonObject; } }