Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Jpom
Commits
dd3e2237
Commit
dd3e2237
authored
6 years ago
by
jiangzeyin
Browse files
Options
Download
Email Patches
Plain Diff
清理代码
parent
5cd80ce4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/main/java/cn/keepbx/jpom/controller/InstallController.java
+1
-5
...ain/java/cn/keepbx/jpom/controller/InstallController.java
src/main/java/cn/keepbx/jpom/controller/system/NginxController.java
+2
-3
...ava/cn/keepbx/jpom/controller/system/NginxController.java
src/main/java/cn/keepbx/jpom/controller/user/UserInfoController.java
+0
-3
...va/cn/keepbx/jpom/controller/user/UserInfoController.java
src/main/java/cn/keepbx/jpom/util/CheckPassword.java
+0
-49
src/main/java/cn/keepbx/jpom/util/CheckPassword.java
with
3 additions
and
60 deletions
+3
-60
src/main/java/cn/keepbx/jpom/controller/InstallController.java
+
1
-
5
View file @
dd3e2237
...
...
@@ -79,11 +79,7 @@ public class InstallController extends BaseController {
if
(
UserModel
.
SYSTEM_OCCUPY_NAME
.
equals
(
userName
)
||
UserModel
.
SYSTEM_ADMIN
.
equals
(
userName
))
{
return
JsonMessage
.
getString
(
401
,
"当前登录名已经被系统占用"
);
}
// // 判断密码级别
// if (CheckPassword.checkPassword(userPwd) != 2) {
// return JsonMessage.getString(401, "系统管理员密码强度太低,请使用复杂的密码");
// }
//
// 创建用户
UserModel
userModel
=
new
UserModel
();
userModel
.
setName
(
UserModel
.
SYSTEM_OCCUPY_NAME
);
userModel
.
setId
(
userName
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/keepbx/jpom/controller/system/NginxController.java
+
2
-
3
View file @
dd3e2237
...
...
@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import
javax.annotation.Resource
;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.List
;
/**
...
...
@@ -48,7 +47,7 @@ public class NginxController extends BaseController {
private
NginxService
nginxService
;
@RequestMapping
(
value
=
"nginx"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
TEXT_HTML_VALUE
)
public
String
ngx
()
throws
IOException
{
public
String
ngx
()
{
JSONArray
ngxDirectory
=
whitelistDirectoryService
.
getNgxDirectory
();
setAttribute
(
"nginx"
,
ngxDirectory
);
List
<
CertModel
>
certList
=
certService
.
list
();
...
...
@@ -57,7 +56,7 @@ public class NginxController extends BaseController {
}
@RequestMapping
(
value
=
"nginx_setting"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
TEXT_HTML_VALUE
)
public
String
setting
(
String
path
,
String
name
,
String
type
)
throws
IOException
{
public
String
setting
(
String
path
,
String
name
,
String
type
)
{
JSONArray
ngxDirectory
=
whitelistDirectoryService
.
getNgxDirectory
();
setAttribute
(
"nginx"
,
ngxDirectory
);
List
<
CertModel
>
certList
=
certService
.
list
();
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/keepbx/jpom/controller/user/UserInfoController.java
+
0
-
3
View file @
dd3e2237
...
...
@@ -45,9 +45,6 @@ public class UserInfoController extends BaseController {
return
JsonMessage
.
getString
(
400
,
"新旧密码一致"
);
}
UserModel
userName
=
getUser
();
// if (UserModel.SYSTEM_ADMIN.equals(userName.getParent()) && CheckPassword.checkPassword(newPwd) != 2) {
// return JsonMessage.getString(401, "系统管理员密码强度太低,请使用复杂的密码");
// }
try
{
UserModel
userModel
=
userService
.
simpleLogin
(
userName
.
getId
(),
oldPwd
);
if
(
userModel
==
null
||
userModel
.
getPwdErrorCount
()
>
0
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/keepbx/jpom/util/CheckPassword.java
deleted
100644 → 0
+
0
-
49
View file @
5cd80ce4
//package cn.keepbx.jpom.util;
//
///**
// * 判断密码强度
// *
// * @author jiangzeyin
// * @date 2019/3/18
// */
//public class CheckPassword {
//
// /**
// * 密码强度
// * Z = 字母 S = 数字 T = 特殊字符
// *
// * @return 0 弱 1 中 2强
// */
// public static int checkPassword(String passwordStr) {
// String regexZ = "\\d*";
// String regexS = "[a-zA-Z]+";
// String regexT = "\\W+$";
// String regexZT = "\\D*";
// String regexST = "[\\d\\W]*";
// String regexZS = "\\w*";
// String regexZST = "[\\w\\W]*";
//
// if (passwordStr.matches(regexZ)) {
// return 0;
// }
// if (passwordStr.matches(regexS)) {
// return 0;
// }
// if (passwordStr.matches(regexT)) {
// return 0;
// }
// if (passwordStr.matches(regexZT)) {
// return 1;
// }
// if (passwordStr.matches(regexST)) {
// return 1;
// }
// if (passwordStr.matches(regexZS)) {
// return 1;
// }
// if (passwordStr.matches(regexZST)) {
// return 2;
// }
// return -1;
// }
//}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help