From b109a950c9d385ef5a2df5d26b3a6e8c7ede5229 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Aug 2022 09:40:45 +0800
Subject: [PATCH] fix
---
/dev/null | 75 ------------------
pom.xml | 22 -----
src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java | 1
src/main/resources/application-xc.yml | 112 ++++++++++++++++++++++++++++
4 files changed, 112 insertions(+), 98 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21ddd22..07d0b01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,28 +180,6 @@
</dependency>
<dependency>
- <groupId>org.tron.trident</groupId>
- <artifactId>abi</artifactId>
- <version>0.3.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/abi-0.3.0.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.tron.trident</groupId>
- <artifactId>utils</artifactId>
- <version>0.3.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/utils-0.3.0.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.tron.trident</groupId>
- <artifactId>core</artifactId>
- <version>0.3.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/core-0.3.0.jar</systemPath>
- </dependency>
-
- <dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>3.9.7</version>
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
index f8c87d3..f3c61d4 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.farmer.cms.common.system.base.BaseEntity;
import lombok.Data;
-import org.tron.trident.abi.datatypes.Int;
import java.util.List;
diff --git a/src/main/resources/application-xc.yml b/src/main/resources/application-xc.yml
new file mode 100644
index 0000000..9f17f3c
--- /dev/null
+++ b/src/main/resources/application-xc.yml
@@ -0,0 +1,112 @@
+server:
+ port: 8878
+ servlet:
+ context-path: /
+ session:
+ timeout: 1
+
+spring:
+ profiles:
+ active: xc
+ mvc:
+ async:
+ request-timeout: 20s
+ datasource:
+ dynamic:
+ # 是否开启 SQL日志输出，生产环境建议关闭，有性能损耗
+ p6spy: false
+ # 配置默认数据源
+ primary: base
+ datasource:
+ base:
+ url: jdbc:mysql://116.62.172.247:3309/farmer_cms?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: xc_erp_scop
+ password: 6o!WlPwG*Jfq%I22
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ druid:
+ initial-size: ${spring_datasource_druid_initial_size:10}
+ max-active: ${spring_datasource_druid_max_active:20}
+ min-idle: ${spring_datasource_druid_min_idle:3}
+ #配置获取连接等待超时的时间
+ max-wait: 60000
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 20
+ validation-query: SELECT 'x'
+ test-on-borrow: true
+ test-on-return: true
+ test-while-idle: true
+ #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ time-between-eviction-runs-millis: 60000
+ #配置一个连接在池中最小生存的时间，单位是毫秒
+ min-evictable-idle-time-millis: 300000
+ #spring.datasource.druid.max-evguide.ftlictable-idle-time-millis=
+ filters: stat,wall
+ stat-view-servlet:
+ # 默认true 内置监控页面首页/druid/index.html
+ enabled: true
+ url-pattern: /druid/*
+ # 允许清空统计数据
+ reset-enable: true
+ login-username: root
+ login-password: 123456
+ # IP白名单 多个逗号分隔
+ allow: ${spring_datasource_stat_view_servlet_allow:}
+ # IP黑名单
+ deny: ${spring_datasource_stat_view_servlet_deny:}
+ ## 国际化配置
+ messages:
+ basename: i18n/messages
+ ## redis配置
+ redis:
+ # Redis数据库索引（默认为 0）
+ database: 0
+ # Redis服务器地址
+ host: 175.6.34.5
+ # Redis服务器连接端口
+ port: 6379
+ # Redis 密码
+ password:
+ jedis:
+ pool:
+ ## 连接池最大连接数（使用负值表示没有限制）
+ #spring.redis.pool.max-active=8
+ max-active: 300
+ ## 连接池最大阻塞等待时间（使用负值表示没有限制）
+ #spring.redis.pool.max-wait=-1
+ max-wait: -1
+ ## 连接池中的最大空闲连接
+ #spring.redis.pool.max-idle=8
+ max-idle: 100
+ ## 连接池中的最小空闲连接
+ #spring.redis.pool.min-idle=0
+ min-idle: 8
+ ## 连接超时时间（毫秒）
+ timeout: 30000
+
+ servlet:
+ multipart:
+ max-file-size: 512MB
+ max-request-size: 512MB
+mybatis-plus:
+ mapper-locations: classpath:mapper/*.xml
+
+
+app:
+ debug: true
+
+rsa:
+ public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB
+ private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIJ/xQVkrngCIrg9G7u0135nypnvuj9BcKeTbkNGbKBWk4S7mYY1IC9+daYqnakRXZGWN5erdGJ3/4tCSidp5swl5cpIXTLEv9WDJ5PwlpDmA1s6t192Vz6YWRcnLPIm3xiS8CkR09E1JTYQ0GfuaBF8PQFg8zi9nr+u/517fwUnAgMBAAECgYBhPt9NvpI4wbanvnndLczr2GJkxfzvSE+vwLCJF4C5FusFHVsxZINggQcg1V75bwRgCiXRMyYefreCSdrCditS43PzTOmE4RRrpxLlm8oubJc0C98LQ2qlN9AsUqL5IHpVGgbHDyWAwjc1GBID6nwXKpxq1/VodFqhahG9D5EZsQJBALnkb+5VTxQbiyQI4Uc9NIvAyVcNY1OisbvY6tvNgdBbJkADgAb78M1HWxxYjUqsvzggNHc7cWqWBHMgpnJaqm8CQQCztze4D7uAk7OC9MJHY5eE980J8Kk+GEZKxz4LahzU6V6dcb9GFac3wEtgilj/tOAn9y0/Q8sm9vvCIbMDzgzJAkEAqRYcqhF26LdVDOX25DHMBgLKISDQZFbsjA13M4/usHL4i+mjHrc0BcUOHu59NpuDI65HitzLAUSLr5zXSdUmiQJAW77wOg4GCejdXsB3IhzMsHwU97sdm26nC+vVV9xvJZ6Rx8zW+f9543NOx9U5BCmhuaVtOvvwDU9PTVcI3atmSQJAXAIJ5gGdtXx0DXiX4VvzNFHqgaqHMGvXyjNVkU2FYQbSAd2A6app4uRO+BkZu9dSjh14m+oXMnV2HzAN2rRnjA==
+
+static:
+ resource:
+ url: https://yfgw-staticfile.xczhyf.cn/uploadeFile/image/
+ path: /mnt/webresource/website/static/uploadeFile/image/
+
+cms:
+ api-url: http://yfgw-service.xczhyf.cn
+ static-url: https://yfgw-staticfile.xczhyf.cn/cms/static/
+ template-path: /mnt/webresource/website/static/cms/template
+ static-path: /mnt/webresource/website/static/cms/static
+ output-path: /mnt/webresource/website/site
+
diff --git a/src/test/java/com/xcong/farmer/cms/TronTest.java b/src/test/java/com/xcong/farmer/cms/TronTest.java
deleted file mode 100644
index acbd77f..0000000
--- a/src/test/java/com/xcong/farmer/cms/TronTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.xcong.farmer.cms;
-
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.tron.trident.core.ApiWrapper;
-import org.tron.trident.core.contract.Contract;
-import org.tron.trident.core.contract.Trc20Contract;
-import org.tron.trident.core.exceptions.IllegalException;
-import org.tron.trident.proto.Chain;
-import org.tron.trident.proto.Response;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * @author wzy
- * @date 2021-10-15
- **/
-@Slf4j
-@SpringBootTest
-public class TronTest {
- // 7a1cdc7aa2976b16cfc79ed8310b1fb53a85780dd27574fa6c5eb7c2aceaa6ae
- // b5627861c6edb2245276273e5f5ad5082f93c3b09fc7b757223ca8526504bfe7
- private final String PRIVATE_KEY = "7a1cdc7aa2976b16cfc79ed8310b1fb53a85780dd27574fa6c5eb7c2aceaa6ae";
-
- @Test
- public void tronTest() throws IllegalException {
- ApiWrapper wrapper = ApiWrapper.ofMainnet(PRIVATE_KEY, "9d461be6-9796-47b9-85d8-b150cbabbb54");
-
- Contract trc20Contract = wrapper.getContract("TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t");
- Trc20Contract token = new Trc20Contract(trc20Contract, "TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", wrapper);
- BigInteger balanceOf = token.balanceOf("TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9");
-
-// token.approve("TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", 9999999999999L, 0, "memo", 100000000);
- System.out.println(balanceOf);
- String s = token.transferFrom("TUy8XwDmdsDKPLDGUrGuNRVMhwSEKtkDcD", "TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", balanceOf.longValue(), 0, "memo", 100000000L);
- System.out.println(s);
-// token.transfer("TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", balanceOf.longValue(), 0, "memo", 100000000);
- }
-
- @Test
- public void kayTest() {
-// KeyPair keyPair = KeyPair.generate();
-// System.out.println(keyPair.toPrivateKey());
-//
-// KeyPair keyPair1 = new KeyPair(keyPair.toPrivateKey());
-// System.out.println(keyPair1.toPrivateKey());
-
- ApiWrapper wrapper = ApiWrapper.ofMainnet(PRIVATE_KEY, "9d461be6-9796-47b9-85d8-b150cbabbb54");
-
- Contract trc20Contract = wrapper.getContract("TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t");
- Trc20Contract token = new Trc20Contract(trc20Contract, "TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", wrapper);
-// BigInteger balanceOf = token.balanceOf("TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9");
-
- System.out.println(token.decimals());
- System.out.println(BigDecimal.TEN.pow(token.decimals().intValue()));
-// System.out.println(balanceOf);
- }
-
- @Test
- public void testTest() throws IllegalException {
-// KeyPair keyPair = KeyPair.generate();
-// System.out.println(keyPair.toPrivateKey());
- ApiWrapper wrapper = ApiWrapper.ofNile(PRIVATE_KEY);
-
- Response.TransactionExtention transfer = wrapper.transfer("TUy8XwDmdsDKPLDGUrGuNRVMhwSEKtkDcD", "TKcyw4igFYhNpTzyZv25j6uDwvTYzncnjp", 3);
- Chain.Transaction transaction = wrapper.signTransaction(transfer);
-// TransactionBuilder builder = new TransactionBuilder(transaction);
-// builder.setFeeLimit(100000000L);
-// builder.setMemo("memo");
-// builder.build();
- wrapper.broadcastTransaction(transaction);
- }
-}
--
Gitblit v1.9.1