From ac07d9f501ac332d524567346933e45e4bf9857b Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 3 Aug 2023 16:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E5=AD=97=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=8C=87=E6=A0=87=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../irs/controller/ApplicationController.java | 10 +- .../pmapi/irs/controller/IrsController.java | 10 +- .../ningdatech/pmapi/irs/manage/AppIrsManage.java | 116 ++++++++++++++------- pmapi/src/main/resources/application-dev.yml | 5 + pmapi/src/main/resources/application-pre.yml | 5 + pmapi/src/main/resources/application-prod.yml | 5 + .../java/com/ningdatech/pmapi/irs/IrsTest.java | 25 +++-- pmapi/src/test/resources/application-dev.yml | 5 + pmapi/src/test/resources/application-pre.yml | 7 +- 9 files changed, 133 insertions(+), 55 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/controller/ApplicationController.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/controller/ApplicationController.java index 2fc2ab3..ec2df81 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/controller/ApplicationController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/irs/controller/ApplicationController.java @@ -1,19 +1,17 @@ package com.ningdatech.pmapi.irs.controller; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.irs.manage.AppIrsManage; import com.ningdatech.pmapi.irs.model.dto.ApiApplyDTO; -import com.ningdatech.pmapi.irs.model.dto.ApiApplySearchResult; import com.ningdatech.pmapi.irs.model.dto.PushProjectAppToIrsDTO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; + import javax.validation.Valid; import java.security.NoSuchAlgorithmException; -import java.util.List; /** * @Classname ApplicationController @@ -45,4 +43,10 @@ public class ApplicationController { public JSONArray searchApps(ApiApplyDTO apply) throws NoSuchAlgorithmException { return appIrsManage.searchApps(apply); } + + @GetMapping("/digitalResourcesIndicators/{appCode}") + public JSONObject getDigitalResourcesIndicators(@PathVariable String appCode) { + return appIrsManage.getDigitalResourceIndicatorsByAppCode(appCode); + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/controller/IrsController.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/controller/IrsController.java index 02856c4..6b92eed 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/controller/IrsController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/irs/controller/IrsController.java @@ -1,9 +1,6 @@ package com.ningdatech.pmapi.irs.controller; import com.ningdatech.log.annotation.WebLog; -import com.ningdatech.pmapi.common.util.CryptUtils; -import com.ningdatech.pmapi.common.util.HttpUtil; -import com.ningdatech.pmapi.irs.utils.RefreshTokenUtil; import com.ningdatech.pmapi.projectdeclared.manage.IrsManage; import com.ningdatech.pmapi.projectdeclared.model.vo.IrsApplicationVO; import com.ningdatech.pmapi.projectdeclared.model.vo.PiotTasksVO; @@ -11,10 +8,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.client.RestTemplate; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java index 82d43f2..9d413f8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java @@ -9,12 +9,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.basic.function.VUtils; import com.ningdatech.irs.service.IRefreshTokenService; import com.ningdatech.pmapi.common.enumeration.CommonEnum; -import com.ningdatech.pmapi.common.statemachine.contants.RegionContant; import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; import com.ningdatech.pmapi.common.util.CryptUtils; import com.ningdatech.pmapi.common.util.HttpUtil; import com.ningdatech.pmapi.common.util.RefreshKeyUtil; -import com.ningdatech.pmapi.irs.model.dto.*; +import com.ningdatech.pmapi.irs.model.dto.ApiApplyDTO; +import com.ningdatech.pmapi.irs.model.dto.ApiApplySearchResult; +import com.ningdatech.pmapi.irs.model.dto.PushProjectAppToIrsDTO; import com.ningdatech.pmapi.irs.model.res.ApiResponse; import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; import com.ningdatech.pmapi.projectlib.model.entity.Project; @@ -34,7 +35,6 @@ import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; import java.security.NoSuchAlgorithmException; import java.time.LocalDateTime; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -93,8 +93,23 @@ public class AppIrsManage { @Value("${irs.push-project-detail.appSecret}") private String pushProjectAppSecret; + //=============数字资源指标获取======================================================================================== + + @Value("${irs.digital-resource-indicators.app-key}") + private String driAppKey; + + @Value("${irs.digital-resource-indicators.app-secret}") + private String driAppSecret; + + @Value("${irs.digital-resource-indicators.interface-name}") + private String driInterfaceName; + + @Value("${irs.digital-resource-indicators.url}") + private String driUrl; + /** * 推送 项目和应用关系 + * * @param dto * @return * @throws NoSuchAlgorithmException @@ -112,14 +127,14 @@ public class AppIrsManage { ApiApplyDTO apiApply = new ApiApplyDTO(); apiApply.setAppId(appCode); JSONObject jsonObject = this.searchApp(apiApply); - ApiApplySearchResult apiApplySearchResult = JSON.parseObject(JSON.toJSONString(jsonObject),ApiApplySearchResult.class); + ApiApplySearchResult apiApplySearchResult = JSON.parseObject(JSON.toJSONString(jsonObject), ApiApplySearchResult.class); VUtils.isTrue(Objects.isNull(apiApplySearchResult)).throwMessage("应用在IRS不存在!"); long timestamp = System.currentTimeMillis(); String areaCode = project.getAreaCode(); String projectName = project.getProjectName(); String requestSecret = RefreshKeyUtil.getRequestSecret(pushAppKey, pushAppScret); - String capCode = CryptUtils.encryptHMAC(timestamp + areaCode,"bcb4fc0f517fc168ee543fcf4d231f3b"); + String capCode = CryptUtils.encryptHMAC(timestamp + areaCode, "bcb4fc0f517fc168ee543fcf4d231f3b"); String capTime = String.valueOf(timestamp); String sign = CryptUtils.MD5Encode(pushAppKey + requestSecret + timestamp); String url = pushUrl + "?requestTime=" + timestamp + @@ -134,14 +149,14 @@ public class AppIrsManage { ApiResponse body = forEntity.getBody(); - if(Objects.isNull(body) || Objects.isNull(body.getCode()) - || 0 != body.getCode()){ + if (Objects.isNull(body) || Objects.isNull(body.getCode()) + || 0 != body.getCode()) { return Boolean.FALSE; } //保存关系 app.setAppCode(appCode); - if(applicationService.updateById(app)){ + if (applicationService.updateById(app)) { /** * 判断下 如果成功的话 那么判断下 这个项目的初次创建的app 是否都已经被注册 * 如果都已经注册 要调用状态机 进入下一个状态 @@ -150,8 +165,8 @@ public class AppIrsManage { .eq(ProjectApplication::getProjectId, project.getId())); //筛选出 初次新建的app 但是没有appCode的 apps = apps.stream().filter(a -> { - if(CommonEnum.YES.getCode().equals(a.getIsFirst()) && - StringUtils.isBlank(app.getAppCode())){ + if (CommonEnum.YES.getCode().equals(a.getIsFirst()) && + StringUtils.isBlank(app.getAppCode())) { return Boolean.TRUE; } return Boolean.FALSE; @@ -159,7 +174,7 @@ public class AppIrsManage { .collect(Collectors.toList()); //如果筛选出来的 为空的话 就调用状态机 - if(CollUtil.isEmpty(apps)){ + if (CollUtil.isEmpty(apps)) { stateMachineUtils.pass(project); project.setUpdateOn(LocalDateTime.now()); projectService.updateById(project); @@ -171,6 +186,7 @@ public class AppIrsManage { /** * 查询app + * * @param apply * @return * @throws NoSuchAlgorithmException @@ -184,27 +200,27 @@ public class AppIrsManage { "&appKey=" + searchAppKey + "&" + "pageSize=10&pageNum=1&appCode=" + appCode + "&areaCode=&deptCode=&name="; - log.info("url : {}",url); + log.info("url : {}", url); RestTemplate restTemplate = new RestTemplate(); ResponseEntity forEntity = restTemplate.getForEntity(url, String.class); - log.info("查询应用目录 : {}",JSON.toJSONString(forEntity)); + log.info("查询应用目录 : {}", JSON.toJSONString(forEntity)); - if(Objects.nonNull(forEntity.getBody()) && Objects.nonNull(forEntity.getBody())){ + if (Objects.nonNull(forEntity.getBody()) && Objects.nonNull(forEntity.getBody())) { JSONObject body = JSON.parseObject(forEntity.getBody()); - if(Objects.isNull(body)){ + if (Objects.isNull(body)) { return null; } JSONObject datas = body.getJSONObject("datas"); - if(Objects.isNull(datas)){ + if (Objects.isNull(datas)) { return null; } JSONObject data = datas.getJSONObject("data"); - if(Objects.isNull(data)){ + if (Objects.isNull(data)) { return null; } JSONArray apiApplySearchResult = data.getJSONArray("apiApplySearchResult"); - if(CollUtil.isEmpty(apiApplySearchResult)){ + if (CollUtil.isEmpty(apiApplySearchResult)) { return null; } return apiApplySearchResult.getJSONObject(0); @@ -225,19 +241,19 @@ public class AppIrsManage { RestTemplate restTemplate = new RestTemplate(); ResponseEntity forEntity = restTemplate.getForEntity(url, String.class); - log.info("查询应用目录 : {}",JSON.toJSONString(forEntity)); + log.info("查询应用目录 : {}", JSON.toJSONString(forEntity)); - if(Objects.nonNull(forEntity.getBody())){ + if (Objects.nonNull(forEntity.getBody())) { JSONObject body = JSON.parseObject(forEntity.getBody()); - if(Objects.isNull(body)){ + if (Objects.isNull(body)) { return null; } JSONObject datas = body.getJSONObject("datas"); - if(Objects.isNull(datas)){ + if (Objects.isNull(datas)) { return null; } JSONObject data = datas.getJSONObject("data"); - if(Objects.isNull(data)){ + if (Objects.isNull(data)) { return null; } JSONArray apiApplySearchResult = data.getJSONArray("apiApplySearchResult"); @@ -252,14 +268,14 @@ public class AppIrsManage { String appKey = "A331101453557202109017383"; String method = "POST"; String interfaceName = "5crv7i4727abLCv0"; - String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,interfaceName,method); - log.info("secret :{}",secret); + String secret = refreshTokenService.refreshToken(appKey, appSecret, govRequestTokenUrl, govRefreshTokenUrl, interfaceName, method); + log.info("secret :{}", secret); String sign = MD5.create().digestHex(appKey + secret + timestamp); HttpComponentsClientHttpRequestFactory factory = HttpUtil.generateHttpRequestFactory(); RestTemplate restTemplate; - if(Objects.nonNull(factory)){ + if (Objects.nonNull(factory)) { restTemplate = new RestTemplate(factory); - }else{ + } else { restTemplate = new RestTemplate(); } String appId = "A330000100000202105005790"; @@ -269,7 +285,7 @@ public class AppIrsManage { "&sign=" + sign + "&appKey=" + appKey + "&capCode=" + capCode + "&capTime=" + timestamp + "&appId=" + appId; - log.info("url :{}",url); + log.info("url :{}", url); ResponseEntity forEntity = restTemplate.getForEntity(url, String.class); log.info(forEntity.getBody()); return forEntity.getBody(); @@ -277,6 +293,7 @@ public class AppIrsManage { /** * 推送项目详情 + * * @return */ public String pushProjectDetail(ProjectDTO projectDto) { @@ -285,14 +302,14 @@ public class AppIrsManage { String appKey = pushProjectAppKey; String method = HttpMethod.POST.name(); String interfaceName = pushProjectInterfaceName; - String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,interfaceName,method); - log.info("secret :{}",secret); + String secret = refreshTokenService.refreshToken(appKey, appSecret, govRequestTokenUrl, govRefreshTokenUrl, interfaceName, method); + log.info("secret :{}", secret); String sign = MD5.create().digestHex(appKey + secret + timestamp); HttpComponentsClientHttpRequestFactory factory = HttpUtil.generateHttpRequestFactory(); RestTemplate restTemplate; - if(Objects.nonNull(factory)){ + if (Objects.nonNull(factory)) { restTemplate = new RestTemplate(factory); - }else{ + } else { restTemplate = new RestTemplate(); } String baseProjPrincipal = projectDto.getResponsibleMan();//"蒋国海" @@ -318,13 +335,13 @@ public class AppIrsManage { String baseProvManDeprtDing = projectDto.getHigherSuperOrgCode();//"GO_6c383c049d95461f9a0df780140ceb32"; String baseBasisEstablish = projectDto.getBuildBasis();//"中共遂昌县委办公室关于研究开发“天工”智能化管理平台（三期）的函"; String capCode = null; - try{ + try { capCode = CryptUtils.encryptHMAC(timestamp + areaCode, "bcb4fc0f517fc168ee543fcf4d231f3b"); - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage()); } - String url = pushProjectUrl+ "?" + + String url = pushProjectUrl + "?" + "requestTime=" + timestamp + "&sign=" + sign + "&appKey=" + appKey + "&baseProjPrincipal=" + baseProjPrincipal + "" + "&baseProjSetYear=" + baseProjSetYear + "&baseProjId=" + baseProjId + @@ -337,9 +354,36 @@ public class AppIrsManage { "&baseProjConsClass=" + baseProjConsClass + "&capCode=" + capCode + "&baseManDeprtDing=" + baseManDeprtDing + "&baseProvManDeprtDing=" + baseProvManDeprtDing + "&baseBasisEstablish=" + baseBasisEstablish + "&baseAreaCode=" + areaCode + "&capTime=" + timestamp + "&baseAreaName=" + baseAreaName; - log.info("url :{}",url); + log.info("url :{}", url); ResponseEntity forEntity = restTemplate.getForEntity(url, String.class); log.info(forEntity.getBody()); return forEntity.getBody(); } + + public JSONObject getDigitalResourceIndicatorsByAppCode(String appCode) { + long timestamp = System.currentTimeMillis(); + String appSecret = driAppSecret; + String appKey = driAppKey; + String method = HttpMethod.POST.name(); + String interfaceName = driInterfaceName; + String secret = refreshTokenService.refreshToken(appKey, appSecret, govRequestTokenUrl, govRefreshTokenUrl, interfaceName, method); + log.info("secret : {}", secret); + String sign = MD5.create().digestHex(appKey + secret + timestamp); + HttpComponentsClientHttpRequestFactory factory = HttpUtil.generateHttpRequestFactory(); + RestTemplate restTemplate; + if (Objects.nonNull(factory)) { + restTemplate = new RestTemplate(factory); + } else { + restTemplate = new RestTemplate(); + } + + String url = driUrl + "?" + + "requestTime=" + timestamp + "&sign=" + sign + + "&appKey=" + appKey + "&appCode=" + appCode; + log.info("url :{}", url); + ResponseEntity forEntity = restTemplate.getForEntity(url, JSONObject.class); + log.info(Objects.requireNonNull(forEntity.getBody()).toJSONString()); + return forEntity.getBody(); + } + } diff --git a/pmapi/src/main/resources/application-dev.yml b/pmapi/src/main/resources/application-dev.yml index be8920d..12506d8 100644 --- a/pmapi/src/main/resources/application-dev.yml +++ b/pmapi/src/main/resources/application-dev.yml @@ -206,6 +206,11 @@ provincial: #天印服务器接口信息 irs: is-search-app: false + digital-resource-indicators: + url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/99E2bic31KdXzaa7.htm + interface-name: 99E2bic31KdXzaa7 + app-key: A331101453557202109017383 + app-secret: 496f0f2a19994f76b4fd9dae087366c7 seal-platform: project-id: 330001110 project-secret: 70e512d40c8f440484db4acab181570a diff --git a/pmapi/src/main/resources/application-pre.yml b/pmapi/src/main/resources/application-pre.yml index 359614b..27b951d 100644 --- a/pmapi/src/main/resources/application-pre.yml +++ b/pmapi/src/main/resources/application-pre.yml @@ -209,6 +209,11 @@ provincial: #天印服务器接口信息 irs: is-search-app: true + digital-resource-indicators: + url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/99E2bic31KdXzaa7.htm + interfaceName: 99E2bic31KdXzaa7 + app-key: A331101453557202109017383 + app-secret: 496f0f2a19994f76b4fd9dae087366c7 seal-platform: project-id: 330001110 project-secret: 70e512d40c8f440484db4acab181570a diff --git a/pmapi/src/main/resources/application-prod.yml b/pmapi/src/main/resources/application-prod.yml index 2f1baa9..23da4c4 100644 --- a/pmapi/src/main/resources/application-prod.yml +++ b/pmapi/src/main/resources/application-prod.yml @@ -209,6 +209,11 @@ provincial: #天印服务器接口信息 irs: is-search-app: true + digital-resource-indicators: + url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/99E2bic31KdXzaa7.htm + interfaceName: 99E2bic31KdXzaa7 + app-key: A331101453557202109017383 + app-secret: 496f0f2a19994f76b4fd9dae087366c7 seal-platform: project-id: 330001110 project-secret: 70e512d40c8f440484db4acab181570a diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest.java b/pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest.java index e0c0d1c..b5a4d53 100644 --- a/pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest.java +++ b/pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest.java @@ -7,6 +7,7 @@ import com.ningdatech.pmapi.AppTests; import com.ningdatech.pmapi.common.util.CryptUtils; import com.ningdatech.pmapi.common.util.HmacAuthUtil; import com.ningdatech.pmapi.common.util.RefreshKeyUtil; +import com.ningdatech.pmapi.irs.manage.AppIrsManage; import com.ningdatech.zwdd.ZwddIntegrationProperties; import com.ningdatech.zwdd.client.ZwddAuthClient; import com.ningdatech.zwdd.client.ZwddClient; @@ -20,12 +21,14 @@ import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; + import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; import java.security.NoSuchAlgorithmException; -import java.util.*; +import java.util.Map; +import java.util.Objects; /** * @Classname IrsTest @@ -40,9 +43,11 @@ public class IrsTest extends AppTests { @Autowired private ZwddClient zwddClient; + @Autowired + private AppIrsManage appIrsManage; @Test - public void test1(){ + public void test1() { String method = "GET"; String url = "https://bcdsg.zj.gov.cn:8443/restapi/prod/IC33000020230427000001/irs-res-bill/report/pdfUrl" + "?appCode=A331101453557202109017383"; @@ -53,14 +58,14 @@ public class IrsTest extends AppTests { //请求头 HttpHeaders headers = new HttpHeaders(); - for(Map.Entry entry : header.entrySet()){ + for (Map.Entry entry : header.entrySet()) { headers.add(entry.getKey(), entry.getValue()); } //封装请求头 HttpEntity> formEntity = new HttpEntity>(headers); RestTemplate restTemplate = new RestTemplate(); - ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET,formEntity, String.class); + ResponseEntity forEntity = restTemplate.exchange(url, HttpMethod.GET, formEntity, String.class); System.out.println(JSON.toJSONString(forEntity)); } @@ -100,7 +105,7 @@ public class IrsTest extends AppTests { String sign = CryptUtils.MD5Encode(appKey + requestSecret + timestamp); String url = "https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/94wbaL1I1Pbz0648.htm?requestTime=" + timestamp + "&sign=" + sign + "&appKey=" + appKey + "&capCode=" + capCode + "&capTime=" + capTime + - "&baseProjSys=" + baseProjSys + "&areaCode=331123&baseProjName=" + baseProjName + "&baseProjId=" + baseProjId + + "&baseProjSys=" + baseProjSys + "&areaCode=331123&baseProjName=" + baseProjName + "&baseProjId=" + baseProjId + "&isEffective=1&baseProjSysCode=" + baseProjSysCode; RestTemplate restTemplate = new RestTemplate(); ResponseEntity forEntity = restTemplate.getForEntity(url, String.class); @@ -116,7 +121,7 @@ public class IrsTest extends AppTests { } @Test - public void test4(){ + public void test4() { CloseableHttpResponse response = null; try { String api = "/media/download"; @@ -147,7 +152,7 @@ public class IrsTest extends AppTests { fos.close(); } catch (Exception e) { System.out.println(e); - }finally { + } finally { if (response != null) { try { //特别提醒：需要调用response的close方法关闭网络连接！！！ @@ -160,7 +165,7 @@ public class IrsTest extends AppTests { } @Test - public void test5(){ + public void test5() { CloseableHttpResponse response = null; try { String api = "/media/download"; @@ -191,7 +196,7 @@ public class IrsTest extends AppTests { fos.close(); } catch (Exception e) { System.out.println(e); - }finally { + } finally { if (response != null) { try { //特别提醒：需要调用response的close方法关闭网络连接！！！ @@ -206,6 +211,7 @@ public class IrsTest extends AppTests { private static ExecutableClient zwddExecutableClient; @Autowired private ZwddIntegrationProperties zwddProperties; + public ExecutableClient getZwddExecutableClient() { if (Objects.isNull(zwddExecutableClient)) { synchronized (ZwddAuthClientProvider.class) { @@ -224,4 +230,5 @@ public class IrsTest extends AppTests { } return zwddExecutableClient; } + } diff --git a/pmapi/src/test/resources/application-dev.yml b/pmapi/src/test/resources/application-dev.yml index be8920d..1576bb9 100644 --- a/pmapi/src/test/resources/application-dev.yml +++ b/pmapi/src/test/resources/application-dev.yml @@ -206,6 +206,11 @@ provincial: #天印服务器接口信息 irs: is-search-app: false + digital-resource-indicators: + url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/99E2bic31KdXzaa7.htm + interfaceName: 99E2bic31KdXzaa7 + app-key: A331101453557202109017383 + app-secret: 496f0f2a19994f76b4fd9dae087366c7 seal-platform: project-id: 330001110 project-secret: 70e512d40c8f440484db4acab181570a diff --git a/pmapi/src/test/resources/application-pre.yml b/pmapi/src/test/resources/application-pre.yml index 359614b..9f449f4 100644 --- a/pmapi/src/test/resources/application-pre.yml +++ b/pmapi/src/test/resources/application-pre.yml @@ -145,7 +145,7 @@ flowable: async-executor-activate: true #关闭一些不需要的功能服务 rest-api-enabled: false -# database-schema-update: false + # database-schema-update: false idm: enabled: false common: @@ -209,6 +209,11 @@ provincial: #天印服务器接口信息 irs: is-search-app: true + digital-resource-indicators: + url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/99E2bic31KdXzaa7.htm + interfaceName: 99E2bic31KdXzaa7 + app-key: A331101453557202109017383 + app-secret: 496f0f2a19994f76b4fd9dae087366c7 seal-platform: project-id: 330001110 project-secret: 70e512d40c8f440484db4acab181570a