suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

增加权限初始化

This commit is contained in:
zhou-hao 2020-01-18 11:57:37 +08:00
parent 541b6d9880
commit 9eb35231f1
5 changed files with 73 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetlinks-components/network-component/mqtt-component/mqtt-component.iml
View File

@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="Entities" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>

4
jetlinks-components/network-component/network-core/network-core.iml
View File

@ -4,7 +4,9 @@
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="Entities" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>

9
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/LocalDeviceInstanceService.java
View File

@ -36,6 +36,7 @@ import org.jetlinks.community.gateway.EncodableMessage;
import org.jetlinks.community.gateway.MessageGateway;
import org.jetlinks.community.io.excel.ImportExportService;
import org.jetlinks.supports.official.JetLinksDeviceMetadata;
import org.reactivestreams.Publisher;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.buffer.DataBufferFactory;
import org.springframework.core.io.buffer.DefaultDataBufferFactory;
@ -63,6 +64,14 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 设备实例服务
*
* @author zhouhao
* @author bestfeng
*
* TODO 一团乱，等待重构.
*/
@Service
@Slf4j
public class LocalDeviceInstanceService extends GenericReactiveCrudService<DeviceInstanceEntity, String> {

12
jetlinks-standalone/src/main/resources/application.yml
View File

@ -63,12 +63,12 @@ hsweb:
static-location: http://localhost:8844/upload
webflux:
response-wrapper: enabled #开启响应包装器(将返回值包装为ResponseMessage)
auth: #默认的用户配置
users:
admin:
username: admin
password: admin
name: 超级管理员
# auth: #默认的用户配置
# users:
# admin:
# username: admin
# password: admin
# name: 超级管理员
authorize:
auto-parse: true
cache:

77
jetlinks-standalone/src/main/resources/hsweb-starter.js
View File

@ -15,7 +15,7 @@ var autzSettings = [
"id": "638a9d26f31890b7d59544251bc638db",
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
@ -24,7 +24,16 @@ var autzSettings = [
"id": "41ef31347373c3020573b5975569de05",
"actions": java.util.Arrays.asList("upload-static"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "user-token",
"id": "a76877d99938197151ba679af228977b",
"actions": java.util.Arrays.asList("query", "save"),
"dimensionType": "user",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
@ -33,70 +42,61 @@ var autzSettings = [
"id": "f4754ac5a714ec97a4e5d6ef60083975",
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "device-instance",
"id": "ef85383c8adb52fcbeb7b4fe6686c6c6",
"actions": java.util.Arrays.asList("query", "save", "delete"),
"actions": java.util.Arrays.asList("query", "save", "delete", "stop", "start", "execute"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "device-properties",
"id": "936f59a0ef4cabb17b5028f8339895d3",
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "dictionary",
"permission": "certificate",
"id": "7dc2cb54ddd22053368c84d8ad8362f3",
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "user",
"id": "5f59ccf52ea4c79f5eacc10cbf40d02",
"actions": java.util.Arrays.asList("add", "query", "get", "save", "update", "delete"),
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "dimension",
"id": "89884beecc62035bc9b8d6e6b2b6a593",
"actions": java.util.Arrays.asList("add", "import", "query", "get", "save", "update", "delete", "export"),
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "permission",
"id": "31e57a1df89c14607758e3dbe618912a",
"actions": java.util.Arrays.asList("add", "query", "get", "save", "update", "delete"),
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "menu",
"id": "7ebc7d1b4316ba444bc64ae6059cd201",
"actions": java.util.Arrays.asList("add", "query", "get", "save", "update", "delete"),
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
@ -105,11 +105,37 @@ var autzSettings = [
"id": "4e03a0db0a50c678f6b6e32cf9c31583",
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "admin",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
} , {
"permission": "network-config",
"id": "4e03a0db0a50c678f6b6e32cf9c31587",
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}, {
"permission": "device-gateway",
"id": "4e03a0db0a50c678f6b6e32cf9c31596",
"actions": java.util.Arrays.asList("query", "save", "delete"),
"dimensionType": "user",
"dimensionTarget": "1199596756811550720",
"dimensionTargetName": "超级管理员",
"dimensionTypeName": "用户",
"state": 1
}];
var users = [{
"id" : "1199596756811550720",
"username" : "admin",
"password": "104ffe90cd840e08f7a79c7fddbe1699",
"salt": "LmKOhcoB",
"name": "超级管理员"
}];
//版本更新信息
var versions = [
{
@ -124,6 +150,7 @@ function initialize(context) {
var database = context.database;
database.dml().upsert("s_autz_setting_info").values(autzSettings).execute().sync();
database.dml().upsert("s_user").values(users).execute().sync();
}
function install(context) {