Compare commits

..

2 Commits

Author SHA1 Message Date
牛子源 b2cd675799 Merge remote-tracking branch 'origin/master' 2025-04-29 09:35:34 +08:00
牛子源 db14bc53ed dev 2025-04-29 09:35:25 +08:00
2 changed files with 4 additions and 8 deletions

View File

@ -9,7 +9,6 @@ import com.syjiaer.clinic.server.common.util.ParmsUtil;
import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.common.vo.Result;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jws; import io.jsonwebtoken.Jws;
import io.jsonwebtoken.JwtException;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.security.Keys; import io.jsonwebtoken.security.Keys;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
@ -51,9 +50,9 @@ public class MvcInterceptor implements HandlerInterceptor {
return true; // 如果方法上有 @NoAuthCheck 注解则跳过检查 return true; // 如果方法上有 @NoAuthCheck 注解则跳过检查
} }
} }
return checkManage(response); return checkManager(response);
} }
private Boolean checkManage(HttpServletResponse response) throws IOException { private Boolean checkManager(HttpServletResponse response) throws IOException {
Map<String, String> headers =headersUtil.getMap(); Map<String, String> headers =headersUtil.getMap();
String token = headers.get("authorization"); String token = headers.get("authorization");
if (token == null || token.isEmpty()) { if (token == null || token.isEmpty()) {
@ -66,9 +65,6 @@ public class MvcInterceptor implements HandlerInterceptor {
.verifyWith(Keys.hmacShaKeyFor(jwtSecret.getBytes())) .verifyWith(Keys.hmacShaKeyFor(jwtSecret.getBytes()))
.build() .build()
.parseSignedClaims(token); .parseSignedClaims(token);
} catch (JwtException e) {
setErrorResult(response,"登录令牌已失效,请重新登陆",301);
return false;
} catch (Exception e) { } catch (Exception e) {
setErrorResult(response,"登录令牌已失效,请重新登陆",301); setErrorResult(response,"登录令牌已失效,请重新登陆",301);
return false; return false;

View File

@ -70,10 +70,10 @@ public class SocialDirectoryService extends BaseService {
queryWrapper.in("code", code_list); queryWrapper.in("code", code_list);
socialDirectoryMapper.delete(queryWrapper); socialDirectoryMapper.delete(queryWrapper);
} }
return insertSocialDirectorys(version_name, type, tab_list); return insertAll(version_name, type, tab_list);
} }
private String insertSocialDirectorys(String version_name, int type, List<String[]> tab_list) { private String insertAll(String version_name, int type, List<String[]> tab_list) {
Map<String, String> title_map = dictoryUtil.getTitleMap(String.valueOf(type)); Map<String, String> title_map = dictoryUtil.getTitleMap(String.valueOf(type));
List<SocialDirectory> list = new ArrayList<>(); List<SocialDirectory> list = new ArrayList<>();
HashMap<String, SocialDirectory> tmp_map = new HashMap<>(); HashMap<String, SocialDirectory> tmp_map = new HashMap<>();