Merge branch 'dev' of http://192.168.0.115:3000/4dzfb-2.0/shop into dev

platform-shop/src/main/java/com/platform/controller/TokenController.java

@@ -55,6 +55,9 @@ public class TokenController extends AbstractController{
         }
         // 判断场景为四维看看或者指房宝
         SceneEntity scene = sceneService.queryByScene(sceneNum);
+        if(ObjectUtils.isEmpty(scene)){
+            throw new CommonBaseException(ResultCodeEnum.D101,"请先保存场景！");
+        }
         if(scene.getSceneUrl().contains("www.4dkankan.com") || scene.getSceneUrl().contains("test.4dkankan.com")){
             Long userId = getUser().getUserId();
             SysUserEntity user = sysUserService.queryObject(userId);
@@ -70,7 +73,7 @@ public class TokenController extends AbstractController{
             if (result.getInteger("code") != 0) {
                 throw new CommonBaseException(ResultCodeEnum.D101, "4d看看密码有误！");
             }
-            return Result.success(result.getJSONObject("data").getString("token"));
+            return Result.success("操作成功",result.getJSONObject("data").getString("token"));
         }
 
         // 判断token是否有效