diff --git a/pom.xml b/pom.xml
index 391b685..0d56809 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,11 @@
     <dependencyManagement>
 
         <dependencies>
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>3.4.4</version>
+            </dependency>
 
             <!-- framework start -->
             <!-- <dependency>
diff --git a/power-admin/power-admin.iml b/power-admin/power-admin.iml
index f57c0a3..3638860 100644
--- a/power-admin/power-admin.iml
+++ b/power-admin/power-admin.iml
@@ -52,7 +52,7 @@
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.5.0" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.5.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.oshi:oshi-json:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:3.4.4" level="project" />
     <orderEntry type="library" name="Maven: org.threeten:threetenbp:1.3.6" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:javax.json:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
diff --git a/power-admin/target/classes/com/manage/controller/DeptController.class b/power-admin/target/classes/com/manage/controller/DeptController.class
index 402a0d0..eaffff7 100644
Binary files a/power-admin/target/classes/com/manage/controller/DeptController.class and b/power-admin/target/classes/com/manage/controller/DeptController.class differ
diff --git a/power-admin/target/classes/com/manage/controller/RoleAndUserPowerController.class b/power-admin/target/classes/com/manage/controller/RoleAndUserPowerController.class
index 2ccb53e..453788a 100644
Binary files a/power-admin/target/classes/com/manage/controller/RoleAndUserPowerController.class and b/power-admin/target/classes/com/manage/controller/RoleAndUserPowerController.class differ
diff --git a/power-admin/target/power/META-INF/MANIFEST.MF b/power-admin/target/power/META-INF/MANIFEST.MF
index e64e69c..1f7c56d 100644
--- a/power-admin/target/power/META-INF/MANIFEST.MF
+++ b/power-admin/target/power/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 Built-By: Administrator
 Created-By: IntelliJ IDEA
-Build-Jdk: 1.8.0_102
+Build-Jdk: 1.8.0_131
 
diff --git a/power-admin/target/power/WEB-INF/classes/com/manage/controller/DeptController.class b/power-admin/target/power/WEB-INF/classes/com/manage/controller/DeptController.class
index 402a0d0..eaffff7 100644
Binary files a/power-admin/target/power/WEB-INF/classes/com/manage/controller/DeptController.class and b/power-admin/target/power/WEB-INF/classes/com/manage/controller/DeptController.class differ
diff --git a/power-admin/target/power/WEB-INF/classes/com/manage/controller/RoleAndUserPowerController.class b/power-admin/target/power/WEB-INF/classes/com/manage/controller/RoleAndUserPowerController.class
index 2ccb53e..453788a 100644
Binary files a/power-admin/target/power/WEB-INF/classes/com/manage/controller/RoleAndUserPowerController.class and b/power-admin/target/power/WEB-INF/classes/com/manage/controller/RoleAndUserPowerController.class differ
diff --git a/power-admin/target/power/WEB-INF/classes/config/jdbc.properties b/power-admin/target/power/WEB-INF/classes/config/jdbc.properties
index ac65c0c..15eabd8 100644
--- a/power-admin/target/power/WEB-INF/classes/config/jdbc.properties
+++ b/power-admin/target/power/WEB-INF/classes/config/jdbc.properties
@@ -1,7 +1,7 @@
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc\:mysql\://localhost\:3306/qfpower?useUnicode\=true&characterEncoding\=utf-8
 jdbc.username=root
-jdbc.password=docus702
+jdbc.password=123456
 
 #hibernate config
 hibernate.dialect = org.hibernate.dialect.MySQLDialect
@@ -14,13 +14,13 @@ hibernate.current_session_context_class=thread
 hibernate.jdbc.batch_size=50  
 hibernate.enable_lazy_load_no_trans=true  
 
-#ִ��:�Ҽ� Run As ---->Maven build ---->Goals:mybatis-generator:generate
-#���Ŀ¼
+#ִ��:�Ҽ� Run As ---->Maven build ---->Goals:mybatis-generator:generate
+#���Ŀ¼
 targetProject=src/main/java
-#modelPackage,sqlMapperPackage,daoMapperPackage ͨ��һ��??
+#modelPackage,sqlMapperPackage,daoMapperPackage ͨ��һ��??
 modelPackage=com.manage.entity
 daoMapperPackage=com.manage.dao
-#���Ŀ¼
+#���Ŀ¼
 targetProject2=src/main/resources
 sqlMapperPackage=mapper
 
diff --git a/power-admin/target/power/WEB-INF/lib/power-dao-1.0-SNAPSHOT.jar b/power-admin/target/power/WEB-INF/lib/power-dao-1.0-SNAPSHOT.jar
index 1fa995c..18425c9 100644
Binary files a/power-admin/target/power/WEB-INF/lib/power-dao-1.0-SNAPSHOT.jar and b/power-admin/target/power/WEB-INF/lib/power-dao-1.0-SNAPSHOT.jar differ
diff --git a/power-admin/target/power/WEB-INF/lib/power-foundaton-1.0-SNAPSHOT.jar b/power-admin/target/power/WEB-INF/lib/power-foundaton-1.0-SNAPSHOT.jar
index de7e75a..a2af3d4 100644
Binary files a/power-admin/target/power/WEB-INF/lib/power-foundaton-1.0-SNAPSHOT.jar and b/power-admin/target/power/WEB-INF/lib/power-foundaton-1.0-SNAPSHOT.jar differ
diff --git a/power-admin/target/power/WEB-INF/lib/power-service-1.0-SNAPSHOT.jar b/power-admin/target/power/WEB-INF/lib/power-service-1.0-SNAPSHOT.jar
index b8809ef..ebb30ff 100644
Binary files a/power-admin/target/power/WEB-INF/lib/power-service-1.0-SNAPSHOT.jar and b/power-admin/target/power/WEB-INF/lib/power-service-1.0-SNAPSHOT.jar differ
diff --git a/power-admin/target/power/WEB-INF/views/deptDir/dept.jsp b/power-admin/target/power/WEB-INF/views/deptDir/dept.jsp
index c698595..09511f7 100644
--- a/power-admin/target/power/WEB-INF/views/deptDir/dept.jsp
+++ b/power-admin/target/power/WEB-INF/views/deptDir/dept.jsp
@@ -4,7 +4,7 @@
 <%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %>
 <html>
 <head>
-    <title>部门管理</title>
+    <title>科室管理</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- 引入 Bootstrap -->
     <link rel="stylesheet" href="${path}/static/css/comm.css">
@@ -81,12 +81,12 @@
     <input type="hidden" id="userNames">
     <div class="row">
         <div class="col-md-12">
-            <div class="panel-heading"><h4>基本管理/部门管理</h4></div>
+            <div class="panel-heading"><h4>基本管理/科室管理</h4></div>
             <hr>
             <form class="form-inline" style="margin-top: 5px;" role="form">
                 <div class="">
                     <div class="form-group">
-                        <label for="dept_name">部门名</label>
+                        <label for="dept_name">科室名</label>
                         <input type="text" class="form-control input-sm" id="dept_name" maxlength="16"/>
                     </div>
                     <c:if test="${user.roleId == 0}">
@@ -146,7 +146,7 @@
             <div class="modal-body" style="height:auto">
                 <form id="updateaddform">
                     <div class="formDiv">
-                        <label class="control-label left">部门名：</label>
+                        <label class="control-label left">科室名：</label>
                         <input type="hidden" id="re_deptId" name="deptId">
                         <input type="text" class="form-control input input-sm" id="re_deptName" name="deptName" maxlength="15">
                     </div>
@@ -188,7 +188,7 @@
                        id="form1">
                     <div class="formDiv">
                         <label class="control-label left">下载模板：</label>
-                        <input class="btn btn-primary btn-sm" onclick="window.open('${path }/static/template/部门列表导入模板.xls');" type="button" value="下载模板">
+                        <input class="btn btn-primary btn-sm" onclick="window.open('${path }/static/template/科室列表导入模板.xls');" type="button" value="下载模板">
                     </div>
                     <div class="formDiv">
                         <label for="re_effective" class="control-label left">选择文件：</label>
@@ -196,12 +196,12 @@
                     </div>
                     <div class="modelBtns">
                         <input class="btn btn-primary btn-sm" type="button" value="批量导入Excel数据"
-                               onclick="importExcel('/dept/importExcel','部门')">
+                               onclick="importExcel('/dept/importExcel','科室')">
                     </div>
                     <div class="formDiv">
                         <label class="warningLabel">友情提醒:</label>
                         <div class="warningDiv">
-                            <span style="color: red"></br>1、部门名不能为空,不能重复,内容最多16个字。</span></br>
+                            <span style="color: red"></br>1、科室名不能为空,不能重复,内容最多16个字。</span></br>
                             <span style="color: red">2、是否有效不能为空,内容最多9个字。</span></br>
                             <span style="color: red">3、备注可为空,内容最多50个字。</span></br>
                             <span style="color: red">4、值包含逗号必须单元格设置为文本类型。</span></br>
diff --git a/power-admin/target/power/WEB-INF/views/loginDir/login.jsp b/power-admin/target/power/WEB-INF/views/loginDir/login.jsp
index 97043bd..e74e4b2 100644
--- a/power-admin/target/power/WEB-INF/views/loginDir/login.jsp
+++ b/power-admin/target/power/WEB-INF/views/loginDir/login.jsp
@@ -77,6 +77,6 @@
     <div class="login_foot">
         <div class="span_div"><span>技术支持：厦门嘉时软件科技有限公司</span></div>
     </div>
-<script type="text/javascript" src="${path}/static/js/login.js"></script>
+<script type="text/javascript" src="${path}/static/js/lokeydowngin.js"></script>
 </body>
 </html>
diff --git a/power-admin/target/power/WEB-INF/views/userDir/user.jsp b/power-admin/target/power/WEB-INF/views/userDir/user.jsp
index 09358b2..f4af3e7 100644
--- a/power-admin/target/power/WEB-INF/views/userDir/user.jsp
+++ b/power-admin/target/power/WEB-INF/views/userDir/user.jsp
@@ -121,7 +121,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="dept_id">所属部门:</label>
+                        <label for="dept_id">所属科室:</label>
                         <div class=" form-group form-inline">
                             <select class="form-control input-sm" style="width:106px" id="dept_id">
                                 <option value="">全部</option>
diff --git a/power-admin/target/power/static/js/blood.js b/power-admin/target/power/static/js/blood.js
index 5e3adf3..98c9df6 100644
--- a/power-admin/target/power/static/js/blood.js
+++ b/power-admin/target/power/static/js/blood.js
@@ -360,9 +360,9 @@ function exportExcel(){
     if(checks != '') {
         checks = checks.substring(0, checks.length - 1);
         if(roleId == 0){
-            url = path+"/dept/export?deptName="+$("#dept_name").val()+"&dictId="+$("#dict_id").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
+            url = path+"/dept/exportBlood?deptName="+$("#dept_name").val()+"&dictId="+$("#dict_id").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
         }else{
-            url = path+"/dept/export?deptName="+$("#dept_name").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
+            url = path+"/dept/exportBlood?deptName="+$("#dept_name").val()+"&effective="+$("#effective").val()+"&creater="+$("#creater").val()+"&checks="+checks;
         }
         window.location.href = url;
     }else{
diff --git a/power-admin/target/power/static/js/dept.js b/power-admin/target/power/static/js/dept.js
index c2385cc..b53c6f5 100644
--- a/power-admin/target/power/static/js/dept.js
+++ b/power-admin/target/power/static/js/dept.js
@@ -20,7 +20,7 @@ $(function(){
             }
         },
         {
-            title:'部门名',
+            title:'科室名',
             field:'deptName',
         });
     var roleId = $("#roleId").val();
diff --git a/power-admin/target/power/static/js/user.js b/power-admin/target/power/static/js/user.js
index 49bf70e..2a69545 100644
--- a/power-admin/target/power/static/js/user.js
+++ b/power-admin/target/power/static/js/user.js
@@ -89,7 +89,7 @@ var form = '';
                     field:'roleName',
                 },
                 {
-                    title:'所属部门',
+                    title:'所属科室',
                     field:'powerDepts',
                     formatter:paramsMatter,
                 },
diff --git a/power-admin/target/power/static/template/²¿ÃÅÁÐ±íµ¼ÈëÄ£°å.xls b/power-admin/target/power/static/template/²¿ÃÅÁÐ±íµ¼ÈëÄ£°å.xls
deleted file mode 100644
index 4c91a0b..0000000
Binary files a/power-admin/target/power/static/template/²¿ÃÅÁÐ±íµ¼ÈëÄ£°å.xls and /dev/null differ
diff --git a/power-admin/target/power/static/template/½ÇÉ«ÁÐ±íµ¼ÈëÄ£°å.xls b/power-admin/target/power/static/template/½ÇÉ«ÁÐ±íµ¼ÈëÄ£°å.xls
deleted file mode 100644
index f573438..0000000
Binary files a/power-admin/target/power/static/template/½ÇÉ«ÁÐ±íµ¼ÈëÄ£°å.xls and /dev/null differ
diff --git a/power-admin/target/power/static/template/Óû§ÁÐ±íµ¼ÈëÄ£°å(ÆêѪ¿â).xls b/power-admin/target/power/static/template/Óû§ÁÐ±íµ¼ÈëÄ£°å(ÆêѪ¿â).xls
deleted file mode 100644
index a6f34ed..0000000
Binary files a/power-admin/target/power/static/template/Óû§ÁÐ±íµ¼ÈëÄ£°å(ÆêѪ¿â).xls and /dev/null differ
diff --git a/power-admin/target/power/static/template/Óû§ÁÐ±íµ¼ÈëÄ£°å.xls b/power-admin/target/power/static/template/Óû§ÁÐ±íµ¼ÈëÄ£°å.xls
deleted file mode 100644
index 80161e4..0000000
Binary files a/power-admin/target/power/static/template/Óû§ÁÐ±íµ¼ÈëÄ£°å.xls and /dev/null differ
diff --git a/power-admin/target/power/ȨÏÞϵͳ°æ±¾ËµÃ÷.txt b/power-admin/target/power/ȨÏÞϵͳ°æ±¾ËµÃ÷.txt
deleted file mode 100644
index 8fd20e3..0000000
--- a/power-admin/target/power/ȨÏÞϵͳ°æ±¾ËµÃ÷.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-				Ȩ��ϵͳ��Ŀ�����汾˵��
-v            �����汾˵��
-1.�����ļ�:User.java��Power_UserMapper.xml
-		  �����û�����˵����û�����������ʽ
-2.������
-	2.1 �û�������hisϵͳ�������ң��û���power_user����deptCode�ֶ�,�����û��б��ӿ�����deptCode�ֶ�
-3.����
-	3.1 �û������Ķ�ѡ���ҵ���Ϊ�������ѡ��֧�ֹؼ�������
-	3.2 �����û�����˵����û�����������ʽ
-4.�޸�����
-	4.1 �����޸�ʱ�������ֶα��ÿ�bug
-				
-v20200211            �����汾˵��
-1.�����ļ�:power.war
-2.������
-	2.1 
-3.����
-	3.1 �û������Ķ�ѡ���ҵ���Ϊ�������ѡ��֧�ֹؼ�������
-4.�޸�����
-	4.1 �����޸�ʱ�������ֶα��ÿ�bug
-	
-v1.2.5            �����汾˵��
-1.�����ļ�:power.war
-2.������
-	2.1 ����sessionʣ�����ʱ�䣬ʣ��10s��5s����ʾһ�Σ�session�����Զ���ת��¼ҳ
-	2.2 �û�����ҳ��Ŀ����������������ӹؼ�����������
-3.����
-	3.1 �޸���Ļ�ͷֱ�����ʾ����
-	4.1	������������¼����֤��ʽ
-4.�޸�����
-	4.1 ����excel�ֶ�̫����excel���ɲ��˱���������
-				
-v1.2.4   2019-11-15         �����汾˵��
-1.�����ļ�:power.war
-2.������
-	1.1 �û�����������䡢�ֻ��š����䡢ְλ����͸�ʽ��֤
-	1.2 �û�����������������Ϣ
-	1.3 �û��б���������̫����ʡ�Ժţ��������ȥ�ɲ鿴��ϸ
-3.����
-	3.1 �Ż��û�����˵��û�������
-	3.2 �Ż���ɫ����˵���ɫ������
-	3.3 �޸�ȫ���б����������ӵ�������
-	3.4 ��ҳ���Ͻǵ�¼����Ϊ������Ϊ�գ���ʾ������������ʾ��ʾ�˺�
-	3.5 �Ż��鵵ϵͳ��ȡ�˵��ӿ�
-4.�޸�����
-	4.1 
-				
-v1.2.3   2019-11-06         �����汾˵��
-1.�����ļ�:power.war
-2.������
-
-3.����
-	3.1 ��ҳ���Ϸ��������ҹ����ʡ�Ժ�
-	3.2 �Ż��û�����˵���
-	3.3 �Ż���ɫ����˵���
-	3.4 �Ż�����excel
-	3.5 �޸IJ�ѯϵͳ�˵���ʽ
-	3.6 �Ż������������Ӷ����ϵͳ
-	3.7 ������ȡtoken�Ľӿڣ��Ա�hisϵͳ�ܹ���¼��ϵͳ
-4.�޸�����
-	4.1 �޸Ŀ��ұ��������Ѵ��ڡ�
-	
-	
-v1.2.2   2019-10-30         �����汾˵��
-1.�����ļ�:power.war
-2.������
-	2.1 ��¼֧�ּ��̻س�ȷ��
-	2.2 ��ҳ���Ϸ�������Ϣ֪ͨ
-	2.3 �Ż�������Ȩ����ʾȨ�����ͼ��	
-	2.4 ���µĵ�¼ҳ
-3.����
-	3.1 ����ǰ��ʾ,����ֵ���������Ÿ�Ϊ��ֵ�������ű��뵥Ԫ������Ϊ�ı����͡�
-	3.2 �ۺϲ�ͬ��������ߵͷֱ��ʵ���ȫվ��ʽ
-	3.3 ��ҳ���Ϸ�ɾ��logo�ġ���ʱ������
-	3.4 ��ҳ���Ϸ���ʾ������ʾ��������
-4.�޸�����
-	4.1 �û�����˵��͹��������������������ϵͳ
-	
-	
-v1.2.1  2019-10-16           �����汾˵��
-
-
diff --git a/power-api/power-api.iml b/power-api/power-api.iml
deleted file mode 100644
index a70323b..0000000
--- a/power-api/power-api.iml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="power-foundaton" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5-pre6" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
-    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-excelant:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hyperic.sigar:com.springsource.org.hyperic.sigar:1.6.3" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.0.9" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.5.0" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-json:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.threeten:threetenbp:1.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:javax.json:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.4" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.4.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.websocket:javax.websocket-api:1.1" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/power-dao/power-dao.iml b/power-dao/power-dao.iml
deleted file mode 100644
index 6bdc60c..0000000
--- a/power-dao/power-dao.iml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.miemiedev:mybatis-paginator:1.2.15" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.32" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5-pre6" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.6.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.4" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-excelant:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.4.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.websocket:javax.websocket-api:1.1" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/power-foundaton/power-foundaton.iml b/power-foundaton/power-foundaton.iml
deleted file mode 100644
index 80a44bb..0000000
--- a/power-foundaton/power-foundaton.iml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5-pre6" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.6.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.4" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
-    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-excelant:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hyperic.sigar:com.springsource.org.hyperic.sigar:1.6.3" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.0.9" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.5.0" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-json:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.threeten:threetenbp:1.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:javax.json:1.0.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.4.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.websocket:javax.websocket-api:1.1" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/power-foundaton/src/main/java/com/manage/util/SigarUtils.java b/power-foundaton/src/main/java/com/manage/util/SigarUtils.java
index c4460be..2c5766c 100644
--- a/power-foundaton/src/main/java/com/manage/util/SigarUtils.java
+++ b/power-foundaton/src/main/java/com/manage/util/SigarUtils.java
@@ -1,7 +1,7 @@
 package com.manage.util;
 
 
-import org.hyperic.sigar.*;
+import org.hyperic.sigar.Sigar;
 
 import java.io.File;
 
diff --git a/power-service/power-service.iml b/power-service/power-service.iml
deleted file mode 100644
index 337cfe3..0000000
--- a/power-service/power-service.iml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="power-dao" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.miemiedev:mybatis-paginator:1.2.15" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.32" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5-pre6" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.4" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-excelant:3.11-beta2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
-    <orderEntry type="module" module-name="power-api" />
-    <orderEntry type="module" module-name="power-foundaton" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
-    <orderEntry type="library" name="Maven: javax.mail:mail:1.4.5" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hyperic.sigar:com.springsource.org.hyperic.sigar:1.6.3" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.0.9" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.5.0" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-json:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.threeten:threetenbp:1.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:javax.json:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
-    <orderEntry type="library" name="Maven: taglibs:standard:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.websocket:javax.websocket-api:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.5" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/power-service/target/classes/com/manage/service/Power_DeptService.class b/power-service/target/classes/com/manage/service/Power_DeptService.class
index 50481a4..42e77a8 100644
Binary files a/power-service/target/classes/com/manage/service/Power_DeptService.class and b/power-service/target/classes/com/manage/service/Power_DeptService.class differ
diff --git a/power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class
index e919759..f0dcde3 100644
Binary files a/power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/Power_DeptServiceImpl.class differ
diff --git a/power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class b/power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class
index 2232222..0967457 100644
Binary files a/power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class and b/power-service/target/classes/com/manage/service/ipml/Power_UserServiceImpl.class differ