代码调整

pqs-advance/advance-boot/pom.xml

@@ -59,18 +59,44 @@
             <version>1.0.0</version>
         </dependency>
 
-        <!-- 使用JNA调用C Lib库 -->
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <version>4.1.0</version>
-        </dependency>
 
 
     </dependencies>
 
     <build>
         <finalName>advanceboot</finalName>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>*.dll</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>*.so</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -85,8 +111,6 @@
                 </executions>
             </plugin>
 
-
-
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
@@ -122,15 +146,7 @@
 
         </plugins>
 
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.dll</include>
-                </includes>
-            </resource>
 
-        </resources>
     </build>
 
 </project>

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("grant_type", "sms_code")
-                .queryParam("client_id", "njcn")
+                .queryParam("client_id", "app")
                 .queryParam("client_secret", "njcnpqs")
-                .queryParam("username", "root")
+                .queryParam("phone", "root")
-                .queryParam("password", "@#001njcnpqs");
+                .queryParam("smsCode", "98746312123");
         URI uri = builder.build().encode().toUri();
 
         ResponseEntity<OAuth2AccessToken> userEntity = RestTemplateUtil.post(uri, OAuth2AccessToken.class);

pqs-common/common-db/src/main/java/com/njcn/db/service/impl/ReplenishMybatisServiceImpl.java

@@ -27,7 +27,6 @@ public class ReplenishMybatisServiceImpl<M extends BatchBaseMapper<T>, 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<T> temp = dataTemp.subList(0, idxLimit);
                         this.baseMapper.insertBatchSomeColumn(temp);

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 {

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 {
 

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 {
 
     /**