cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. Spring Boot 升级到 2.3.12
2. 修复单测MySQL服务器配置
3. 修复URLPath拼接缺少一个“/”
This commit is contained in:
HuangXin 2021-10-09 10:44:35 +08:00
parent 65a938d5bb
commit cbb1d29a63
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/application-test.properties
View File

@ -4,16 +4,16 @@ server.tomcat.basedir=./basedir
# 多个项目放在nginx下同个端口，通过该配置区分
server.servlet.context-path=/dispose
# 配置数据源
spring.datasource.url=jdbc:mysql://10.88.77.65:33061/ci_dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
=convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=h0K0_8u
#spring.datasource.url=jdbc:mysql://172.21.48.75:3306/ci_dispose_v1?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
# =convertToNull&useUnicode=true
#spring.datasource.url=jdbc:mysql://10.88.77.65:33061/ci_dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
# =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=root
#spring.datasource.password=BCcf6Dd7&8
#spring.datasource.password=h0K0_8u
spring.datasource.url=jdbc:mysql://172.21.48.75:3306/ci_dispose_v1?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
=convertToNull&useUnicode=true
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=BCcf6Dd7&8
# 配置连接池
spring.datasource.schema=classpath:test_db/unit_test.sql
spring.datasource.initialization-mode=always

2
pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.9.RELEASE</version>
<version>2.3.12.RELEASE</version>
<relativePath/>
</parent>
<groupId>com.dispose</groupId>

12
src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java
View File

@ -145,11 +145,19 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
@Override
public ErrorCode addDisposeAbilityDevice(DisposeDevice dev) {
DisposeAbility db;
String urlSpiltChar = "/";
String url;
String httpType = dev.getUrlType() == HttpType.HTTP ? "http://" : "https://";
String addr = (dev.getIpPort() == null || dev.getIpPort()
.length() == 0) ? dev.getIpAddr() : (dev.getIpAddr() + ":" + dev.getIpPort());
String url = httpType + addr + "/" + dev.getUrlPath();
if (dev.getUrlPath().length() == 0) {
url = httpType + addr + urlSpiltChar;
} else if (dev.getUrlPath().endsWith(urlSpiltChar)) {
url = httpType + addr + urlSpiltChar + dev.getUrlPath();
} else {
url = httpType + addr + urlSpiltChar + dev.getUrlPath() + urlSpiltChar;
}
switch (dev.getDeviceType()) {
case DPTECH_UMC: