build: 2.1.1 integration

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java

@@ -9,7 +9,6 @@ import cn.yixblog.platform.http.HttpRequestGenerator;
 import cn.yixblog.platform.http.HttpRequestResult;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import io.netty.util.internal.ConcurrentSet;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Date;
 import java.util.List;
@@ -61,20 +59,17 @@ public class MerchantLocationServiceImpl implements MerchantLocationService {
     public void initClientLocations() throws InterruptedException {
         List<Map<String, Object>> clients = jdbcTemplate.queryForList("select client_id, CONCAT(IFNULL(address,''),' ',IFNULL(suburb,''),' ',IFNULL(state,''),' ',IFNULL(country,'')) as 'address' from royalpay_production.sys_clients where client_id not in (select client_id from royalpay_production.sys_clients_locations) ");
         final int totalLen = clients.size();
-        logger.info("total length:" + totalLen);
+        logger.info("total length:{}", totalLen);
         for (int i = 0; i < totalLen; i++) {
             Map<String, Object> client = clients.get(i);
             final JSONObject clientObj = new JSONObject(client);
             final int idx = i;
-            pool.execute(new Runnable() {
+            pool.execute(() -> {
-                @Override
-                public void run() {
                 try {
                     processClient(clientObj, idx, totalLen);
                 } catch (URISyntaxException e) {
                     failureSet.add(clientObj.getIntValue("client_id"));
                 }
-                }
             });
             Thread.sleep(120);
 
@@ -90,7 +85,7 @@ public class MerchantLocationServiceImpl implements MerchantLocationService {
                 .queryParam("address", client.get("address")).toUriString();
         HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET);
         int clientId = client.getIntValue("client_id");
-        logger.info("start processing index " + idx + "/" + totalLen + ",client_id=" + clientId);
+        logger.info("start processing index {}/{},client_id={}", idx, totalLen, clientId);
         HttpRequestResult result = gen.execute();
         if (result.isSuccess()) {
             try {
@@ -111,7 +106,7 @@ public class MerchantLocationServiceImpl implements MerchantLocationService {
             System.err.print(result.getStatusCode());
             failureSet.add(clientId);
         }
-        logger.info("finished index " + idx + "/" + totalLen + ",client_id=" + clientId);
+        logger.info("finished index {}/{},client_id={}", idx, totalLen, clientId);
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/mappers/system/SysWxMerchantApplyMapper.java

@@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
 
-import javax.validation.constraints.Max;
 import java.util.List;
 
 /**

src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java

@@ -1,10 +1,10 @@
 package au.com.royalpay.payment.manage.merchants.beans;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;
+
 import javax.validation.constraints.NotBlank;
 
 /**

src/main/resources/application-dev.properties

@@ -1,16 +0,0 @@
-#多数据源配置
-spring.datasource.type = com.zaxxer.hikari.HikariDataSource
-#数据源master
-
-spring.datasource.master.schema-name=royalpay_dev
-spring.datasource.master.host=127.0.0.1:3306
-spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.master.username=root
-spring.datasource.master.password=root
-
-#数据源salve
-spring.datasource.slave.schema-name=royalpay_dev
-spring.datasource.slave.host=127.0.0.1:3306
-spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.slave.username=root
-spring.datasource.slave.password=root

src/main/resources/application-local.properties

@@ -1,16 +0,0 @@
-#多数据源配置
-spring.datasource.type = com.zaxxer.hikari.HikariDataSource
-#数据源master
-
-spring.datasource.master.schema-name=royalpay_production
-spring.datasource.master.host=119.28.3.196:3310
-spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.master.username=readonly
-spring.datasource.master.password=read0nly
-
-#数据源salve
-spring.datasource.slave.schema-name=royalpay_production
-spring.datasource.slave.host=119.28.3.196:3310
-spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.slave.username=readonly
-spring.datasource.slave.password=read0nly

src/main/resources/application-local.yml

@@ -1,8 +1,15 @@
 spring:
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
+    master:
-    host: 127.0.0.1:3306
+      host: 119.28.3.196:3310
-    password: root
+      jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
+      password: read0nly
       schema-name: royalpay_production
-    url: jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
+      username: readonly
-    username: root
+    slave:
+      host: 119.28.3.196:3310
+      jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
+      password: read0nly
+      schema-name: royalpay_production
+      username: readonly
+    type: com.zaxxer.hikari.HikariDataSource

src/main/resources/application.properties

@@ -1,162 +0,0 @@
-server.port=5000
-
-spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay
-
-env.company=RoyalPay
-
-multipart.max-file-size=10MB
-
-spring.datasource.test-while-idle=true
-#连接池检测释放周期
-spring.datasource.time-between-eviction-runs-millis=500
-spring.datasource.validation-query=select 1
-#最大连接数
-spring.datasource.max-active=1000
-spring.datasource.max-pool-prepared-statement-per-connection-size=100
-spring.datasource.max-idle=150
-#建立连接最大等待时间
-spring.datasource.max-wait=3000
-spring.datasource.filters=stat,wall,log4j
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.database=1
-
-mybatis.autosql.default-dialect=mysql
-
-app.redis.prefix=payment
-app.redis.settle.check-code.prefix=settlementCheckCode
-
-logging.level.java.sql.Connection=debug
-logging.level.java.sql.Statement=debug
-logging.level.java.sql.PreparedStatement=debug
-logging.level.au.com.royalpay.payment=debug
-logging.pattern.console=[%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){blue}] %clr(%-5level) %logger: %msg%n
-
-jetty.threadPool.maxThreads=1000
-
-spring.mail.host=smtp.office365.com
-spring.mail.port=587
-
-stockholder.mails=leo.huang@royalpay.com.au
-
-
-app.attachment.host=https://file.royalpay.com.au/
-app.attachment.source=03
-
-##合同模板
-app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499665073802_qV7fpEuS9rdbTnpa4po6rmbW9CSUfE.pdf
-##聚合支付合同模板
-#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf
-#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549950518019_vW4tU5t6D6yA0wMSDNBB9G195W3g99.pdf
-#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf
-app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf
-
-#app.host.main=https://mpay.royalpay.com.au/
-#app.host.regions.cn=https://mpay-cn.royalpay.com.au/
-#app.host.regions.au=https://mpay-au.royalpay.com.au/
-app.host.main=http://192.168.0.8:9009/
-app.host.regions.cn=http://192.168.0.8:9009/
-app.host.regions.au=http://192.168.0.8:9009/
-app.debug=true
-
-app.name=RoyalPay
-
-#app.cms.host=https://www.royalpay.com.au/
-
-app.cms.host=http://127.0.0.1:9533
-
-app.server.ip=127.0.0.1
-
-
-app.redpack_auth.enable=false
-hf.rsa-file=/opt/2000604000101.pfx
-##积分商城
-app.customer.host=https://customer.royalpay.com.au/
-customer.app.appid=customer
-customer.app.auth-code=xxnpdBRwd4sIaCCI
-
-app.settlement.email-to=astro.dai@royalpay.com.au
-app.settlement.email-cc=leo.huang@royalpay.com.au
-
-app.mpsupport.appid=royalpay
-app.mpsupport.auth_code=W3xucYnbmbE6rZDmA2V9BsKmagTrVIny
-
-app.run-tasks=false
-app.allow-clearing-generation=false
-
-app.mail.appid=1
-app.mail.host=https://mailsupport.royalpay.com.au
-mail.send.credentialCode=Fd1aRfdjc9
-
-spring.thymeleaf.mode=HTML
-
-app.mpsupport.host=https://mp.royalpay.com.au
-app.foreign-currency=AUD
-
-app.ofei.md5-key=Khjx6wejblaJzmG0JBWFlPFKAUxhFIXQ
-app.ofei.pwd=aomi@8888
-app.ofei.sp-code=A1407200
-
-mail.mailgun.api_key=api:key-2e67b891a1a7974bf3a40ea440d5a77f
-mail.mailgun.public_key=api:pubkey-1aaaffc2662ba1b400c409d3e974ba7e
-mail.mailgun.domain=mail.royalpay.com.au
-mail.mailgun.default.merchantlist=merchants@mail.royalpay.com.au
-
-
-##############
-##短信key
-##############
-royalpay.sms.appid=1400094878
-royalpay.sms.appkey=43390d81e20c5191c278fbf4cd275be2
-
-im.openim.appkey=24986533
-im.openim.secret=96e28e7be21a874177211c31834b5174
-
-app.settle.aes-key=EPrfsM2JE69ZPR7BhXn34g==
-app.partner.aes-key=xyc7Ya6TmL8/csM1ygtviA==
-app.risk.aes-key=NRvwd9dgbT2Cdz6zJz9AWA==
-app.risk.control.aes-key=Aa+MtthC4Ztq4Kfa9aL+UA==
-
-#清算银行配置
-settle.abafile.default-bank=CBA
-settle.abafile.remains-to=ANZ
-
-settle.abafile.bank.CBA.bank=CBA
-settle.abafile.bank.CBA.apca=301500
-settle.abafile.bank.CBA.bsb=063109
-settle.abafile.bank.CBA.account-no=11655861
-settle.abafile.bank.CBA.account-name=Tunnel Show Pty Ltd
-
-settle.abafile.bank.ANZ.manual-sending=true
-settle.abafile.bank.ANZ.bank=ANZ
-settle.abafile.bank.ANZ.apca=514624
-settle.abafile.bank.ANZ.bsb=013006
-settle.abafile.bank.ANZ.account-no=837022519
-settle.abafile.bank.ANZ.account-name=Tunnel Show Pty Ltd
-
-settle.abafile.bank.NAB.manual-sending=true
-settle.abafile.bank.NAB.bank=NAB
-settle.abafile.bank.NAB.apca=514624
-settle.abafile.bank.NAB.bsb=013006
-settle.abafile.bank.NAB.account-no=837022519
-settle.abafile.bank.NAB.account-name=Tunnel Show Pty Ltd
-
-# 瀚银Secure
-app.hanyin-secure.pid=ROYALPAY
-app.hanyin-secure.sftp-host=180.168.61.93
-app.hanyin-secure.sftp-port=28480
-app.hanyin-secure.sftp-username=royalpay
-app.hanyin-secure.sftp-pwd=royalpay
-
-qcloud.secret-id=AKIDlHdjgWzZliPvBauZFfrnW0MaZOyHdTPz
-qcloud.secret-key=YswoQDsIZfWEqEAEvMXS8Yic84lFn9Jp
-qcloud.scf.region=ap-hongkong
-
-apple.message.apns.file=
-apple.message.apns.password=
-android.message.appkey=
-android.message.secret=
-
-spring.servlet.multipart.max-file-size=20MB
-spring.servlet.multipart.max-request-size=20MB

src/main/resources/application.yml

@@ -5,7 +5,7 @@ android:
 app:
   agreetemplate:
     aggregate:
-      path: https://file.royalpay.com.au/open/2019/10/22/1571723034726_5xK6A0FGv5aQPbMIDJzXJrUPKHFutv.pdf
+      path: https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf
     classic:
       path: https://file.royalpay.com.au/open/2017/07/10/1499665073802_qV7fpEuS9rdbTnpa4po6rmbW9CSUfE.pdf
   allow-clearing-generation: false