فهرست منبع

添加设备修改

xiwa 3 سال پیش
والد
کامیت
c981e5a77a

+ 4 - 4
manager/src/main/java/cc/iotkit/manager/config/KeycloakSecurityConfig.java

@@ -68,8 +68,8 @@ public class KeycloakSecurityConfig extends KeycloakWebSecurityConfigurerAdapter
                 .antMatchers("/space/myDevices/**").hasRole("iot_client_user")
                 .antMatchers("/space/findDevice/**").hasRole("iot_client_user")
                 .antMatchers("/space/addDevice/**").hasRole("iot_client_user")
-                .antMatchers("/**/service/property/set").hasRole("iot_client_user")
-                .antMatchers("/**/service/*/invoke").hasRole("iot_client_user")
+                .antMatchers("/device/*/service/property/set").hasRole("iot_client_user")
+                .antMatchers("/device/*/service/*/invoke").hasRole("iot_client_user")
 
 
                 .antMatchers(HttpMethod.DELETE).hasRole("iot_write")
@@ -79,8 +79,8 @@ public class KeycloakSecurityConfig extends KeycloakWebSecurityConfigurerAdapter
                 .antMatchers("/**/add*/**").hasRole("iot_write")
                 .antMatchers("/**/clear*/**").hasRole("iot_write")
                 .antMatchers("/**/set*/**").hasRole("iot_write")
-                .antMatchers("/**/service/property/set").hasRole("iot_write")
-                .antMatchers("/**/service/*/invoke").hasRole("iot_write")
+                .antMatchers("/**/set").hasRole("iot_write")
+                .antMatchers("/**/invoke").hasRole("iot_write")
                 .antMatchers("/**").hasAnyRole(systemRole)
                 .and().csrf().disable();
     }

+ 1 - 0
manager/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java

@@ -189,6 +189,7 @@ public class SpaceDeviceController {
         List<String> subUid = deviceInfo.getSubUid();
         if (subUid == null) {
             subUid = new ArrayList<>();
+            deviceInfo.setSubUid(subUid);
         }
 
         String uid = AuthUtil.getUserId();

+ 0 - 0
manager/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java