Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

vehicle-admin/src/main/java/com/ozs/web/controller/sdk/GeoHazardMonitorTokenController.java

@@ -60,6 +60,7 @@ import com.ozs.web.core.util.CameraUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -131,6 +132,8 @@ public class GeoHazardMonitorTokenController {
     private SysUserMapper sysUserMapper;
     @Autowired
     WebSocketCommon webSocketCommon;
+    @Value("${base.env}")
+    private String env;
 
     /**
      * 获取web访问令牌
@@ -144,6 +147,7 @@ public class GeoHazardMonitorTokenController {
         LambdaQueryWrapper<SvcAddress> lw = new LambdaQueryWrapper<SvcAddress>();
         if (!ObjectUtils.isEmpty(svcAddress.getClientId())) {
             lw.eq(SvcAddress::getClientId, svcAddress.getClientId());
+            lw.eq(SvcAddress::getEnv,env);
         } else {
             jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");

vehicle-admin/src/main/resources/application.yml

@@ -26,6 +26,7 @@ base:
   wsUrl: ws://124.70.58.209:9080
   historyUrl: http://124.70.58.209:18812
   recordUrl: http://124.70.58.209:18810${server.servlet.context-path}
+  env: 1
 
 server:
   # 服务器的HTTP端口，默认为8080