diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 907629471..0b6feb2ea 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -111,9 +111,11 @@ jobs: # todo get fisco's tag. temporarily use variable of DOCKER_FISCO_TAG - name: Set docker tag from tag id: set_docker_tag - run: -# [[ ${{github.ref}} == */tags/* ]] && DOCKER_TAG="${GIT_TAG_NAME}" || DOCKER_TAG="${BRANCH_NAME}" -# DOCKER_TAG="${{ secrets.DOCKERHUB_ORG }}/${DOCKER_FISCO_REPOSITORY}:${DOCKER_FISCO_TAG}" + run: | + DOCKER_TAG="${DOCKER_FISCO_TAG}" + DOCKER_TAG="${{ secrets.DOCKERHUB_ORG }}/${DOCKER_FISCO_REPOSITORY}:${DOCKER_TAG}" + + echo "New docker tag is ${DOCKER_FISCO_TAG}" echo "::set-output name=docker_tag::$(echo ${DOCKER_FISCO_TAG})" diff --git a/build.gradle b/build.gradle index 18cf2dfcb..4a81f58b7 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ repositories { } -def spring_version="4.3.29.RELEASE" +def spring_version="5.2.22.RELEASE" List spring =[ "org.springframework:spring-core:$spring_version", "org.springframework:spring-beans:$spring_version", @@ -40,13 +40,14 @@ List spring =[ ] -def spring_boot_version="1.5.22.RELEASE" +def spring_boot_version="2.3.12.RELEASE" List spring_boot =[ "org.springframework.boot:spring-boot-starter-web:$spring_boot_version", "org.springframework.boot:spring-boot-autoconfigure:$spring_boot_version", "org.springframework.boot:spring-boot-configuration-processor:$spring_boot_version", "org.springframework.boot:spring-boot-starter-data-jpa:$spring_boot_version", - "org.springframework.boot:spring-boot-starter-amqp:$spring_boot_version" + "org.springframework.boot:spring-boot-starter-amqp:$spring_boot_version", + "org.springframework.boot:spring-boot-starter-validation:$spring_boot_version" ] @@ -56,7 +57,7 @@ List swagger = [ ] -def log4j_version="2.15.0" +def log4j_version="2.18.0" List logger = [ "org.apache.logging.log4j:log4j-api:$log4j_version", "org.apache.logging.log4j:log4j-core:$log4j_version", @@ -71,12 +72,13 @@ List jaxb = [ "javax.activation:activation:1.1.1" ] -def jackson_version = "2.11.4" +def jackson_version = "2.14.1" List jackson = [ "com.fasterxml.jackson.core:jackson-annotations:$jackson_version", "com.fasterxml.jackson.core:jackson-core:$jackson_version", "com.fasterxml.jackson.core:jackson-databind:$jackson_version", - "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version", + "com.fasterxml.jackson.core:jackson-databind:$jackson_version" ] // cover old version @@ -107,6 +109,7 @@ dependencies { compile 'com.github.jsqlparser:jsqlparser:2.0' compile 'org.apache.commons:commons-lang3:3.8.1' compile 'org.slf4j:jcl-over-slf4j:1.7.30' + compile 'org.apache.httpcomponents:httpclient:4.5.14' // cover low version guava compile 'com.google.guava:guava:29.0-jre' testCompile('org.springframework.boot:spring-boot-starter-test') { diff --git a/src/main/java/com/webank/webase/front/abi/AbiController.java b/src/main/java/com/webank/webase/front/abi/AbiController.java index 2ac762c4a..c03ca63d7 100644 --- a/src/main/java/com/webank/webase/front/abi/AbiController.java +++ b/src/main/java/com/webank/webase/front/abi/AbiController.java @@ -61,8 +61,8 @@ public BasePageResponse getAbiListByGroupId(@PathVariable("groupId") Integer gro if (pageNumber < 1) { throw new FrontException(ConstantCode.PARAM_ERROR); } - Pageable pageable = new PageRequest(pageNumber - 1, pageSize, - new Sort(Sort.Direction.DESC, "createTime")); + Pageable pageable = PageRequest.of(pageNumber - 1, pageSize, + Sort.by(Sort.Direction.DESC, "createTime")); resList = abiService.getListByGroupId(groupId, pageable); log.debug("end getAbiListByGroupId resList count. {}", resList.size()); diff --git a/src/main/java/com/webank/webase/front/abi/AbiService.java b/src/main/java/com/webank/webase/front/abi/AbiService.java index 4140a9989..bf18227bd 100644 --- a/src/main/java/com/webank/webase/front/abi/AbiService.java +++ b/src/main/java/com/webank/webase/front/abi/AbiService.java @@ -130,7 +130,7 @@ public void updateAbiInfo(ReqImportAbi param) { public void delete(Long id) { checkAbiIdExist(id); - abiRepository.delete(id); + abiRepository.deleteById(id); } public AbiInfo getAbiById(Long abiId) { diff --git a/src/main/java/com/webank/webase/front/base/config/TomcatConfig.java b/src/main/java/com/webank/webase/front/base/config/TomcatConfig.java index d34c78941..18eafbf49 100644 --- a/src/main/java/com/webank/webase/front/base/config/TomcatConfig.java +++ b/src/main/java/com/webank/webase/front/base/config/TomcatConfig.java @@ -1,26 +1,25 @@ -package com.webank.webase.front.base.config; - -import com.webank.webase.front.base.properties.Constants; -import org.apache.coyote.http11.Http11NioProtocol; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class TomcatConfig { - - @Autowired - Constants constantProperties; - @Bean - public EmbeddedServletContainerFactory createEmbeddedServletContainerFactory() { - TomcatEmbeddedServletContainerFactory tomcatFactory = new TomcatEmbeddedServletContainerFactory(); - tomcatFactory.addConnectorCustomizers(connector -> { - Http11NioProtocol protocol = (Http11NioProtocol) connector.getProtocolHandler(); - protocol.setKeepAliveTimeout(constantProperties.getKeepAliveTimeout()* 1000); - protocol.setMaxKeepAliveRequests(constantProperties.getKeepAliveRequests()); - }); - return tomcatFactory; - } -} +//package com.webank.webase.front.base.config; +// +//import com.webank.webase.front.base.properties.Constants; +//import org.apache.coyote.http11.Http11NioProtocol; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +//@Configuration +//public class TomcatConfig { +// +// @Autowired +// Constants constantProperties; +// @Bean +// public TomcatServletWebServerFactory createEmbeddedServletContainerFactory() { +// TomcatServletWebServerFactory tomcatFactory = new TomcatServletWebServerFactory(); +// tomcatFactory.addConnectorCustomizers(connector -> { +// Http11NioProtocol protocol = (Http11NioProtocol) connector.getProtocolHandler(); +// protocol.setKeepAliveTimeout(constantProperties.getKeepAliveTimeout()* 1000); +// protocol.setMaxKeepAliveRequests(constantProperties.getKeepAliveRequests()); +// }); +// return tomcatFactory; +// } +//} diff --git a/src/main/java/com/webank/webase/front/contract/ContractRepository.java b/src/main/java/com/webank/webase/front/contract/ContractRepository.java index ad3cadc15..ffe23f379 100644 --- a/src/main/java/com/webank/webase/front/contract/ContractRepository.java +++ b/src/main/java/com/webank/webase/front/contract/ContractRepository.java @@ -17,7 +17,6 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import com.webank.webase.front.contract.entity.Contract; diff --git a/src/main/java/com/webank/webase/front/contract/ContractService.java b/src/main/java/com/webank/webase/front/contract/ContractService.java index da0c5d87d..7c8e474c6 100644 --- a/src/main/java/com/webank/webase/front/contract/ContractService.java +++ b/src/main/java/com/webank/webase/front/contract/ContractService.java @@ -516,7 +516,7 @@ public void deleteContract(Long contractId, int groupId) { // check contract id verifyContractIdExist(contractId, groupId); // remove - contractRepository.delete(contractId); + contractRepository.deleteById(contractId); log.debug("end deleteContract"); } @@ -619,7 +619,7 @@ public Page findContractByPage(ReqPageContract param) throws IOExcepti // page start from index 1 instead of 0 int pageNumber = param.getPageNumber() - 1; Pageable pageable = - new PageRequest(pageNumber, param.getPageSize(), Direction.DESC, "modifyTime"); + PageRequest.of(pageNumber, param.getPageSize(), Direction.DESC, "modifyTime"); Page contractPage = contractRepository.findAll( (Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) -> { // v1.4.2, param add contractPath to filter @@ -867,7 +867,7 @@ public boolean accept(File dir, String fileName) { */ public ContractPath addContractPath(ReqContractPath req) { ContractPathKey pathKey = new ContractPathKey(req.getGroupId(), req.getContractPath()); - ContractPath check = contractPathRepository.findOne(pathKey); + ContractPath check = contractPathRepository.findById(pathKey).orElse(null); if (check != null) { log.error("addContractPath fail, path exists check:{}", check); throw new FrontException(ConstantCode.CONTRACT_PATH_IS_EXISTS); @@ -888,7 +888,7 @@ public List findPathList(Integer groupId) throws IOException { // init default contracts and dir initDefaultContract(groupId); // get from database - Sort sort = new Sort(Sort.Direction.DESC, "modifyTime"); + Sort sort = Sort.by(Sort.Direction.DESC, "modifyTime"); List contractPaths = contractPathRepository.findAll((Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) -> { Predicate predicate = criteriaBuilder.equal(root.get("groupId"), groupId); @@ -904,7 +904,7 @@ public void deletePath(Integer groupId, String contractPath) { ContractPathKey contractPathKey = new ContractPathKey(); contractPathKey.setGroupId(groupId); contractPathKey.setContractPath(contractPath); - contractPathRepository.delete(contractPathKey); + contractPathRepository.deleteById(contractPathKey); } /** @@ -943,14 +943,14 @@ public void batchDeleteByPath(int groupId, String contractPath) { List contractList = contractRepository.findByGroupIdAndContractPath(groupId, contractPath); log.debug("batchDeleteByPath delete contracts"); - contractList.forEach(c -> contractRepository.delete(c.getId())); + contractList.forEach(c -> contractRepository.deleteById(c.getId())); log.debug("batchDeleteByPath delete contracts"); - contractPathRepository.delete(new ContractPathKey(groupId, contractPath)); + contractPathRepository.deleteById(new ContractPathKey(groupId, contractPath)); log.debug("batchDeleteByPath delete contract path"); } public Contract findById(Long contractId) { - Contract contract = contractRepository.findOne(contractId); + Contract contract = contractRepository.findById(contractId).orElse(null); if (Objects.isNull(contract)) { throw new FrontException(ConstantCode.INVALID_CONTRACT_ID); } diff --git a/src/main/java/com/webank/webase/front/contractStore/PresetDataService.java b/src/main/java/com/webank/webase/front/contractStore/PresetDataService.java index ea807920f..c5f2528ef 100644 --- a/src/main/java/com/webank/webase/front/contractStore/PresetDataService.java +++ b/src/main/java/com/webank/webase/front/contractStore/PresetDataService.java @@ -17,6 +17,7 @@ import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; +import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -84,7 +85,7 @@ public void insertStoreItem(long storeId, String storeName, String StoreName_en, String StoreDetail_en) { log.info("insert storeItem id:{},storeName:{}", storeId, storeName); - if (contractStoreRepository.exists(storeId)) { + if (contractStoreRepository.existsById(storeId)) { log.info("insertStoreItem skip storeId:{} already exist", storeId); return; } @@ -155,7 +156,7 @@ public void insertContractFolderItem(long contractFolderId, long storeId, String String contractFolderDesc_en, String contractFolderDetail_en) { log.info("insert contractFolderItem id:{},contractFolderName:{} ", contractFolderId, contractFolderName); - if (contractFolderRepository.exists(contractFolderId)) { + if (contractFolderRepository.existsById(contractFolderId)) { log.info("insertContractFolderItem skip contractFolderId:{} already exist", contractFolderId); return; } @@ -289,7 +290,7 @@ public void insertContractItem(long contractId, long contractFolderId, String co String contractDesc, String contractDesc_en) { log.info("insert contractItem id:{},contractName:{}", contractId, contractName); - if (contractItemRepository.exists(contractId)) { + if (contractItemRepository.existsById(contractId)) { log.info("insertContractItem skip contractId:{} already exist", contractId); return; } @@ -327,13 +328,13 @@ public void readAndInitStoreItem() { } List item2Save = new ArrayList<>(); for (StoreItem item : storeItems) { - if (!contractStoreRepository.exists(item.getStoreId())) { + if (!contractStoreRepository.existsById(item.getStoreId())) { item.setCreateTime(LocalDateTime.now()); item.setModifyTime(item.getCreateTime()); item2Save.add(item); } } - contractStoreRepository.save(item2Save); + contractStoreRepository.saveAll(item2Save); log.info("readAndInitStoreItem save {} items", storeItems.size()); } @@ -346,13 +347,13 @@ public void readAndInitFolderItem() { } List item2Save = new ArrayList<>(); for (ContractFolderItem item : folderItems) { - if (!contractFolderRepository.exists(item.getContractFolderId())) { + if (!contractFolderRepository.existsById(item.getContractFolderId())) { item.setCreateTime(LocalDateTime.now()); item.setModifyTime(item.getCreateTime()); item2Save.add(item); } } - contractFolderRepository.save(item2Save); + contractFolderRepository.saveAll(item2Save); log.info("readAndInitFolderItem save {} items", folderItems.size()); } @@ -365,13 +366,13 @@ public void readAndInitContractItem() { } List item2Save = new ArrayList<>(); for (ContractItem item : contractItems) { - if (!contractItemRepository.exists(item.getContractId())) { + if (!contractItemRepository.existsById(item.getContractId())) { item.setCreateTime(LocalDateTime.now()); item.setModifyTime(item.getCreateTime()); item2Save.add(item); } } - contractItemRepository.save(item2Save); + contractItemRepository.saveAll(item2Save); log.info("readAndInitContractItem save {} items", contractItems.size()); } diff --git a/src/main/java/com/webank/webase/front/event/ContractEventInfoRepository.java b/src/main/java/com/webank/webase/front/event/ContractEventInfoRepository.java index e229115a8..8c61654bf 100644 --- a/src/main/java/com/webank/webase/front/event/ContractEventInfoRepository.java +++ b/src/main/java/com/webank/webase/front/event/ContractEventInfoRepository.java @@ -14,8 +14,6 @@ public interface ContractEventInfoRepository extends CrudRepository, JpaSpecificationExecutor { - ContractEventInfo findById(String id); - List findByAppId(String appId); List findByGroupId(int groupId); diff --git a/src/main/java/com/webank/webase/front/event/EventController.java b/src/main/java/com/webank/webase/front/event/EventController.java index 33aa65e5b..0a0056087 100644 --- a/src/main/java/com/webank/webase/front/event/EventController.java +++ b/src/main/java/com/webank/webase/front/event/EventController.java @@ -168,8 +168,8 @@ public BasePageResponse getNewBlockEventInfo(@PathVariable("groupId") Integer gr if (pageNumber < 1) { return new BasePageResponse(ConstantCode.PARAM_ERROR, null, 0); } - Pageable pageable = new PageRequest(pageNumber - 1, pageSize, - new Sort(Sort.Direction.DESC, "createTime")); + Pageable pageable = PageRequest.of(pageNumber - 1, pageSize, + Sort.by(Sort.Direction.DESC, "createTime")); resList = eventService.getNewBlockInfoList(groupId, pageable); } log.debug("end getNewBlockEventInfo resList count. {}", resList.size()); @@ -227,8 +227,8 @@ public BasePageResponse getContractEventInfo(@PathVariable("groupId") Integer gr if (pageNumber < 1) { return new BasePageResponse(ConstantCode.PARAM_ERROR, null, 0); } - Pageable pageable = new PageRequest(pageNumber - 1, pageSize, - new Sort(Sort.Direction.DESC, "createTime")); + Pageable pageable = PageRequest.of(pageNumber - 1, pageSize, + Sort.by(Sort.Direction.DESC, "createTime")); resList = eventService.getContractEventInfoList(groupId, pageable); } log.debug("end getContractEventInfo resList count. {}", resList.size()); diff --git a/src/main/java/com/webank/webase/front/event/EventService.java b/src/main/java/com/webank/webase/front/event/EventService.java index b1c30b1b7..c78214cba 100644 --- a/src/main/java/com/webank/webase/front/event/EventService.java +++ b/src/main/java/com/webank/webase/front/event/EventService.java @@ -295,7 +295,7 @@ public List unregisterNewBlock(String infoId, String appId, i String queueName) { log.debug("unregisterNewBlock appId:{},groupId:{},exchangeName:{},queueName:{}", appId, groupId, exchangeName, queueName); - NewBlockEventInfo eventInfo = newBlockEventInfoRepository.findById(infoId); + NewBlockEventInfo eventInfo = newBlockEventInfoRepository.findById(infoId).orElse(null);; if (Objects.isNull(eventInfo)) { throw new FrontException(ConstantCode.DATA_NOT_EXIST_ERROR); } @@ -310,7 +310,7 @@ public List unregisterNewBlock(String infoId, String appId, i throw new FrontException(ConstantCode.UNREGISTER_FAILED_ERROR); } // remove from db - newBlockEventInfoRepository.delete(infoId); + newBlockEventInfoRepository.deleteById(infoId); return newBlockEventInfoRepository.findByAppId(appId); } @@ -347,7 +347,7 @@ public List unregisterContractEvent(String infoId, String app String queueName) { log.debug("unregisterContractEvent infoId:{},appId:{},groupId:{},exchangeName:{},queueName:{}", infoId, appId, groupId, exchangeName, queueName); - ContractEventInfo eventInfo = contractEventInfoRepository.findById(infoId); + ContractEventInfo eventInfo = contractEventInfoRepository.findById(infoId).orElse(null);; if (Objects.isNull(eventInfo)) { throw new FrontException(ConstantCode.DATA_NOT_EXIST_ERROR); } @@ -367,7 +367,7 @@ public List unregisterContractEvent(String infoId, String app throw new FrontException(ConstantCode.UNREGISTER_FAILED_ERROR); } // remove from db - contractEventInfoRepository.delete(infoId); + contractEventInfoRepository.deleteById(infoId); return contractEventInfoRepository.findByAppId(appId); } diff --git a/src/main/java/com/webank/webase/front/event/NewBlockEventInfoRepository.java b/src/main/java/com/webank/webase/front/event/NewBlockEventInfoRepository.java index c73e8e502..354fe93a6 100644 --- a/src/main/java/com/webank/webase/front/event/NewBlockEventInfoRepository.java +++ b/src/main/java/com/webank/webase/front/event/NewBlockEventInfoRepository.java @@ -27,8 +27,6 @@ public interface NewBlockEventInfoRepository extends CrudRepository, JpaSpecificationExecutor { - NewBlockEventInfo findById(String id); - List findByGroupIdAndAppId(int groupId, String appId); List findByAppId(String appId); diff --git a/src/main/java/com/webank/webase/front/keystore/KeyStoreService.java b/src/main/java/com/webank/webase/front/keystore/KeyStoreService.java index 0d6ec2b6c..54c9ef4ca 100644 --- a/src/main/java/com/webank/webase/front/keystore/KeyStoreService.java +++ b/src/main/java/com/webank/webase/front/keystore/KeyStoreService.java @@ -100,7 +100,7 @@ public class KeyStoreService { * without external user */ public List getLocalKeyStoreList() { - Sort sort = new Sort(Sort.Direction.ASC, "userName"); + Sort sort = Sort.by(Sort.Direction.ASC, "userName"); List keyStores = keystoreRepository.findAll( (Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) -> { Predicate predicate = criteriaBuilder.equal(root.get("type"), KeyTypes.LOCALUSER.getValue()); @@ -179,7 +179,7 @@ private KeyStoreInfo saveSignKeyStore(RspUserInfo rspUserInfo) { * deleteKeyStore. */ public void deleteKeyStore(String address) { - keystoreRepository.delete(address); + keystoreRepository.deleteById(address); } /** diff --git a/src/main/java/com/webank/webase/front/logparse/LogParseService.java b/src/main/java/com/webank/webase/front/logparse/LogParseService.java index 20b84048c..a867c5a54 100644 --- a/src/main/java/com/webank/webase/front/logparse/LogParseService.java +++ b/src/main/java/com/webank/webase/front/logparse/LogParseService.java @@ -158,8 +158,8 @@ public synchronized void syncLogData() { public Page getNetWorkData(Integer groupId, Integer pageNumber, Integer pageSize, LocalDateTime beginDate, LocalDateTime endDate) { - Sort sort = new Sort(Sort.Direction.ASC, "id"); - Pageable pageable = new PageRequest(pageNumber - 1, pageSize, sort); + Sort sort = Sort.by(Sort.Direction.ASC, "id"); + Pageable pageable = PageRequest.of(pageNumber - 1, pageSize, sort); Specification queryParam = new Specification() { @Override public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, @@ -182,8 +182,8 @@ public Predicate toPredicate(Root root, CriteriaQuery criteriaQu public Page getTxGasData(int groupId, Integer pageNumber, Integer pageSize, LocalDateTime beginDate, LocalDateTime endDate, String transHash) { - Sort sort = new Sort(Sort.Direction.ASC, "id"); - Pageable pageable = new PageRequest(pageNumber - 1, pageSize, sort); + Sort sort = Sort.by(Sort.Direction.ASC, "id"); + Pageable pageable = PageRequest.of(pageNumber - 1, pageSize, sort); Specification queryParam = new Specification() { @Override public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, @@ -221,7 +221,7 @@ public int deleteData(int groupId, int type, LocalDateTime keepEndDate) { } private CurrentState getCurrentState() { - CurrentState currentState = currentStateRepository.findOne(1); + CurrentState currentState = currentStateRepository.findById(1).orElse(null); return currentState; } diff --git a/src/main/java/com/webank/webase/front/method/MethodService.java b/src/main/java/com/webank/webase/front/method/MethodService.java index 1909d266a..5e82d2011 100644 --- a/src/main/java/com/webank/webase/front/method/MethodService.java +++ b/src/main/java/com/webank/webase/front/method/MethodService.java @@ -54,6 +54,6 @@ public Method getByMethodId(String methodId, int groupId) { MethodKey pram = new MethodKey(); pram.setMethodId(methodId); pram.setGroupId(groupId); - return methodRepository.findOne(pram); + return methodRepository.findById(pram).orElse(null); } } diff --git a/src/main/java/com/webank/webase/front/monitor/MonitorService.java b/src/main/java/com/webank/webase/front/monitor/MonitorService.java index bb6ae015f..1fbf09e2a 100644 --- a/src/main/java/com/webank/webase/front/monitor/MonitorService.java +++ b/src/main/java/com/webank/webase/front/monitor/MonitorService.java @@ -93,7 +93,7 @@ public List findContrastDataByTime(int groupId, LocalDateTime s public Page pagingQuery(int groupId, Integer pageNumber, Integer pageSize, LocalDateTime beginDate, LocalDateTime endDate) { - Pageable pageable = new PageRequest(pageNumber - 1, pageSize); + Pageable pageable = PageRequest.of(pageNumber - 1, pageSize); Specification queryParam = (root, criteriaQuery, criteriaBuilder) -> { List predicates = new ArrayList<>(); predicates.add(criteriaBuilder.equal(root.get("groupId"), groupId)); @@ -269,8 +269,8 @@ public List getGroupSizeInfos() { public BasePageResponse pagingQueryStat(int groupId, Integer pageNumber, Integer pageSize, LocalDateTime beginDate, LocalDateTime endDate) { // get larger than endDate - Pageable pageableEnd = new PageRequest(pageNumber - 1, pageSize / 2, - new Sort(Direction.ASC, "id")); + Pageable pageableEnd = PageRequest.of(pageNumber - 1, pageSize / 2, + Sort.by(Direction.ASC, "id")); Specification queryEndParam = (root, criteriaQuery, criteriaBuilder) -> { List predicates = new ArrayList<>(); predicates.add(criteriaBuilder.equal(root.get("groupId"), groupId)); @@ -282,8 +282,8 @@ public BasePageResponse pagingQueryStat(int groupId, Integer pageNumber, Integer return criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])); }; // get less than beginDate - Pageable pageableBegin = new PageRequest(pageNumber - 1, pageSize / 2, - new Sort(Direction.DESC, "id")); + Pageable pageableBegin = PageRequest.of(pageNumber - 1, pageSize / 2, + Sort.by(Direction.DESC, "id")); Specification queryBeginParam = (root, criteriaQuery, criteriaBuilder) -> { List predicates = new ArrayList<>(); predicates.add(criteriaBuilder.equal(root.get("groupId"), groupId)); diff --git a/src/main/java/com/webank/webase/front/performance/PerformanceService.java b/src/main/java/com/webank/webase/front/performance/PerformanceService.java index ae8fd0d8a..52409bcb9 100644 --- a/src/main/java/com/webank/webase/front/performance/PerformanceService.java +++ b/src/main/java/com/webank/webase/front/performance/PerformanceService.java @@ -122,7 +122,7 @@ public List findContrastDataByTime(LocalDateTime startTime, public Page pagingQuery(Integer pageNumber, Integer pageSize, LocalDateTime beginDate, LocalDateTime endDate) { - Pageable pageable = new PageRequest(pageNumber - 1, pageSize); + Pageable pageable = PageRequest.of(pageNumber - 1, pageSize); Specification queryParam = new Specification() { @Override public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, @@ -155,8 +155,8 @@ public Predicate toPredicate(Root root, CriteriaQuery criteriaQu public BasePageResponse pagingQueryStat(Integer pageNumber, Integer pageSize, LocalDateTime beginDate, LocalDateTime endDate) { // get larger than endDate - Pageable pageableEnd = new PageRequest(pageNumber - 1, - pageSize / 2, new Sort(Direction.ASC, "id")); + Pageable pageableEnd = PageRequest.of(pageNumber - 1, + pageSize / 2, Sort.by(Direction.ASC, "id")); Specification queryEndParam = (root, criteriaQuery, criteriaBuilder) -> { List predicates = new ArrayList<>(); if (endDate != null) { @@ -168,8 +168,8 @@ public BasePageResponse pagingQueryStat(Integer pageNumber, Integer pageSize, return criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])); }; // get less than beginDate - Pageable pageableBegin = new PageRequest(pageNumber - 1, - pageSize / 2, new Sort(Direction.DESC, "id")); + Pageable pageableBegin = PageRequest.of(pageNumber - 1, + pageSize / 2, Sort.by(Direction.DESC, "id")); Specification queryBeginParam = (root, criteriaQuery, criteriaBuilder) -> { List predicates = new ArrayList<>(); if (beginDate != null) { diff --git a/src/main/java/com/webank/webase/front/solc/SolcService.java b/src/main/java/com/webank/webase/front/solc/SolcService.java index f1c26c00c..e79d0423d 100644 --- a/src/main/java/com/webank/webase/front/solc/SolcService.java +++ b/src/main/java/com/webank/webase/front/solc/SolcService.java @@ -199,7 +199,7 @@ public List getAllSolcInfo() { @Transactional public boolean deleteFile(Integer solcId) { - SolcInfo solcInfo = solcRepository.findOne(solcId); + SolcInfo solcInfo = solcRepository.findById(solcId).orElse(null); String fileName = solcInfo.getSolcName(); File solcDir = getSolcDir(); String solcLocate = solcDir.getAbsolutePath() + File.separator + fileName; @@ -212,10 +212,10 @@ public boolean deleteFile(Integer solcId) { } private void removeSolcInfo(Integer solcId) { - SolcInfo checkExist = solcRepository.findOne(solcId); + SolcInfo checkExist = solcRepository.findById(solcId).orElse(null); if (Objects.isNull(checkExist)) { throw new FrontException(ConstantCode.FILE_IS_NOT_EXIST); } - solcRepository.delete(solcId); + solcRepository.deleteById(solcId); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 027571c24..fba421c77 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -44,7 +44,9 @@ spring: multipart: max-request-size: 30MB # request max size max-file-size: 20MB # single file size - + mvc: + pathmatch: + matching-strategy: ant_path_matcher server: port: 5002