update

src/main/resources/application-test.properties

@@ -0,0 +1,37 @@
+# mvc config
+server.port=8090
+server.context-path=/
+server.tomcat.uri-encoding=UTF-8
+spring.freemarker.request-context-attribute=request
+spring.freemarker.settings.number_format=#
+spring.freemarker.suffix=.ftl
+# logs config
+logging.file=logs/logging.txt
+logging.level.org.springframework=WARN
+logging.level.org.apache=WARN
+logging.level.com.qmth=DEBUG
+logging.level.cn.com.qmth=DEBUG
+# mysql config
+spring.datasource.url=jdbc:mysql://192.168.10.30:3306/app_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=root
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.jpa.show-sql=false
+spring.jpa.hibernate.ddl-auto=update
+spring.datasource.sql-script-encoding=UTF-8
+spring.datasource.continue-on-error=false
+spring.datasource.initialize=false
+# 蕉昢督昢華硊
+examcloud.exam.admin.url=http://192.168.10.30:8001
+# 厙蕉督昢華硊
+examcloud.net.exam.url=http://192.168.10.30:8003
+# 枙踱督昢華硊
+examcloud.question.pool.url=http://192.168.10.30:8868
+# ＇痐笢陑督昢華硊
+examcloud.user.auth.url=http://192.168.10.30
+# 衱鼴堁恅璃督昢華硊
+examcloud.upyun.url=https://ecs-test-static.qmth.com.cn
+# 傻陓督昢饜离
+examcloud.sms.url=http://192.168.10.30:8007
+examcloud.sms.sign=\u8003\u8BD5\u4E91\u5E73\u53F0
+examcloud.sms.template=SMS_138073780

src/main/resources/templates/deviceRecord/list.ftl

@@ -60,7 +60,7 @@
         <input type="text" class="form-control" id="loginToken" placeholder="TOKEN"/>
     </div>
     <div class="btn-group">
-        <a href="#" class="btn btn-info" onclick="doSearch()"> 搜索</a>
+        <a href="#" class="btn btn-info" onclick="doSearch()" style="margin-bottom: 10px"> 搜索</a>
     </div>
     <table id="contentTable" class="table">
         <thead>
@@ -73,10 +73,10 @@
     </table>
     <ul id="contentPager" class="pagination"></ul>
 </div>
+
 <script src="${base}/styles/jquery/jquery-1.9.1.min.js"></script>
 <script src="${base}/page.js"></script>
 <script type="text/javascript">
-
     $(function () {
         loadData(1, true);
     });
@@ -87,7 +87,6 @@
     }
 
     function loadData(curPageNo, needCreatePage) {
-        $("#contentDiv").empty();
         var params = {};
         params.url = $('#url').val();
         params.system = $('#system').val();
@@ -102,42 +101,23 @@
         params.account = $('#account').val();
         params.loginKey = $('#loginKey').val();
         params.loginToken = $('#loginToken').val();
+
+        $("#contentDiv").empty();
         $.ajax({
-            url: '${base}/device/record/list?pageSize=5&pageNo=' + curPageNo,
+            url: '${base!}/device/record/list?pageSize=5&pageNo=' + curPageNo,
             contentType: "application/json; charset=UTF-8",
             dataType: "json",
             type: "POST",
             data: JSON.stringify(params),
             success: function (response) {
                 if (response && response.success) {
-                    var list = response.data.content;
-                    if (list && list.length > 0) {
-                        var html = [];
-                        for (var n = 0; n < list.length; n++) {
-                            var obj = list[n];
-                            html.push('<tr>');
-                            html.push('<td curId=' + obj.id + '>' + checkNull(obj.createDate) + '</td>');
-                            html.push('<td>');
-                            html.push('<span> <b>访问地址：</b>' + checkNull(obj.url) + '</span></br>');
-                            html.push('<span> <b>KEY：</b>' + checkNull(obj.loginKey) + '</span>');
-                            html.push('<span> <b>TOKEN：</b>' + checkNull(obj.loginToken) + '</span>');
-                            html.push('<span> <b>来源账号：</b>' + checkNull(obj.account) + '</span></br>');
-                            html.push('<span> <b>系统标识：</b>' + checkNull(obj.system) + '</span>');
-                            html.push('<span> <b>设备编号：</b>' + checkNull(obj.deviceId) + '</span>');
-                            html.push('<span> <b>网络类型：</b>' + checkNull(obj.netType) + '</span>');
-                            html.push('<span> <b>设备品牌：</b>' + checkNull(obj.brand) + '</span>');
-                            html.push('<span> <b>型号：</b>' + checkNull(obj.model) + '</span></br>');
-                            html.push('<span> <b>系统版本号：</b>' + checkNull(obj.sysVersion) + '</span>');
-                            html.push('<span> <b>APP版本号：</b>' + checkNull(obj.appVersion) + '</span>');
-                            html.push('<span> <b>APP更新号：</b>' + checkNull(obj.appCode) + '</span>');
-                            html.push('<span> <b>APP补丁号：</b>' + checkNull(obj.patchCode) + '</span>');
-                            html.push('</td>');
-                            html.push('</tr>');
-                        }
-                        $("#contentDiv").html(html.join(''));
+                    var data = response.data;
+                    if (data.numberOfElements > 0) {
+                        var html = render(data.content);
+                        $("#contentDiv").html(html);
                         if (needCreatePage) {
                             $("#contentPager").createPage({
-                                pageCount: response.data.totalPages,
+                                pageCount: data.totalPages,
                                 current: curPageNo,
                                 backFn: function (current) {
                                     loadData(current, false);
@@ -150,7 +130,33 @@
         });
     }
 
-    function checkNull(str) {
+    function render(list) {
+        var html = [];
+        for (var n = 0; n < list.length; n++) {
+            var obj = list[n];
+            html.push('<tr>');
+            html.push('<td style="vertical-align: middle" curId=' + obj.id + '>' + emptyStr(obj.createDate) + '</td>');
+            html.push('<td>');
+            html.push('<span> <b>访问地址：</b>' + emptyStr(obj.url) + '</span');
+            html.push('<span> <b>KEY：</b>' + emptyStr(obj.loginKey) + '</span>');
+            html.push('<span> <b>TOKEN：</b>' + emptyStr(obj.loginToken) + '</span>');
+            html.push('<span> <b>来源账号：</b>' + emptyStr(obj.account) + '</span></br>');
+            html.push('<span> <b>系统标识：</b>' + emptyStr(obj.system) + '</span>');
+            html.push('<span> <b>设备编号：</b>' + emptyStr(obj.deviceId) + '</span>');
+            html.push('<span> <b>网络类型：</b>' + emptyStr(obj.netType) + '</span>');
+            html.push('<span> <b>设备品牌：</b>' + emptyStr(obj.brand) + '</span>');
+            html.push('<span> <b>型号：</b>' + emptyStr(obj.model) + '</span>');
+            html.push('<span> <b>系统版本号：</b>' + emptyStr(obj.sysVersion) + '</span>');
+            html.push('<span> <b>APP版本号：</b>' + emptyStr(obj.appVersion) + '</span>');
+            html.push('<span> <b>APP更新号：</b>' + emptyStr(obj.appCode) + '</span>');
+            html.push('<span> <b>APP补丁号：</b>' + emptyStr(obj.patchCode) + '</span>');
+            html.push('</td>');
+            html.push('</tr>');
+        }
+        return html.join('');
+    }
+
+    function emptyStr(str) {
         if (!str || str == null) {
             return "无";
         }