From c229e266e25310886b1334adb8b8cd9d24f2d127 Mon Sep 17 00:00:00 2001
From: wu <wsjxh1023@163.com>
Date: Mon, 27 Nov 2023 13:57:16 +0800
Subject: [PATCH] bug fix

---
 ruoyi-admin/src/main/resources/application.yml               | 2 +-
 ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml  | 5 +++--
 .../main/java/com/ruoyi/framework/config/SecurityConfig.java | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 34aaf2e..72c1cfe 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -126,7 +126,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /api
+  pathMapping: /
 
 # 防止XSS攻击
 xss:
diff --git a/ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml b/ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml
index 850b2d6..e8bde75 100644
--- a/ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml
@@ -22,8 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBNetList" parameterType="BNet" resultMap="BNetResult">
         <include refid="selectBNetVo"/>
-        <where>  
-            <if test="netName != null  and netName != ''"> and net_name like concat('%', #{netName}, '%')</if>
+        <where>
+            <if test="netName != null  and netName != ''">and net_name like concat('%', #{netName}, '%')</if>
+            <if test="shanghuId != null  and shanghuId != ''">and shanghu_id like = #{shanghuId}</if>
         </where>
     </select>
     
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 0097ce1..3814556 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -115,6 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers( "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/jn/**").permitAll()
+                .antMatchers("/netEwm/net/findById/**").anonymous()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()