diff --git a/json/build.sh b/json/build.sh
index ba74263..73d1af1 100755
--- a/json/build.sh
+++ b/json/build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/bash
 
-xls2ui -m ../models -o ../wwwroot msp *.json
+xls2ui -m ../../appbase/models ../../rbac/models ../models -o ../wwwroot msp *.json
diff --git a/models/mysql.ddl.sql b/models/mysql.ddl.sql
index 9188074..53c68c3 100644
--- a/models/mysql.ddl.sql
+++ b/models/mysql.ddl.sql
@@ -1,66 +1,4 @@
 
--- ./atomservice.xlsx
-
-
-
-
-
-drop table if exists atomservice;
-CREATE TABLE atomservice
-(
-
-  `id` VARCHAR(32)   comment 'id',
-  `name` VARCHAR(99)   comment '服务名称',
-  `description` VARCHAR(500)   comment '描述',
-  `ownerid` VARCHAR(32)   comment '属主id',
-  `paramsdesc` longtext   comment '参数描述',
-  `script` longtext   comment '脚本'
-
-
-,primary key(id)
-
-
-)
-engine=innodb 
-default charset=utf8 
-comment '原子服务'
-;
-
-
--- ./hostdev.xlsx
-
-
-
-
-
-drop table if exists hostdev;
-CREATE TABLE hostdev
-(
-
-  `id` VARCHAR(32)   comment 'id',
-  `name` VARCHAR(99)   comment '主机名称',
-  `description` VARCHAR(500)   comment '描述',
-  `ownerid` VARCHAR(32)   comment '属主id',
-  `host` VARCHAR(400)   comment '域名或ip',
-  `port` int   comment '端口',
-  `user` VARCHAR(400)   comment '用户',
-  `ssh_method` VARCHAR(1)   comment 'ssh方法',
-  `passwd` VARCHAR(400)   comment '用户密码',
-  `client_key` longtext   comment '私钥',
-  `passphrase` VARCHAR(100)   comment '私钥密码',
-  `devgroupid` VARCHAR(32)   comment '设备组id'
-
-
-,primary key(id)
-
-
-)
-engine=innodb 
-default charset=utf8 
-comment '主机设备'
-;
-
-
 -- ./service_log.xlsx
 
 
@@ -72,9 +10,8 @@ CREATE TABLE service_log
 (
 
   `id` VARCHAR(32)   comment 'id',
-  `servname` VARCHAR(100)   comment '服务名称',
-  `date` date   comment '主机名称',
-  `timestamp` TIMESTAMP DEFAULT CURRENT_TIMESTAMP   comment '描述',
+  `serve_date` date   comment '服务日期',
+  `timestamp` TIMESTAMP DEFAULT CURRENT_TIMESTAMP   comment '服务时间',
   `hostid` VARCHAR(32)   comment '主机id',
   `serviceid` VARCHAR(32)   comment '服务id',
   `params` longtext   comment '参数',
@@ -106,8 +43,11 @@ CREATE TABLE techservice
   `name` VARCHAR(100)   comment '服务名称',
   `description` longtext   comment '描述',
   `script` longtext   comment '服务脚本',
-  `params_ui` longtext   comment '参数',
+  `params` longtext   comment '参数',
   `ownerid` VARCHAR(32)   comment '属主机构',
+  `osname` VARCHAR(100)   comment '操作系统',
+  `osver` VARCHAR(100)   comment '操作系统版本',
+  `serve_status` VARCHAR(1)   comment '服务状态',
   `enable_date` date   comment '启用日期',
   `disable_date` date   comment '禁用日期'
 
@@ -122,34 +62,6 @@ comment '技术服务'
 ;
 
 
--- ./mixservice.xlsx
-
-
-
-
-
-drop table if exists mixservice;
-CREATE TABLE mixservice
-(
-
-  `id` VARCHAR(32)   comment 'id',
-  `name` VARCHAR(99)   comment '服务名称',
-  `description` VARCHAR(500)   comment '描述',
-  `ownerid` VARCHAR(32)   comment '属主id',
-  `paramsdesc` longtext   comment '参数描述',
-  `script` longtext   comment '脚本'
-
-
-,primary key(id)
-
-
-)
-engine=innodb 
-default charset=utf8 
-comment '混合服务'
-;
-
-
 -- ./devgroup.xlsx
 
 
@@ -163,8 +75,7 @@ CREATE TABLE devgroup
   `id` VARCHAR(32)   comment 'id',
   `name` VARCHAR(99)   comment '组名称',
   `description` VARCHAR(500)   comment '描述',
-  `ownerid` VARCHAR(32)   comment '属主id',
-  `enterhostid` VARCHAR(32)   comment '跳板机id'
+  `ownerid` VARCHAR(32)   comment '属主id'
 
 
 ,primary key(id)
@@ -178,20 +89,23 @@ comment '设备组'
 
 CREATE  INDEX devgroup_idx1 ON devgroup(ownerid);
 
--- ./mixserviceitem.xlsx
+-- ./serve_status.xlsx
 
 
 
 
 
-drop table if exists atomservice;
-CREATE TABLE atomservice
+drop table if exists serve_status;
+CREATE TABLE serve_status
 (
 
   `id` VARCHAR(32)   comment 'id',
-  `mixid` VARCHAR(32)   comment '混合服务id',
-  `serviceid` VARCHAR(32)   comment '服务id',
-  `hostvar` VARCHAR(99)   comment '主机变量名'
+  `change_date` date   comment '操作日期',
+  `change_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP   comment '操作时间',
+  `serveid` VARCHAR(32)   comment '服务id',
+  `old_status` VARCHAR(1)   comment '原状态',
+  `new_status` VARCHAR(1)   comment '新状态',
+  `opererid` VARCHAR(32)   comment '操作员id'
 
 
 ,primary key(id)
@@ -200,7 +114,42 @@ CREATE TABLE atomservice
 )
 engine=innodb 
 default charset=utf8 
-comment '原子服务'
+comment '服务状态'
+;
+
+
+-- ./hostdev.xlsx
+
+
+
+
+
+drop table if exists hostdev;
+CREATE TABLE hostdev
+(
+
+  `id` VARCHAR(32)   comment 'id',
+  `name` VARCHAR(99)   comment '主机名称',
+  `description` VARCHAR(500)   comment '描述',
+  `ownerid` VARCHAR(32)   comment '属主id',
+  `host` VARCHAR(400)   comment '域名或ip',
+  `port` int   comment '端口',
+  `user` VARCHAR(400)   comment '用户',
+  `passwd` VARCHAR(400)   comment '用户密码',
+  `client_key` longtext   comment '私钥',
+  `passphrase` VARCHAR(100)   comment '私钥密码',
+  `jumperid` VARCHAR(32)   comment '跳板机id',
+  `osname` VARCHAR(100)   comment '操作系统名称',
+  `osver` VARCHAR(100)   comment '操作系统版本'
+
+
+,primary key(id)
+
+
+)
+engine=innodb 
+default charset=utf8 
+comment '主机设备'
 ;
 
 
diff --git a/wwwroot/connecthost.ui b/wwwroot/connecthost.ui
index 965c7c6..c659fc1 100644
--- a/wwwroot/connecthost.ui
+++ b/wwwroot/connecthost.ui
@@ -17,7 +17,7 @@
 				"term_options":{
 					"fontSize":24
 				},
-				"ws_url":"{{entire_url('https://msp.kymoz.com:10443/wss/ws/connecthost.xterm')}}?hostid={{params_kw.id}}"
+				"ws_url":"{{entire_url('/wss/ws/connecthost.xterm')}}?hostid={{params_kw.id}}"
 			}
 		}
 	}