bug fix

ruoyi-admin/src/main/resources/application.yml

@@ -126,7 +126,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /api
+  pathMapping: /
 
 # 防止XSS攻击
 xss:

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>  
+        <where>
-            <if test="netName != null  and netName != ''"> and net_name like concat('%', #{netName}, '%')</if>
+            <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>
     

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()