Commit bd6319c4 by huluobin

update

parent 032f36b8
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<commons-lang3.verson>3.10</commons-lang3.verson> <commons-lang3.verson>3.10</commons-lang3.verson>
<qiniu-java-sdk.version>[7.2.0, 7.2.99]</qiniu-java-sdk.version> <qiniu-java-sdk.version>[7.2.0, 7.2.99]</qiniu-java-sdk.version>
<log4j2.disruptor.version>3.4.2</log4j2.disruptor.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -43,6 +44,16 @@ ...@@ -43,6 +44,16 @@
<dependency> <dependency>
<groupId>com.bailuntec</groupId> <groupId>com.bailuntec</groupId>
<artifactId>bailuntec-cost-api</artifactId> <artifactId>bailuntec-cost-api</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
...@@ -72,19 +83,24 @@ ...@@ -72,19 +83,24 @@
<dependency> <dependency>
<groupId>com.bailuntec</groupId> <groupId>com.bailuntec</groupId>
<artifactId>bailuntec-api</artifactId> <artifactId>bailuntec-api</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- 自动生成接口文档 --> <!-- 自动生成接口文档 -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/io.swagger/swagger-models --> <!-- https://mvnrepository.com/artifact/io.swagger/swagger-models -->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
...@@ -142,17 +158,31 @@ ...@@ -142,17 +158,31 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency> <!-- 引入log4j2依赖 -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>${log4j2.disruptor.version}</version>
</dependency>
<!--springboot starter-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId> <artifactId>spring-boot-starter-logging</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <!-- 引入log4j2依赖 --> <dependency> <!-- 引入log4j2依赖 -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId> <artifactId>spring-boot-starter-log4j2</artifactId>
...@@ -189,6 +219,7 @@ ...@@ -189,6 +219,7 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<AsyncLogger name="io.lettuce" level="ERROR" includeLocation="true"/> <AsyncLogger name="io.lettuce" level="ERROR" includeLocation="true"/>
<AsyncRoot level="INFO" includeLocation="true"> <AsyncRoot level="INFO" includeLocation="true">
<appender-ref ref="FILE"/> <appender-ref ref="FILE"/>
<!-- <appender-ref ref="CONSOLE"/>--> <appender-ref ref="CONSOLE"/>
</AsyncRoot> </AsyncRoot>
</Loggers> </Loggers>
</Configuration> </Configuration>
...@@ -11,6 +11,8 @@ import com.blt.other.module.auth.model.OaUser; ...@@ -11,6 +11,8 @@ import com.blt.other.module.auth.model.OaUser;
import com.blt.other.module.auth.service.IOaDepartmentService; import com.blt.other.module.auth.service.IOaDepartmentService;
import com.blt.other.module.auth.service.IOaUserService; import com.blt.other.module.auth.service.IOaUserService;
import com.blt.other.module.cost.dao.CostCompanyDao; import com.blt.other.module.cost.dao.CostCompanyDao;
import com.blt.other.module.cost.service.impl.costcheck.CostContext;
import com.blt.other.module.cost.service.impl.costcheck.DepartmentCheckState;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -103,10 +105,13 @@ public class OtherApplicationTests { ...@@ -103,10 +105,13 @@ public class OtherApplicationTests {
@Resource @Resource
CostCompanyDao costCompanyDao; CostCompanyDao costCompanyDao;
@Resource
DepartmentCheckState departmentCheckState;
@Test @Test
public void importMallProduct() { public void importMallProduct() {
String filePath = "/Users/huluobin/Library/Containers/com.tencent.WeWorkMac/Data/Library/Application Support/WXWork/Data/1688853793439460/Cache/File/2020-11/cost_company_updated(1).xlsx"; CostContext costContext = new CostContext("F029432", null);
EasyExcel.read(filePath, CostCompanyExcel.class, new CostCompanyDomainListener()).sheet().doRead(); costContext.setCostState(departmentCheckState);
costContext.handle();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment