From 486cad2d6ca6c6ec93aa277332eacb63036f80d7 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 22 Jul 2025 01:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=99=BB=E5=BD=95=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=AD=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/config/shiro/AppletShiroConfig.java  |  2 +-
 .../org/jeecg/config/shiro/AppletShiroRealm.java   |  2 +-
 .../java/org/jeecg/config/shiro/ShiroConfig.java   |  4 +-
 .../java/org/jeecg/config/shiro/ShiroRealm.java    | 58 ++++++++++++++++++++--
 .../config/shiro/filters/AppletJwtFilter.java      |  2 +
 .../org/jeecg/config/shiro/filters/JwtFilter.java  | 22 +++++++-
 .../controller/AppletApiIndexController.java       | 13 ++---
 .../applet/service/AppletApiIndexService.java      |  7 ++-
 .../service/impl/AppletApiIndexServiceImpl.java    |  5 +-
 9 files changed, 92 insertions(+), 23 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/AppletShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/AppletShiroConfig.java
index cc3dfad..d4958c7 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/AppletShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/AppletShiroConfig.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * @date 2025-01-25
  */
 @Slf4j
-@Configuration
+//@Configuration
 public class AppletShiroConfig {
 
     /**
diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/AppletShiroRealm.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/AppletShiroRealm.java
index 0132468..6c39462 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/AppletShiroRealm.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/AppletShiroRealm.java
@@ -164,7 +164,7 @@ public class AppletShiroRealm extends AuthorizingRealm {
             
         } catch (Exception e) {
             log.error("获取小程序用户信息异常，openid: {}", openid, e);
-            return null;
+        return null;
         }
     }
 
diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index d02a2c8..2a4da6e 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -104,7 +104,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览
 
 
-        filterChainDefinitionMap.put("/appletApi/**", "anon");//小程序
+        //filterChainDefinitionMap.put("/appletApi/**", "anon");//小程序
 
         //filterChainDefinitionMap.put("/sys/common/view/**", "anon");//图片预览不限制token
         //filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token
@@ -191,10 +191,12 @@ public class ShiroConfig {
         //如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】
         Object cloudServer = env.getProperty(CommonConstant.CLOUD_SERVER_KEY);
         filterMap.put("jwt", new JwtFilter(cloudServer==null));
+//        filterMap.put("appletApi", new AppletJwtFilter(cloudServer==null));
         shiroFilterFactoryBean.setFilters(filterMap);
         
         // <!-- 过滤链定义，从上向下顺序执行
         // 其他请求使用jwt过滤器
+//        filterChainDefinitionMap.put("/appletApi/**", "appletApi");
         filterChainDefinitionMap.put("/**", "jwt");
 
         // 未授权界面返回JSON
diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
index a9caf12..d4e44ff 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
@@ -10,10 +10,12 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.apache.shiro.realm.AuthorizingRealm;
 import org.apache.shiro.subject.PrincipalCollection;
 import org.jeecg.common.api.CommonAPI;
+import org.jeecg.common.api.IAppletUserService;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.AppletUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SpringContextUtils;
@@ -44,12 +46,16 @@ public class ShiroRealm extends AuthorizingRealm {
     @Resource
     private RedisUtil redisUtil;
 
+    @Lazy
+    @Resource
+    private IAppletUserService appletUserService;
+
     /**
      * 必须重写此方法，不然Shiro会报错
      */
     @Override
     public boolean supports(AuthenticationToken token) {
-        return token instanceof JwtToken;
+        return token instanceof JwtToken || token instanceof AppletJwtToken;
     }
 
     /**
@@ -65,6 +71,11 @@ public class ShiroRealm extends AuthorizingRealm {
         String username = null;
         String userId = null;
         if (principals != null) {
+
+            if (principals.getPrimaryPrincipal() instanceof AppletUser){
+                return new SimpleAuthorizationInfo();
+            }
+
             LoginUser sysUser = (LoginUser) principals.getPrimaryPrincipal();
             username = sysUser.getUsername();
             userId = sysUser.getId();
@@ -102,9 +113,16 @@ public class ShiroRealm extends AuthorizingRealm {
             throw new AuthenticationException("token为空!");
         }
         // 校验token有效性
-        LoginUser loginUser = null;
+        Object loginUser = null;
         try {
-            loginUser = this.checkUserTokenIsEffect(token);
+
+            if (auth instanceof AppletJwtToken){
+                String openid = JwtUtil.getUsername(token);
+                loginUser =  getAppletUser(openid, token);
+            }else {
+                loginUser = this.checkUserTokenIsEffect(token);
+            }
+
         } catch (AuthenticationException e) {
             JwtUtil.responseError(SpringContextUtils.getHttpServletResponse(),401,e.getMessage());
             e.printStackTrace();
@@ -181,6 +199,40 @@ public class ShiroRealm extends AuthorizingRealm {
         return loginUser;
     }
 
+    /**
+     * 获取小程序用户信息
+     *
+     * @param openid
+     * @param token
+     * @return 用户信息
+     */
+    private AppletUser getAppletUser(String openid, String token) {
+        try {
+            log.debug("开始获取小程序用户信息，openid: {}", openid);
+            if (openid == null) {
+                throw new AuthenticationException("小程序token非法无效!");
+            }
+            // 从数据库查询用户信息
+            AppletUser appletUser = appletUserService.getByOpenid(openid);
+
+            if (appletUser != null) {
+                log.debug("从数据库获取到小程序用户: {}", appletUser.getName());
+                return appletUser;
+            }
+
+            if (!jwtTokenRefresh(token, openid, appletUser.getId())) {
+                throw new AuthenticationException(CommonConstant.TOKEN_IS_INVALID_MSG);
+            }
+
+            log.warn("未找到小程序用户，openid: {}", openid);
+            return null;
+
+        } catch (Exception e) {
+            log.error("获取小程序用户信息异常，openid: {}", openid, e);
+            return null;
+        }
+    }
+
     /**
      * JWTToken刷新生命周期 （实现： 用户在线操作不掉线功能）
      * 1、登录成功后将用户的JWT生成的Token作为k、v存储到cache缓存里面(这时候k、v值一样)，缓存有效期设置为Jwt有效时间的2倍
diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/AppletJwtFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/AppletJwtFilter.java
index 538e778..e76aac8 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/AppletJwtFilter.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/AppletJwtFilter.java
@@ -110,6 +110,8 @@ public class AppletJwtFilter extends BasicHttpAuthenticationFilter {
         AppletJwtToken jwtToken = new AppletJwtToken(token);
         // 提交给小程序专用realm进行登入，如果错误他会抛出异常并被捕获
         getSubject(request, response).login(jwtToken);
+
+
         // 如果没有抛出异常则代表登入成功，返回true
         log.debug("小程序登录认证成功");
         return true;
diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
index 095f0db..49cd9e5 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
@@ -2,11 +2,13 @@ package org.jeecg.config.shiro.filters;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.config.shiro.AppletJwtToken;
 import org.jeecg.config.shiro.JwtToken;
 import org.jeecg.config.shiro.ignore.InMemoryIgnoreAuth;
 import org.springframework.http.HttpHeaders;
@@ -48,10 +50,19 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
     @Override
     protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
         try {
+            HttpServletRequest httpRequest = (HttpServletRequest) request;
+            String requestPath = httpRequest.getServletPath();
+
             // 判断当前路径是不是注解了@IngoreAuth路径，如果是，则放开验证
             if (InMemoryIgnoreAuth.contains(((HttpServletRequest) request).getServletPath())) {
                 return true;
             }
+
+            // 不处理以/appletApi开头的请求
+//            if (requestPath.startsWith("/appletApi")) {
+//                log.debug("不是小程序请求，直接放行: {}", requestPath);
+//                return true; // 不是appletApi请求，直接放行
+//            }
             
             executeLogin(request, response);
             return true;
@@ -75,9 +86,16 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
         }
         // update-end--Author:lvdandan Date:20210105 for：JT-355 OA聊天添加token验证，获取token参数
 
-        JwtToken jwtToken = new JwtToken(token);
-        // 提交给realm进行登入，如果错误他会抛出异常并被捕获
+        String requestPath = httpServletRequest.getServletPath();
+
+        AuthenticationToken jwtToken;
+        if (requestPath.startsWith("/appletApi")) {
+            jwtToken = new AppletJwtToken(token);
+        }else {
+            jwtToken = new JwtToken(token);
+        }
         getSubject(request, response).login(jwtToken);
+
         // 如果没有抛出异常则代表登入成功，返回true
         return true;
     }
diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiIndexController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiIndexController.java
index f8a65c2..5606afc 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiIndexController.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiIndexController.java
@@ -31,18 +31,15 @@ public class AppletApiIndexController {
 
     /**
      * Banner列表查询
-     * @return Banner列表，按类型分组
+     * @return Banner列表
      */
     @AutoLog(value = "Banner列表查询")
-    @Operation(summary = "Banner列表查询", description = "获取Banner列表，按类型分组，按排序字段排序")
+    @Operation(summary = "Banner列表查询", description = "获取Banner列表")
     @GetMapping(value = "/list")
     @IgnoreAuth
-    public Result<Map<String, List<AppletBanner>>> list() {
-        
+    public Result<List<AppletBanner>> list() {
         log.info("Banner列表查询");
-        
-        Map<String, List<AppletBanner>> groupedBanners = appletIndexService.getBannerListGrouped();
-        
-        return Result.OK(groupedBanners);
+        List<AppletBanner> bannerList = appletIndexService.getBannerList();
+        return Result.OK(bannerList);
     }
 } 
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiIndexService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiIndexService.java
index 7b0fda5..2b3d47a 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiIndexService.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiIndexService.java
@@ -14,8 +14,7 @@ import java.util.Map;
 public interface AppletApiIndexService {
 
     /**
-     * 获取Banner列表，按类型分组
-     * @return Banner分组数据
+     * 获取Banner列表
      */
-    Map<String, List<AppletBanner>> getBannerListGrouped();
-} 
\ No newline at end of file
+    List<AppletBanner> getBannerList();
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java
index 16857e4..0033b34 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java
@@ -24,14 +24,13 @@ public class AppletApiIndexServiceImpl implements AppletApiIndexService {
     private IAppletBannerService appletBannerService;
 
     @Override
-    public Map<String, List<AppletBanner>> getBannerListGrouped() {
+    public List<AppletBanner> getBannerList() {
         LambdaQueryWrapper<AppletBanner> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.orderByAsc(AppletBanner::getSortOrder);
         
         List<AppletBanner> list = appletBannerService.list(queryWrapper);
         
         // 按类型分组
-        return list.stream()
-                .collect(Collectors.groupingBy(AppletBanner::getType));
+        return list;
     }
 } 
\ No newline at end of file