2
0

2 Commity 5217968d39 ... bf79309183

Autor SHA1 Správa Dátum
  tianwu.sun bf79309183 Merge remote-tracking branch 'origin/master' 3 mesiacov pred
  tianwu.sun a43aa9ab33 优化 3 mesiacov pred

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 3230 - 6726
log/cic-data-reportin.out


+ 0 - 5
src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -3,7 +3,6 @@ package com.bootdo.datas.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.bootdo.common.config.BootdoConfig;
 import com.bootdo.common.utils.*;
-import com.bootdo.datas.controller.GyDataImportController;
 import com.bootdo.datas.domain.ExpertOpinionDO;
 import com.bootdo.datas.dao.GyDataDao;
 import com.bootdo.datas.dao.GyUnitDao;
@@ -13,13 +12,11 @@ import com.bootdo.datas.dto.GyDataImportDTO;
 import com.bootdo.datas.service.ExamineLogService;
 import com.bootdo.datas.service.GyDataService;
 import com.bootdo.datas.service.MessageService;
-import com.bootdo.datas.service.UnitService;
 import com.bootdo.datas.tools.ExcelUtils;
 import com.bootdo.datas.tools.gm.FileCryptTool;
 import com.bootdo.system.domain.RoleDO;
 import com.bootdo.system.domain.UserDO;
 import com.bootdo.system.service.RoleService;
-import com.google.common.collect.Lists;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -30,14 +27,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 @Transactional

+ 3 - 1
src/main/resources/application-dev.yml

@@ -57,7 +57,9 @@ spring:
         # 连接池最大阻塞等待时间(使用负值表示没有限制)
         max-wait: -1
     database: 0
-
+server:
+  tomcat:
+    basedir: D:/workspace_data/cic/cic-data-reportin-fujian/res/tmp
 ## ca 证书配置
 #ca:
 #  # cert 文件路径

+ 3 - 1
src/main/resources/application-prod.yml

@@ -64,7 +64,9 @@ spring:
         # 连接池最大阻塞等待时间(使用负值表示没有限制)
         max-wait: -1
     database: 0
-
+server:
+  tomcat:
+    basedir: /home/data/service/cic-data/res/tmp
 ## ca 证书配置
 #ca:
 #  # cert 文件路径

+ 3 - 1
src/main/resources/application-test.yml

@@ -57,7 +57,9 @@ spring:
         # 连接池最大阻塞等待时间(使用负值表示没有限制)
         max-wait: -1
     database: 0
-
+server:
+  tomcat:
+    basedir: /opt/streams/service/cic-data/res/data_filing/tmp
 # ca 证书配置
 #ca:
 #  # cert 文件路径