pom文件更新

acs/nladmin-system/pom.xml

@@ -20,7 +20,6 @@
         <java.version>1.8</java.version>
         <log4jdbc.version>1.16</log4jdbc.version>
         <swagger.version>2.9.2</swagger.version>
-        <fastjson.version>1.2.70</fastjson.version>
         <druid.version>1.1.22</druid.version>
         <commons-pool2.version>2.5.0</commons-pool2.version>
         <mapstruct.version>1.3.1.Final</mapstruct.version>
@@ -34,11 +33,11 @@
 
     <dependencies>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
             <version>1.50</version>
-        </dependency>
+        </dependency>-->
         <!--导出CSV相关-->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -65,21 +64,21 @@
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>4.1.2</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.openscada.jinterop</groupId>
             <artifactId>org.openscada.jinterop.core</artifactId>
             <version>2.1.8</version>
-        </dependency>
+        </dependency>-->
-        <dependency>
+        <!--<dependency>
             <groupId>org.openscada.jinterop</groupId>
             <artifactId>org.openscada.jinterop.deps</artifactId>
             <version>1.5.0</version>
-        </dependency>
+        </dependency>-->
-        <dependency>
+       <!-- <dependency>
             <groupId>org.openscada.utgard</groupId>
             <artifactId>org.openscada.opc.dcom</artifactId>
             <version>1.5.0</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.openscada.utgard</groupId>
             <artifactId>org.openscada.opc.lib</artifactId>
@@ -103,11 +102,11 @@
             <version>1.8.0</version>
         </dependency>
 
-        <dependency>
+  <!--      <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
             <version>1.9.2</version>
-        </dependency>
+        </dependency>-->
 
         <!--接口限流-->
         <dependency>
@@ -116,11 +115,11 @@
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>29.0-jre</version>
-        </dependency>
+        </dependency>-->
         <!--模板引擎-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -231,6 +230,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--Spring boot 安全框架-->
@@ -296,6 +301,10 @@
                     <groupId>io.swagger</groupId>
                     <artifactId>swagger-models</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>mapstruct</artifactId>
+                    <groupId>org.mapstruct</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -362,13 +371,6 @@
             <version>2.12.0</version>
         </dependency>
 
-        <!-- fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>${fastjson.version}</version>
-        </dependency>
-
         <!--mapStruct依赖-->
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -453,6 +455,9 @@
                 <includes>
                     <include>**/*.*</include>
                 </includes>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
             </resource>
 
             <resource>

lms/nladmin-system/pom.xml

@@ -45,22 +45,6 @@
             <version>6.1.4</version>
         </dependency>
 
-
-        <!--        <dependency>-->
-<!--            <groupId>org.elasticsearch.client</groupId>-->
-<!--            <artifactId>elasticsearch-rest-high-level-client</artifactId>-->
-<!--            <version>7.6.1</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.elasticsearch.client</groupId>-->
-<!--            <artifactId>elasticsearch-rest-client</artifactId>-->
-<!--            <version>7.6.1</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.elasticsearch</groupId>-->
-<!--            <artifactId>elasticsearch</artifactId>-->
-<!--            <version>7.6.1</version>-->
-<!--        </dependency>-->
         <!--        logback appender日志-->
         <dependency>
             <groupId>com.internetitem</groupId>

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -682,7 +682,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     public void initialize(JSONObject param) {
-        {
         {
             int j_size = param.getInteger("j"); // 排
             int k_size = param.getInteger("k"); // 列
@@ -782,4 +781,3 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
     }
 }
-}

lms/nladmin-system/src/main/resources/config/application-prod.yml

@@ -178,13 +178,7 @@ sa-token:
   is-log: false
   jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
   # token 前缀
-  token-prefix:
+  token-prefix: Bearer
   cookie:
     # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
     domain:
-
-loki:
-  url: http://localhost:3100/loki/api/v1
-  systemName: lms
-es:
-  index: lms_log_prod