Skip to content

李苗 / Vion-DevOps

Go to a project
Commit e91a8a68 by HlQ
Options

[chore] 升级依赖并解决依赖升级的兼容性问题

1 parent cb11ee1c
Inline Side-by-side
Showing 3 changed files with 14 additions and 14 deletions
pom.xml
...@@ -8,23 +8,23 @@ ...@@ -8,23 +8,23 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.1</version> <version>3.4.4</version>
</parent> </parent>
<artifactId>Vion-DevOps</artifactId> <artifactId>Vion-DevOps</artifactId>
<version>1</version> <version>1</version>
<properties> <properties>
<java.version>21</java.version> <java.version>21</java.version>
<hutool.version>6.0.0-M18</hutool.version> <hutool.version>6.0.0-M21</hutool.version>
<redisson.verion>3.40.2</redisson.verion> <redisson.verion>3.45.1</redisson.verion>
<mapstruct-plus.version>1.4.6</mapstruct-plus.version> <mapstruct-plus.version>1.4.8</mapstruct-plus.version>
<mp.version>3.5.9</mp.version> <mp.version>3.5.11</mp.version>
<mp-join.version>1.5.2</mp-join.version> <mp-join.version>1.5.3</mp-join.version>
<wx-mp.version>4.6.9.B</wx-mp.version> <wx-mp.version>4.7.4.B</wx-mp.version>
<sa-token.verion>1.39.0</sa-token.verion> <sa-token.verion>1.42.0</sa-token.verion>
<myexcel.version>4.5.6</myexcel.version> <myexcel.version>4.5.6</myexcel.version>
<maxmind.version>4.2.1</maxmind.version> <maxmind.version>4.2.1</maxmind.version>
<mica.mqtt.version>2.4.0</mica.mqtt.version> <mica.mqtt.version>2.4.4</mica.mqtt.version>
</properties> </properties>
<dependencies> <dependencies>
......
src/main/java/vion/config/MqttClientCustomizerConfig.java
package vion.config; package vion.config;
import org.dromara.mica.mqtt.spring.client.MqttClientCustomizer; import org.dromara.mica.mqtt.core.client.MqttClientCustomizer;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
......
src/main/java/vion/service/impl/ContractServiceImpl.java
...@@ -29,7 +29,7 @@ import org.dromara.hutool.core.math.NumberUtil; ...@@ -29,7 +29,7 @@ import org.dromara.hutool.core.math.NumberUtil;
import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil; import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.crypto.SecureUtil; import org.dromara.hutool.crypto.SecureUtil;
import org.dromara.hutool.http.client.HttpDownloader; import org.dromara.hutool.http.HttpUtil;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
...@@ -40,8 +40,8 @@ import vion.dto.ContractDTO; ...@@ -40,8 +40,8 @@ import vion.dto.ContractDTO;
import vion.dto.RContractTeamDTO; import vion.dto.RContractTeamDTO;
import vion.mapper.ContractMapper; import vion.mapper.ContractMapper;
import vion.mapper.SettlementDiffMapper; import vion.mapper.SettlementDiffMapper;
import vion.model.Dictionary;
import vion.model.*; import vion.model.*;
import vion.model.Dictionary;
import vion.service.*; import vion.service.*;
import vion.third.DingMod; import vion.third.DingMod;
import vion.utils.JsonUtil; import vion.utils.JsonUtil;
...@@ -706,8 +706,8 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -706,8 +706,8 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
var filename = o.path("filename").asText(); var filename = o.path("filename").asText();
String path = fileUrl + FileUtil.FILE_SEPARATOR + "contract" + FileUtil.FILE_SEPARATOR + contractId + FileUtil.FILE_SEPARATOR + filename; String path = fileUrl + FileUtil.FILE_SEPARATOR + "contract" + FileUtil.FILE_SEPARATOR + contractId + FileUtil.FILE_SEPARATOR + filename;
byte[] bytes; byte[] bytes;
try { try (var response = HttpUtil.createGet(o.path("attachIndex").asText()).send()) {
bytes = HttpDownloader.downloadBytes(o.path("attachIndex").asText()); bytes = response.bodyBytes();
} catch (Exception e) { } catch (Exception e) {
log.error("合同：{}，[{}] 文件同步失败", contractNo, filename, e); log.error("合同：{}，[{}] 文件同步失败", contractNo, filename, e);
continue; continue;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!