From 498476e8fae2f41cbbc2485380fc6adffa113053 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 10:07:42 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 3 +++
src/main/resources/application.yml | 11 +++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index f1486a7..3416f49 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -477,6 +477,9 @@
long parseLong = Long.parseLong(tradeId);
//获取【跟随者设置】数据
FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);
+ if (followFollowerSettingEntity == null) {
+ return Result.ok("设置不存在");
+ }
documentaryOrderSetInfoVo.setTraderId(parseLong);
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d8cae7a..fda83b3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,9 +7,12 @@
profiles:
active: dev
datasource:
- url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ctcoin_data
- password: ctcoin_123
+# url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+# username: ctcoin_data
+# password: ctcoin_123
+ url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: ct_test
+ password: 123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -91,7 +94,7 @@
app:
- debug: false
+ debug: true
redis_expire: 3000
# k线更新任务控制
kline-update-job: false
--
Gitblit v1.9.1