From 53d4c0d723402840c3a591664a839f7ce044bd2d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 10:39:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 2 --
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java | 2 --
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 6 ++----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java | 2 --
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 4 ----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java | 1 -
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 1 -
7 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
index 5bae3ed..bc7d1d6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
@@ -57,7 +57,6 @@
* @param
* @return
*/
- @AnonymousAccess
@PostMapping("/updateBroadcastTerminalName/{id}")
public ResponseVO<Object> updateBroadcastTerminalName(@PathVariable Integer id, @RequestBody ReceiveParam param) {
if (!permissionConfig.check(MenuEnum.IP_BROADCAST_INFO_UPDATE.getCode())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
index 5b0dfab..dc8c7e9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
@@ -97,8 +97,6 @@
}
}
-
- // @AnonymousAccess
@GetMapping("/list")
public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_LIST.getCode())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
index caf7bc8..80d72fa 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -67,7 +67,6 @@
return ResponseUtil.success(ledProgramFileService.list(wrapper));
}
- @AnonymousAccess
@PostMapping("/uploading/{dateType}")
public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file, @PathVariable Integer dateType) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index 3f35397..ace0d00 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -112,7 +112,6 @@
/**
* 鍦ㄧ嚎鏁伴噺
*/
- @AnonymousAccess
@GetMapping("/online")
public ResponseVO<Object> online() {
return ResponseUtil.success(poleService.poleCount());
@@ -292,7 +291,6 @@
/**
* 鏌ョ湅鐏潌缁戝畾鐨勮澶�
*/
- @AnonymousAccess
@PostMapping("/getPoleBindDevice/{poleId}")
public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.GET_POLE_BINDING.getCode())) {
@@ -305,7 +303,6 @@
/**
* 鎺ㄩ�佸ぇ姘旇澶囧埌璇虹摝
*/
- @AnonymousAccess
@GetMapping("/pushAidDataToNova/{poleId}")
public ResponseVO<Object> pushAirDataToNova(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_NOVA.getCode())) {
@@ -317,7 +314,6 @@
/**
* 鎺ㄩ�佸ぇ姘旇澶囧埌鐔欒
*/
- @AnonymousAccess
@GetMapping("/pushAirDataToXiXun/{poleId}")
public ResponseVO<Object> pushAirDataToXiXun(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_XIXUN.getCode())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index cb7b594..c50718a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -82,7 +82,6 @@
/**
* 鍚屾鎾斁
*/
- @AnonymousAccess
@PostMapping("/syncPlay")
public ResponseVO<Object> syncPlay(@RequestBody Map map) {
if (!permissionConfig.check(MenuEnum.VNNOX_SYNC_PLAY.getCode())) {
@@ -97,7 +96,6 @@
/**
* ntp瀵规椂
*/
- @AnonymousAccess
@PostMapping("/ntp")
public ResponseVO<Object> ntp(@RequestBody Map map) {
if (!permissionConfig.check(MenuEnum.VNNOX_NTP.getCode())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 4527904..2c6278f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -259,11 +259,9 @@
return ResponseUtil.success(poleLightemitService.getLedByLightControlCode(lightemitControlCode));
}
- /*
- 璁剧疆灞忓箷寮�鍏�
+ /**
+ * 璁剧疆灞忓箷寮�鍏�
*/
-
- @AnonymousAccess
@PostMapping("/setScreenOpen")
public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity) {
if (!permissionConfig.check(MenuEnum.XIXUN_ON_OFF.getCode())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java
index 019ab85..df7aae1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java
@@ -38,7 +38,6 @@
* @param xmlData
* @return
*/
- @AnonymousAccess
@RequestMapping("wechatCallback")
public Object wechatNotify(@RequestBody String xmlData) {
return userOrderService.payWechatNotify(xmlData);
@@ -49,7 +48,6 @@
*
* @return
*/
- @AnonymousAccess
@RequestMapping("alipayCallback")
public Object alipayCallback(HttpServletRequest request) {
log.info("杩欓噷鏄敮浠樺疂鍥炶皟");
--
Gitblit v1.9.3