增加大屏免登录

jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java

@@ -21,18 +21,19 @@ public class WebSocketConfig {
         return new ServerEndpointExporter();
     }
 
-    @Bean
-    public WebsocketFilter websocketFilter(){
-        return new WebsocketFilter();
-    }
-
-    @Bean
-    public FilterRegistrationBean getFilterRegistrationBean(){
-        FilterRegistrationBean bean = new FilterRegistrationBean();
-        bean.setFilter(websocketFilter());
-        //TODO 临时注释掉，测试下线上socket总断的问题
-        bean.addUrlPatterns("/websocket/*","/eoaSocket/*", "/newsWebsocket/*", "/vxeSocket/*");
-        return bean;
-    }
+// 大屏免登录，去掉下面的验证
+//    @Bean
+//    public WebsocketFilter websocketFilter(){
+//        return new WebsocketFilter();
+//    }
+//
+//    @Bean
+//    public FilterRegistrationBean getFilterRegistrationBean(){
+//        FilterRegistrationBean bean = new FilterRegistrationBean();
+//        bean.setFilter(websocketFilter());
+//        //TODO 临时注释掉，测试下线上socket总断的问题
+//        bean.addUrlPatterns("/websocket/*","/eoaSocket/*", "/newsWebsocket/*", "/vxeSocket/*");
+//        return bean;
+//    }
 
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java

@@ -37,7 +37,7 @@ public class WebSocket {
 
     //==========【websocket接受、推送消息等方法 —— 具体服务节点推送ws消息】========================================================================================
     @OnOpen
-    public void onOpen(Session session, @PathParam(value = "userId") String userId) {
+    public void onOpen(@PathParam(value = "userId") String userId, Session session) {
         try {
             sessionPool.put(userId, session);
             log.info("【系统 WebSocket】有新的连接，总数为:" + sessionPool.size());

jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/java/org/jeecg/monitor/config/SecuritySecureConfig.java

@@ -32,6 +32,8 @@ public class SecuritySecureConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers(adminContextPath + "/assets/**").permitAll()
                 //登录页面允许访问
                 .antMatchers(adminContextPath + "/login", "/css/**", "/js/**", "/image/*").permitAll()
+                // websocket如果需要不登录也可以访问，需要在`SecurityConfig.java`中设置匿名访问
+                .antMatchers("/websocket/**").permitAll()
                 //其他所有请求需要登录
                 .anyRequest().authenticated()
                 .and()

module-guan/src/main/java/org/jeecg/modules/webaccess/controller/GuanDashboardParamController.java

@@ -33,6 +33,7 @@ public class GuanDashboardParamController extends JeecgController<GuanDashboardP
                                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                        HttpServletRequest req) {
+        guanDashboardParam.setTagName(guanDashboardParam.getParamName());
         QueryWrapper<GuanDashboardParam> queryWrapper = QueryGenerator.initQueryWrapper(guanDashboardParam, req.getParameterMap());
         Page<GuanDashboardParam> page = new Page<GuanDashboardParam>(pageNo, pageSize);
         IPage<GuanDashboardParam> pageList = guanDashboardParamService.page(page, queryWrapper);