From 7a39d2ddaf414a6184abb23d5a594d22d4cb959c Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 29 四月 2024 17:05:02 +0800
Subject: [PATCH] 最新版本
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1 +
server/visits/dmvisit_admin/src/main/java/com/doumee/api/CloudCarsController.java | 3 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java | 2 +-
server/system_timer/src/main/java/com/doumee/api/timer/QuartzController.java | 3 ++-
server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java | 3 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java | 3 ++-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java
index 7ac3253..896c0c4 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java
@@ -47,7 +47,7 @@
*/
@Api(tags = "寰湇鍔�-浼氳瀹ょ浉鍏虫帴鍙�")
@RestController
-@RequestMapping("/cloudService/bookings")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/bookings")
public class CloudBookingsController extends BaseController {
@Autowired
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java b/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java
index 52cc778..5ad5c9e 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java
@@ -1,5 +1,6 @@
package com.doumee.config.shiro;
+import com.doumee.core.utils.Constants;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.session.mgt.SessionManager;
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
@@ -73,7 +74,7 @@
map.put("/common/captcha", "anon");
//鏂囦欢涓婁紶鍙栨秷鎷︽埅
map.put("/public/**", "anon");
- map.put("/cloudService/**", "anon");
+ map.put(Constants.CLOUD_SERVICE_URL_INDEX+"/**", "anon");
// - 鏀捐swagger
map.put("/doc.html", "anon");
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
index 086e792..a8dc5a7 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
@@ -1,5 +1,6 @@
package com.doumee.config.cloudfilter;
+import com.doumee.core.utils.Constants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
@@ -13,6 +14,6 @@
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(new LoginHandlerInterceptor(stringRedisTemplate))
- .addPathPatterns("/cloudService/**");
+ .addPathPatterns(Constants.CLOUD_SERVICE_URL_INDEX+"/**");
}
}
\ No newline at end of file
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 22ab110..d18fe3f 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -83,6 +83,7 @@
public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
public static final String VIRTUAL_CARD_INDEX = "02098469790";
public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ;
+ public static final String CLOUD_SERVICE_URL_INDEX = "/cloudService";
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
public static boolean DEALING_HK_SYNCDEVICE_STATUS = false;
diff --git a/server/system_timer/src/main/java/com/doumee/api/timer/QuartzController.java b/server/system_timer/src/main/java/com/doumee/api/timer/QuartzController.java
index d6a488a..0535e68 100644
--- a/server/system_timer/src/main/java/com/doumee/api/timer/QuartzController.java
+++ b/server/system_timer/src/main/java/com/doumee/api/timer/QuartzController.java
@@ -1,5 +1,6 @@
package com.doumee.api.timer;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.timer.entity.QuartzJob;
import com.doumee.service.timer.QuartzJobService;
import io.swagger.annotations.Api;
@@ -9,7 +10,7 @@
import javax.annotation.Resource;
@RestController
-@RequestMapping("/cloudService/quartz")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/quartz")
@Api(tags = "瀹氭椂浠诲姟鎺ュ彛")
public class QuartzController {
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/CloudCarsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/CloudCarsController.java
index 6cc3e51..8714d27 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/CloudCarsController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/CloudCarsController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Cars;
import com.doumee.service.business.CarsService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
@@ -26,7 +27,7 @@
*/
@Api(tags = "杞﹁締鎺ュ彛")
@RestController
-@RequestMapping("/cloudService/cars")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/cars")
public class CloudCarsController extends BaseController {
@Autowired
private CarsService carsService;
--
Gitblit v1.9.3