Merge branch 'bug-lyh-34963' into test

src/main/java/com/fdkankan/ucenter/common/BaseController.java

@@ -1,7 +1,9 @@
 package com.fdkankan.ucenter.common;
 
+import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.DateEditor;
 import com.fdkankan.ucenter.common.constants.NacosProperty;
+import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.util.DateUserUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,6 +87,9 @@ public class BaseController {
     }
 
     protected String getToken(){
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(request.getHeader("token")) ){
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3004, LoginConstant.FAILURE_MSG_3004);
+        }
         return request.getHeader("token");
     }
     protected String getLang(){

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -327,7 +327,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 this.removeById(scenePlus.getId());
                 log.error("复制场景异常", e);
             }
-        });
+        }).join();
         return scenePlus.getId();
     }
 

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -841,7 +841,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 this.removeById(oldScene.getId());
                 log.error("复制场景异常", e);
             }
-        });
+        }).join();
         return oldScene.getId();
     }