Skip to content

A
automatic-test
Commit 2ef33cd3 by 朽木不可雕也
Options

给barrage-crawler-server模块添加环境配置

parent bd11c981
Showing with 165 additions and 7 deletions
barrage-crawler-server/pom.xml
......@@ -31,4 +31,49 @@
<version>${public.version}</version>
</dependency>
</dependencies>
<profiles>
<profile>
<id>dev</id>
<properties>
<profile.active>dev</profile.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>test</id>
<properties>
<profile.active>test</profile.active>
</properties>
</profile>
</profiles>
<build>
<resources>
<!--排除环境相关配置文件-->
<resource>
<directory>${project.basedir}/src/main/resources</directory>
<excludes>
<exclude>*-test.*</exclude>
<exclude>*-dev.*</exclude>
<exclude>test/*</exclude>
<exclude>dev/*</exclude>
</excludes>
</resource>
<!--引入需要的环境配置文件-->
<resource>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>*-${profile.active}.*</include>
</includes>
</resource>
<resource>
<directory>${project.basedir}/src/main/resources/${profile.active}/</directory>
</resource>
</resources>
</build>
</project>
\ No newline at end of file
barrage-crawler-server/src/main/java/com/zhiweidata/automatictest/barragecrawlerserver/config/BaseConfig.java
package com.zhiweidata.automatictest.barragecrawlerserver.config;
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Properties;
import lombok.extern.slf4j.Slf4j;
import static java.util.Objects.requireNonNull;
/**
* 基本配置
*
......@@ -13,10 +19,21 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@SuppressWarnings("JavaDoc")
public class BaseConfig {
private static final Properties PROPERTIES = new Properties();
static {
try (InputStream configInput = requireNonNull(BaseConfig.class.getClassLoader().getResourceAsStream("config.properties"))) {
InputStreamReader reader = new InputStreamReader(configInput, StandardCharsets.UTF_8);
PROPERTIES.load(reader);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
/**
* 接口的基础url
*/
public static final String BASE_URL = "http://barrage-crawler-server:8080/barrage-crawler-server";
public static final String BASE_URL = PROPERTIES.getProperty("requesrt.url");
/**
* 采集任务接口
*/
......
barrage-crawler-server/src/main/java/com/zhiweidata/automatictest/barragecrawlerserver/entity/BarrageCollectionInfo.java
......@@ -52,7 +52,7 @@ public class BarrageCollectionInfo implements Serializable {
* 任务执行状态
*/
@JsonProperty(value = "status")
@JsonDeserialize(using = BarrageStatusEnumJsonHandler.class)
@JsonDeserialize(contentUsing = BarrageStatusEnumJsonHandler.class)
private BarrageStatusEnums status;
/**
* 直播间平台
......
barrage-crawler-server/src/main/resources/dev/config.properties 0 → 100644
requesrt.url=http://192.168.0.119:8080/barrage-crawler-server
\ No newline at end of file
barrage-crawler-server/src/main/resources/test/config.properties 0 → 100644
requesrt.url=http://barrage-crawler-server:8080/barrage-crawler-server
\ No newline at end of file
barrage-crawler-server/src/test/java/com/zhiweidata/automatictest/barragecrawlerserver/exporttasks/ExportTaskJobTest.java
package com.zhiweidata.automatictest.barragecrawlerserver.exporttasks;
import com.zhiweidata.automatictest.barragecrawlerserver.entity.BarrageCollectionTestTask;
import com.zhiweidata.automatictest.barragecrawlerserver.timertask.ExportTaskJob;
import java.io.IOException;
import org.quartz.SchedulerException;
......@@ -20,8 +19,6 @@ class ExportTaskJobTest {
"https://live.bilibili.com/12265?hotRank=0", "62aae6a3-e563-4f24-9e3a-135c6e74a8ac"
);
ExportTaskJob exportTaskJob = new ExportTaskJob();
exportTaskJob.export(collectionTask);
SCHEDULER.shutdown(true);
}
}
\ No newline at end of file
public/pom.xml
......@@ -63,4 +63,49 @@
</dependency>
</dependencies>
<profiles>
<!--开发环境-->
<profile>
<id>dev</id>
<properties>
<profile.active>dev</profile.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<!--测试环境-->
<profile>
<id>test</id>
<properties>
<profile.active>test</profile.active>
</properties>
</profile>
</profiles>
<build>
<resources>
<!--排除文件-->
<resource>
<directory>${project.basedir}/src/main/resources</directory>
<excludes>
<exclude>*-dev.*</exclude>
<exclude>*-test.*</exclude>
<exclude>dev/*</exclude>
<exclude>test/*</exclude>
</excludes>
</resource>
<!--引入文件-->
<resource>
<directory>${project.basedir}/src/main/resources/${profile.active}/</directory>
</resource>
<resource>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>*-${profile.active}.*</include>
</includes>
</resource>
</resources>
</build>
</project>
\ No newline at end of file
public/src/main/java/com/zhiweidata/automatictest/publics/BeanContainer.java
......@@ -67,7 +67,7 @@ public class BeanContainer {
static {
SqlSessionFactory sqlSessionFactory = null;
try (InputStream inputStream = Resources.getResourceAsStream("mybatis.xml")) {
try (InputStream inputStream = Resources.getResourceAsStream("test/mybatis.xml")) {
SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
// 先读取xml中的配置
......
public/src/main/resources/dev/mybatis.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<environments default="development">
<environment id="development">
<transactionManager type="JDBC"/>
<dataSource type="com.zhiweidata.automatictest.publics.HikariDataSourceFactory">
<property name="driver" value="com.mysql.cj.jdbc.Driver"/>
<property name="url"
value="jdbc:mysql://192.168.0.119:3306/automatic_test?useSSL=FALSE&amp;serverTimezone=Asia/Shanghai"/>
<property name="username" value="root"/>
<property name="password" value="z199809051593"/>
</dataSource>
</environment>
</environments>
<mappers>
<mapper resource="mappers/BarrageCollectionTestTaskMapper.xml"/>
<mapper resource="mappers/BarrageExportResultMapper.xml"/>
<mapper resource="mappers/ServerResponseMessageMapper.xml"/>
</mappers>
</configuration>
\ No newline at end of file
public/src/main/resources/test/log4j2.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn">
<Appenders>
<!-- 输出到控制台 -->
<Console name="console" target="SYSTEM_OUT">
<!--输出日志的格式，使用SpringBoot配色（仅能在SpringBoot项目中使用） -->
<PatternLayout
pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight{%5p} --- [%-30t] %-90c %-40M %-5L: %m%n"/>
</Console>
</Appenders>
<!-- sync/async -->
<Loggers>
<logger name="org.mongodb" level="ERROR"/>
<logger name="com.zhiweidata.automatictest.barragecrawlerserver" level="DEBUG"/>
<logger name="com.zhiweidata.automatictest.barragecrawlerserver.mapper" level="ERROR"/>
<Root level="INFO" includeLocation="true">
<AppenderRef ref="console"/>
</Root>
</Loggers>
</configuration>
\ No newline at end of file
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