lyhzzz 2 月之前
父節點
當前提交
e10037f882

+ 8 - 0
src/main/java/com/fdkankan/ucenter/controller/LoginController.java

@@ -169,5 +169,13 @@ public class LoginController extends BaseController {
 
         return Result.success();
     }
+
+
+    @Value("${laser.host}")
+    private String laserHost;
+    @GetMapping("/getLaserHost")
+    public Result getLaserHost(){
+        return Result.success(laserHost);
+    }
 }
 

+ 1 - 0
src/main/java/com/fdkankan/ucenter/controller/app/AppSceneController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.ucenter.controller.app;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.ISceneProService;

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -75,7 +75,7 @@ public class AppSceneService {
     private String ossHost;
 
     public PageInfo pageList(AppSceneParam param) {
-        if(StringUtils.isEmpty(param.getAppUserName()) && StringUtils.isEmpty(param.getPhoneNum()) && param.getCameraId() == null){
+        if((StringUtils.isEmpty(param.getAppUserName()) || StringUtils.isEmpty(param.getAppPassword())) && StringUtils.isEmpty(param.getPhoneNum()) && param.getCameraId() == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
         if(!StringUtils.isEmpty(param.getAppUserName()) && !StringUtils.isEmpty(param.getAppPassword())){