src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java
@@ -41,7 +41,6 @@ @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query") }) @GetMapping(value = "/findBlockAddress") @SubmitRepeat public Result findBlockAddress(String symbol) { return blockSerive.findBlockAddress(symbol); } src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java
@@ -85,7 +85,7 @@ // 获取最新区块 String string = redisUtils.getString(USDT_BLOCK_NUM_GOLDEN); if(string==null){ string = "11282213"; string = "11371620"; } BigInteger blockNum = new BigInteger(string); Credentials credentials = Credentials.create(privateKey); src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
@@ -38,9 +38,9 @@ public static String ETH_FEE = "0.0042"; public static final String TOTAL_ADDRESS = "0x0e9f7eEfa4Dd804dDAE2972A7195Ea1fE04d2253"; public static final String TOTAL_PRIVATE = "2b9cb76dd75dddc8ab4c4614f4c66b53604da49672586a026b253fae873bd017"; public static final String POOL_ADDRESS = "0x1A37e4B839E5b691a835ff5fCf7c7A760003155D"; public static final String TOTAL_ADDRESS = "0x50F9a0D98090E49F07816595EadBd0e698FfA48c"; public static final String TOTAL_PRIVATE = "55527574621e87ed870eea6469557e084707fb58af33d16d405f240614ef3d0e"; public static final String POOL_ADDRESS = "0x20652BB140de5A1e39a507fBB9C019Bab8C3Ac1D"; @Resource private MemberCoinChargeDao memberCoinChargeDao; @Resource src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -439,11 +439,11 @@ // 限价买不能高于当前10% BigDecimal multiply = nowPrice.multiply(new BigDecimal("1.2")); if (price.compareTo(multiply) > 0) { return Result.fail("不能高于当前价的120%"); return Result.fail("请输入合适的价格"); } multiply= nowPrice.multiply(new BigDecimal("0.8")); if (price.compareTo(multiply) < 0) { return Result.fail("不能低于当前价的80%"); return Result.fail("请输入合适的价格"); } } else { src/main/java/com/xcong/excoin/quartz/job/UsdtErc20InitJob.java
@@ -26,6 +26,6 @@ @PostConstruct public void initCoinTrade() { System.out.println("开启USDT同步"); // usdtErc20UpdateService.updateUsdt(); usdtErc20UpdateService.updateUsdt(); } } src/main/java/com/xcong/excoin/rabbit/consumer/OrderSubmitConsumer.java
@@ -33,7 +33,7 @@ @RabbitListener(queues = RabbitMqConfig.QUEUE_ROC_ORDER_SUBMIT) public void doSomething(String content) { //log.info("#提交的订单---->{}#", content); log.info("#提交的订单---->{}#", content); OrderCoinsEntity coinsEntity = JSONObject.parseObject(content, OrderCoinsEntity.class); String symbol = coinsEntity.getSymbol(); CoinTrader trader = factory.getTrader(symbol); src/main/java/com/xcong/excoin/utils/mail/Sms106Send.java
@@ -19,8 +19,8 @@ public class Sms106Send { private static final String URL = "http://www.qf106.com/sms.aspx"; private static final String ID = "16624"; private static final String ACCOUNT = "golden1"; private static final String ID = "16638"; private static final String ACCOUNT = "moko"; private static final String PASSWORD = "123456";
@@ -7,9 +7,9 @@ profiles: active: dev datasource: url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: roc_user password: roc123pasd!@ url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_moko?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: moko_user password: moko123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -48,13 +48,13 @@ ## redis配置 redis: ## Redis数据库索引（默认为0） database: 1 database: 0 ## Redis服务器地址 host: 47.114.114.219 host: 114.55.92.106 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码（默认为空） password: roccqwe1234 password: hibit123 jedis: pool: ## 连接池最大连接数（使用负值表示没有限制） @@ -72,10 +72,10 @@ ## 连接超时时间（毫秒） timeout: 30000 rabbitmq: host: 47.114.114.219 host: 114.55.92.106 port: 5672 username: roc_user password: roc123456 username: moko_user password: moko123456 publisher-confirm-type: correlated
@@ -1,15 +1,15 @@ server: port: 8888 port: 9100 servlet: context-path: / spring: profiles: active: dev active: prod datasource: url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: roc_user password: roc123pasd!@ url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_moko?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: moko_user password: moko123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -48,13 +48,13 @@ ## redis配置 redis: ## Redis数据库索引（默认为0） database: 1 database: 0 ## Redis服务器地址 host: 127.0.0.1 host: 114.55.92.106 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码（默认为空） password: roccqwe1234 password: hibit123 jedis: pool: ## 连接池最大连接数（使用负值表示没有限制） @@ -72,19 +72,11 @@ ## 连接超时时间（毫秒） timeout: 30000 rabbitmq: host: 120.27.238.55 host: 114.55.92.106 port: 5672 username: ct_rabbit password: 123456 username: moko_user password: moko123456 publisher-confirm-type: correlated #custom: # rabbitmq: # host: 120.27.238.55 # port: 5672 # username: ct_rabbit # password: 123456 mybatis-plus: mapper-locations: classpath:mapper/**/*.xml @@ -96,7 +88,7 @@ kline-update-job: false newest-price-update-job: true exchange-trade: true day-line: false day-line: true other-job: true loop-job: false rabbit-consumer: false @@ -110,5 +102,5 @@ access-key-secret: vbCjQtPxABWjqtUlQfzjlA0qAY96fh 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== public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDhiZ2Gevs6sL16dss4AYCwsb3HchEevjjNxeY9wVnWlrm2uicMoXPWne8Khvprxtg7J/pOjtb5Sok33uFZZOUl3nIoTEoOQbG82Zat+2bc+N4MXOp9pVCEgQJoXT29NU5DizNfDTfb0edCH2YjMFaar/KwiMLmijyj0Z6QM3uipwIDAQAB private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOGJnYZ6+zqwvXp2yzgBgLCxvcdyER6+OM3F5j3BWdaWuba6Jwyhc9ad7wqG+mvG2Dsn+k6O1vlKiTfe4Vlk5SXecihMSg5BsbzZlq37Ztz43gxc6n2lUISBAmhdPb01TkOLM18NN9vR50IfZiMwVpqv8rCIwuaKPKPRnpAze6KnAgMBAAECgYAwdUHsQAY0kP7VDisRqHj+/eF5tc9p3JMV2zxh7mYgDhhu40Y6l4HtDdfrWh76Ayo4Y5mLQXN88n/TCkc+zsfQ2MA4AY/z0F3cF2tRKPy7auMa6/g1+tuZBR+28bdwoGag5BfMIOdriLJ5TqFXObaCH5CULa+qHTHDgrTIvSF1SQJBAPv/Ti+xpUCJNjHYAgqfiJohqPCH6frCucGAFdbcf4w8vEqHVAmDdxolJTU8xwffNBE+cAgS+CQkWFHrx8VPdAsCQQDlHreJTCd54gghw9xZiWribRagoixYVL5j8EbmVGYwDeMNGXxbeGPFMYqT5r/JUHq1RYTf9L+IL4RN7tM7LDFVAkEAx5OrmJpZBoOlKFSrST6QMYH3CoiaBr+x3k5S/ZgkbCyt81i6dc5oxYwlq8Q23UUpN377u2lKnVUrnbXewaXrgQJASOR227VgscQZdjSLu+ieGp8+Hai6lvePAtiEle6v/AXPAHHlQGySwT+7qMY2qeNyxozxcxa4gKktXGXoyeCLaQJARXA82H8HHDsW2SaUz5TgQUfvaUDDQ18lB2NAKelwMUFR+nK6L+W+vRg6pFCzUN27snysfUYYE+CR7IaY4nHNWA== src/main/resources/application-prodapp.yml
@@ -1,15 +1,15 @@ server: port: 8888 port: 9101 servlet: context-path: / spring: profiles: active: dev active: prodapp datasource: url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: roc_user password: roc123pasd!@ url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_moko?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 username: moko_user password: moko123!@# driver-class-name: com.mysql.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: @@ -48,13 +48,13 @@ ## redis配置 redis: ## Redis数据库索引（默认为0） database: 1 database: 0 ## Redis服务器地址 host: 127.0.0.1 host: 114.55.92.106 ## Redis服务器连接端口 port: 6379 ## Redis服务器连接密码（默认为空） password: roccqwe1234 password: hibit123 jedis: pool: ## 连接池最大连接数（使用负值表示没有限制） @@ -72,19 +72,11 @@ ## 连接超时时间（毫秒） timeout: 30000 rabbitmq: host: 120.27.238.55 host: 114.55.92.106 port: 5672 username: ct_rabbit password: 123456 username: moko_user password: moko123456 publisher-confirm-type: correlated #custom: # rabbitmq: # host: 120.27.238.55 # port: 5672 # username: ct_rabbit # password: 123456 mybatis-plus: mapper-locations: classpath:mapper/**/*.xml @@ -110,5 +102,5 @@ access-key-secret: vbCjQtPxABWjqtUlQfzjlA0qAY96fh 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== public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDhiZ2Gevs6sL16dss4AYCwsb3HchEevjjNxeY9wVnWlrm2uicMoXPWne8Khvprxtg7J/pOjtb5Sok33uFZZOUl3nIoTEoOQbG82Zat+2bc+N4MXOp9pVCEgQJoXT29NU5DizNfDTfb0edCH2YjMFaar/KwiMLmijyj0Z6QM3uipwIDAQAB private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOGJnYZ6+zqwvXp2yzgBgLCxvcdyER6+OM3F5j3BWdaWuba6Jwyhc9ad7wqG+mvG2Dsn+k6O1vlKiTfe4Vlk5SXecihMSg5BsbzZlq37Ztz43gxc6n2lUISBAmhdPb01TkOLM18NN9vR50IfZiMwVpqv8rCIwuaKPKPRnpAze6KnAgMBAAECgYAwdUHsQAY0kP7VDisRqHj+/eF5tc9p3JMV2zxh7mYgDhhu40Y6l4HtDdfrWh76Ayo4Y5mLQXN88n/TCkc+zsfQ2MA4AY/z0F3cF2tRKPy7auMa6/g1+tuZBR+28bdwoGag5BfMIOdriLJ5TqFXObaCH5CULa+qHTHDgrTIvSF1SQJBAPv/Ti+xpUCJNjHYAgqfiJohqPCH6frCucGAFdbcf4w8vEqHVAmDdxolJTU8xwffNBE+cAgS+CQkWFHrx8VPdAsCQQDlHreJTCd54gghw9xZiWribRagoixYVL5j8EbmVGYwDeMNGXxbeGPFMYqT5r/JUHq1RYTf9L+IL4RN7tM7LDFVAkEAx5OrmJpZBoOlKFSrST6QMYH3CoiaBr+x3k5S/ZgkbCyt81i6dc5oxYwlq8Q23UUpN377u2lKnVUrnbXewaXrgQJASOR227VgscQZdjSLu+ieGp8+Hai6lvePAtiEle6v/AXPAHHlQGySwT+7qMY2qeNyxozxcxa4gKktXGXoyeCLaQJARXA82H8HHDsW2SaUz5TgQUfvaUDDQ18lB2NAKelwMUFR+nK6L+W+vRg6pFCzUN27snysfUYYE+CR7IaY4nHNWA== src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@ <configuration> <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 --> <property name="log.path" value="biue/logs" /> <property name="log.path" value="moko/logs" /> <!-- <springProperty scope="context" name="log.path" source="logging.file.path"/>--> <!-- 彩色日志 -->
