From 3a75981733f6f0e172635cf9ca95acf9eb05df81 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Dec 2020 17:57:17 +0800
Subject: [PATCH] Merge branch 'outcenter-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage.git into outcenter-bak
---
src/main/resources/logback-spring.xml | 2 +-
src/main/resources/application-prod.yml | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index b5ac2ef..408b87e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -15,20 +15,20 @@
datasource:
# 数据源-1，名称为 base
base:
- username: ct_test
- password: 123456
+ username: moko_user
+ password: moko123!@#
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://120.27.238.55:3306/outcenter_test?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_moko?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
- # Redis数据库索引（默认为 0）
+ ## Redis数据库索引（默认为0）
database: 0
- # Redis服务器地址
- host: 120.27.238.55
- # Redis服务器连接端口
+ ## Redis服务器地址
+ host: 114.55.92.106
+ ## Redis服务器连接端口
port: 6379
- # Redis 密码
- password: xcong123
+ ## Redis服务器连接密码（默认为空）
+ password: hibit123
lettuce:
pool:
# 连接池中的最小空闲连接
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 6d69b8c..986ad1d 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<contextName>febs</contextName>
- <property name="log.path" value="logs/back" />
+ <property name="log.path" value="moko/back/logs" />
<property name="log.maxHistory" value="15" />
<property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %yellow(%thread) %green(%logger) %msg%n"/>
<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level %thread %logger %msg%n"/>
--
Gitblit v1.9.1