From c576b9f8f6a49a1efb27e5e7d1e09fc5f2336796 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Dec 2020 17:58:44 +0800
Subject: [PATCH] Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin.git into outcenter

---
 src/main/resources/application-prodapp.yml |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/application-prodapp.yml b/src/main/resources/application-prodapp.yml
index b674a96..dc41176 100644
--- a/src/main/resources/application-prodapp.yml
+++ b/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==

--
Gitblit v1.9.1