From 794b6e8d50cc501b99e21e0f67b32e0399664cb0 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 11 八月 2025 17:25:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'huliguo/master'
---
guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java
index 666620c..4f3f610 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java
@@ -44,7 +44,9 @@
//获取数据库中的账号密码，准备比对
User user = userMapper.getByAccount(username);
-
+ if(null == user){
+ return new ErrorTip(500, "无效的账号！");
+ }
String credentials = user.getPassword();
String salt = user.getSalt();
ByteSource credentialsSalt = new Md5Hash(salt);
@@ -75,6 +77,11 @@
public Object test() {
return SUCCESS_TIP;
}
-
+
+
+ public static void main(String[] args) {
+ String s = ShiroKit.md5("96e79218965eb72c92a549dd5a330112", "8pgby");
+ System.err.println(s);
+ }
}
--
Gitblit v1.7.1