From 3bda6b6b4b59a367761ef436ae5942dd0803e950 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Tue, 6 Aug 2024 11:21:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/framework/config/SecurityConfig.java | 2 +- .../src/main/resources/mapper/business/DcDeviceMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ea1a8073..2ae6050f 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 @@ -127,7 +127,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { "/profile/**" ).permitAll() // .antMatchers("/swagger-ui.html").anonymous() -// .antMatchers("/swagger-resources/**").anonymous() + .antMatchers("/swagger-resources/**").anonymous() .antMatchers("/webjars/**").anonymous() .antMatchers("/*/api-docs").anonymous() .antMatchers("/druid/**").anonymous() diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index ac812fba..722e32ac 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.network_segment,t1.device_img,t1.child_type, t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer from dc_device t1 - left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark + left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction left join dc_product t3 on t3.id = t1.product_id and t1.id = #{id} From 423e7bf60f00dfc285948c84609dfd284cd66238 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Tue, 6 Aug 2024 11:22:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E8=AE=BE=E5=A4=87=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3bda6b6b --- .../main/java/com/ruoyi/framework/config/SecurityConfig.java | 2 +- .../src/main/resources/mapper/business/DcDeviceMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2ae6050f..ea1a8073 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 @@ -127,7 +127,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { "/profile/**" ).permitAll() // .antMatchers("/swagger-ui.html").anonymous() - .antMatchers("/swagger-resources/**").anonymous() +// .antMatchers("/swagger-resources/**").anonymous() .antMatchers("/webjars/**").anonymous() .antMatchers("/*/api-docs").anonymous() .antMatchers("/druid/**").anonymous() diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index 722e32ac..ac812fba 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.network_segment,t1.device_img,t1.child_type, t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer from dc_device t1 - left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction + left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark left join dc_product t3 on t3.id = t1.product_id and t1.id = #{id} From a7a0f09a5746bde9912469d810f9bd3bed4224e3 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Tue, 6 Aug 2024 11:24:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/business/DcDeviceMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index ac812fba..722e32ac 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.network_segment,t1.device_img,t1.child_type, t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer from dc_device t1 - left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark + left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction left join dc_product t3 on t3.id = t1.product_id and t1.id = #{id}