diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8950b3d8d..8be115e3d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,11 +1,11 @@
 spring:
   datasource:
     master:
-      host: 192.168.0.84:3306
+      host: 192.168.0.92:3306
       jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-      password: rpayplus123
-      schema-name: royalpay
-      username: root
+      password: SuTUUxyvzS0cLETi6Rzm
+      schema-name: royalpay_payment
+      username: rpaydev
     slave:
       host: 192.168.0.84:3306
       jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
@@ -13,3 +13,105 @@ spring:
       schema-name: royalpay
       username: root
     type: com.zaxxer.hikari.HikariDataSource
+  redis:
+    database: 1
+    host: 192.168.0.84
+    port: 6379
+  mail:
+    host: smtp.exmail.qq.com
+    port: 465
+app:
+  run-tasks: false
+  host:
+    main: http://192.168.0.38:5000/
+    regions:
+      au: http://192.168.0.38:5000/
+      cn: http://192.168.0.38:5000/
+  mail:
+    appid: 1
+    host: https://dev.mailsupport.hcqtech.com
+  # Mpsupport
+  mpsupport:
+    appid: payment
+    auth_code: eaHe5iaztrnz6xrc8mgX
+    host: https://mp.globepay.co
+    account: globepay
+    # 微信模板消息
+    wechat:
+      accounts:
+        vitesse:
+          mp-id: vitesse
+          app-id: wxfa5d340b39a63a57_dev
+          open-id-key: vitesse_openid
+          open-id-start: o1vB
+          templates:
+            commission: whcyp5eYvKG9CtmkA820yBOoLs5gDvCJOTUn_QXOQmY
+            new-apply: QQUoZ_k73XJHgq2XCcUtoYNSXjuwgPSIx19cT5jgOy4
+            newpartner-overtime: enoAIvboVTAhNkNTl6JHPV22XTXbWZ-9NbQXAqiK9xQ
+            payment-success: c2W-buYXHZb4hVwZ6jepKz_RRNHHh0tlfe8JkhpgPkE1OnY
+            payment-success-customer: buYXHZb4hVwZ6jepKz_RRNHHh0tlfe8JkhpgPkE1OnY
+            payment-success-cashier: buYXHZb4hVwZ6jepKz_RRNHHh0tlfe8JkhpgPkE1OnY
+            refund-audit-notice: I30yZCRupub8Lwi4jWAZwH17BQgKMGgzGeUkf63jfeo
+            refund-send: Z9j88_AZXmAa_V7CP1Lu2riUwDN-jpzazEDiO5AW2So
+            refuse-bd: dkEQ1QBY5rmEhiOzkRDheLEtnJB9oACO_pfURQPLnGQ
+            report-generated: ''
+            settlement: m6JfuEKLw3-c_XOeioJaFBj1QR4S497SlvDFv74fY-w
+            settlement-check-code: cJE5GwNIxmby2OAZ_mcC90vZppOGDcq1YLsGc2jNq40
+            task-finished: VZHxG_2rBtk1UznqLtgfKojJls_-eXFkk2r-BkzeElQ
+            transaction-daily: ''
+            login-notice: CYtSHQ9gly6Tz68NfG8pm2Kp0dWcfwn5plPU26Rw6Pg
+            risk-warning-notice: JJz1KAgh2WHEV30ZzY5UdnMqJZL_eq14LEJV9Dh7Zuw
+        globepay:
+          mp-id: globepay
+          app-id: wxa0aa0b46f598ee79_dev
+          open-id-key: openid
+          open-id-start: oHew
+          templates:
+            commission: whcyp5eYvKG9CtmkA820yBOoLs5gDvCJOTUn_QXOQmY
+            new-apply: QQUoZ_k73XJHgq2XCcUtoYNSXjuwgPSIx19cT5jgOy4
+            newpartner-overtime: enoAIvboVTAhNkNTl6JHPV22XTXbWZ-9NbQXAqiK9xQ
+            payment-success: c2W-buYXHZb4hVwZ6jepKz_RRNHHh0tlfe8JkhpgPkE1OnY
+            payment-success-customer: buYXHZb4hVwZ6jepKz_RRNHHh0tlfe8JkhpgPkE1OnY
+            payment-success-cashier: buYXHZb4hVwZ6jepKz_RRNHHh0tlfe8JkhpgPkE1OnY
+            refund-audit-notice: I30yZCRupub8Lwi4jWAZwH17BQgKMGgzGeUkf63jfeo
+            refund-send: xfhJsfopcj3MG8YADaLRSeNNjk5qCs07Oi2WITsNw4w
+            refuse-bd: dkEQ1QBY5rmEhiOzkRDheLEtnJB9oACO_pfURQPLnGQ
+            report-generated: ''
+            settlement: m6JfuEKLw3-c_XOeioJaFBj1QR4S497SlvDFv74fY-w
+            settlement-check-code: JGlluEjt-WNBnnPph30zldrtr4y_yaLYC3Nc4to7zjc
+            task-finished: sTuHL1bMOqikwDVSdZDlPDtoG3OCGvok3Fh2Das6Em4
+            transaction-daily: ''
+            login-notice: C3YzQJuDPKDjmXgpRtyfl-sSo3xY51pKzcsbnyoi6KA
+            risk-warning-notice: BrSfB7UdPS4uywrbki_4C0Z9dsmNgm2RNY5k7n6bUxI
+        ronghan:
+          mp-id: ronghan
+          app-id: wxfab9f0f16082d77e
+          open-id-key: ronghan_openid
+          open-id-start: oTIy
+          templates:
+            commission: ''
+            new-apply: ''
+            newpartner-overtime: ''
+            payment-success: ''
+            payment-success-customer: ''
+            payment-success-cashier: ''
+            refund-audit-notice: ''
+            refund-send: ''
+            refuse-bd: ''
+            report-generated: ''
+            settlement: ''
+            settlement-check-code: ''
+            task-finished: ''
+            transaction-daily: ''
+            login-notice: ''
+mail:
+  send:
+    credentialCode: Fd1aRfdjc9_dev
+merchant:
+  mail:
+    sender:
+      password: pYhfyz-sutzew-dadzo2
+      username: test1@geekforbest.com
+gfp:
+  app:
+    host: http:localhost:9008/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b56db2a08..df94edbe3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,22 @@
-android:
-  message:
-    appkey: ''
-    secret: ''
+server:
+  port: 5555
+spring:
+  profiles:
+    active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc,common
+  mail:
+    host: ''
+    port: ''
+  redis:
+    database: 1
+    host: 127.0.0.1
+    port: 6379
+  thymeleaf:
+    mode: HTML
+jetty:
+  threadPool:
+    maxThreads: 1000
+multipart:
+  max-file-size: 10Mb
 app:
   crossapp:
     enable: true
@@ -67,7 +82,10 @@ app:
     enable: true
   tax:
     type: GST
-
+android:
+  message:
+    appkey: ''
+    secret: ''
 apple:
   message:
     apns:
@@ -85,10 +103,6 @@ im:
   openim:
     appkey: 24986533
     secret: 96e28e7be21a874177211c31834b5174
-jetty:
-  threadPool:
-    maxThreads: 1000
-
 mail:
   mailgun:
     api_key: api:key-2e67b891a1a7974bf3a40ea440d5a77f
@@ -98,11 +112,6 @@ mail:
     public_key: api:pubkey-1aaaffc2662ba1b400c409d3e974ba7e
   send:
     credentialCode: Fd1aRfdjc9
-
-multipart:
-  max-file-size: 10Mb
-
-
 qcloud:
   scf:
     region: ap-hongkong
@@ -112,10 +121,6 @@ royalpay:
   sms:
     appid: 1400094878
     appkey: 43390d81e20c5191c278fbf4cd275be2
-
-server:
-  port: 5555
-
 settle:
   abafile:
     bank:
@@ -154,18 +159,6 @@ settle:
         balance-group:
           - RPAY_SVC_CARD
           - RPAY_SVC_DIRECTDEBIT
-spring:
-  mail:
-    host: ''
-    port: ''
-  profiles:
-    active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc,common
-  redis:
-    database: 1
-    host: 127.0.0.1
-    port: 6379
-  thymeleaf:
-    mode: HTML
 logging:
     level:
         au: