优化 machine 模块的数据和操作

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/MachineService.java

@@ -1,6 +1,7 @@
 package cn.reghao.autodop.dmaster.machine.service;
 
 import cn.reghao.autodop.dmaster.machine.db.crud.MachineHostCrud;
+import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
 import cn.reghao.autodop.dmaster.machine.db.query.MachineQuery;
 import cn.reghao.autodop.dmaster.machine.model.po.MachineHost;
 import cn.reghao.autodop.dmaster.machine.model.po.SshAuth;
@@ -16,10 +17,12 @@ import java.util.List;
 @Deprecated
 @Service
 public class MachineService {
+    private final MachineHostQuery hostQuery;
     private final MachineHostCrud hostCrudService;
     private final MachineQuery machineQuery;
 
-    public MachineService(MachineHostCrud hostCrudService, MachineQuery machineQuery) {
+    public MachineService(MachineHostQuery hostQuery, MachineHostCrud hostCrudService, MachineQuery machineQuery) {
+        this.hostQuery = hostQuery;
         this.hostCrudService = hostCrudService;
         this.machineQuery = machineQuery;
     }
@@ -31,7 +34,7 @@ public class MachineService {
     }
 
     public void setSshAuth(String machineId, SshAuth sshAuth) {
-        MachineHost machineHost = machineQuery.query(machineId);
+        MachineHost machineHost = hostQuery.findByMachineId(machineId);
         machineHost.setSshAuth(sshAuth);
         hostCrudService.save(machineHost);
     }

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/impl/NodeClazzPubResult.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Slf4j
 @Component
 public class NodeClazzPubResult {
-    private MachineHostQuery hostQuery;
+    private final MachineHostQuery hostQuery;
     private final MachineHostCrud hostCrud;
     private final MachineInfoQuery infoQuery;
     private final MachineInfoCrud infoCrud;

dmaster/src/main/resources/templates/machine/sshauth.html

@@ -8,25 +8,25 @@
         <div class="layui-form-item">
             <label class="layui-form-label required">SSH 端口</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="port" placeholder="请输入 SSH 端口" th:value="${sshAuth.port}">
+                <input class="layui-input" type="text" name="port" placeholder="请输入 SSH 端口" th:value="${sshAuth?.port}">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label required">用户名</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="username" placeholder="请输入用户名" required th:value="${sshAuth.username}">
+                <input class="layui-input" type="text" name="username" placeholder="请输入用户名" required th:value="${sshAuth?.username}">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label required">密码</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="password" placeholder="请输入用户密码" required th:value="${sshAuth.password}">
+                <input class="layui-input" type="text" name="password" placeholder="请输入用户密码" required th:value="${sshAuth?.password}">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label required">RSA 私钥</label>
             <div class="layui-input-inline">
-                <textarea class="layui-textarea" name="rsaPrikey" placeholder="请输入 RSA 私钥" required th:text="${sshAuth.rsaPrikey}"></textarea>
+                <textarea class="layui-textarea" name="rsaPrikey" placeholder="请输入 RSA 私钥" required th:text="${sshAuth?.rsaPrikey}"></textarea>
             </div>
         </div>
         <div class="layui-form-item timo-finally">