update
This commit is contained in:
parent
97264a3f4f
commit
5bf5459590
|
@ -1,16 +1,16 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="RemoteRepositoriesConfiguration">
|
<component name="RemoteRepositoriesConfiguration">
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="central" />
|
|
||||||
<option name="name" value="Central Repository" />
|
|
||||||
<option name="url" value="https://repo.maven.apache.org/maven2" />
|
|
||||||
</remote-repository>
|
|
||||||
<remote-repository>
|
<remote-repository>
|
||||||
<option name="id" value="rdd-releases" />
|
<option name="id" value="rdd-releases" />
|
||||||
<option name="name" value="rdd-releases" />
|
<option name="name" value="rdd-releases" />
|
||||||
<option name="url" value="https://packages.aliyun.com/maven/repository/2226303-release-LbOUW1/" />
|
<option name="url" value="https://packages.aliyun.com/maven/repository/2226303-release-LbOUW1/" />
|
||||||
</remote-repository>
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="central" />
|
||||||
|
<option name="name" value="Central Repository" />
|
||||||
|
<option name="url" value="https://repo.maven.apache.org/maven2" />
|
||||||
|
</remote-repository>
|
||||||
<remote-repository>
|
<remote-repository>
|
||||||
<option name="id" value="rdc-releases" />
|
<option name="id" value="rdc-releases" />
|
||||||
<option name="name" value="rdc-releases" />
|
<option name="name" value="rdc-releases" />
|
||||||
|
@ -36,16 +36,16 @@
|
||||||
<option name="name" value="JBoss Community repository" />
|
<option name="name" value="JBoss Community repository" />
|
||||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||||
</remote-repository>
|
</remote-repository>
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="central" />
|
|
||||||
<option name="name" value="Central Repository" />
|
|
||||||
<option name="url" value="https://maven.aliyun.com/repository/public" />
|
|
||||||
</remote-repository>
|
|
||||||
<remote-repository>
|
<remote-repository>
|
||||||
<option name="id" value="rdc-snapshots" />
|
<option name="id" value="rdc-snapshots" />
|
||||||
<option name="name" value="rdc-snapshots" />
|
<option name="name" value="rdc-snapshots" />
|
||||||
<option name="url" value="https://packages.aliyun.com/maven/repository/2123695-snapshot-LiQOYE/" />
|
<option name="url" value="https://packages.aliyun.com/maven/repository/2123695-snapshot-LiQOYE/" />
|
||||||
</remote-repository>
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="central" />
|
||||||
|
<option name="name" value="Central Repository" />
|
||||||
|
<option name="url" value="https://maven.aliyun.com/repository/public" />
|
||||||
|
</remote-repository>
|
||||||
<remote-repository>
|
<remote-repository>
|
||||||
<option name="id" value="snapshots" />
|
<option name="id" value="snapshots" />
|
||||||
<option name="name" value="snapshots" />
|
<option name="name" value="snapshots" />
|
||||||
|
|
|
@ -4,5 +4,5 @@ _ip=119.3.109.134
|
||||||
cd ../
|
cd ../
|
||||||
mvn clean package
|
mvn clean package
|
||||||
scp target/build/*.jar root@${_ip}:${_pwd}
|
scp target/build/*.jar root@${_ip}:${_pwd}
|
||||||
#scp target/build/lib/*.* root@${_ip}:${_pwd}/lib
|
scp target/build/lib/*.* root@${_ip}:${_pwd}/lib
|
||||||
ssh root@${_ip} "cd ${_pwd}; sh ./start.sh"
|
ssh root@${_ip} "cd ${_pwd}; sh ./start.sh"
|
|
@ -12,7 +12,7 @@ import java.util.regex.Pattern;
|
||||||
public class PasswordUtil {
|
public class PasswordUtil {
|
||||||
|
|
||||||
public static Boolean valid(String password) {
|
public static Boolean valid(String password) {
|
||||||
String regexp = "^(?=.[a-z])(?=.[A-Z])(?=.\\d)(?=.[!@#$%^&*]).{8,}$";
|
String regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,24}$";
|
||||||
return Pattern.matches(regexp, password);
|
return Pattern.matches(regexp, password);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,7 @@ public class AuthServiceImpl extends BaseService<UserMapper, User> implements IA
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult editPassword(String oldPassword, String newPassword) {
|
public AjaxResult editPassword(String oldPassword, String newPassword) {
|
||||||
if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符,并且长度至少为8位");
|
if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符,并且长度至少为8位,最长24位");
|
||||||
String loginId = StpUtil.getLoginIdAsString();
|
String loginId = StpUtil.getLoginIdAsString();
|
||||||
User user = getById(loginId);
|
User user = getById(loginId);
|
||||||
if (!user.getPassword().equals(PasswordUtil.password(user.getSalt(), oldPassword))) return AjaxResult.fail(
|
if (!user.getPassword().equals(PasswordUtil.password(user.getSalt(), oldPassword))) return AjaxResult.fail(
|
||||||
|
@ -168,7 +168,7 @@ public class AuthServiceImpl extends BaseService<UserMapper, User> implements IA
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult newPassword(String newPassword) {
|
public AjaxResult newPassword(String newPassword) {
|
||||||
if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符,并且长度至少为8位");
|
if (!PasswordUtil.valid(newPassword)) return AjaxResult.fail("密码必须同时包含大写字母、小写字母、数字和特殊字符,并且长度至少为8位,最长24位");
|
||||||
String loginId = StpUtil.getLoginIdAsString();
|
String loginId = StpUtil.getLoginIdAsString();
|
||||||
String salt = RandomUtil.randomString(6);
|
String salt = RandomUtil.randomString(6);
|
||||||
String password = PasswordUtil.password(salt, newPassword);
|
String password = PasswordUtil.password(salt, newPassword);
|
||||||
|
|
Loading…
Reference in New Issue