Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!274 调整逻辑

Browse Source 
Merge pull request !274 from 德仔/develop
This commit is contained in:
德仔 2021-06-03 18:32:37 +08:00 committed by Gitee
commit 3844894249
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-admin/src/main/filters/local/application.yml
View File

@ -83,7 +83,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: 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 password: gzDxPaZcSiXJpi2N
username: root username: root
slave: slave:

2
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java
View File

@ -171,7 +171,7 @@ public class SysServicesTopicServiceImp implements ISysServicesTopicService {
msgObj.put("type", WsUtils.WS_TYPE_NEW_CUSTOMER_REPLY); msgObj.put("type", WsUtils.WS_TYPE_NEW_CUSTOMER_REPLY);
msgObj.put("msg", "新客户回复"); msgObj.put("msg", "新客户回复");
msgObj.put("data", dataObj); msgObj.put("data", dataObj);
WebSocketServer.sendInfo(msgObj.toJSONString(), counts.get(i).getUid()); WebSocketServer.sendInfo(msgObj.toJSONString(), statusList.get(i).getUid());
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();

1
stdiet-ui/src/views/custom/message/messageBrowser/Comment.vue
View File

@ -86,6 +86,7 @@ export default {
.reply_btn { .reply_btn {
margin-left: 16px; margin-left: 16px;
color: #1890ff;
cursor: pointer; cursor: pointer;
} }
} }

3
stdiet-ui/src/views/custom/message/messageBrowser/index.vue
View File

@ -57,7 +57,7 @@
<div <div
:style="{ marginBottom: '8px', fontSize: '12px', color: '#8c8c8c' }" :style="{ marginBottom: '8px', fontSize: '12px', color: '#8c8c8c' }"
> >
回复：{{ replyTarget }} 回复 to：{{ replyTarget }}
</div> </div>
<el-input <el-input
type="textarea" type="textarea"
@ -339,6 +339,7 @@ export default {
.reply_btn { .reply_btn {
margin-left: 16px; margin-left: 16px;
color: #1890ff;
cursor: pointer; cursor: pointer;
} }
} }