@ -6,12 +6,12 @@ spring:
druid:
# 主库数据源
master:
# url: jdbc:mysql://121.36.58.109:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Haiwei123456
url: jdbc:mysql://localhost:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://121.36.58.109:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: root
password: Haiwei123456
# url: jdbc:mysql://localhost:3306/jrm-intelligent-iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# password: root
# 从库数据源
slave:
# 从数据源开关/默认关闭
@ -133,9 +133,9 @@ span{
}
.bootstrap-table .fixed-table-container .fixed-table-body{
/*height: 28em;*/
height: 27em;
overflow-x: auto;
overflow-y: visible;
overflow-y: auto;
.bootstrap-table .fixed-table-container .fixed-table-body::-webkit-scrollbar {
@ -578,7 +578,7 @@
$.cookie('userID', '0000');
var wsImpl = window.WebSocket || window.MozWebSocket;
console.log("connecting to server ..");
window.ws = new wsImpl('ws://127.0.0.1:7181');
window.ws = new wsImpl('ws://121.36.58.109:7181');
ws.onmessage = function (evt) {
let result = $.parseJSON(evt.data);
console.log(result);