From 9b0404a207ab19cffd8a31e1ba5d763a9667299f Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 30 Jun 2023 11:37:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-advance/advance-boot/pom.xml | 48 ++++++++++++------- pqs-auth/src/test/java/AuthTest.java | 10 ++-- .../impl/ReplenishMybatisServiceImpl.java | 1 - .../biz/commApi/CommLedgerDeptClient.java | 1 + .../commApi/CommTerminalGeneralClient.java | 1 + .../com/njcn/system/api/AreaFeignClient.java | 2 +- 6 files changed, 40 insertions(+), 23 deletions(-) diff --git a/pqs-advance/advance-boot/pom.xml b/pqs-advance/advance-boot/pom.xml index 6b70e4f45..081b7cba7 100644 --- a/pqs-advance/advance-boot/pom.xml +++ b/pqs-advance/advance-boot/pom.xml @@ -59,18 +59,44 @@ 1.0.0 - - - net.java.dev.jna - jna - 4.1.0 - advanceboot + + + + src/main/resources + true + + *.yml + + + + src/main/resources + false + + *.dll + + + + src/main/resources + false + + *.so + + + + src/main/java + false + + **/*.xml + + + + org.springframework.boot @@ -85,8 +111,6 @@ - - com.spotify docker-maven-plugin @@ -122,15 +146,7 @@ - - - src/main/resources - - **/*.dll - - - diff --git a/pqs-auth/src/test/java/AuthTest.java b/pqs-auth/src/test/java/AuthTest.java index bf929f646..bb7b80337 100644 --- a/pqs-auth/src/test/java/AuthTest.java +++ b/pqs-auth/src/test/java/AuthTest.java @@ -26,13 +26,13 @@ public class AuthTest extends BaseJunitTest { @SneakyThrows @Test public void test(){ - String userUrl = "http://127.0.0.1:10215/pqs-auth/oauth/token"; + String userUrl = "http://127.0.0.1:10214/oauth/token"; UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(userUrl) - .queryParam("grant_type", "password") - .queryParam("client_id", "njcn") + .queryParam("grant_type", "sms_code") + .queryParam("client_id", "app") .queryParam("client_secret", "njcnpqs") - .queryParam("username", "root") - .queryParam("password", "@#001njcnpqs"); + .queryParam("phone", "root") + .queryParam("smsCode", "98746312123"); URI uri = builder.build().encode().toUri(); ResponseEntity userEntity = RestTemplateUtil.post(uri, OAuth2AccessToken.class); diff --git a/pqs-common/common-db/src/main/java/com/njcn/db/service/impl/ReplenishMybatisServiceImpl.java b/pqs-common/common-db/src/main/java/com/njcn/db/service/impl/ReplenishMybatisServiceImpl.java index 73d8ae9ba..2a6fab746 100644 --- a/pqs-common/common-db/src/main/java/com/njcn/db/service/impl/ReplenishMybatisServiceImpl.java +++ b/pqs-common/common-db/src/main/java/com/njcn/db/service/impl/ReplenishMybatisServiceImpl.java @@ -27,7 +27,6 @@ public class ReplenishMybatisServiceImpl, T> extend if (idxLimit == size) { int times = totalCount / idxLimit + 1; for (int i = 1; i <= times; i++) { - System.out.printf("第%d次分片%n", i); if (totalCount >= idxLimit) { List temp = dataTemp.subList(0, idxLimit); this.baseMapper.insertBatchSomeColumn(temp); diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLedgerDeptClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLedgerDeptClient.java index 7394c7d1b..920716157 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLedgerDeptClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommLedgerDeptClient.java @@ -22,6 +22,7 @@ import java.util.List; */ @FeignClient( value = ServerInfo.DEVICE, + contextId = "pmsLedger", path = "pmsLedger", fallbackFactory = CommLedgerDeptClientFallbackFactory.class) public interface CommLedgerDeptClient { diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java index 0c84eceae..f34dfbc9d 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java @@ -26,6 +26,7 @@ import java.util.List; @FeignClient( value = ServerInfo.DEVICE, path = "commTerminal", + contextId = "commTerminal", fallbackFactory = CommTerminalGeneralClientFallbackFactory.class) public interface CommTerminalGeneralClient { diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/AreaFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/AreaFeignClient.java index f945624d5..f734388de 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/AreaFeignClient.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/AreaFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @version 1.0.0 * @date 2022年01月05日 15:11 */ -@FeignClient(value = ServerInfo.SYSTEM, path = "/area", fallbackFactory = AreaFeignClientFallbackFactory.class, contextId = "area") +@FeignClient(value = ServerInfo.SYSTEM, path = "/area", fallbackFactory = AreaFeignClientFallbackFactory.class, contextId = "sys-area") public interface AreaFeignClient { /**