diff --git a/src/main/java/top/xinsin/service/AccountService.java b/src/main/java/top/xinsin/service/AccountService.java index c907014..4b7ce34 100644 --- a/src/main/java/top/xinsin/service/AccountService.java +++ b/src/main/java/top/xinsin/service/AccountService.java @@ -64,7 +64,7 @@ public class AccountService implements UserDetailsService { } else { if (authAccount.getAuth().equals("商户")){ Verify verify = verifyMapper.selectOne(new LambdaQueryWrapper().eq(Verify::getStoreId, authAccount.getId())); - if (verify.getVerifyResult().equals("false")){ + if ("false".equals(verify.getVerifyResult())){ log.info("无法登录,因为商户管理员已拒绝"); return User.withUsername(authAccount.getUsername()).password("").build(); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 84f06c1..84d30f6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,6 +2,8 @@ server: port: 8001 spring: datasource: +# username: commerce +# password: Jix656dzD6St4YCn_ username: commerce_system password: Jix656dzD6St4YCn url: jdbc:mysql://wzpmc.cn:3306/commerce_system?serverTimezone=UTC-8 diff --git a/src/test/java/top/xinsin/MainTest.java b/src/test/java/top/xinsin/MainTest.java index 1926cb5..8e5dd41 100644 --- a/src/test/java/top/xinsin/MainTest.java +++ b/src/test/java/top/xinsin/MainTest.java @@ -1,23 +1,39 @@ package top.xinsin; +import lombok.SneakyThrows; import org.apache.commons.codec.digest.DigestUtils; import org.junit.Test; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.FileInputStream; +import java.nio.charset.StandardCharsets; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.LinkedList; import java.util.Scanner; @SuppressWarnings("resource") public class MainTest { @Test + @SneakyThrows + public void test02(){ + String s = "%E6%96%B0%E5%BB%BA%E6%96%87%E6%9C%AC%E6%96%87%E6%A1%A3%20"; + System.out.println(new String(s.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1)); + } + + @Test + @SneakyThrows public void test01(){ - System.out.println(new BCryptPasswordEncoder().encode(DigestUtils.md5Hex("xinsin"))); - System.out.println(DigestUtils.md5Hex("w433200w")); + System.out.println(new BCryptPasswordEncoder().encode(DigestUtils.md5Hex("12345678"))); + System.out.println(DigestUtils.md5Hex("12345678")); + System.out.println(DigestUtils.md5Hex("xinsin")); System.out.println(new BCryptPasswordEncoder().encode("996c24dbd061aeacb928fe4892d7a70b")); }