lhq/FT546-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/bas/srgvmap/service/impl/RoadCacheServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java
#	ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
#	ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
#	ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/mapper/WcsSrgvQueueMapper.java
#	ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/service/impl/WcsSrgvQueueServiceImpl.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/cdz/PlcCdzRead.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/srgv/PlcSrgvRead.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java
#	ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java
#	ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
#	ruoyi-admin/src/main/resources/mapper/queue/WcsSrgvQueueMapper.xml
This commit is contained in:
zgw
2026-07-24 08:52:43 +08:00
parent 72b88ed0e3 d98fe2a30c
commit 89b2fff3d1
9 changed files with 172 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View File

@@ -119,6 +119,7 @@ public class SecurityConfig
.antMatchers("/api/agv/**").permitAll()
.antMatchers("/device/api/**").permitAll()
.antMatchers("/wcs2Wms/api/**").permitAll()
.antMatchers("/agv/api/**").permitAll()
.antMatchers("/test/**").permitAll()
.antMatchers("/largeScreen/monitor/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证