Skip to content

李苗 / Vion-DevOps

Go to a project
Commit 7c7fa772 by HlQ
Options

[add] 升级依赖版本

1 parent d02ddb5c
Inline Side-by-side
Showing 3 changed files with 11 additions and 21 deletions
pom.xml
...@@ -14,17 +14,16 @@ ...@@ -14,17 +14,16 @@
<artifactId>Vion-DevOps</artifactId> <artifactId>Vion-DevOps</artifactId>
<version>1</version> <version>1</version>
<properties> <properties>
<pg.version>42.7.2</pg.version> <pg.version>42.7.3</pg.version>
<sqlserver.version>12.2.0.jre8</sqlserver.version> <lombok.version>1.18.34</lombok.version>
<lombok.version>1.18.30</lombok.version>
<hutool.version>6.0.0-M13</hutool.version> <hutool.version>6.0.0-M13</hutool.version>
<redisson.verion>3.27.1</redisson.verion> <redisson.verion>3.32.0</redisson.verion>
<mapstruct-plus.version>1.4.3</mapstruct-plus.version> <mapstruct-plus.version>1.4.3</mapstruct-plus.version>
<mp.version>3.5.5</mp.version> <mp.version>3.5.7</mp.version>
<mp-join.version>1.4.7.2</mp-join.version> <mp-join.version>1.4.13</mp-join.version>
<wx-mp.version>4.6.0</wx-mp.version> <wx-mp.version>4.6.0</wx-mp.version>
<sa-token.verion>1.37.0</sa-token.verion> <sa-token.verion>1.38.0</sa-token.verion>
<myexcel.version>4.5.0</myexcel.version> <myexcel.version>4.5.1</myexcel.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -34,11 +33,6 @@ ...@@ -34,11 +33,6 @@
<version>${pg.version}</version> <version>${pg.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${sqlserver.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>${lombok.version}</version>
......
src/main/java/vion/controller/ContractController.java
...@@ -144,12 +144,12 @@ public class ContractController { ...@@ -144,12 +144,12 @@ public class ContractController {
return contractService.unbindSale(dto); return contractService.unbindSale(dto);
} }
@PostMapping("/contractSync") /*@PostMapping("/contractSync")
@SaCheckPermission(value = "contract:sync", orRole = "admin") @SaCheckPermission(value = "contract:sync", orRole = "admin")
public String manualSyncContract() { public String manualSyncContract() {
contractRunner.contractSync(); contractRunner.contractSync();
return "成功"; return "成功";
} }*/
@PostMapping("/contractSync1") @PostMapping("/contractSync1")
@SaCheckPermission(value = "contract:sync1", orRole = "admin") @SaCheckPermission(value = "contract:sync1", orRole = "admin")
......
src/main/java/vion/cron/ContractRunner.java
...@@ -25,10 +25,6 @@ import vion.model.*; ...@@ -25,10 +25,6 @@ import vion.model.*;
import vion.service.*; import vion.service.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -56,7 +52,7 @@ public class ContractRunner { ...@@ -56,7 +52,7 @@ public class ContractRunner {
@Value("${xbongbong.corpid}") @Value("${xbongbong.corpid}")
private String corpId; private String corpId;
// @Scheduled(cron = "0 0 * * * *") /* @Scheduled(cron = "0 0 * * * *")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void contractSync() { public void contractSync() {
log.info("【开始】从crm系统同步合同信息"); log.info("【开始】从crm系统同步合同信息");
...@@ -295,7 +291,7 @@ public class ContractRunner { ...@@ -295,7 +291,7 @@ public class ContractRunner {
redissonClient.getBucket(RedisKeyEnum.CONTRACT_SYNC_TIME.getVal()).set(DateUtil.formatDateTime(insOrUpdContractList.get(0).getOriginalModTime())); redissonClient.getBucket(RedisKeyEnum.CONTRACT_SYNC_TIME.getVal()).set(DateUtil.formatDateTime(insOrUpdContractList.get(0).getOriginalModTime()));
log.info("【结束】从crm系统同步合同信息"); log.info("【结束】从crm系统同步合同信息");
} }*/
@Scheduled(cron = "0 0 * * * *") @Scheduled(cron = "0 0 * * * *")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!