diff --git a/src/main/java/com/lq/cms/web/AdminBaseController.java b/src/main/java/com/lq/cms/web/AdminBaseController.java index ef96142..d6ad32b 100644 --- a/src/main/java/com/lq/cms/web/AdminBaseController.java +++ b/src/main/java/com/lq/cms/web/AdminBaseController.java @@ -33,7 +33,7 @@ public abstract class AdminBaseController { * 管理后台url(用于权限控制) * @return */ - public abstract String getIndexUrl(); + public abstract String getIndexUrl(); public Map setPageDate(V vo){ Map map=new HashMap(); diff --git a/src/main/java/com/lq/code/util/HttpsClient.java b/src/main/java/com/lq/code/util/HttpsClient.java index 45c1e38..c83eeb5 100644 --- a/src/main/java/com/lq/code/util/HttpsClient.java +++ b/src/main/java/com/lq/code/util/HttpsClient.java @@ -27,7 +27,9 @@ import org.apache.http.impl.client.HttpClients; import com.alibaba.fastjson.JSONObject; public class HttpsClient { - + + + public static String post(String url,Map params) throws IOException{ String boundary = getBoundaryStr(); CloseableHttpResponse reponse =null; @@ -141,15 +143,16 @@ public class HttpsClient { } private static SSLContext getTrustAllSSLContext() throws Exception { - SSLContext context = SSLContexts.custom().loadTrustMaterial(null, new TrustStrategy() { - - @Override - public boolean isTrusted(X509Certificate[] arg0, String arg1) - throws java.security.cert.CertificateException { - // 这一句就是信任任何的证书,当然你也可以去验证服务器的真实性 - return true; - } - }).build(); +// SSLContext context = SSLContexts.custom().loadTrustMaterial(null, new TrustStrategy() { +// +// @Override +// public boolean isTrusted(X509Certificate[] arg0, String arg1) +// throws java.security.cert.CertificateException { +// // 这一句就是信任任何的证书,当然你也可以去验证服务器的真实性 +// return true; +// } +// }).build(); + SSLContext context = SSLContext.getDefault(); return context; } diff --git a/src/main/webapp/WEB-INF/views/jsp/cms/sys/user/edit.jsp b/src/main/webapp/WEB-INF/views/jsp/cms/sys/user/edit.jsp index 51db48a..0ef1d88 100644 --- a/src/main/webapp/WEB-INF/views/jsp/cms/sys/user/edit.jsp +++ b/src/main/webapp/WEB-INF/views/jsp/cms/sys/user/edit.jsp @@ -6,8 +6,35 @@ 编辑 @@ -34,10 +61,15 @@ - + 头像: + + + + + 备注: diff --git a/src/main/webapp/WEB-INF/views/jsp/cms/sys/user/index.jsp b/src/main/webapp/WEB-INF/views/jsp/cms/sys/user/index.jsp index 64c2826..bc91b2e 100644 --- a/src/main/webapp/WEB-INF/views/jsp/cms/sys/user/index.jsp +++ b/src/main/webapp/WEB-INF/views/jsp/cms/sys/user/index.jsp @@ -49,7 +49,7 @@ iconCls: 'icon-add', handler: function(){openEdit('新增',null)} }] - }) + }); }); diff --git a/ssm.iml b/ssm.iml index 356b28d..b9e0e31 100644 --- a/ssm.iml +++ b/ssm.iml @@ -10,10 +10,6 @@ - - - - @@ -26,7 +22,6 @@ -