1.剔除nacos组件依赖

2.修改任务信息修改的方法,防止全量修改任务信息。

pom.xml

@@ -20,24 +20,24 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <!--  nacos 服务的注册发现     -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!--客户端负载均衡loadbalancer-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
-
-
-        <!--  nacos  配置中心做依赖管理    -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
+<!--        &lt;!&ndash;  nacos 服务的注册发现     &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+<!--        </dependency>-->
+
+<!--        &lt;!&ndash;客户端负载均衡loadbalancer&ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-loadbalancer</artifactId>-->
+<!--        </dependency>-->
+
+
+<!--        &lt;!&ndash;  nacos  配置中心做依赖管理    &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--        </dependency>-->
 
         <!-- mongodb -->
         <dependency>

src/main/java/com/keyware/composeanalysis/ComposeAnalysisApplication.java

@@ -3,14 +3,10 @@ package com.keyware.composeanalysis;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @MapperScan("com.keyware.composeanalysis.mapper")
 @SpringBootApplication
-@EnableDiscoveryClient
-@RefreshScope
 @EnableAsync
 public class ComposeAnalysisApplication {
 

src/main/java/com/keyware/composeanalysis/service/impl/AnalysisTaskServiceImpl.java

@@ -2,6 +2,7 @@ package com.keyware.composeanalysis.service.impl;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.keyware.common.constant.RedisConst;
 import com.keyware.common.constant.enums.AnalysisStatusEnum;
@@ -70,7 +71,10 @@ public class AnalysisTaskServiceImpl extends ServiceImpl<AnalyzeTaskMapper, Anal
 
         //开始分析前,将成分分析的状态为 进行中
         analysisTask.setComposeFlag(AnalysisStatusEnum.ANALYSISING.getCode());
-        this.updateById(analysisTask);
+        LambdaUpdateWrapper<AnalysisTask> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(AnalysisTask::getId, analysisTask.getId())
+                .set(AnalysisTask::getComposeFlag, AnalysisStatusEnum.ANALYSISING.getCode());
+        this.update(null,updateWrapper);
         MongoTemplate mongoTemplate = new MongoTemplate(mongoClient, MongoDBConst.DB_NAME_PREFIX + analysisTask.getId());
         AnalysisLogUtil.insert(mongoTemplate, "【成分分析】开始:" + analysisTask.getFileName());
 
@@ -85,8 +89,9 @@ public class AnalysisTaskServiceImpl extends ServiceImpl<AnalyzeTaskMapper, Anal
         checkProjectIfOpen(mongoTemplate,analysisTask);
 
         //修改成分分析状态为完成
-        analysisTask.setComposeFlag(AnalysisStatusEnum.ANALYSIS_DONE.getCode());
-        this.updateById(analysisTask);
+        updateWrapper.set(AnalysisTask::getComposeFlag, AnalysisStatusEnum.ANALYSIS_DONE.getCode())
+                                .set(AnalysisTask::getOpenType, analysisTask.getOpenType());
+        this.update(null,updateWrapper);
 
         //插入分析日志
         AnalysisLogUtil.insert(mongoTemplate,"【成分分析】已完成,耗时:"+ DateUtil.between(analysisTask.getAnalysisStartTime(),DateUtil.date(), DateUnit.SECOND) +"秒");

src/main/java/com/keyware/composeanalysis/task/PorjectAnalysisTask.java

@@ -2,6 +2,7 @@ package com.keyware.composeanalysis.task;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.FileUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.google.common.collect.Sets;
 import com.keyware.common.constant.enums.AnalysisStatusEnum;
 import com.keyware.composeanalysis.constant.FixedValue;
@@ -85,8 +86,10 @@ public class PorjectAnalysisTask {
         } catch (Exception e) {
             AnalysisLogUtil.insert(mongoTemplate, "成分分析失败:" + e.getStackTrace());
             log.error("项目级分析失败,项目名称:" + analysisTask.getFileName(), e);
-            analysisTask.setAnalysisStatus(AnalysisStatusEnum.FAIL_ANALYSIS.getCode());
-            analysisService.updateById(analysisTask);
+            LambdaUpdateWrapper<AnalysisTask> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(AnalysisTask::getId, analysisTask.getId())
+                    .set(AnalysisTask::getAnalysisStatus, AnalysisStatusEnum.FAIL_ANALYSIS.getCode());
+            analysisService.update(null,updateWrapper);
         }
     }
 

src/main/resources/application-dev.yaml

@@ -0,0 +1,42 @@
+server:
+  port: 8001
+
+spring:
+  application:
+    name: compose-analysis
+  data:
+    mongodb:
+      uri: mongodb://127.0.0.1:27017/KEYSWAN
+    redis:
+      host: 127.0.0.1
+      port: 6379
+      password: 123456
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/keyswan?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+    username: root
+    password: 123456
+    hikari:
+      #最小连接数
+      minimum-idle: 5
+      #最大连接数
+      maximum-pool-size: 30
+      #最大空闲时间
+      idle-timeout: 30000
+      #连接超时时间
+      connection-timeout: 30000
+      #自动提交
+      auto-commit: true
+
+#solr检索库地址
+solr:
+  solrUrl: http://172.16.36.7:8993/solr/
+  #批量匹配时,返回的匹配数量
+  row: 5
+
+#被测件上传存储路径
+codeResourcePath: D:\codeResourcePath
+
+logging:
+  level:
+    com.txlc.dwh.job.common.interceptor.PerformanceInterceptor: debug

src/main/resources/application.yaml

@@ -1,15 +1,45 @@
+server:
+  port: 8001
+
 spring:
   application:
     name: compose-analysis
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-        namespace: 4ce70f33-8b88-4931-a88c-2b68e7259bd7
-      config:
-        server-addr: 127.0.0.1:8848
-        namespace: 4ce70f33-8b88-4931-a88c-2b68e7259bd7
-        file-extension: yaml
-  config:
-    import: nacos:compose-analysis-dev.yaml
+  data:
+    mongodb:
+      uri: mongodb://127.0.0.1:27017/KEYSWAN
+    redis:
+      host: 127.0.0.1
+      port: 6379
+      password: 123456
+
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/keyswan?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+    username: root
+    password: 123456
+    hikari:
+      #最小连接数
+      minimum-idle: 5
+      #最大连接数
+      maximum-pool-size: 30
+      #最大空闲时间
+      idle-timeout: 30000
+      #连接超时时间
+      connection-timeout: 30000
+      #自动提交
+      auto-commit: true
+
+
+#solr检索库地址
+solr:
+  solrUrl: http://172.16.36.7:8993/solr/
+  #批量匹配时,返回的匹配数量
+  row: 5
+
+#被测件上传存储路径
+codeResourcePath: D:\codeResourcePath
+
+logging:
+  level:
+    com.txlc.dwh.job.common.interceptor.PerformanceInterceptor: debug