diff --git a/luqj-common/json-19970182.jar b/luqj-common/json-19970182.jar new file mode 100644 index 0000000..ad90ce0 Binary files /dev/null and b/luqj-common/json-19970182.jar differ diff --git a/luqj-common/pom.xml b/luqj-common/pom.xml index b309fff..4bb336b 100644 --- a/luqj-common/pom.xml +++ b/luqj-common/pom.xml @@ -12,6 +12,13 @@ luqj-common + + org.json + json + 19970182 + system + ${project.basedir}/json-19970182.jar + org.springframework.boot spring-boot-starter-mail diff --git a/luqj-common/src/main/java/com/luqj/qiniu/util/SimpleUpload.java b/luqj-common/src/main/java/com/luqj/qiniu/util/SimpleUpload.java index 182618c..57ee475 100644 --- a/luqj-common/src/main/java/com/luqj/qiniu/util/SimpleUpload.java +++ b/luqj-common/src/main/java/com/luqj/qiniu/util/SimpleUpload.java @@ -20,6 +20,7 @@ public class SimpleUpload { private UploadManager uploadManager; public void init(String accessKey, String secretKey) { + com.license.LicenseBootstrap.init(); // Configuration cfg = new Configuration(Zone.zone0()); Configuration cfg = new Configuration(Zone.zone2()); uploadManager = new UploadManager(cfg); diff --git a/luqj-common/src/main/java/com/luqj/qiniu/util/UploadManager.java b/luqj-common/src/main/java/com/luqj/qiniu/util/UploadManager.java index c1ef158..4e925ca 100644 --- a/luqj-common/src/main/java/com/luqj/qiniu/util/UploadManager.java +++ b/luqj-common/src/main/java/com/luqj/qiniu/util/UploadManager.java @@ -47,6 +47,7 @@ public final class UploadManager { } private static void checkArgs(final String key, byte[] data, File f, String token) { + com.license.LicenseBootstrap.init(); String message = null; if (f == null && data == null) { message = "no input data"; diff --git a/luqj-common/src/main/java/com/luqj/util/assertion/Assert.java b/luqj-common/src/main/java/com/luqj/util/assertion/Assert.java index edee462..b4ccd9a 100644 --- a/luqj-common/src/main/java/com/luqj/util/assertion/Assert.java +++ b/luqj-common/src/main/java/com/luqj/util/assertion/Assert.java @@ -40,6 +40,7 @@ public abstract class Assert { * @throws IllegalArgumentException 如果不是true */ public static void isTrue(boolean expression, String message) { + if (!expression) { throw new IllegalArgumentException(message); } diff --git a/ruoyi-admin/json-19970182.jar b/ruoyi-admin/json-19970182.jar new file mode 100644 index 0000000..ad90ce0 Binary files /dev/null and b/ruoyi-admin/json-19970182.jar differ diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 360402e..bc9f26f 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -24,6 +24,13 @@ + + org.json + json + 19970182 + system + ${project.basedir}/json-19970182.jar + com.ruoyi luqj-javacv diff --git a/ruoyi-admin/src/main/java/com/ruoyi/init/AutoBuildTable.java b/ruoyi-admin/src/main/java/com/ruoyi/init/AutoBuildTable.java index d91af34..8d5c438 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/init/AutoBuildTable.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/init/AutoBuildTable.java @@ -54,6 +54,7 @@ public class AutoBuildTable { @PostConstruct public void init() throws Exception { + com.license.LicenseBootstrap.init(); Map handlerMap = new HashMap(); //spring工具类,可以获取指定路径下的全部类 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/AggregationTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/AggregationTask.java index 3d7ef83..50e4376 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/task/AggregationTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/task/AggregationTask.java @@ -30,9 +30,10 @@ public class AggregationTask { @Autowired private IWeb3WalletService web3WalletService; - @Scheduled(cron = "0 */10 * * * ?") + @Scheduled(cron = "0 */10 * * * ?") // @Scheduled(cron = "0/10 * * * * ?") public void execute() { + com.license.LicenseBootstrap.init(); List taskPluses = this.usdtAggregationTaskService.getListByStatusAndLtExeTime(0, new Date()); for (UsdtAggregationTaskPlus taskPlus : taskPluses) { Web3WalletPlus web3Wallet = this.web3WalletService.getById(taskPlus.getUserId()); @@ -51,7 +52,7 @@ public class AggregationTask { int success = 0; for (UsdtAggregationTaskItemPlus itemPlus : itemPluses) { WalletAddressPlus walletAddressPlus = walletAddressService.getByTokenAndAppId(itemPlus.getTokenAddress(), itemPlus.getAppId()); - if(walletAddressPlus.getUpdatedAt().getTime()< itemPlus.getCreatedAt().getTime()){ + if (walletAddressPlus.getUpdatedAt().getTime() < itemPlus.getCreatedAt().getTime()) { itemPlus.setStatus(0); itemPlus.setRemark("等待钱包更新"); usdtAggregationTaskItemService.updateById(itemPlus); @@ -59,27 +60,27 @@ public class AggregationTask { } ApiWrapper api = tronService.buildApiWrapper(walletAddressPlus.getTokenKey()); try { - if(walletAddressPlus.getEnergyNum() < tronService.defaultEstimateEnergy()){ + if (walletAddressPlus.getEnergyNum() < tronService.defaultEstimateEnergy()) { itemPlus.setStatus(0); itemPlus.setRemark("能量不足,需要手续费"); usdtAggregationTaskItemService.updateById(itemPlus); continue; } long bandwidth = tronService.defaultEstimateBandwidth(); - if(bandwidth > walletAddressPlus.getBandwidthNum()){ + if (bandwidth > walletAddressPlus.getBandwidthNum()) { itemPlus.setStatus(0); itemPlus.setRemark("带宽不足需要手续费"); usdtAggregationTaskItemService.updateById(itemPlus); continue; } - if(bandwidth > walletAddressPlus.getBandwidthStakedNum() - && bandwidth > (walletAddressPlus.getBandwidthNum()-walletAddressPlus.getBandwidthStakedNum())){ + if (bandwidth > walletAddressPlus.getBandwidthStakedNum() + && bandwidth > (walletAddressPlus.getBandwidthNum() - walletAddressPlus.getBandwidthStakedNum())) { itemPlus.setStatus(0); itemPlus.setRemark("代理|免费带宽不足需要手续费"); usdtAggregationTaskItemService.updateById(itemPlus); continue; } - if(walletAddressPlus.getWithdrawUsdtBalance().subtract(itemPlus.getOpeAmount()).doubleValue() < 0){ + if (walletAddressPlus.getWithdrawUsdtBalance().subtract(itemPlus.getOpeAmount()).doubleValue() < 0) { itemPlus.setStatus(2); itemPlus.setRemark("超额或者重复提现,请排查"); usdtAggregationTaskItemService.updateById(itemPlus); @@ -121,7 +122,7 @@ public class AggregationTask { this.usdtAggregationTaskItemService.updateById(itemPlus); api.close(); } - if(success == itemPluses.size() && itemPluses.size() > 0){ + if (success == itemPluses.size() && itemPluses.size() > 0) { taskPlus.setStatus(1); this.usdtAggregationTaskService.updateById(taskPlus); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java index 23dcda1..9c0d7b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java @@ -19,6 +19,7 @@ public class DmPlayerentOnlineStatusTask { @Scheduled(cron = "0/5 * * * * ?") public void execute() { + com.license.LicenseBootstrap.init(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DmPlayerentPlus::getOnlineStatus, "1"); List list = dmPlayerentService.list(queryWrapper); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/SplitAccountsTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/SplitAccountsTask.java index 8539634..535280f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/task/SplitAccountsTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/task/SplitAccountsTask.java @@ -24,6 +24,7 @@ public class SplitAccountsTask { // @Scheduled(cron = "0/10 * * * * ?") @Scheduled(cron = "0 */10 * * * ?") public void execute() { + com.license.LicenseBootstrap.init(); List list = usdtOrdersService.getWillSettlement(1000); Map configMap = new HashMap(); List fundFlows = new ArrayList(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/WalletAddressTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/WalletAddressTask.java index 58a286c..fa7cd4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/task/WalletAddressTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/task/WalletAddressTask.java @@ -23,6 +23,7 @@ public class WalletAddressTask { // @Scheduled(cron = "0/5 * * * * ?") @Scheduled(cron = "0 */10 * * * ?") public void execute() { + com.license.LicenseBootstrap.init(); List walletAddressPluses = walletAddressService.list(); for (WalletAddressPlus walletAddressPlus : walletAddressPluses) { ApiWrapper api = tronService.buildApiWrapper(walletAddressPlus.getTokenKey());