Merge remote-tracking branch 'origin/dev' into feature-cloud

applications/device/device-client/src/main/java/com/usoftchina/smartschool/device/client/po/School.java

@@ -11,6 +11,14 @@ public class School implements Serializable {
      * 学校名称
      */
     private String name;
+    /**
+     * ID
+     */
+    private String id;
+    /**
+     * 私钥
+     */
+    private String secret;
 
     public String getName() {
         return name;
@@ -19,4 +27,20 @@ public class School implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
 }

applications/device/device-client/src/main/java/com/usoftchina/smartschool/device/client/repository/SchoolRepository.java

@@ -27,10 +27,12 @@ public class SchoolRepository{
     }
 
     public void save(School school) {
-        jdbcTemplate.update("insert into school (name) values (?)", school.getName());
+        jdbcTemplate.update("insert into school (name,id,secret) values (?,?,?)", school.getName(),
+                school.getId(), school.getSecret());
     }
 
     public void update(School school) {
-        jdbcTemplate.update("update school set name=?", school.getName());
+        jdbcTemplate.update("update school set name=?,id=?,secret=?",
+                school.getName(), school.getId(), school.getSecret());
     }
 }

applications/device/device-client/src/main/resources/schema.sql

@@ -10,7 +10,9 @@ password varchar(50) not null
 
 create table if not exists school
 (
-name varchar(500) primary key not null
+name varchar(500) not null,
+id varchar(32) not null,
+secret varchar(100) not null
 );
 
 create table if not exists iccard

applications/device/device-client/src/main/resources/static/iccard.html

@@ -26,32 +26,42 @@
 </nav>
 <div class="container">
     <div class="row justify-content-md-center">
-        <div class="col-lg-auto" style="width: 500px">
+        <div class="col-lg-auto" style="width: 500px;padding: 20px">
             <form id="form">
-                <div class="form-group">
-                    <label for="ipInput">IP</label>
-                    <input type="text" class="form-control" id="ipInput" name="ip" required
-                           aria-describedby="ipHelp" placeholder="ip地址，例如192.168.1.100">
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="ipInput">IP</label>
+                    <div class="col-sm-10">
+                        <input type="text" class="form-control" id="ipInput" name="ip" required
+                               placeholder="ip地址，例如192.168.1.100">
+                    </div>
                 </div>
-                <div class="form-group">
-                    <label for="portInput">端口</label>
-                    <input type="text" class="form-control" id="portInput" name="port" required
-                           aria-describedby="portHelp" placeholder="tcp端口，例如37777">
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="portInput">端口</label>
+                    <div class="col-sm-10">
+                        <input type="text" class="form-control" id="portInput" name="port" required
+                               placeholder="tcp端口，例如1433">
+                    </div>
                 </div>
-                <div class="form-group">
-                    <label for="usernameInput">账号</label>
-                    <input type="text" class="form-control" id="usernameInput" name="username"
-                           value="admin" required aria-describedby="usernameHelp" placeholder="数据库账号，例如sa">
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="usernameInput">账号</label>
+                    <div class="col-sm-10">
+                        <input type="text" class="form-control" id="usernameInput" name="username"
+                               value="admin" required placeholder="数据库账号，例如sa">
+                    </div>
                 </div>
-                <div class="form-group">
-                    <label for="passwordInput">密码</label>
-                    <input type="password" class="form-control" id="passwordInput" name="password"
-                           required aria-describedby="passwordHelp" placeholder="数据库密码">
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="passwordInput">密码</label>
+                    <div class="col-sm-10">
+                        <input type="password" class="form-control" id="passwordInput" name="password"
+                               required placeholder="数据库密码">
+                    </div>
                 </div>
-                <div class="form-group">
-                    <label for="databaseNameInput">数据库</label>
-                    <input type="text" class="form-control" id="databaseNameInput" name="databaseName"
-                           required aria-describedby="databaseNameHelp" placeholder="数据库名称">
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="databaseNameInput">数据库</label>
+                    <div class="col-sm-10">
+                        <input type="text" class="form-control" id="databaseNameInput" name="databaseName"
+                               required placeholder="数据库名称">
+                    </div>
                 </div>
                 <button type="button" class="btn btn-primary btn-save">保存</button>
             </form>

applications/device/device-client/src/main/resources/static/js/school.js

@@ -8,6 +8,8 @@ $(document).ready(function () {
                     success: function (content) {
                         if (content.success) {
                             $('#nameInput').val(content.data.name);
+                            $('#idInput').val(content.data.id);
+                            $('#secretInput').val(content.data.secret);
                         } else {
                             alert(content.message);
                         }

applications/device/device-client/src/main/resources/static/school.html

@@ -26,12 +26,28 @@
 </nav>
 <div class="container">
     <div class="row justify-content-md-center">
-        <div class="col-lg-auto" style="width: 500px">
+        <div class="col-lg-auto" style="width: 500px;padding: 20px">
             <form id="form">
-                <div class="form-group">
-                    <label for="nameInput">名称</label>
-                    <input type="text" class="form-control" id="nameInput" name="name" required
-                           aria-describedby="nameHelp" placeholder="学校名称">
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="nameInput">名称</label>
+                    <div class="col-sm-10">
+                        <input type="text" class="form-control" id="nameInput" name="name" required
+                               placeholder="学校名称">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="idInput">ID</label>
+                    <div class="col-sm-10">
+                        <input type="text" class="form-control" id="idInput" name="id" required
+                               placeholder="学校唯一标志">
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="secretInput">私钥</label>
+                    <div class="col-sm-10">
+                        <input type="text" class="form-control" id="secretInput" name="secret" required
+                               placeholder="学校数据传输私钥">
+                    </div>
                 </div>
                 <button type="button" class="btn btn-primary btn-save">保存</button>
             </form>