Merge branch 'master' of zx/cuspay into master

src/main/java/com/emato/cuspay/service/merch/MerchPayCfgService.java

@@ -0,0 +1,15 @@
+package com.emato.cuspay.service;
+
+import com.emato.cuspay.dto.merch.MerchPayCfg;
+
+import java.util.List;
+
+/**
+ * @author zx
+ * @version 1.0
+ * 2018-05-18 14:29
+ */
+public interface MerchPayCfgService {
+
+    List<MerchPayCfg> loadMerchCusCfg();
+}

src/main/resources/application.yml

@@ -20,7 +20,7 @@ ds:
 # 使用环境
 spring:
     profiles:
-        active: dev
+        active:
 
     # 使用CGLIB实现AOP
     aop:
@@ -33,9 +33,9 @@ spring:
             # 数据源zaxxer HikariCP
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
-            url: jdbc:mysql://127.0.0.1:3306/cuspay?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-            username: root
-            password: root
+            url: jdbc:mysql://120.76.84.45:3306/cuspay?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            username: ceshi
+            password: abc-123
             # hikari连接池配置
             hikari:
                 connection-timeout: 10000
@@ -102,4 +102,7 @@ wx:
 db:
   wx:
     #定时器报关一次区的数据
-    limit: 20
+    declare:
+      limit: 20
+    notify:
+      limit: 20