Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fgqyxxlr
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaru
fgqyxxlr
Commits
c2ef1721
Commit
c2ef1721
authored
Sep 21, 2018
by
RuoYi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitee.com/y_project/RuoYi
parents
7d5167b3
8ce5bb4f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+14
-14
src/main/resources/templates/system/user/resetPwd.html
+1
-1
No files found.
src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
View file @
c2ef1721
...
@@ -60,19 +60,19 @@ public class HttpUtils
...
@@ -60,19 +60,19 @@ public class HttpUtils
}
}
catch
(
ConnectException
e
)
catch
(
ConnectException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendGet ConnectException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendGet ConnectException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
SocketTimeoutException
e
)
catch
(
SocketTimeoutException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendGet SocketTimeoutException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendGet SocketTimeoutException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
IOException
e
)
catch
(
IOException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendGet IOException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendGet IOException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
Exception
e
)
catch
(
Exception
e
)
{
{
log
.
error
(
"调用HttpsUtil.sendGet Exception, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpsUtil.sendGet Exception, url="
+
url
+
",param="
+
param
,
e
);
}
}
finally
finally
{
{
...
@@ -85,7 +85,7 @@ public class HttpUtils
...
@@ -85,7 +85,7 @@ public class HttpUtils
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
log
.
error
(
"调用in.close Exception, url="
+
url
+
",param="
+
param
,
ex
.
getMessage
()
);
log
.
error
(
"调用in.close Exception, url="
+
url
+
",param="
+
param
,
ex
);
}
}
}
}
return
result
.
toString
();
return
result
.
toString
();
...
@@ -129,19 +129,19 @@ public class HttpUtils
...
@@ -129,19 +129,19 @@ public class HttpUtils
}
}
catch
(
ConnectException
e
)
catch
(
ConnectException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendPost ConnectException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendPost ConnectException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
SocketTimeoutException
e
)
catch
(
SocketTimeoutException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendPost SocketTimeoutException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendPost SocketTimeoutException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
IOException
e
)
catch
(
IOException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendPost IOException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendPost IOException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
Exception
e
)
catch
(
Exception
e
)
{
{
log
.
error
(
"调用HttpsUtil.sendPost Exception, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpsUtil.sendPost Exception, url="
+
url
+
",param="
+
param
,
e
);
}
}
finally
finally
{
{
...
@@ -158,7 +158,7 @@ public class HttpUtils
...
@@ -158,7 +158,7 @@ public class HttpUtils
}
}
catch
(
IOException
ex
)
catch
(
IOException
ex
)
{
{
log
.
error
(
"调用in.close Exception, url="
+
url
+
",param="
+
param
,
ex
.
getMessage
()
);
log
.
error
(
"调用in.close Exception, url="
+
url
+
",param="
+
param
,
ex
);
}
}
}
}
return
result
.
toString
();
return
result
.
toString
();
...
@@ -202,19 +202,19 @@ public class HttpUtils
...
@@ -202,19 +202,19 @@ public class HttpUtils
}
}
catch
(
ConnectException
e
)
catch
(
ConnectException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendSSLPost ConnectException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendSSLPost ConnectException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
SocketTimeoutException
e
)
catch
(
SocketTimeoutException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendSSLPost SocketTimeoutException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendSSLPost SocketTimeoutException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
IOException
e
)
catch
(
IOException
e
)
{
{
log
.
error
(
"调用HttpUtils.sendSSLPost IOException, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpUtils.sendSSLPost IOException, url="
+
url
+
",param="
+
param
,
e
);
}
}
catch
(
Exception
e
)
catch
(
Exception
e
)
{
{
log
.
error
(
"调用HttpsUtil.sendSSLPost Exception, url="
+
url
+
",param="
+
param
,
e
.
getMessage
()
);
log
.
error
(
"调用HttpsUtil.sendSSLPost Exception, url="
+
url
+
",param="
+
param
,
e
);
}
}
return
result
.
toString
();
return
result
.
toString
();
}
}
...
...
src/main/resources/templates/system/user/resetPwd.html
View file @
c2ef1721
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
输入密码:
</label>
<label
class=
"col-sm-3 control-label"
>
输入密码:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"col-sm-8"
>
<input
class=
"form-control"
type=
"password"
name=
"password"
id=
"password"
value=
"123456
"
>
<input
class=
"form-control"
type=
"password"
name=
"password"
id=
"password"
th:value=
"${@config.getKey('sys.user.initPassword')}
"
>
</div>
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment