客户端开发

applications/device/device-cli-hisign/README.md

@@ -0,0 +1,7 @@
+# 环境要求
+- inno setup下载地址：http://files.jrsoftware.org/is/5/innosetup-5.6.1.exe
+- WIX 下载地址：https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311.exe
+- 配置到环境变量
+
+# 打包
+- mvn jfx:native

applications/device/device-client-biometric/pom.xml → applications/device/device-cli-hisign/pom.xml

@@ -3,19 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>smartschool-platform</artifactId>
+        <artifactId>device</artifactId>
         <groupId>com.usoftchina.smartschool</groupId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>device-client-biometric</artifactId>
+    <artifactId>device-cli-hisign</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.usoftchina.smartschool</groupId>
-            <artifactId>device-sdk-biometric</artifactId>
+            <artifactId>device-sdk-hisign</artifactId>
         </dependency>
         <dependency>
             <groupId>org.controlsfx</groupId>
@@ -39,6 +38,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>1.4.197</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -55,6 +55,7 @@
             <artifactId>httpclient</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -62,45 +63,28 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>com.akathist.maven.plugins.launch4j</groupId>
-                <artifactId>launch4j-maven-plugin</artifactId>
-                <version>1.7.25</version>
-                <executions>
-                    <execution>
-                        <id>l4j</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>launch4j</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>com.zenjava</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>8.8.3</version>
                 <configuration>
-                    <jar>${project.build.directory}/${artifactId}-${version}.jar</jar>
-                    <headerType>gui</headerType>
-                    <outfile>${project.build.directory}/device-client.exe</outfile>
-                    <downloadUrl>http://java.com/download</downloadUrl>
-                    <classPath>
-                        <mainClass>org.springframework.boot.loader.JarLauncher</mainClass>
-                    </classPath>
-                    <icon>src/main/resources/favicon.ico</icon>
-                    <stayAlive>true</stayAlive>
-                    <restartOnCrash>true</restartOnCrash>
-                    <jre>
-                        <minVersion>1.8.0</minVersion>
-                        <jdkPreference>preferJre</jdkPreference>
-                    </jre>
-                    <versionInfo>
-                        <fileVersion>2.0.0.0</fileVersion>
-                        <txtFileVersion>${project.version}</txtFileVersion>
-                        <fileDescription>${project.name}</fileDescription>
-                        <copyright>2018 usoftchina.com</copyright>
-                        <productVersion>2.0.0.0</productVersion>
-                        <txtProductVersion>2.0.0.0</txtProductVersion>
-                        <productName>${project.name}</productName>
-                        <companyName>usoftchina.com</companyName>
-                        <internalName>device-client</internalName>
-                        <originalFilename>device-client.exe</originalFilename>
-                    </versionInfo>
+                    <mainClass>com.usoftchina.smartschool.device.cli.hisign.DeviceClient</mainClass>
+                    <vendor>深圳市优软科技有限公司</vendor>
+                    <appName>SmartSchool</appName>
+                    <bundleArguments>
+                        <runtime/>
+                    </bundleArguments>
+                    <jvmArgs>
+                        <jvmArg>-Xms1024m</jvmArg>
+                        <jvmArg>-Xmx2048m</jvmArg>
+                        <jvmArg>-XX:MaxNewSize=256M</jvmArg>
+                        <jvmArg>-XX:MaxPermSize=512m</jvmArg>
+                        <jvmArg>-XX:-UseGCOverheadLimit</jvmArg>
+                    </jvmArgs>
+                    <needShortcut>true</needShortcut>
+                    <needMenu>true</needMenu>
+                    <skipMainClassScanning>true</skipMainClassScanning>
+                    <skipJNLP>true</skipJNLP>
+                    <nativeReleaseVersion>2.0.0</nativeReleaseVersion>
                 </configuration>
             </plugin>
         </plugins>

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/DeviceClient.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/DeviceClient.java

@@ -1,11 +1,11 @@
-package com.usoftchina.smartschool.device.client.biometric;
-
-import com.usoftchina.smartschool.device.client.biometric.config.DeviceServerProperties;
-import com.usoftchina.smartschool.device.client.biometric.controller.LoginController;
-import com.usoftchina.smartschool.device.client.biometric.support.AbstractJavaFxApplicationSupport;
-import com.usoftchina.smartschool.device.client.biometric.support.SplashScreen;
-import com.usoftchina.smartschool.device.client.biometric.util.ClientConstant;
-import com.usoftchina.smartschool.device.client.biometric.util.Tray;
+package com.usoftchina.smartschool.device.cli.hisign;
+
+import com.usoftchina.smartschool.device.cli.hisign.config.DeviceServerProperties;
+import com.usoftchina.smartschool.device.cli.hisign.controller.LoginController;
+import com.usoftchina.smartschool.device.cli.hisign.support.AbstractJavaFxApplicationSupport;
+import com.usoftchina.smartschool.device.cli.hisign.support.SplashScreen;
+import com.usoftchina.smartschool.device.cli.hisign.util.ClientConstant;
+import com.usoftchina.smartschool.device.cli.hisign.util.Tray;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -17,16 +17,16 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @date 2019/11/12
  */
 @EnableConfigurationProperties(DeviceServerProperties.class)
-@SpringBootApplication
 @EnableScheduling
+@SpringBootApplication
 public class DeviceClient extends AbstractJavaFxApplicationSupport {
 
+    public static Image[] defaultIcons;
+
     public static void main(String[] args) {
         launch(DeviceClient.class, new SplashScreen("设备监听程序启动中"), args);
     }
 
-    public static Image[] defaultIcons = new Image[]{new Image(ClientConstant.icon.toExternalForm())};
-
     @Override
     protected void initStage(Stage stage) {
         super.initStage(stage);
@@ -36,7 +36,10 @@ public class DeviceClient extends AbstractJavaFxApplicationSupport {
     }
 
     @Override
-    protected Image[] getDefaultIcons() {
+    public Image[] getDefaultIcons() {
+        if (null == defaultIcons) {
+            defaultIcons = new Image[]{new Image(ClientConstant.icon.toExternalForm())};
+        }
         return defaultIcons;
     }
 

applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/MainController.java

@@ -0,0 +1,49 @@
+package com.usoftchina.smartschool.device.cli.hisign;
+
+import com.usoftchina.smartschool.device.cli.hisign.support.AbstractJavaFxApplicationSupport;
+import com.usoftchina.smartschool.device.cli.hisign.support.SplashScreen;
+import javafx.stage.Stage;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author yingp
+ * @date 2019/11/21
+ */
+//@SpringBootApplication
+//@Configuration
+public class MainController extends AbstractJavaFxApplicationSupport {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+
+    /**
+     * The entry point of application.
+     *
+     * @param args the input arguments
+     */
+    public static void main(String[] args) {
+//        launchApp(MainController.class, MainStageView.class, args);
+        launch(MainController.class, new SplashScreen("设备监听程序启动中"), args);
+    }
+
+    //    /**
+//     * Start.
+//     *
+//     * @param stage the stage
+//     *
+//     * @exception Exception the exception
+//     */
+//    @Override
+//    public void start(Stage stage) throws Exception {
+//        super.start(stage);
+//    }
+    @Override
+    protected void initStage(Stage stage) {
+        showView("/view/login.fxml");
+    }
+}

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/config/DataSourceConfig.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/config/DataSourceConfig.java

@@ -1,7 +1,7 @@
-package com.usoftchina.smartschool.device.client.biometric.config;
+package com.usoftchina.smartschool.device.cli.hisign.config;
 
-import com.usoftchina.smartschool.device.client.biometric.jdbc.DynamicDataSource;
-import com.usoftchina.smartschool.device.client.biometric.jdbc.DynamicDataSourceRegister;
+import com.usoftchina.smartschool.device.cli.hisign.jdbc.DynamicDataSource;
+import com.usoftchina.smartschool.device.cli.hisign.jdbc.DynamicDataSourceRegister;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/config/DeviceServerProperties.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/config/DeviceServerProperties.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.config;
+package com.usoftchina.smartschool.device.cli.hisign.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/config/RestTemplateConfig.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/config/RestTemplateConfig.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.config;
+package com.usoftchina.smartschool.device.cli.hisign.config;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.config.Registry;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/control/IconFont.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/control/IconFont.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.control;
+package com.usoftchina.smartschool.device.cli.hisign.control;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/control/IntegerField.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/control/IntegerField.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.control;
+package com.usoftchina.smartschool.device.cli.hisign.control;
 
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/control/NavItem.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/control/NavItem.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.control;
+package com.usoftchina.smartschool.device.cli.hisign.control;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/control/NumberField.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/control/NumberField.java

@@ -1,6 +1,7 @@
-package com.usoftchina.smartschool.device.client.biometric.control;
+package com.usoftchina.smartschool.device.cli.hisign.control;
 
-import javafx.beans.property.*;
+import javafx.beans.property.Property;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.TextField;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/control/ParameterizedScene.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/control/ParameterizedScene.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.control;
+package com.usoftchina.smartschool.device.cli.hisign.control;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/CameraController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/CameraController.java

@@ -1,9 +1,9 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
 import com.github.sarxos.webcam.Webcam;
 import com.github.sarxos.webcam.WebcamPanel;
 import com.github.sarxos.webcam.WebcamResolution;
-import com.usoftchina.smartschool.device.client.biometric.control.ParameterizedScene;
+import com.usoftchina.smartschool.device.cli.hisign.control.ParameterizedScene;
 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.embed.swing.SwingNode;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/CloudSettingController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/CloudSettingController.java

@@ -1,9 +1,9 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.po.CloudSetting;
-import com.usoftchina.smartschool.device.client.biometric.service.CloudSettingService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.po.CloudSetting;
+import com.usoftchina.smartschool.device.cli.hisign.service.CloudSettingService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/GateController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/GateController.java

@@ -1,13 +1,13 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.DeviceClient;
-import com.usoftchina.smartschool.device.client.biometric.po.AccessType;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.po.HealthStatus;
-import com.usoftchina.smartschool.device.client.biometric.service.FaceGateService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.ViewUtils;
+import com.usoftchina.smartschool.device.cli.hisign.DeviceClient;
+import com.usoftchina.smartschool.device.cli.hisign.po.AccessType;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.po.HealthStatus;
+import com.usoftchina.smartschool.device.cli.hisign.service.FaceGateService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.ViewUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/GateEditController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/GateEditController.java

@@ -1,11 +1,11 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.control.ParameterizedScene;
-import com.usoftchina.smartschool.device.client.biometric.po.AccessType;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.service.FaceGateService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.control.ParameterizedScene;
+import com.usoftchina.smartschool.device.cli.hisign.po.AccessType;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.service.FaceGateService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -18,8 +18,6 @@ import javafx.fxml.Initializable;
 import javafx.scene.Scene;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
-import javafx.stage.Stage;
-import org.controlsfx.control.Notifications;
 import org.springframework.util.StringUtils;
 
 import java.net.URL;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/GateIssueController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/GateIssueController.java

@@ -1,11 +1,11 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.control.ParameterizedScene;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.service.FaceGateService;
-import com.usoftchina.smartschool.device.client.biometric.service.GatePersonService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.control.ParameterizedScene;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.service.FaceGateService;
+import com.usoftchina.smartschool.device.cli.hisign.service.GatePersonService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/GateIssueStatusController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/GateIssueStatusController.java

@@ -1,11 +1,11 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.control.ParameterizedScene;
-import com.usoftchina.smartschool.device.client.biometric.po.PersonGateView;
-import com.usoftchina.smartschool.device.client.biometric.repository.GatePersonRepository;
-import com.usoftchina.smartschool.device.client.biometric.service.GatePersonService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.control.ParameterizedScene;
+import com.usoftchina.smartschool.device.cli.hisign.po.PersonGateView;
+import com.usoftchina.smartschool.device.cli.hisign.repository.GatePersonRepository;
+import com.usoftchina.smartschool.device.cli.hisign.service.GatePersonService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -19,7 +19,6 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.control.cell.PropertyValueFactory;
 
 import java.net.URL;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/GateSettingController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/GateSettingController.java

@@ -1,15 +1,15 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.biometric.BiometricDeviceService;
-import com.usoftchina.smartschool.device.biometric.DeviceSetting;
-import com.usoftchina.smartschool.device.biometric.FaceLevel;
-import com.usoftchina.smartschool.device.biometric.LivingLevel;
-import com.usoftchina.smartschool.device.client.biometric.control.IntegerField;
-import com.usoftchina.smartschool.device.client.biometric.control.ParameterizedScene;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.service.FaceGateService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
+import com.usoftchina.smartschool.device.hisign.BiometricDeviceService;
+import com.usoftchina.smartschool.device.hisign.DeviceSetting;
+import com.usoftchina.smartschool.device.hisign.FaceLevel;
+import com.usoftchina.smartschool.device.hisign.LivingLevel;
+import com.usoftchina.smartschool.device.cli.hisign.control.IntegerField;
+import com.usoftchina.smartschool.device.cli.hisign.control.ParameterizedScene;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.service.FaceGateService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/IcCardController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/IcCardController.java

@@ -1,10 +1,10 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.control.IntegerField;
-import com.usoftchina.smartschool.device.client.biometric.po.IcCard;
-import com.usoftchina.smartschool.device.client.biometric.service.IcCardService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.control.IntegerField;
+import com.usoftchina.smartschool.device.cli.hisign.po.IcCard;
+import com.usoftchina.smartschool.device.cli.hisign.service.IcCardService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/LoginController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/LoginController.java

@@ -1,7 +1,7 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.DeviceClient;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.DeviceClient;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/MainController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/MainController.java

@@ -1,7 +1,7 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.control.NavItem;
-import com.usoftchina.smartschool.device.client.biometric.util.ViewUtils;
+import com.usoftchina.smartschool.device.cli.hisign.control.NavItem;
+import com.usoftchina.smartschool.device.cli.hisign.util.ViewUtils;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.Scene;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/PersonController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/PersonController.java

@@ -1,15 +1,15 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.DeviceClient;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.po.Person;
-import com.usoftchina.smartschool.device.client.biometric.po.PersonGroup;
-import com.usoftchina.smartschool.device.client.biometric.po.SexType;
-import com.usoftchina.smartschool.device.client.biometric.service.PersonGroupService;
-import com.usoftchina.smartschool.device.client.biometric.service.PersonService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.ViewUtils;
+import com.usoftchina.smartschool.device.cli.hisign.DeviceClient;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.po.Person;
+import com.usoftchina.smartschool.device.cli.hisign.po.PersonGroup;
+import com.usoftchina.smartschool.device.cli.hisign.po.SexType;
+import com.usoftchina.smartschool.device.cli.hisign.service.PersonGroupService;
+import com.usoftchina.smartschool.device.cli.hisign.service.PersonService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.ViewUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/PersonEditController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/PersonEditController.java

@@ -1,16 +1,16 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
-
-import com.usoftchina.smartschool.device.client.biometric.DeviceClient;
-import com.usoftchina.smartschool.device.client.biometric.control.ParameterizedScene;
-import com.usoftchina.smartschool.device.client.biometric.po.Person;
-import com.usoftchina.smartschool.device.client.biometric.po.PersonGroup;
-import com.usoftchina.smartschool.device.client.biometric.po.SexType;
-import com.usoftchina.smartschool.device.client.biometric.service.FileService;
-import com.usoftchina.smartschool.device.client.biometric.service.PersonGroupService;
-import com.usoftchina.smartschool.device.client.biometric.service.PersonService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.ViewUtils;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
+
+import com.usoftchina.smartschool.device.cli.hisign.DeviceClient;
+import com.usoftchina.smartschool.device.cli.hisign.control.ParameterizedScene;
+import com.usoftchina.smartschool.device.cli.hisign.po.Person;
+import com.usoftchina.smartschool.device.cli.hisign.po.PersonGroup;
+import com.usoftchina.smartschool.device.cli.hisign.po.SexType;
+import com.usoftchina.smartschool.device.cli.hisign.service.FileService;
+import com.usoftchina.smartschool.device.cli.hisign.service.PersonGroupService;
+import com.usoftchina.smartschool.device.cli.hisign.service.PersonService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.ViewUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -31,13 +31,11 @@ import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.util.List;
 import java.util.ResourceBundle;
 
 /**

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/PersonIssueStatusController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/PersonIssueStatusController.java

@@ -1,14 +1,13 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.control.ParameterizedScene;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.po.GatePersonView;
-import com.usoftchina.smartschool.device.client.biometric.po.PersonGateView;
-import com.usoftchina.smartschool.device.client.biometric.po.SexType;
-import com.usoftchina.smartschool.device.client.biometric.repository.GatePersonRepository;
-import com.usoftchina.smartschool.device.client.biometric.service.GatePersonService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.control.ParameterizedScene;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.po.GatePersonView;
+import com.usoftchina.smartschool.device.cli.hisign.po.SexType;
+import com.usoftchina.smartschool.device.cli.hisign.repository.GatePersonRepository;
+import com.usoftchina.smartschool.device.cli.hisign.service.GatePersonService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -23,7 +22,6 @@ import javafx.scene.control.Button;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.control.cell.PropertyValueFactory;
 
 import java.net.URL;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/SchoolController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/SchoolController.java

@@ -1,9 +1,9 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
-import com.usoftchina.smartschool.device.client.biometric.po.School;
-import com.usoftchina.smartschool.device.client.biometric.service.SchoolService;
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.NotifyUtils;
+import com.usoftchina.smartschool.device.cli.hisign.po.School;
+import com.usoftchina.smartschool.device.cli.hisign.service.SchoolService;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.NotifyUtils;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/ViewController.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/controller/ViewController.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.controller;
+package com.usoftchina.smartschool.device.cli.hisign.controller;
 
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/jdbc/Connectable.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/jdbc/Connectable.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.jdbc;
+package com.usoftchina.smartschool.device.cli.hisign.jdbc;
 
 /**
  * Created by Pro1 on 2017/7/27.

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/jdbc/DynamicDataSource.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/jdbc/DynamicDataSource.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.jdbc;
+package com.usoftchina.smartschool.device.cli.hisign.jdbc;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.datasource.AbstractDataSource;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/jdbc/DynamicDataSourceContextHolder.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/jdbc/DynamicDataSourceContextHolder.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.jdbc;
+package com.usoftchina.smartschool.device.cli.hisign.jdbc;
 
 /**
  * Created by Pro1 on 2017/7/27.

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/jdbc/DynamicDataSourceRegister.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/jdbc/DynamicDataSourceRegister.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.jdbc;
+package com.usoftchina.smartschool.device.cli.hisign.jdbc;
 
 import com.zaxxer.hikari.HikariDataSource;
 import org.slf4j.Logger;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/jdbc/ReturnKeyStatementCallback.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/jdbc/ReturnKeyStatementCallback.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.jdbc;
+package com.usoftchina.smartschool.device.cli.hisign.jdbc;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.*;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/jdbc/ReturnKeyStatementCreator.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/jdbc/ReturnKeyStatementCreator.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.jdbc;
+package com.usoftchina.smartschool.device.cli.hisign.jdbc;
 
 import org.springframework.jdbc.core.PreparedStatementCreator;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/listener/AccessControlListener.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/listener/AccessControlListener.java

@@ -1,9 +1,9 @@
-package com.usoftchina.smartschool.device.client.biometric.listener;
+package com.usoftchina.smartschool.device.cli.hisign.listener;
 
-import com.usoftchina.smartschool.device.biometric.AccessControlEvent;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.service.CloudService;
-import com.usoftchina.smartschool.device.client.biometric.service.FaceGateService;
+import com.usoftchina.smartschool.device.hisign.AccessControlEvent;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.service.CloudService;
+import com.usoftchina.smartschool.device.cli.hisign.service.FaceGateService;
 import com.usoftchina.smartschool.device.dto.AccessControlInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/AccessType.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/AccessType.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 /**
  * @author yingp

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/CloudSetting.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/CloudSetting.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 import com.usoftchina.smartschool.device.property.DirtyBean;
 import com.usoftchina.smartschool.device.property.DirtyObjectProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/FaceGate.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/FaceGate.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 import com.usoftchina.smartschool.device.dto.DeviceInfo;
 import javafx.beans.property.*;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/GatePerson.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/GatePerson.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 import java.util.Date;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/GatePersonView.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/GatePersonView.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/HealthStatus.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/HealthStatus.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 /**
  * @author yingp

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/IcCard.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/IcCard.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
-import com.usoftchina.smartschool.device.client.biometric.jdbc.Connectable;
+import com.usoftchina.smartschool.device.cli.hisign.jdbc.Connectable;
 import com.usoftchina.smartschool.device.property.DirtyBean;
 import com.usoftchina.smartschool.device.property.DirtyObjectProperty;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/Person.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/Person.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 import javafx.beans.property.*;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/PersonGateView.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/PersonGateView.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/PersonGroup.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/PersonGroup.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 /**
  * @author yingp

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/School.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/School.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 import com.usoftchina.smartschool.device.property.DirtyBean;
 import javafx.beans.property.SimpleStringProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/Selectable.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/Selectable.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/po/SexType.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/po/SexType.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.po;
+package com.usoftchina.smartschool.device.cli.hisign.po;
 
 /**
  * @author yingp

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/repository/BaseRepository.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/repository/BaseRepository.java

@@ -1,7 +1,7 @@
-package com.usoftchina.smartschool.device.client.biometric.repository;
+package com.usoftchina.smartschool.device.cli.hisign.repository;
 
-import com.usoftchina.smartschool.device.client.biometric.jdbc.ReturnKeyStatementCallback;
-import com.usoftchina.smartschool.device.client.biometric.jdbc.ReturnKeyStatementCreator;
+import com.usoftchina.smartschool.device.cli.hisign.jdbc.ReturnKeyStatementCallback;
+import com.usoftchina.smartschool.device.cli.hisign.jdbc.ReturnKeyStatementCreator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/repository/CloudSettingRepository.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/repository/CloudSettingRepository.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.repository;
+package com.usoftchina.smartschool.device.cli.hisign.repository;
 
-import com.usoftchina.smartschool.device.client.biometric.po.CloudSetting;
+import com.usoftchina.smartschool.device.cli.hisign.po.CloudSetting;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.dao.EmptyResultDataAccessException;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/repository/FaceGateRepository.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/repository/FaceGateRepository.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.repository;
+package com.usoftchina.smartschool.device.cli.hisign.repository;
 
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Caching;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/repository/GatePersonRepository.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/repository/GatePersonRepository.java

@@ -1,6 +1,8 @@
-package com.usoftchina.smartschool.device.client.biometric.repository;
+package com.usoftchina.smartschool.device.cli.hisign.repository;
 
-import com.usoftchina.smartschool.device.client.biometric.po.*;
+import com.usoftchina.smartschool.device.cli.hisign.po.GatePerson;
+import com.usoftchina.smartschool.device.cli.hisign.po.GatePersonView;
+import com.usoftchina.smartschool.device.cli.hisign.po.PersonGateView;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Repository;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/repository/IcCardRepository.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/repository/IcCardRepository.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.repository;
+package com.usoftchina.smartschool.device.cli.hisign.repository;
 
-import com.usoftchina.smartschool.device.client.biometric.po.IcCard;
+import com.usoftchina.smartschool.device.cli.hisign.po.IcCard;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/repository/PersonGroupRepository.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/repository/PersonGroupRepository.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.repository;
+package com.usoftchina.smartschool.device.cli.hisign.repository;
 
-import com.usoftchina.smartschool.device.client.biometric.po.PersonGroup;
+import com.usoftchina.smartschool.device.cli.hisign.po.PersonGroup;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.dao.EmptyResultDataAccessException;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/repository/PersonRepository.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/repository/PersonRepository.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.repository;
+package com.usoftchina.smartschool.device.cli.hisign.repository;
 
-import com.usoftchina.smartschool.device.client.biometric.po.Person;
+import com.usoftchina.smartschool.device.cli.hisign.po.Person;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.dao.EmptyResultDataAccessException;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/repository/SchoolRepository.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/repository/SchoolRepository.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.repository;
+package com.usoftchina.smartschool.device.cli.hisign.repository;
 
-import com.usoftchina.smartschool.device.client.biometric.po.School;
+import com.usoftchina.smartschool.device.cli.hisign.po.School;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.dao.EmptyResultDataAccessException;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/CloudService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/CloudService.java

@@ -1,8 +1,8 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
+package com.usoftchina.smartschool.device.cli.hisign.service;
 
 import com.usoftchina.smartschool.device.base.Result;
-import com.usoftchina.smartschool.device.client.biometric.po.CloudSetting;
-import com.usoftchina.smartschool.device.client.biometric.po.School;
+import com.usoftchina.smartschool.device.cli.hisign.po.CloudSetting;
+import com.usoftchina.smartschool.device.cli.hisign.po.School;
 import com.usoftchina.smartschool.device.dto.AccessControlInfo;
 import com.usoftchina.smartschool.device.exception.ExceptionCode;
 import org.springframework.beans.factory.annotation.Autowired;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/CloudSettingService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/CloudSettingService.java

@@ -1,8 +1,8 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
+package com.usoftchina.smartschool.device.cli.hisign.service;
 
-import com.usoftchina.smartschool.device.client.biometric.config.DeviceServerProperties;
-import com.usoftchina.smartschool.device.client.biometric.po.CloudSetting;
-import com.usoftchina.smartschool.device.client.biometric.repository.CloudSettingRepository;
+import com.usoftchina.smartschool.device.cli.hisign.config.DeviceServerProperties;
+import com.usoftchina.smartschool.device.cli.hisign.po.CloudSetting;
+import com.usoftchina.smartschool.device.cli.hisign.repository.CloudSettingRepository;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/FaceGateService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/FaceGateService.java

@@ -1,12 +1,12 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
+package com.usoftchina.smartschool.device.cli.hisign.service;
 
-import com.usoftchina.smartschool.device.biometric.BiometricDeviceService;
-import com.usoftchina.smartschool.device.biometric.DeviceSetting;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.po.HealthStatus;
-import com.usoftchina.smartschool.device.client.biometric.repository.FaceGateRepository;
-import com.usoftchina.smartschool.device.client.biometric.repository.GatePersonRepository;
-import com.usoftchina.smartschool.device.client.biometric.util.RandomUtils;
+import com.usoftchina.smartschool.device.hisign.BiometricDeviceService;
+import com.usoftchina.smartschool.device.hisign.DeviceSetting;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.po.HealthStatus;
+import com.usoftchina.smartschool.device.cli.hisign.repository.FaceGateRepository;
+import com.usoftchina.smartschool.device.cli.hisign.repository.GatePersonRepository;
+import com.usoftchina.smartschool.device.cli.hisign.util.RandomUtils;
 import com.usoftchina.smartschool.device.exception.ExceptionCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/FileService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/FileService.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
+package com.usoftchina.smartschool.device.cli.hisign.service;
 
-import com.usoftchina.smartschool.device.client.biometric.util.RandomUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.RandomUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/GatePersonService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/GatePersonService.java

@@ -1,15 +1,14 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
-
-import com.usoftchina.smartschool.device.biometric.BiometricDeviceService;
-import com.usoftchina.smartschool.device.biometric.PersonPo;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.po.GatePerson;
-import com.usoftchina.smartschool.device.client.biometric.po.Person;
-import com.usoftchina.smartschool.device.client.biometric.po.PersonGateView;
-import com.usoftchina.smartschool.device.client.biometric.repository.FaceGateRepository;
-import com.usoftchina.smartschool.device.client.biometric.repository.GatePersonRepository;
-import com.usoftchina.smartschool.device.client.biometric.repository.PersonRepository;
-import com.usoftchina.smartschool.device.client.biometric.util.RandomUtils;
+package com.usoftchina.smartschool.device.cli.hisign.service;
+
+import com.usoftchina.smartschool.device.hisign.BiometricDeviceService;
+import com.usoftchina.smartschool.device.hisign.PersonPo;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.po.GatePerson;
+import com.usoftchina.smartschool.device.cli.hisign.po.Person;
+import com.usoftchina.smartschool.device.cli.hisign.po.PersonGateView;
+import com.usoftchina.smartschool.device.cli.hisign.repository.FaceGateRepository;
+import com.usoftchina.smartschool.device.cli.hisign.repository.GatePersonRepository;
+import com.usoftchina.smartschool.device.cli.hisign.repository.PersonRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/IcCardService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/IcCardService.java

@@ -1,8 +1,8 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
+package com.usoftchina.smartschool.device.cli.hisign.service;
 
-import com.usoftchina.smartschool.device.client.biometric.jdbc.DynamicDataSourceRegister;
-import com.usoftchina.smartschool.device.client.biometric.po.IcCard;
-import com.usoftchina.smartschool.device.client.biometric.repository.IcCardRepository;
+import com.usoftchina.smartschool.device.cli.hisign.jdbc.DynamicDataSourceRegister;
+import com.usoftchina.smartschool.device.cli.hisign.po.IcCard;
+import com.usoftchina.smartschool.device.cli.hisign.repository.IcCardRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/PersonGroupService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/PersonGroupService.java

@@ -1,8 +1,8 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
+package com.usoftchina.smartschool.device.cli.hisign.service;
 
-import com.usoftchina.smartschool.device.client.biometric.po.PersonGroup;
-import com.usoftchina.smartschool.device.client.biometric.repository.PersonGroupRepository;
-import com.usoftchina.smartschool.device.client.biometric.repository.PersonRepository;
+import com.usoftchina.smartschool.device.cli.hisign.po.PersonGroup;
+import com.usoftchina.smartschool.device.cli.hisign.repository.PersonGroupRepository;
+import com.usoftchina.smartschool.device.cli.hisign.repository.PersonRepository;
 import com.usoftchina.smartschool.device.exception.ExceptionCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/PersonService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/PersonService.java

@@ -1,7 +1,7 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
+package com.usoftchina.smartschool.device.cli.hisign.service;
 
-import com.usoftchina.smartschool.device.client.biometric.po.Person;
-import com.usoftchina.smartschool.device.client.biometric.repository.PersonRepository;
+import com.usoftchina.smartschool.device.cli.hisign.po.Person;
+import com.usoftchina.smartschool.device.cli.hisign.repository.PersonRepository;
 import com.usoftchina.smartschool.device.exception.ExceptionCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/service/SchoolService.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/service/SchoolService.java

@@ -1,7 +1,7 @@
-package com.usoftchina.smartschool.device.client.biometric.service;
+package com.usoftchina.smartschool.device.cli.hisign.service;
 
-import com.usoftchina.smartschool.device.client.biometric.po.School;
-import com.usoftchina.smartschool.device.client.biometric.repository.SchoolRepository;
+import com.usoftchina.smartschool.device.cli.hisign.po.School;
+import com.usoftchina.smartschool.device.cli.hisign.repository.SchoolRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/support/AbstractJavaFxApplicationSupport.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/support/AbstractJavaFxApplicationSupport.java

@@ -1,7 +1,7 @@
-package com.usoftchina.smartschool.device.client.biometric.support;
+package com.usoftchina.smartschool.device.cli.hisign.support;
 
-import com.usoftchina.smartschool.device.client.biometric.util.AlertUtils;
-import com.usoftchina.smartschool.device.client.biometric.util.ViewUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.AlertUtils;
+import com.usoftchina.smartschool.device.cli.hisign.util.ViewUtils;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -72,7 +72,7 @@ public abstract class AbstractJavaFxApplicationSupport extends Application {
         stage.getIcons().addAll(getDefaultIcons());
     }
 
-    protected Image[] getDefaultIcons() {
+    public Image[] getDefaultIcons() {
         return new Image[0];
     }
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/support/SplashScreen.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/support/SplashScreen.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.support;
+package com.usoftchina.smartschool.device.cli.hisign.support;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/task/GateScheduler.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/task/GateScheduler.java

@@ -1,9 +1,9 @@
-package com.usoftchina.smartschool.device.client.biometric.task;
+package com.usoftchina.smartschool.device.cli.hisign.task;
 
-import com.usoftchina.smartschool.device.biometric.BiometricDeviceService;
-import com.usoftchina.smartschool.device.client.biometric.po.FaceGate;
-import com.usoftchina.smartschool.device.client.biometric.po.HealthStatus;
-import com.usoftchina.smartschool.device.client.biometric.service.FaceGateService;
+import com.usoftchina.smartschool.device.hisign.BiometricDeviceService;
+import com.usoftchina.smartschool.device.cli.hisign.po.FaceGate;
+import com.usoftchina.smartschool.device.cli.hisign.po.HealthStatus;
+import com.usoftchina.smartschool.device.cli.hisign.service.FaceGateService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/task/IcCardScheduler.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/task/IcCardScheduler.java

@@ -1,15 +1,15 @@
-package com.usoftchina.smartschool.device.client.biometric.task;
+package com.usoftchina.smartschool.device.cli.hisign.task;
 
 import com.alibaba.fastjson.JSON;
 import com.usoftchina.smartschool.device.base.Result;
-import com.usoftchina.smartschool.device.client.biometric.jdbc.DynamicDataSourceContextHolder;
-import com.usoftchina.smartschool.device.client.biometric.jdbc.DynamicDataSourceRegister;
-import com.usoftchina.smartschool.device.client.biometric.po.CloudSetting;
-import com.usoftchina.smartschool.device.client.biometric.po.IcCard;
-import com.usoftchina.smartschool.device.client.biometric.po.School;
-import com.usoftchina.smartschool.device.client.biometric.service.CloudSettingService;
-import com.usoftchina.smartschool.device.client.biometric.service.IcCardService;
-import com.usoftchina.smartschool.device.client.biometric.service.SchoolService;
+import com.usoftchina.smartschool.device.cli.hisign.jdbc.DynamicDataSourceContextHolder;
+import com.usoftchina.smartschool.device.cli.hisign.jdbc.DynamicDataSourceRegister;
+import com.usoftchina.smartschool.device.cli.hisign.po.CloudSetting;
+import com.usoftchina.smartschool.device.cli.hisign.po.IcCard;
+import com.usoftchina.smartschool.device.cli.hisign.po.School;
+import com.usoftchina.smartschool.device.cli.hisign.service.CloudSettingService;
+import com.usoftchina.smartschool.device.cli.hisign.service.IcCardService;
+import com.usoftchina.smartschool.device.cli.hisign.service.SchoolService;
 import com.usoftchina.smartschool.device.dto.AccTransDetail;
 import com.usoftchina.smartschool.device.exception.ExceptionCode;
 import org.springframework.beans.factory.annotation.Autowired;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/util/AlertUtils.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/util/AlertUtils.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.util;
+package com.usoftchina.smartschool.device.cli.hisign.util;
 
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/util/ClientConstant.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/util/ClientConstant.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.util;
+package com.usoftchina.smartschool.device.cli.hisign.util;
 
 import java.net.URL;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/util/NotifyUtils.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/util/NotifyUtils.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.util;
+package com.usoftchina.smartschool.device.cli.hisign.util;
 
 import javafx.geometry.Pos;
 import javafx.util.Duration;

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/util/RandomUtils.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/util/RandomUtils.java

@@ -1,4 +1,4 @@
-package com.usoftchina.smartschool.device.client.biometric.util;
+package com.usoftchina.smartschool.device.cli.hisign.util;
 
 import java.util.UUID;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/util/Tray.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/util/Tray.java

@@ -1,6 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.util;
+package com.usoftchina.smartschool.device.cli.hisign.util;
 
-import com.usoftchina.smartschool.device.client.biometric.DeviceClient;
+import com.usoftchina.smartschool.device.cli.hisign.DeviceClient;
 import javafx.application.Platform;
 import javafx.stage.Stage;
 

applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/util/ViewUtils.java → applications/device/device-cli-hisign/src/main/java/com/usoftchina/smartschool/device/cli/hisign/util/ViewUtils.java

@@ -1,7 +1,6 @@
-package com.usoftchina.smartschool.device.client.biometric.util;
+package com.usoftchina.smartschool.device.cli.hisign.util;
 
-import com.usoftchina.smartschool.device.client.biometric.DeviceClient;
-import com.usoftchina.smartschool.device.client.biometric.control.ParameterizedScene;
+import com.usoftchina.smartschool.device.cli.hisign.control.ParameterizedScene;
 import javafx.fxml.FXMLLoader;
 
 import java.io.IOException;
@@ -13,7 +12,7 @@ import java.io.IOException;
 public class ViewUtils {
     public static ParameterizedScene load(String viewPath, Object params) throws IOException {
         FXMLLoader loader = new FXMLLoader();
-        loader.setLocation(DeviceClient.class.getResource(viewPath));
+        loader.setLocation(ViewUtils.class.getResource(viewPath));
         ParameterizedScene scene = new ParameterizedScene(loader.load());
         scene.setParams(params);
         return scene;

applications/device/device-client-biometric/src/main/resources/application.yml → applications/device/device-cli-hisign/src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
   datasource:
     primary:
       driver-class-name: org.h2.Driver
-      jdbc-url: jdbc:h2:file:${user.home}/.device-client/data/device_client;FILE_LOCK=NO;DB_CLOSE_ON_EXIT=FALSE
+      jdbc-url: jdbc:h2:file:${user.home}/.SmartSchool/data/cli;FILE_LOCK=NO;DB_CLOSE_ON_EXIT=FALSE
       username: admin
       password: select111***
     hikari:
@@ -26,8 +26,8 @@ spring:
       max-lifetime: 1800000
       connection-timeout: 30000
 logging:
-  path: ${user.home}/.device-client/logs/
+  path: ${user.home}/.SmartSchool/logs/
   level:
     com.usoftchina.smartschool: debug
 assert:
-  path: ${user.home}/.device-client/assert/
+  path: ${user.home}/.SmartSchool/assert/

applications/device/device-client-biometric/src/main/resources/view/camera.fxml → applications/device/device-cli-hisign/src/main/resources/view/camera.fxml

@@ -6,7 +6,7 @@
 <?import javafx.embed.swing.SwingNode?>
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.CameraController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.CameraController"
             prefHeight="600.0" prefWidth="800.0">
     <top>
         <AnchorPane prefHeight="40" prefWidth="800">

applications/device/device-client-biometric/src/main/resources/view/cloud.fxml → applications/device/device-cli-hisign/src/main/resources/view/cloud.fxml

@@ -6,7 +6,7 @@
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.CloudSettingController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.CloudSettingController"
             prefHeight="400.0" prefWidth="600.0">
     <top>
         <ToolBar BorderPane.alignment="CENTER">

applications/device/device-client-biometric/src/main/resources/view/gate.fxml → applications/device/device-cli-hisign/src/main/resources/view/gate.fxml

@@ -9,7 +9,7 @@
 <?import javafx.scene.control.Separator?>
 <BorderPane xmlns="http://javafx.com/javafx/8.0.172-ea"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.GateController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.GateController"
             xmlns:fx="http://javafx.com/fxml/1">
     <top>
         <ToolBar BorderPane.alignment="CENTER">

applications/device/device-client-biometric/src/main/resources/view/gate_edit.fxml → applications/device/device-cli-hisign/src/main/resources/view/gate_edit.fxml

@@ -10,7 +10,7 @@
 <AnchorPane prefHeight="340.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.172-ea"
             xmlns:fx="http://javafx.com/fxml/1"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.GateEditController">
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.GateEditController">
     <children>
         <HBox styleClass="field-control" layoutX="10" layoutY="30">
             <children>

applications/device/device-client-biometric/src/main/resources/view/gate_issue.fxml → applications/device/device-cli-hisign/src/main/resources/view/gate_issue.fxml

@@ -11,7 +11,7 @@
       stylesheets="/style/main.css"
       spacing="20"
       style="-fx-padding: 20px"
-      fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.GateIssueController">
+      fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.GateIssueController">
     <children>
         <Label text="选择人脸闸机：" style="-fx-font-weight: bold;-fx-font-size: 14px"/>
         <HBox spacing="20" fx:id="gateList"/>

applications/device/device-client-biometric/src/main/resources/view/gate_issue_status.fxml → applications/device/device-cli-hisign/src/main/resources/view/gate_issue_status.fxml

@@ -6,7 +6,7 @@
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.GateIssueStatusController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.GateIssueStatusController"
             prefHeight="600.0" prefWidth="800.0">
     <top>
         <ToolBar BorderPane.alignment="CENTER">

applications/device/device-client-biometric/src/main/resources/view/gate_setting.fxml → applications/device/device-cli-hisign/src/main/resources/view/gate_setting.fxml

@@ -3,11 +3,11 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<?import com.usoftchina.smartschool.device.client.biometric.control.IntegerField?>
+<?import com.usoftchina.smartschool.device.cli.hisign.control.IntegerField?>
 <AnchorPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.GateSettingController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.GateSettingController"
             prefHeight="600.0" prefWidth="900.0">
     <children>
         <HBox styleClass="field-control" layoutX="10" layoutY="30">

applications/device/device-client-biometric/src/main/resources/view/ic.fxml → applications/device/device-cli-hisign/src/main/resources/view/ic.fxml

@@ -3,11 +3,11 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<?import com.usoftchina.smartschool.device.client.biometric.control.IntegerField?>
+<?import com.usoftchina.smartschool.device.cli.hisign.control.IntegerField?>
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.IcCardController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.IcCardController"
             prefHeight="400.0" prefWidth="600.0">
     <top>
         <ToolBar BorderPane.alignment="CENTER">

applications/device/device-client-biometric/src/main/resources/view/login.fxml → applications/device/device-cli-hisign/src/main/resources/view/login.fxml

@@ -8,7 +8,7 @@
 
 <AnchorPane prefHeight="363.0" prefWidth="400.0" stylesheets="/style/login.css"
             xmlns="http://javafx.com/javafx/8.0.172-ea" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.LoginController">
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.LoginController">
     <children>
         <TextField fx:id="usernameField" layoutX="91.0" layoutY="131.0" prefHeight="43.0" prefWidth="218.0"
                    promptText="账号" onKeyPressed="#handleKeyPressed">

applications/device/device-client-biometric/src/main/resources/view/main.fxml → applications/device/device-cli-hisign/src/main/resources/view/main.fxml

@@ -5,12 +5,12 @@
 
 <?import javafx.scene.control.TreeView?>
 <?import javafx.scene.control.TreeItem?>
-<?import com.usoftchina.smartschool.device.client.biometric.control.NavItem?>
-<?import com.usoftchina.smartschool.device.client.biometric.control.IconFont?>
+<?import com.usoftchina.smartschool.device.cli.hisign.control.NavItem?>
+<?import com.usoftchina.smartschool.device.cli.hisign.control.IconFont?>
 <?import javafx.scene.control.Label?>
 <BorderPane prefHeight="700.0" prefWidth="960.0" stylesheets="/style/main.css"
             xmlns="http://javafx.com/javafx/8.0.172-ea" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.MainController">
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.MainController">
     <left>
         <TreeView fx:id="treeView" prefHeight="200.0" prefWidth="140.0" showRoot="false">
             <root>

applications/device/device-client-biometric/src/main/resources/view/person.fxml → applications/device/device-cli-hisign/src/main/resources/view/person.fxml

@@ -9,11 +9,11 @@
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.TreeView?>
 <?import javafx.scene.control.TreeItem?>
-<?import com.usoftchina.smartschool.device.client.biometric.control.IconFont?>
+<?import com.usoftchina.smartschool.device.cli.hisign.control.IconFont?>
 <?import javafx.scene.control.ListView?>
 <BorderPane xmlns="http://javafx.com/javafx/8.0.172-ea"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.PersonController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.PersonController"
             xmlns:fx="http://javafx.com/fxml/1">
     <top>
         <ToolBar BorderPane.alignment="CENTER">

applications/device/device-client-biometric/src/main/resources/view/person_edit.fxml → applications/device/device-cli-hisign/src/main/resources/view/person_edit.fxml

@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 
-<AnchorPane prefHeight="340.0" prefWidth="600.0" stylesheets="/style/main.css" xmlns="http://javafx.com/javafx/8.0.172-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.PersonEditController">
+<AnchorPane prefHeight="340.0" prefWidth="600.0" stylesheets="/style/main.css" xmlns="http://javafx.com/javafx/8.0.172-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.PersonEditController">
     <children>
         <HBox layoutX="10" layoutY="30" styleClass="field-control">
             <children>

applications/device/device-client-biometric/src/main/resources/view/person_issue_status.fxml → applications/device/device-cli-hisign/src/main/resources/view/person_issue_status.fxml

@@ -6,7 +6,7 @@
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.PersonIssueStatusController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.PersonIssueStatusController"
             prefHeight="600.0" prefWidth="800.0">
     <top>
         <ToolBar BorderPane.alignment="CENTER">

applications/device/device-client-biometric/src/main/resources/view/school.fxml → applications/device/device-cli-hisign/src/main/resources/view/school.fxml

@@ -6,7 +6,7 @@
 <BorderPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             stylesheets="/style/main.css"
-            fx:controller="com.usoftchina.smartschool.device.client.biometric.controller.SchoolController"
+            fx:controller="com.usoftchina.smartschool.device.cli.hisign.controller.SchoolController"
             prefHeight="400.0" prefWidth="600.0">
     <top>
         <ToolBar BorderPane.alignment="CENTER">

applications/device/device-client-biometric/config/inno.iss

@@ -1,45 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "device-client"
-#define MyAppVersion "2.0.0.0"
-#define MyAppPublisher "usoftchina.com"
-#define MyAppURL "https://www.usoftchina.com/"
-#define MyAppExeName "device-client.exe"
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{B53F1479-C51D-4EC5-9E67-C6A0D6705E75}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableProgramGroupPage=yes
-OutputBaseFilename=setup
-SetupIconFile=F:\workspace\smartschool-platform\applications\device\device-client\src\main\resources\icon.ico
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "F:\workspace\smartschool-platform\applications\device\device-client\target\device-client.exe"; DestDir: "{app}"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-

applications/device/device-sdk-biometric/pom.xml → applications/device/device-sdk-hisign/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>device-sdk-biometric</artifactId>
+    <artifactId>device-sdk-hisign</artifactId>
 
     <dependencies>
         <dependency>