From 672ca49a55f5c2bf8e5fc5dfe77765d1c2d9e977 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 3 Jun 2021 18:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stdiet-admin/src/main/filters/local/application.yml | 2 +- .../stdiet/custom/service/impl/SysServicesTopicServiceImp.java | 2 +- stdiet-ui/src/views/custom/message/messageBrowser/Comment.vue | 1 + stdiet-ui/src/views/custom/message/messageBrowser/index.vue | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stdiet-admin/src/main/filters/local/application.yml b/stdiet-admin/src/main/filters/local/application.yml index 6932d7b76..b3bead739 100644 --- a/stdiet-admin/src/main/filters/local/application.yml +++ b/stdiet-admin/src/main/filters/local/application.yml @@ -83,7 +83,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://47.115.23.82:3306/stdiet_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.115.23.82:3306/stdiet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 password: gzDxPaZcSiXJpi2N username: root slave: diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java index 941518c5b..1e57ffabd 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java @@ -171,7 +171,7 @@ public class SysServicesTopicServiceImp implements ISysServicesTopicService { msgObj.put("type", WsUtils.WS_TYPE_NEW_CUSTOMER_REPLY); msgObj.put("msg", "新客户回复"); msgObj.put("data", dataObj); - WebSocketServer.sendInfo(msgObj.toJSONString(), counts.get(i).getUid()); + WebSocketServer.sendInfo(msgObj.toJSONString(), statusList.get(i).getUid()); } } catch (IOException e) { e.printStackTrace(); diff --git a/stdiet-ui/src/views/custom/message/messageBrowser/Comment.vue b/stdiet-ui/src/views/custom/message/messageBrowser/Comment.vue index db43c3cd8..04f56f3e1 100644 --- a/stdiet-ui/src/views/custom/message/messageBrowser/Comment.vue +++ b/stdiet-ui/src/views/custom/message/messageBrowser/Comment.vue @@ -86,6 +86,7 @@ export default { .reply_btn { margin-left: 16px; + color: #1890ff; cursor: pointer; } } diff --git a/stdiet-ui/src/views/custom/message/messageBrowser/index.vue b/stdiet-ui/src/views/custom/message/messageBrowser/index.vue index 836d84e1a..2e90a4659 100644 --- a/stdiet-ui/src/views/custom/message/messageBrowser/index.vue +++ b/stdiet-ui/src/views/custom/message/messageBrowser/index.vue @@ -57,7 +57,7 @@
- 回复:{{ replyTarget }} + 回复 to:{{ replyTarget }}