个人中心 v2.0.1 国际服

src/main/java/com/fdkankan/scene/Interceptor/CheckPermitAspect.java

@@ -1,28 +1,22 @@
 package com.fdkankan.scene.Interceptor;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.service.IFranceService;
+import com.fdkankan.scene.service.IPermissionService;
 import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.web.user.SSOLoginHelper;
 import com.fdkankan.web.user.SSOUser;
 import com.fdkankan.web.util.WebUtil;
 import java.io.IOException;
-import java.net.URI;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import lombok.extern.log4j.Log4j2;
 import org.aspectj.lang.JoinPoint;
@@ -30,7 +24,6 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -51,7 +44,7 @@ public class CheckPermitAspect {
 	@Autowired
 	private ISceneCooperationService sceneCooperationService;
 	@Autowired
-	private IFranceService franceService;
+	private IPermissionService permissionService;
 
 
 	@Pointcut("@annotation(com.fdkankan.scene.annotation.CheckPermit)")
@@ -107,7 +100,8 @@ public class CheckPermitAspect {
 		}
 
         if(scenePlus.getUserId().equals(user.getId())){
-			franceService.demoSceneNoSubmit(num, user.getUserName(), request.getRequestURI());
+			//法国宣传页demo场景权限控制，如果是法国宣传页demo场景，则不允许提交数据
+			permissionService.franceDemoSceneNoSubmit(num, user.getUserName(), request.getRequestURI());
             return;
         }
 
@@ -115,6 +109,9 @@ public class CheckPermitAspect {
 		SceneCooperation sceneCooperation = sceneCooperationService.getByNumAndUserId(num, user.getId());
 		if(Objects.isNull(sceneCooperation)){
 			throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+		}else{
+			//注册新用户时，给新用户协作一个mesh案例场景，所以这里做一个限制，不允许提交数据
+			permissionService.eurDemoSceneNoSubmit(num, request.getRequestURI());
 		}
 
 	}

src/main/java/com/fdkankan/scene/Interceptor/TokenInterceptor.java

@@ -27,9 +27,6 @@ import org.springframework.web.servlet.HandlerInterceptor;
 @Slf4j
 public class TokenInterceptor implements HandlerInterceptor {
 
-	@Value("#{'${demo.scene.num:}'.split(',')}")
-	private List<String> demoSceneNums;
-
 	@Autowired
 	private RedisUtil redisUtil;
 

src/main/java/com/fdkankan/scene/service/IFranceService.java

@@ -1,8 +0,0 @@
-package com.fdkankan.scene.service;
-
-public interface IFranceService {
-
-    void demoSceneNoSubmit(String num, String userName, String uri);
-
-
-}

src/main/java/com/fdkankan/scene/service/IPermissionService.java

@@ -0,0 +1,10 @@
+package com.fdkankan.scene.service;
+
+public interface IPermissionService {
+
+    void franceDemoSceneNoSubmit(String num, String userName, String uri);
+
+    void eurDemoSceneNoSubmit(String num, String uri);
+
+
+}

src/main/java/com/fdkankan/scene/service/impl/FranceServiceImpl.java

@@ -3,7 +3,7 @@ package com.fdkankan.scene.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.scene.service.IFranceService;
+import com.fdkankan.scene.service.IPermissionService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
@@ -14,7 +14,7 @@ import java.util.Set;
 
 @RefreshScope
 @Service
-public class FranceServiceImpl implements IFranceService {
+public class PermissionServiceImpl implements IPermissionService {
 
     public static Set<String> demoAllowApis = new HashSet<>();
 
@@ -45,10 +45,22 @@ public class FranceServiceImpl implements IFranceService {
     private List<String> demoSceneNums;
     @Value("${demo.userName:wherefordemo@4dage.com}")
     private String demoUser;
+    @Value("#{'${eur.newUser.collaborationScenes.num:}'.split(',')}")
+    private List<String> eurCollaborationScenes;
+
+
+    @Override
+    public void franceDemoSceneNoSubmit(String num, String userName, String uri) {
+        if(CollUtil.isNotEmpty(demoSceneNums) && demoSceneNums.contains(num) && userName.equals(demoUser)){
+            if(!demoAllowApis.contains(uri)){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+            }
+        }
+    }
 
     @Override
-    public void demoSceneNoSubmit(String num, String userName, String uri) {
-        if(CollUtil.isNotEmpty(demoSceneNums) && demoSceneNums.contains(num) && userName.equals(demoUser)){//如果是法国宣传页demo场景，则不允许提交数据
+    public void eurDemoSceneNoSubmit(String num, String uri) {
+        if(CollUtil.isNotEmpty(eurCollaborationScenes) && eurCollaborationScenes.contains(num)){
             if(!demoAllowApis.contains(uri)){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
             }