diff --git a/power-admin/pom.xml b/power-admin/pom.xml
index 03938c3..fee7ecc 100644
--- a/power-admin/pom.xml
+++ b/power-admin/pom.xml
@@ -16,6 +16,7 @@
UTF-8
UTF-8
+ 1.2.5
@@ -56,6 +57,11 @@
org.mybatis
mybatis-spring
+
+ org.apache.httpcomponents
+ httpclient
+ 4.3.5
+
com.alibaba
@@ -107,6 +113,11 @@
org.apache.cxf
cxf-rt-frontend-jaxws
+
+ org.apache.shiro
+ shiro-spring
+ ${shiro.version}
+
org.apache.commons
@@ -155,7 +166,7 @@
2.2
/power
- 8080
+ 8081
UTF-8
diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java
index 0fcb599..8496d1a 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -514,91 +514,6 @@ public class FontController {
//设置进缓存
CacheManager.putCache(date,new Cache(date,userVo,TOKEN_EXPIRE_TIME));
ActionScopeUtils.setSessionAttribute("CURRENT_USER",userVo,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))/1000);
-// UserVo userVo1 =new UserVo();
-//// userVo1.setUserName("admin");
-//// userVo1.setPassWord("123456");
-//// CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-//// // 创建Post请求
-//// HttpPost httpPost = new HttpPost(EMRRECORD_URLHEAD+"/login");
-//// String jsonString = JSON.toJSONString(userVo1);
-//// StringEntity entity = new StringEntity(jsonString, "UTF-8");
-//// // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中
-//// httpPost.setEntity(entity);
-//// httpPost.setHeader("Content-Type", "application/json;charset=utf8");
-//// // 响应模型
-//// CloseableHttpResponse response = null;
-//// HttpEntity responseEntity=null;
-//// try {
-//// // 由客户端执行(发送)Post请求
-//// response = httpClient.execute(httpPost);
-//// // 从响应模型中获取响应实体
-//// responseEntity = response.getEntity();
-//// System.out.println("responseEntity::::"+responseEntity);
-//// System.out.println("响应状态为:" + response.getStatusLine());
-//// } catch (ClientProtocolException e) {
-//// e.printStackTrace();
-//// } catch (IOException e) {
-//// e.printStackTrace();
-//// } finally {
-//// try {
-//// // 释放资源
-//// if (httpClient != null) {
-//// httpClient.close();
-//// }
-//// if (response != null) {
-//// response.close();
-//// }
-//// } catch (IOException e) {
-//// e.printStackTrace();
-//// }
-//// }
-//// String date = String.valueOf(DateUtils.getDate());
-//// String token = Base64.encode(MD5.KL(date));
-//// ActionScopeUtils.setSessionAttribute("token", token, Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME)) / 1000);
-//// SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
-//// CacheManager.addloginUserCount(fmt.format(new Date()), userVo.getUserName());
-//// CacheManager.addExcCount("noExc");
-//// List list = null;
-//// List menuList = new ArrayList<>();
-//// Set menus = new LinkedHashSet<>();
-//// userVo.setRoleId(0);
-//// if (userVo.getRoleId().equals(0) || userVo.getRoleId().equals(-100)) {
-//// list = powerMenuService.queryAllPowerMenu(null, userVo.getRoleId());
-//// } else {
-//// list = powerMenuService.selectUserAndRoleMenuListPower(userVo.getUserId(), null);
-//// }
-//// if (null != list && !list.isEmpty()) {
-//// for (Power_Menu powerMenu : list) {
-//// User_Dept_Menu deptMenu = new User_Dept_Menu();
-//// String menuUrl = powerMenu.getMenuUrl();
-//// if (StringUtils.isNotBlank(menuUrl)) {
-//// BeanUtils.copyProperties(powerMenu, deptMenu);
-//// deptMenu.setMethodParent(powerMenu.getParentId());
-//// menuList.add(deptMenu);
-//// }
-//// if (StringUtils.isNotBlank(powerMenu.getMethod())) {
-//// menus.add(powerMenu.getMenuUrl());
-//// }
-//// }
-//// }
-//// userVo.setMenuList(menuList);
-//// userVo.setMenus(menus);
-////
-//// //设置科室
-////// StringBuilder powerDepts = new StringBuilder();
-////// List powerDeptList = power_deptService.selectByPrimaryKeys(user.getDeptId());
-////// for(int j=0;j
diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index 34a6974..0784387 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -13,143 +13,86 @@
var path = "${path}";
-<%--hhhhhhhhhhhhhhhh--%>
@@ -157,401 +100,231 @@
-
- <%--
-
-
--%>
+
-