提交 90654adc 编写于 作者: xiaonannet's avatar xiaonannet

Merge branch 'release/1.0.0' into main

{
"name": "thinglinks",
"lockfileVersion": 2,
"requires": true,
"packages": {}
}
{
"name": "thinglinks",
"lockfileVersion": 2,
"requires": true,
"packages": {}
}
...@@ -293,7 +293,7 @@ public class DeviceServiceImpl implements DeviceService { ...@@ -293,7 +293,7 @@ public class DeviceServiceImpl implements DeviceService {
//更新数据库设备状态 //更新数据库设备状态
Device device = new Device(); Device device = new Device();
device.setId(oneByClientId.getId()); device.setId(oneByClientId.getId());
device.setConnectStatus(DeviceConnectStatus.INIT.getValue()); device.setConnectStatus(DeviceConnectStatus.OFFLINE.getValue());
device.setUpdateTime(DateUtils.getNowDate()); device.setUpdateTime(DateUtils.getNowDate());
deviceMapper.updateByPrimaryKeySelective(device); deviceMapper.updateByPrimaryKeySelective(device);
} }
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<meta charset="utf-8"> <head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta charset="utf-8">
<meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="renderer" content="webkit">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title><%= webpackConfig.name %></title> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--> <title>
<style lang="scss"> <%= webpackConfig.name %>
</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<!-- <style lang="scss">
html, html,
body, body,
#app { #app {
...@@ -193,16 +196,393 @@ ...@@ -193,16 +196,393 @@
color: #FFF; color: #FFF;
opacity: 0.5; opacity: 0.5;
} }
</style> </style> -->
</head> </head>
<body> <style lang="scss" scoped>
<div id="app"> @import url(https://fonts.googleapis.com/css?family=Archivo+Narrow);
<div id="loader-wrapper">
<div id="loader"></div> .cube-folding {
<div class="loader-section section-left"></div> width: 50px;
<div class="loader-section section-right"></div> height: 50px;
<div class="load_title">正在加载ThingLinks系统资源,请耐心等待</div> display: inline-block;
</div> -webkit-transform: rotate(45deg);
</div> -moz-transform: rotate(45deg);
</body> transform: rotate(45deg);
</html> font-size: 0;
}
.cube-folding span {
position: relative;
width: 25px;
height: 25px;
-webkit-transform: scale(1.1);
-moz-transform: scale(1.1);
transform: scale(1.1);
display: inline-block;
}
.cube-folding span::before {
content: "";
background-color: white;
position: absolute;
left: 0;
top: 0;
display: block;
width: 25px;
height: 25px;
-moz-transform-origin: 100% 100%;
-ms-transform-origin: 100% 100%;
-webkit-transform-origin: 100% 100%;
transform-origin: 100% 100%;
-webkit-animation: folding 2.5s infinite linear both;
-moz-animation: folding 2.5s infinite linear both;
animation: folding 2.5s infinite linear both;
}
.cube-folding .leaf2 {
-webkit-transform: rotateZ(90deg) scale(1.1);
-moz-transform: rotateZ(90deg) scale(1.1);
transform: rotateZ(90deg) scale(1.1);
}
.cube-folding .leaf2::before {
-webkit-animation-delay: 0.3s;
animation-delay: 0.3s;
background-color: #f2f2f2;
}
.cube-folding .leaf3 {
-webkit-transform: rotateZ(270deg) scale(1.1);
-moz-transform: rotateZ(270deg) scale(1.1);
transform: rotateZ(270deg) scale(1.1);
}
.cube-folding .leaf3::before {
-webkit-animation-delay: 0.9s;
animation-delay: 0.9s;
background-color: #f2f2f2;
}
.cube-folding .leaf4 {
-webkit-transform: rotateZ(180deg) scale(1.1);
-moz-transform: rotateZ(180deg) scale(1.1);
transform: rotateZ(180deg) scale(1.1);
}
.cube-folding .leaf4::before {
-webkit-animation-delay: 0.6s;
animation-delay: 0.6s;
background-color: #e6e6e6;
}
@-webkit-keyframes folding {
0%,
10% {
-webkit-transform: perspective(140px) rotateX(-180deg);
-moz-transform: perspective(140px) rotateX(-180deg);
transform: perspective(140px) rotateX(-180deg);
-webkit-opacity: 0;
-moz-opacity: 0;
opacity: 0;
}
25%,
75% {
-webkit-transform: perspective(140px) rotateX(0deg);
-moz-transform: perspective(140px) rotateX(0deg);
transform: perspective(140px) rotateX(0deg);
-webkit-opacity: 1;
-moz-opacity: 1;
opacity: 1;
}
90%,
100% {
-webkit-transform: perspective(140px) rotateY(180deg);
-moz-transform: perspective(140px) rotateY(180deg);
transform: perspective(140px) rotateY(180deg);
-webkit-opacity: 0;
-moz-opacity: 0;
opacity: 0;
}
}
@-moz-keyframes folding {
0%,
10% {
-webkit-transform: perspective(140px) rotateX(-180deg);
-moz-transform: perspective(140px) rotateX(-180deg);
transform: perspective(140px) rotateX(-180deg);
-webkit-opacity: 0;
-moz-opacity: 0;
opacity: 0;
}
25%,
75% {
-webkit-transform: perspective(140px) rotateX(0deg);
-moz-transform: perspective(140px) rotateX(0deg);
transform: perspective(140px) rotateX(0deg);
-webkit-opacity: 1;
-moz-opacity: 1;
opacity: 1;
}
90%,
100% {
-webkit-transform: perspective(140px) rotateY(180deg);
-moz-transform: perspective(140px) rotateY(180deg);
transform: perspective(140px) rotateY(180deg);
-webkit-opacity: 0;
-moz-opacity: 0;
opacity: 0;
}
}
@-ms-keyframes folding {
0%,
10% {
-webkit-transform: perspective(140px) rotateX(-180deg);
-moz-transform: perspective(140px) rotateX(-180deg);
transform: perspective(140px) rotateX(-180deg);
-webkit-opacity: 0;
-moz-opacity: 0;
opacity: 0;
}
25%,
75% {
-webkit-transform: perspective(140px) rotateX(0deg);
-moz-transform: perspective(140px) rotateX(0deg);
transform: perspective(140px) rotateX(0deg);
-webkit-opacity: 1;
-moz-opacity: 1;
opacity: 1;
}
90%,
100% {
-webkit-transform: perspective(140px) rotateY(180deg);
-moz-transform: perspective(140px) rotateY(180deg);
transform: perspective(140px) rotateY(180deg);
-webkit-opacity: 0;
-moz-opacity: 0;
opacity: 0;
}
}
@keyframes folding {
0%,
10% {
-webkit-transform: perspective(140px) rotateX(-180deg);
-moz-transform: perspective(140px) rotateX(-180deg);
transform: perspective(140px) rotateX(-180deg);
-webkit-opacity: 0;
-moz-opacity: 0;
opacity: 0;
}
25%,
75% {
-webkit-transform: perspective(140px) rotateX(0deg);
-moz-transform: perspective(140px) rotateX(0deg);
transform: perspective(140px) rotateX(0deg);
-webkit-opacity: 1;
-moz-opacity: 1;
opacity: 1;
}
90%,
100% {
-webkit-transform: perspective(140px) rotateY(180deg);
-moz-transform: perspective(140px) rotateY(180deg);
transform: perspective(140px) rotateY(180deg);
-webkit-opacity: 0;
-moz-opacity: 0;
opacity: 0;
}
}
.cube-wrapper {
position: fixed;
left: 50%;
top: 50%;
margin-top: -50px;
margin-left: -50px;
width: 100px;
height: 100px;
text-align: center;
}
.cube-wrapper:after {
content: "";
position: absolute;
left: 0;
right: 0;
bottom: -20px;
margin: auto;
width: 90px;
height: 6px;
z-index: 1;
background-color: rgba(0, 0, 0, 0.1);
-webkit-filter: blur(2px);
filter: blur(2px);
-webkit-border-radius: 100%;
-moz-border-radius: 100%;
border-radius: 100%;
-webkit-animation: shadow 0.5s ease infinite alternate;
-moz-animation: shadow 0.5s ease infinite alternate;
animation: shadow 0.5s ease infinite alternate;
}
.cube-wrapper .loading {
font-size: 12px;
letter-spacing: 0.1em;
display: block;
color: white;
position: relative;
top: 25px;
z-index: 2;
-webkit-animation: text 0.5s ease infinite alternate;
-moz-animation: text 0.5s ease infinite alternate;
animation: text 0.5s ease infinite alternate;
}
@-webkit-keyframes text {
100% {
top: 35px;
}
}
@-moz-keyframes text {
100% {
top: 35px;
}
}
@-ms-keyframes text {
100% {
top: 35px;
}
}
@keyframes text {
100% {
top: 35px;
}
}
@-webkit-keyframes shadow {
100% {
bottom: -18px;
width: 100px;
}
}
@-moz-keyframes shadow {
100% {
bottom: -18px;
width: 100px;
}
}
@-ms-keyframes shadow {
100% {
bottom: -18px;
width: 100px;
}
}
@keyframes shadow {
100% {
bottom: -18px;
width: 100px;
}
}
html,
body {
min-height: 100%;
}
body {
/* fallback for old browsers */
/* Chrome 10-25, Safari 5.1-6 */
background: linear-gradient(to left, #00c6ff, #0072ff);
/* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
font-family: arial;
}
h1 {
font-size: 26px;
display: block;
text-align: center;
color: #fff;
padding: 50px 20px;
font-weight: 300;
font-family: "Archivo Narrow", sans-serif;
}
.made-with-love {
position: fixed;
left: 0;
width: 100%;
bottom: 10px;
text-align: center;
font-size: 10px;
z-index: 9999;
font-family: arial;
color: #fff;
}
.made-with-love i {
font-style: normal;
color: #f50057;
font-size: 14px;
position: relative;
top: 2px;
}
.made-with-love a {
color: #fff;
text-decoration: none;
}
.made-with-love a:hover {
text-decoration: underline;
}
/*# sourceMappingURL=index.css.map */
</style>
<body>
<div id="app">
<!-- <div id="loader-wrapper">
<div id="loader"></div>
<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>
<div class="load_title">正在加载ThingLinks系统资源,请耐心等待</div>
</div> -->
<h1>ThingLinks Iot Integrated Platform</h1>
<div class="cube-wrapper">
<div class="cube-folding">
<span class="leaf1"></span>
<span class="leaf2"></span>
<span class="leaf3"></span>
<span class="leaf4"></span>
</div>
<span class="loading" data-name="Loading">Loading</span>
</div>
<!-- follow me template -->
<div class="made-with-love">
<a target="_blank" href="http://thinglinks.mqttsnet.com">@ThingLinks</a>
</div>
</div>
</body>
</html>
\ No newline at end of file
...@@ -17,3 +17,9 @@ export default { ...@@ -17,3 +17,9 @@ export default {
} }
} }
</script> </script>
<style>
body{
background:white;
margin: 0;
}
</style>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册