diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java index 3ba4ab1..587f864 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java @@ -42,42 +42,42 @@ public class ProjectRenewalFundDeclarationController { @GetMapping("/{id}") @ApiOperation("项目续建资金详情") @WebLog("项目续建资金详情") - private ProjectRenewalFundDeclarationVO detail (@PathVariable Long id){ + public ProjectRenewalFundDeclarationVO detail (@PathVariable Long id){ return projectRenewalFundManage.detail(id); } @PostMapping("/declared") @ApiOperation("项目续建资金申请") @WebLog("项目续建资金申请") - private Long declared (@Validated @RequestBody ProjectRenewalFundDeclarationDTO dto){ + public Long declared (@Validated @RequestBody ProjectRenewalFundDeclarationDTO dto){ return projectRenewalFundManage.declared(dto); } @PostMapping("/audit") @ApiOperation("续建项目审核") @WebLog("续建项目审核") - private Long audit(@Validated @RequestBody ProjectRenewalAuditReq param){ + public Long audit(@Validated @RequestBody ProjectRenewalAuditReq param){ return projectRenewalFundManage.audit(param); } @DeleteMapping("/delete/{projectRenewalId}") @ApiOperation("续建项目删除") @WebLog("续建项目删除") - private Long delete(@PathVariable("projectRenewalId") Long projectRenewalId){ + public Long delete(@PathVariable("projectRenewalId") Long projectRenewalId){ return projectRenewalFundManage.delete(projectRenewalId); } @GetMapping("/export") @ApiOperation("项目库续建项目列表导出") @WebLog("项目库续建项目列表导出") - private void exportList(ProjectRenewalListReq req, HttpServletResponse response){ + public void exportList(ProjectRenewalListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportList); } @GetMapping("/exportRenewalDeclare") @ApiOperation("申报管理续建项目资金申报列表导出") @WebLog("申报管理续建项目资金申报列表导出") - private void exportRenewalDeclareList(ProjectRenewalListReq req, HttpServletResponse response){ + public void exportRenewalDeclareList(ProjectRenewalListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportRenewalDeclareList); } diff --git a/pmapi/src/test/resources/application-prod.yml b/pmapi/src/test/resources/application-prod.yml index f085ff9..7f9325a 100644 --- a/pmapi/src/test/resources/application-prod.yml +++ b/pmapi/src/test/resources/application-prod.yml @@ -208,7 +208,10 @@ irs: access-key: 42bcb49bea174986a3bfdfba7d005566 secret-key: bebff29877d4443abd67fc4f8fb335d8 api-url: https://bcdsg.zj.gov.cn:8443/restapi/prod/IC33000020220309000004/seal-platform/seal/v1/rest/sign/signPdf - + app-report: + url: https://bcdsg.zj.gov.cn:8443/restapi/prod/IC33000020230427000001/irs-res-bill/report/pdfUrl + appScret: BCDSGS_4ab4235d26a9a357170a39f3a13fd68c + appKey: BCDSGA_d874c8e46b541eb4e8aac6510fd3351b hostname: iZ6mx01gyeodd80imxd2gbZ login: phone-verify-code: diff --git a/pmapi/src/test/resources/application.yml b/pmapi/src/test/resources/application.yml index 3d7808a..9f96606 100644 --- a/pmapi/src/test/resources/application.yml +++ b/pmapi/src/test/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: dev + active: prod diff --git a/pmapi/src/test/resources/integration/zwdd-prod.yml b/pmapi/src/test/resources/integration/zwdd-prod.yml index cc28814..6b30e1b 100644 --- a/pmapi/src/test/resources/integration/zwdd-prod.yml +++ b/pmapi/src/test/resources/integration/zwdd-prod.yml @@ -1,12 +1,12 @@ -#专有钉钉 +#浙政钉 integration: zwdd: #扫码 - app-auth-key: ls-rebuild_dingoa-rgeWs3YVr26z - app-auth-secret: 37qCe6ylNMW0N8K2741z0c2b9vJP2gtuMRQQtZ9P + app-auth-key: ls_project_managment_din-b1Y3I1g7Rr94yX76KfFkpp18Uy4WHtU0b6rINJ3 + app-auth-secret: 75e8PMHv984KYF0Mcy6v4pxt480y73dbD7kB65dD #免登/获取信息 - app-key: ls_rebuild-10c8n5X0707yFV7jURr - app-secret: gN8J3WazyXLMWKDuFmx6C4yaH5lFUY41x8rYLLo6 + app-key: ls_project-c32LNu87v60UiANZVja + app-secret: R14QgbBr21751LTGml3Vt8oX9doPl4Lk1ROzZNfG #专有钉钉在开发管理工作台,右键查看网页源码realmId: '31141',浙政钉固定196729 - tenantId: 31141 - domain: openplatform.dg-work.cn \ No newline at end of file + tenantId: 196729 + domain: openplatform-pro.ding.zj.gov.cn \ No newline at end of file