From 7f9c83f26127a1b826d0b294724c3f750ba0dab7 Mon Sep 17 00:00:00 2001 From: ykh <1029354657@qq.com> Date: Sat, 30 Mar 2024 11:19:43 +0800 Subject: [PATCH 01/14] feat: add service user and acl --- .../console/controller/AclController.java | 56 ++++ .../controller/ServiceUserController.java | 66 +++++ .../console/entity/acl/AclEntity.java | 45 +++ .../entity/serviceuser/ServiceUserEntity.java | 46 +++ .../console/mapper/acl/AclMapper.java | 64 ++++ .../console/mapper/config/ConfigMapper.java | 3 +- .../mapper/serviceuser/ServiceUserMapper.java | 56 ++++ .../console/service/acl/AclService.java | 39 +++ .../service/acl/Impl/AclServiceImpl.java | 59 ++++ .../Impl/ServiceUserServiceImpl.java | 68 +++++ .../serviceuser/ServiceUserService.java | 41 +++ .../src/main/resources/application-dev.yml | 4 +- .../main/resources/eventmesh-dashboard.sql | 273 ++++++++++-------- .../console/mapper/acl/AclMapperTest.java | 100 +++++++ .../src/test/resources/acl-test.sql | 23 ++ 15 files changed, 822 insertions(+), 121 deletions(-) create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/AclController.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/ServiceUserController.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/acl/AclEntity.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/serviceuser/ServiceUserEntity.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapper.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/serviceuser/ServiceUserMapper.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/acl/AclService.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/acl/Impl/AclServiceImpl.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/serviceuser/Impl/ServiceUserServiceImpl.java create mode 100644 eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/serviceuser/ServiceUserService.java create mode 100644 eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapperTest.java create mode 100644 eventmesh-dashboard-console/src/test/resources/acl-test.sql diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/AclController.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/AclController.java new file mode 100644 index 00000000..c35ebf94 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/AclController.java @@ -0,0 +1,56 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.controller; + +import org.apache.eventmesh.dashboard.console.entity.acl.AclEntity; +import org.apache.eventmesh.dashboard.console.service.acl.AclService; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/acl") +public class AclController { + + @Autowired + private AclService aclService; + + @PostMapping("/insertAcl") + public void insertAcl(@RequestBody AclEntity aclEntity) { + this.aclService.insert(aclEntity); + } + + @PostMapping("deleteAcl") + public void deleteAcl(@RequestBody AclEntity aclEntity) { + this.aclService.deleteAclById(aclEntity); + } + + @PostMapping("/updateAcl") + public void updateAcl(@RequestBody AclEntity aclEntity) { + this.aclService.updateResourceTypeById(aclEntity); + } + + @PostMapping("/selectAcl") + public void selectAcl(@RequestBody AclEntity aclEntity) { + this.aclService.selectById(aclEntity); + } + +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/ServiceUserController.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/ServiceUserController.java new file mode 100644 index 00000000..03b7790c --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/ServiceUserController.java @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.controller; + +import org.apache.eventmesh.dashboard.console.entity.serviceuser.ServiceUserEntity; +import org.apache.eventmesh.dashboard.console.service.serviceuser.ServiceUserService; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/serviceUser") +public class ServiceUserController { + + @Autowired + private ServiceUserService serviceUserService; + + @PostMapping("/insertServiceUser") + public void insertServiceUser(@RequestBody ServiceUserEntity serviceUserEntity) { + this.serviceUserService.insert(serviceUserEntity); + } + + @PostMapping("/deleteServiceUserByCluster") + public void deleteServiceUserByCluster(@RequestBody ServiceUserEntity serviceUserEntity) { + this.serviceUserService.deleteServiceUserByCluster(serviceUserEntity); + } + + @PostMapping("/updateNameById") + public void updateNameById(@RequestBody ServiceUserEntity serviceUserEntity) { + this.serviceUserService.updatePasswordById(serviceUserEntity); + } + + @PostMapping("/selectAll") + public void selectAll() { + + } + + @PostMapping("/selectById") + public void selectById(@RequestBody ServiceUserEntity serviceUserEntity) { + this.serviceUserService.selectById(serviceUserEntity); + } + + @PostMapping("/selectByName") + public void selectByName(@RequestBody ServiceUserEntity serviceUserEntity) { + this.serviceUserService.selectByName(serviceUserEntity); + } + +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/acl/AclEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/acl/AclEntity.java new file mode 100644 index 00000000..ea7d32f2 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/acl/AclEntity.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.entity.acl; + +import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true, exclude = "status") +public class AclEntity extends BaseEntity { + + private static final long serialVersionUID = 6057071983428111947L; + private Long id; + private Long clusterId; + private String principal; + private Integer operation; + private Integer permissionType; + private String host; + private Integer resourceType; + private String resourceName; + private Integer patternType; + private Integer status; + +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/serviceuser/ServiceUserEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/serviceuser/ServiceUserEntity.java new file mode 100644 index 00000000..96aacfa0 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/serviceuser/ServiceUserEntity.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.entity.serviceuser; + +import org.apache.eventmesh.dashboard.console.entity.base.BaseEntity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true, exclude = "status") +public class ServiceUserEntity extends BaseEntity { + + private Integer serviceType; + + private String password; + + private Long clusterId; + + private String name; + + private String token; + + private Integer status; + +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapper.java new file mode 100644 index 00000000..ab242f10 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapper.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.mapper.acl; + +import org.apache.eventmesh.dashboard.console.entity.acl.AclEntity; + +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * Mybatis Mapper for the table of acl. + */ +@Mapper +public interface AclMapper { + + @Insert({ + ""}) + @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") + void batchInsert(List aclEntities); + + @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") + @Insert("INSERT INTO acl (cluster_id, principal, operation, permission_type, host, resource_type, resource_name, pattern_type)" + + "VALUE (#{clusterId}, #{principal}, #{operation}, #{permissionType}, #{host}, #{resourceType}, #{resourceName}, #{patternType})") + void insert(AclEntity aclEntity); + + @Update("UPDATE acl SET status=0 WHERE id=#{id}") + void deleteById(AclEntity aclEntity); + + @Update("UPDATE acl SET resource_type=#{resourceType} WHERE id=#{id}") + void updateResourceTypeById(AclEntity aclEntity); + + @Select("SELECT * FROM acl") + List selectAll(); + + @Select("SELECT * FROM acl WHERE id=#{id}") + AclEntity selectById(AclEntity aclEntity); +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java index 167c7b24..905b551b 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java @@ -52,7 +52,8 @@ public interface ConfigMapper { @Insert("INSERT INTO config (cluster_id, business_type, instance_type, instance_id, config_name, config_value, start_version, " + "status, is_default, end_version, diff_type, description, edit, is_modify, eventmesh_version) VALUE " + "(#{clusterId},#{businessType},#{instanceType},#{instanceId},#{configName}," - + "#{configValue},#{startVersion},#{status},#{isDefault},#{endVersion},#{diffType},#{description},#{edit},#{isModify},#{eventmeshVersion})") + + "#{configValue},#{startVersion},#{status},#{isDefault},#{endVersion},#{diffType}," + + "#{description},#{edit},#{isModify},#{eventmeshVersion})") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") Integer addConfig(ConfigEntity configEntity); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/serviceuser/ServiceUserMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/serviceuser/ServiceUserMapper.java new file mode 100644 index 00000000..5757d101 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/serviceuser/ServiceUserMapper.java @@ -0,0 +1,56 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.mapper.serviceuser; + +import org.apache.eventmesh.dashboard.console.entity.serviceuser.ServiceUserEntity; + +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * Mybatis Mapper for the table of serviceuser. + */ +@Mapper +public interface ServiceUserMapper { + + @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") + @Insert("INSERT INTO service_user (id, service_type, password, cluster_id, name, token, status) " + + "VALUES (#{id}, #{serviceType}, #{password}, #{clusterId}, #{name}, #{token},1)") + void insert(ServiceUserEntity serviceuserEntity); + + @Update("UPDATE service_user SET status=0 WHERE cluster_id=#{clusterId}") + void deleteServiceUserByCluster(ServiceUserEntity serviceuserEntity); + + @Update("UPDATE service_user SET password=#{password} WHERE id=#{id}") + void updatePasswordById(ServiceUserEntity serviceuserentity); + + @Select("SELECT * FROM service_user WHERE status=1") + List selectAll(); + + @Select("SELECT * FROM service_user WHERE id=#{id} AND status=1") + ServiceUserEntity selectById(ServiceUserEntity serviceuserEntity); + + @Select("SELECT * FROM service_user WHERE name=#{name} AND status=1") + List selectByName(ServiceUserEntity serviceuserEntity); + +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/acl/AclService.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/acl/AclService.java new file mode 100644 index 00000000..b92af3ad --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/acl/AclService.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.service.acl; + +import org.apache.eventmesh.dashboard.console.entity.acl.AclEntity; + +import java.util.List; + +/** + * Service providing data of acl. + */ +public interface AclService { + + void insert(AclEntity aclEntity); + + void deleteAclById(AclEntity aclEntity); + + void updateResourceTypeById(AclEntity aclEntity); + + List selectAll(); + + AclEntity selectById(AclEntity aclEntity); + +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/acl/Impl/AclServiceImpl.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/acl/Impl/AclServiceImpl.java new file mode 100644 index 00000000..94d15194 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/acl/Impl/AclServiceImpl.java @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.service.acl.Impl; + +import org.apache.eventmesh.dashboard.console.entity.acl.AclEntity; +import org.apache.eventmesh.dashboard.console.mapper.acl.AclMapper; +import org.apache.eventmesh.dashboard.console.service.acl.AclService; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class AclServiceImpl implements AclService { + + @Autowired + private AclMapper aclMapper; + + @Override + public void insert(AclEntity aclEntity) { + aclMapper.insert(aclEntity); + } + + @Override + public void deleteAclById(AclEntity aclEntity) { + aclMapper.deleteById(aclEntity); + } + + @Override + public void updateResourceTypeById(AclEntity aclEntity) { + aclMapper.updateResourceTypeById(aclEntity); + } + + @Override + public List selectAll() { + return aclMapper.selectAll(); + } + + @Override + public AclEntity selectById(AclEntity aclEntity) { + return aclMapper.selectById(aclEntity); + } +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/serviceuser/Impl/ServiceUserServiceImpl.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/serviceuser/Impl/ServiceUserServiceImpl.java new file mode 100644 index 00000000..b03aa0c5 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/serviceuser/Impl/ServiceUserServiceImpl.java @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.service.serviceuser.Impl; + +import org.apache.eventmesh.dashboard.console.entity.serviceuser.ServiceUserEntity; +import org.apache.eventmesh.dashboard.console.mapper.serviceuser.ServiceUserMapper; +import org.apache.eventmesh.dashboard.console.service.serviceuser.ServiceUserService; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional + +@Service +public class ServiceUserServiceImpl implements ServiceUserService { + + @Autowired + private ServiceUserMapper serviceUserMapper; + + @Override + public void insert(ServiceUserEntity serviceuserEntity) { + serviceUserMapper.insert(serviceuserEntity); + } + + @Override + public void deleteServiceUserByCluster(ServiceUserEntity serviceuserEntity) { + serviceUserMapper.deleteServiceUserByCluster(serviceuserEntity); + } + + @Override + public void updatePasswordById(ServiceUserEntity serviceuserEntity) { + serviceUserMapper.updatePasswordById(serviceuserEntity); + } + + @Override + public List selectAll() { + return serviceUserMapper.selectAll(); + } + + @Override + public ServiceUserEntity selectById(ServiceUserEntity serviceuserEntity) { + return serviceUserMapper.selectById(serviceuserEntity); + } + + @Override + public List selectByName(ServiceUserEntity serviceuserEntity) { + return serviceUserMapper.selectByName(serviceuserEntity); + } + +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/serviceuser/ServiceUserService.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/serviceuser/ServiceUserService.java new file mode 100644 index 00000000..a5bb22e8 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/serviceuser/ServiceUserService.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.service.serviceuser; + +import org.apache.eventmesh.dashboard.console.entity.serviceuser.ServiceUserEntity; + +import java.util.List; + +/** + * ServiceUser data service + */ +public interface ServiceUserService { + + void insert(ServiceUserEntity serviceuserEntity); + + void deleteServiceUserByCluster(ServiceUserEntity serviceuserEntity); + + void updatePasswordById(ServiceUserEntity serviceuserentity); + + List selectAll(); + + ServiceUserEntity selectById(ServiceUserEntity serviceuserEntity); + + List selectByName(ServiceUserEntity serviceuserEntity); + +} diff --git a/eventmesh-dashboard-console/src/main/resources/application-dev.yml b/eventmesh-dashboard-console/src/main/resources/application-dev.yml index b0cee4bc..0a4e288d 100644 --- a/eventmesh-dashboard-console/src/main/resources/application-dev.yml +++ b/eventmesh-dashboard-console/src/main/resources/application-dev.yml @@ -30,9 +30,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${DB_ADDRESS:localhost:3306}/eventmesh_dashboard?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true + url: jdbc:mysql://${DB_ADDRESS:localhost:3306}/eventmesh_dashboard_test?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true username: ${DB_USERNAME:root} - password: ${DB_PASSWORD:password} + password: ${DB_PASSWORD:123456} initial-size: 1 max-active: 50 diff --git a/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql b/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql index fa1ccb3a..92524d84 100644 --- a/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql +++ b/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql @@ -23,10 +23,10 @@ create table cluster register_name_list varchar(4096) default '' not null comment '注册中心名字', bootstrap_servers varchar(2048) default '' not null comment 'server地址', eventmesh_version varchar(32) default '' not null comment 'eventmesh版本', - client_properties text null comment 'EventMesh客户端配置', - jmx_properties text null comment 'JMX配置', - reg_properties text null comment '注册中心配置', - description text null comment '备注', + client_properties text null comment 'EventMesh客户端配置', + jmx_properties text null comment 'JMX配置', + reg_properties text null comment '注册中心配置', + description text null comment '备注', auth_type int default 0 not null comment '认证类型，-1未知，0:无认证，', run_state tinyint default 1 not null comment '运行状态, 0表示未监控, 1监控中，有注册中心，2:监控中，无注册中心', create_time timestamp default CURRENT_TIMESTAMP not null comment '接入时间', @@ -35,8 +35,7 @@ create table cluster store_type int default 0 not null, constraint uniq_name unique (name) -) - comment '物理集群信息表'; +) comment '物理集群信息表'; create index idx_uniq_name on cluster (name); @@ -52,10 +51,10 @@ create table config instance_type tinyint not null comment '配置类型 0:runtime,1:storage,2:connector,3:topic', instance_id bigint default -1 not null comment '实例ID，上面配置对应的(比如runtime)的id', config_name varchar(192) default '' not null comment '配置名称', - config_value text null comment '配置值', + config_value text null comment '配置值', start_version varchar(64) default '' not null comment '配置开始使用的版本', status int default 1 not null comment '0 关闭 1 开启 ', - is_default int default 1 null, + is_default int default 1 null, end_version varchar(64) default '' not null comment '配置结束使用的版本', diff_type int default -1 not null comment '差异类型', description varchar(1000) default '' not null comment '备注', @@ -66,8 +65,7 @@ create table config eventmesh_version varchar(64) default ' ' not null, constraint uniq_instance_type_instance_id_config_name unique (instance_id, config_name, instance_type) -) - comment '配置信息表'; +) comment '配置信息表'; create index idx_phy_id_instance_id on config (cluster_id, instance_id); @@ -81,8 +79,8 @@ create table `group` primary key, cluster_id bigint default -1 not null comment '集群id', name varchar(192) collate utf8_bin default '' not null comment 'Group名称', - member_count int unsigned default '0' not null comment '成员数', - members text null comment 'group的member列表', + member_count int unsigned default '0' not null comment '成员数', + members text null comment 'group的member列表', type tinyint not null comment 'group类型 0：consumer 1：producer', state varchar(64) default '' not null comment '状态', create_time timestamp default CURRENT_TIMESTAMP not null comment '创建时间', @@ -90,8 +88,7 @@ create table `group` status int default 1 not null, constraint uniq_cluster_phy_id_name unique (cluster_id, name) -) - comment 'Group信息表'; +) comment 'Group信息表'; create index cluster_id on `group` (cluster_id, name); @@ -112,16 +109,13 @@ create table group_member status int default 1 not null, constraint uniq_cluster_topic_group unique (cluster_id, topic_name, group_name) -) - comment 'GroupMember信息表'; +) comment 'GroupMember信息表'; create index cluster_id on group_member (cluster_id, topic_name, group_name); - - drop table if exists runtime; create table runtime ( @@ -140,8 +134,7 @@ create table runtime endpoint_map varchar(1024) default '' not null comment '监听信息', constraint uniq_cluster_phy_id__host_port unique (cluster_id, host) -) - comment 'Runtime信息表'; +) comment 'Runtime信息表'; create index idx_phy_id_host_storage_id on runtime (cluster_id, storage_cluster_id); @@ -169,30 +162,67 @@ create table store endpoint_map varchar(1024) default '' not null comment '监听信息', constraint uniq_cluster_phy_id__storage_id unique (cluster_id, store_id) -) - comment 'Store信息表'; +) comment 'Store信息表'; create index idx_store_id_runtime_id on store (store_id, cluster_id, runtime_id); +DROP TABLE IF EXISTS `service_user`; +CREATE TABLE `service_user` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `service_type` int(255) NOT NULL DEFAULT 0 COMMENT '区分不同软件', + `password` varchar(100) NOT NULL DEFAULT '' COMMENT '密码', + `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '物理集群ID', + `name` varchar(192) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '名称', + `token` varchar(8192) NOT NULL DEFAULT '' COMMENT '密钥', + `status` int default 1 not null comment '状态: 1启用，0未启用', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Service_User信息表'; + + + +DROP TABLE IF EXISTS `acl`; +CREATE TABLE `acl` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id', + `cluster_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '集群id', + `principal` varchar(192) NOT NULL DEFAULT '' COMMENT 'Service User Pattern', + `operation` int(11) NOT NULL DEFAULT '0' COMMENT '操作,', + `permission_type` int(11) NOT NULL DEFAULT '0' COMMENT '权限类型(0:未知，1:任意，2:拒绝，3:允许)', + `host` varchar(192) NOT NULL DEFAULT '' COMMENT '', + `resource_type` int(11) NOT NULL DEFAULT '0' COMMENT '资源类型(0:未知，1:任意，10:Kafka Topic,11:Kafka Group;21:Rocketmq topic)', + `resource_name` varchar(192) NOT NULL DEFAULT '' COMMENT '资源名称', + `pattern_type` tinyint(4) NOT NULL COMMENT '匹配类型(0:未知，1:任意，2:Match，3:Literal，4:prefixed)', + `status` int NOT NULL DEFAULT 1 COMMENT '状态(0:删除，1:存在)', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `idx_cluster_phy_id_principal_res_name` (`cluster_id`, `principal`, `resource_name`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4, + DEFAULT COLLATE = utf8mb4_bin COMMENT ='ACL信息表'; + DROP TABLE IF EXISTS `group`; CREATE TABLE `group` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `cluster_id` bigint NOT NULL DEFAULT '-1' COMMENT '集群id', `name` varchar(192) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT 'Group名称', - `member_count` int unsigned NOT NULL DEFAULT '0' COMMENT '成员数', + `member_count` int unsigned NOT NULL DEFAULT '0' COMMENT '成员数', `members` varchar(1024) COMMENT 'group的member列表', `type` tinyint NOT NULL COMMENT 'group类型 0：consumer 1：producer', `state` varchar(64) NOT NULL DEFAULT '' COMMENT '状态', `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `status` int NOT NULL DEFAULT '1', + `status` int NOT NULL DEFAULT '1', PRIMARY KEY (`id`), UNIQUE KEY `uniq_cluster_phy_id_name` (`cluster_id`, `name`), - KEY `cluster_id` (`cluster_id`, `name`) + KEY `cluster_id` (`cluster_id`, `name`) ) ENGINE = InnoDB AUTO_INCREMENT = 322 DEFAULT CHARSET = utf8mb4, @@ -203,17 +233,17 @@ DROP TABLE IF EXISTS `group_member`; CREATE TABLE `group_member` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `cluster_id` bigint NOT NULL DEFAULT '-1' COMMENT '集群ID', - `topic_name` varchar(192) NOT NULL DEFAULT '' COMMENT 'Topic名称', - `group_name` varchar(192) NOT NULL DEFAULT '' COMMENT 'Group名称', - `eventmesh_user` varchar(192) NOT NULL DEFAULT '' COMMENT 'EventMesh用户', - `state` varchar(64) NOT NULL DEFAULT '' COMMENT '状态', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `status` int NOT NULL DEFAULT '1', + `cluster_id` bigint NOT NULL DEFAULT '-1' COMMENT '集群ID', + `topic_name` varchar(192) NOT NULL DEFAULT '' COMMENT 'Topic名称', + `group_name` varchar(192) NOT NULL DEFAULT '' COMMENT 'Group名称', + `eventmesh_user` varchar(192) NOT NULL DEFAULT '' COMMENT 'EventMesh用户', + `state` varchar(64) NOT NULL DEFAULT '' COMMENT '状态', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `status` int NOT NULL DEFAULT '1', PRIMARY KEY (`id`), UNIQUE KEY `uniq_cluster_topic_group` (`cluster_id`, `topic_name`, `group_name`), - KEY `cluster_id` (`cluster_id`, `topic_name`, `group_name`) + KEY `cluster_id` (`cluster_id`, `topic_name`, `group_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 257 DEFAULT CHARSET = utf8mb4, @@ -224,19 +254,19 @@ DROP TABLE IF EXISTS `operation_log`; CREATE TABLE `operation_log` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `cluster_id` bigint NOT NULL DEFAULT '-1' COMMENT '物理集群ID', - `operation_type` varchar(192) NOT NULL DEFAULT '' COMMENT '操作类型,如:启动，停止，重启，添加，删除，修改', - `state` int NOT NULL DEFAULT '0' COMMENT '操作状态 0:未知，1:执行中，2:成功，3:失败', + `cluster_id` bigint NOT NULL DEFAULT '-1' COMMENT '物理集群ID', + `operation_type` varchar(192) NOT NULL DEFAULT '' COMMENT '操作类型,如:启动，停止，重启，添加，删除，修改', + `state` int NOT NULL DEFAULT '0' COMMENT '操作状态 0:未知，1:执行中，2:成功，3:失败', `content` varchar(1024) COMMENT '备注信息', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `end_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '结束时间', - `operation_user` varchar(192) DEFAULT NULL, + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `end_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '结束时间', + `operation_user` varchar(192) DEFAULT NULL, `result` varchar(1024), - `target_type` varchar(192) NOT NULL, - `is_delete` int NOT NULL DEFAULT '0', + `target_type` varchar(192) NOT NULL, + `is_delete` int NOT NULL DEFAULT '0', PRIMARY KEY (`id`), - KEY `idx_cluster_phy_id` (`cluster_id`), - KEY `idx_state` (`state`) + KEY `idx_cluster_phy_id` (`cluster_id`), + KEY `idx_state` (`state`) ) ENGINE = InnoDB AUTO_INCREMENT = 68 DEFAULT CHARSET = utf8mb4, @@ -247,20 +277,20 @@ DROP TABLE IF EXISTS `topic`; CREATE TABLE `topic` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `cluster_id` bigint NOT NULL DEFAULT '-1' COMMENT '集群ID', + `cluster_id` bigint NOT NULL DEFAULT '-1' COMMENT '集群ID', `topic_name` varchar(192) CHARACTER SET utf8mb4 - COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT 'Topic名称', - `runtime_id` varchar(2048) NOT NULL DEFAULT '' COMMENT 'RuntimeId', - `storage_id` varchar(2048) NOT NULL DEFAULT '' COMMENT 'StorageId', - `retention_ms` bigint NOT NULL DEFAULT '-2' COMMENT '保存时间，-2：未知，-1：无限制，>=0对应时间，单位ms', - `type` tinyint NOT NULL DEFAULT '0' COMMENT 'Topic类型，默认0，0:普通，1:EventMesh内部', - `description` varchar(1024) DEFAULT '' COMMENT '备注信息', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间(尽量与Topic实际创建时间一致)', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间(尽量与Topic实际创建时间一致)', - `status` int NOT NULL DEFAULT '1', + COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT 'Topic名称', + `runtime_id` varchar(2048) NOT NULL DEFAULT '' COMMENT 'RuntimeId', + `storage_id` varchar(2048) NOT NULL DEFAULT '' COMMENT 'StorageId', + `retention_ms` bigint NOT NULL DEFAULT '-2' COMMENT '保存时间，-2：未知，-1：无限制，>=0对应时间，单位ms', + `type` tinyint NOT NULL DEFAULT '0' COMMENT 'Topic类型，默认0，0:普通，1:EventMesh内部', + `description` varchar(1024) DEFAULT '' COMMENT '备注信息', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间(尽量与Topic实际创建时间一致)', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间(尽量与Topic实际创建时间一致)', + `status` int NOT NULL DEFAULT '1', PRIMARY KEY (`id`), UNIQUE KEY `uniq_cluster_phy_id_topic_name` (`cluster_id`, `topic_name`), - KEY `cluster_id` (`cluster_id`, `topic_name`) + KEY `cluster_id` (`cluster_id`, `topic_name`) ) ENGINE = InnoDB AUTO_INCREMENT = 562 DEFAULT CHARSET = utf8mb4, @@ -270,24 +300,24 @@ CREATE TABLE `topic` DROP TABLE IF EXISTS `client`; CREATE TABLE `client` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '集群ID', - `name` varchar(192) NOT NULL DEFAULT '' COMMENT '客户端名称', - `platform` varchar(192) NOT NULL DEFAULT '' COMMENT '客户端平台', - `language` varchar(192) NOT NULL DEFAULT '' COMMENT '客户端语言', - `pid` bigint(22) NOT NULL DEFAULT '-1' COMMENT '客户端进程ID', - `host` varchar(128) NOT NULL DEFAULT '' COMMENT '客户端地址', - `port` int(16) NOT NULL DEFAULT '-1' COMMENT '客户端端口', - `protocol` varchar(192) NOT NULL DEFAULT '' COMMENT '协议类型', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '集群ID', + `name` varchar(192) NOT NULL DEFAULT '' COMMENT '客户端名称', + `platform` varchar(192) NOT NULL DEFAULT '' COMMENT '客户端平台', + `language` varchar(192) NOT NULL DEFAULT '' COMMENT '客户端语言', + `pid` bigint(22) NOT NULL DEFAULT '-1' COMMENT '客户端进程ID', + `host` varchar(128) NOT NULL DEFAULT '' COMMENT '客户端地址', + `port` int(16) NOT NULL DEFAULT '-1' COMMENT '客户端端口', + `protocol` varchar(192) NOT NULL DEFAULT '' COMMENT '协议类型', `status` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '状态: 1启用，0未启用', - `config_ids` varchar(1024) NOT NULL DEFAULT '' COMMENT 'csv config id list, like:1,3,7', - `description` varchar(1024) NOT NULL DEFAULT '' COMMENT '客户端描述', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '结束时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `config_ids` varchar(1024) NOT NULL DEFAULT '' COMMENT 'csv config id list, like:1,3,7', + `description` varchar(1024) NOT NULL DEFAULT '' COMMENT '客户端描述', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '结束时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - INDEX `idx_cluster_id` (`cluster_id`) + INDEX `idx_cluster_id` (`cluster_id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4, DEFAULT COLLATE = utf8mb4_bin COMMENT ='client is an SDK application that can produce or consume events.'; @@ -298,17 +328,17 @@ DROP TABLE IF EXISTS `connector`; CREATE TABLE `connector` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '集群ID', - `name` varchar(512) NOT NULL DEFAULT '' COMMENT 'Connector名称', - `class_name` varchar(512) NOT NULL DEFAULT '' COMMENT 'Connector类', - `type` varchar(32) NOT NULL DEFAULT '' COMMENT 'Connector类型', + `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '集群ID', + `name` varchar(512) NOT NULL DEFAULT '' COMMENT 'Connector名称', + `class_name` varchar(512) NOT NULL DEFAULT '' COMMENT 'Connector类', + `type` varchar(32) NOT NULL DEFAULT '' COMMENT 'Connector类型', `status` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '状态: 1启用，0未启用', `pod_state` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'k8s pod状态。0: pending;1: running;2: success;3: failed;4: unknown', - `config_ids` varchar(1024) NOT NULL DEFAULT '' COMMENT 'csv config id list, like:1,3,7', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `config_ids` varchar(1024) NOT NULL DEFAULT '' COMMENT 'csv config id list, like:1,3,7', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - INDEX `idx_cluster_id` (`cluster_id`) + INDEX `idx_cluster_id` (`cluster_id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4, DEFAULT COLLATE = utf8mb4_bin COMMENT ='Connector信息表'; @@ -316,27 +346,27 @@ CREATE TABLE `connector` DROP TABLE IF EXISTS `connection`; CREATE TABLE `connection` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '集群ID', - `source_type` varchar(64) NOT NULL DEFAULT '' COMMENT 'source类型,可以为client或source connector', - `source_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT 'client或source connector ID', - `sink_type` varchar(64) NOT NULL DEFAULT '' COMMENT 'sink类型,可以为client或sink connector', - `sink_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT 'client或sink connector ID', - `runtime_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '对应runtime id', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '集群ID', + `source_type` varchar(64) NOT NULL DEFAULT '' COMMENT 'source类型,可以为client或source connector', + `source_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT 'client或source connector ID', + `sink_type` varchar(64) NOT NULL DEFAULT '' COMMENT 'sink类型,可以为client或sink connector', + `sink_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT 'client或sink connector ID', + `runtime_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '对应runtime id', `status` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '状态: 1启用，0未启用', - `topic` varchar(192) NOT NULL DEFAULT '' COMMENT 'topic name', - `group_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT 'GroupID', - `description` varchar(1024) NOT NULL DEFAULT '' COMMENT '客户端描述', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '结束时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `topic` varchar(192) NOT NULL DEFAULT '' COMMENT 'topic name', + `group_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT 'GroupID', + `description` varchar(1024) NOT NULL DEFAULT '' COMMENT '客户端描述', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '结束时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - INDEX `idx_cluster_id` (`cluster_id`), - INDEX `idx_group_id` (`group_id`), - INDEX `idx_topic` (`topic`), - INDEX `idx_source_id` (`source_id`), - INDEX `idx_sink_id` (`sink_id`) + INDEX `idx_cluster_id` (`cluster_id`), + INDEX `idx_group_id` (`group_id`), + INDEX `idx_topic` (`topic`), + INDEX `idx_source_id` (`source_id`), + INDEX `idx_sink_id` (`sink_id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4, DEFAULT COLLATE = utf8mb4_bin COMMENT ='connection from event source to event sink. event source can be a source connector or a producer client.'; @@ -345,16 +375,16 @@ DROP TABLE IF EXISTS `health_check_result`; CREATE TABLE `health_check_result` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id', - `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '检查维度(0:未知, 1:Cluster, 2:Runtime, 3:Topic, 4:Storage)', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '检查维度(0:未知, 1:Cluster, 2:Runtime, 3:Topic, 4:Storage)', `type_id` bigint(20) unsigned NOT NULL COMMENT '对应检查维度的实例id', - `cluster_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '集群ID', - `state` tinyint(4) NOT NULL DEFAULT '0' COMMENT '检查状态(0:未通过，1:通过,2:正在检查,3:超时)', - `result_desc` varchar(1024) NOT NULL DEFAULT '' COMMENT '检查结果描述', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `cluster_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '集群ID', + `state` tinyint(4) NOT NULL DEFAULT '0' COMMENT '检查状态(0:未通过，1:通过,2:正在检查,3:超时)', + `result_desc` varchar(1024) NOT NULL DEFAULT '' COMMENT '检查结果描述', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`), - INDEX `idx_cluster_id` (`cluster_id`), - INDEX `idx_type` (`type`) + INDEX `idx_cluster_id` (`cluster_id`), + INDEX `idx_type` (`type`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4, DEFAULT COLLATE = utf8mb4_bin COMMENT ='健康检查结果'; @@ -363,23 +393,30 @@ DROP TABLE IF EXISTS `meta`; CREATE TABLE `meta` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(192) NOT NULL DEFAULT '' COMMENT '注册中心名称', - `type` varchar(192) NOT NULL DEFAULT '' COMMENT '注册中心类型,nacos,etcd,zookeeper', - `version` varchar(128) NOT NULL DEFAULT '' COMMENT '注册中心版本', - `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '集群ID', - `host` varchar(128) NOT NULL DEFAULT '' COMMENT '注册中心地址', - `port` int(16) NOT NULL DEFAULT '-1' COMMENT '注册中心端口', - `role` varchar(16) NOT NULL DEFAULT '-1' COMMENT '角色, leader follower observer', - `username` varchar(192) NOT NULL DEFAULT '' COMMENT '注册中心用户名', - `params` varchar(192) NOT NULL DEFAULT '' COMMENT '注册中心启动参数', + `name` varchar(192) NOT NULL DEFAULT '' COMMENT '注册中心名称', + `type` varchar(192) NOT NULL DEFAULT '' COMMENT '注册中心类型,nacos,etcd,zookeeper', + `version` varchar(128) NOT NULL DEFAULT '' COMMENT '注册中心版本', + `cluster_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '集群ID', + `host` varchar(128) NOT NULL DEFAULT '' COMMENT '注册中心地址', + `port` int(16) NOT NULL DEFAULT '-1' COMMENT '注册中心端口', + `role` varchar(16) NOT NULL DEFAULT '-1' COMMENT '角色, leader follower observer', + `username` varchar(192) NOT NULL DEFAULT '' COMMENT '注册中心用户名', + `params` varchar(192) NOT NULL DEFAULT '' COMMENT '注册中心启动参数', `status` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '状态: 1启用，0未启用', - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - INDEX `idx_cluster_id` (`cluster_id`) + INDEX `idx_cluster_id` (`cluster_id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4, - DEFAULT COLLATE = utf8mb4_bin COMMENT ='注册中心信息表'; \ No newline at end of file + DEFAULT COLLATE = utf8mb4_bin COMMENT ='注册中心信息表'; + + + + + + + diff --git a/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapperTest.java b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapperTest.java new file mode 100644 index 00000000..168f5027 --- /dev/null +++ b/eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapperTest.java @@ -0,0 +1,100 @@ +package org.apache.eventmesh.dashboard.console.mapper.acl; +import java.sql.Timestamp; + +import org.apache.eventmesh.dashboard.console.EventMeshDashboardApplication; +import org.apache.eventmesh.dashboard.console.entity.acl.AclEntity; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.jdbc.Sql; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +@ExtendWith(SpringExtension.class) +@SpringBootTest(classes = EventMeshDashboardApplication.class) +@ActiveProfiles("test") +@Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = {"classpath:use-test-schema.sql", "classpath:eventmesh-dashboard.sql"}) +@Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = "classpath:acl-test.sql") + +public class AclMapperTest { + + @Autowired + private AclMapper aclMapper; + + @Test + public void testBatchInsert() { + + List aclEntities = new ArrayList<>(); + for (int i = 7; i < 10; i++) { + AclEntity aclEntity = new AclEntity(); + + aclEntity.setClusterId(1L); + aclEntity.setPrincipal("principal1"); + aclEntity.setOperation(0); + aclEntity.setPermissionType(1); + aclEntity.setHost("127.0.0.1"); + aclEntity.setResourceType(1); + aclEntity.setResourceName("2"); + aclEntity.setPatternType(1); + aclEntities.add(aclEntity); + } + + aclMapper.batchInsert(aclEntities); + assertEquals(3, aclEntities.size()); + } + + @Test + public void testInsert() { +// AclEntity aclEntity = new AclEntity("", 0, "0", "", "0", "source_name", 1); + AclEntity aclEntity = new AclEntity(); + aclEntity.setClusterId(0L); + aclEntity.setPrincipal("pr"); + aclEntity.setOperation(0); + aclEntity.setPermissionType(1); + aclEntity.setHost("host"); + aclEntity.setResourceType(1); + aclEntity.setResourceName("resn"); + aclEntity.setPatternType(0); + aclEntity.setStatus(0); + aclEntity.setId(0L); + aclEntity.setClusterId(0L); + + aclMapper.insert(aclEntity); + assertNotNull(aclEntity); + assertEquals(5, aclEntity.getId()); + } + + @Test + public void testDelete() { + AclEntity aclEntity = new AclEntity(); + aclEntity.setId(4L); + aclMapper.deleteById(aclEntity); + assertEquals(4, aclEntity.getId()); + // 删除的就是id=4这条数据 + } + + @Test + public void testUpdate() { + AclEntity aclEntity = new AclEntity(); + aclEntity.setId(3L); + aclEntity.setResourceType(10); + aclMapper.updateResourceTypeById(aclEntity); + aclEntity = aclMapper.selectById(aclEntity); + assertEquals(10, aclEntity.getResourceType()); + } + + @Test + public void testSelect() { + AclEntity aclEntity = new AclEntity(); + aclEntity.setId(3L); + aclMapper.selectById(aclEntity); + assertEquals(3, aclEntity.getId()); + } + +} diff --git a/eventmesh-dashboard-console/src/test/resources/acl-test.sql b/eventmesh-dashboard-console/src/test/resources/acl-test.sql new file mode 100644 index 00000000..380fdb86 --- /dev/null +++ b/eventmesh-dashboard-console/src/test/resources/acl-test.sql @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +INSERT INTO eventmesh_dashboard_test.acl (id, cluster_id, principal, operation, permission_type, host, resource_type, + resource_name, pattern_type, create_time, update_time) +VALUES (3, 0, '', 0, '0', '', '0', 'source_name', 1, '2024-03-27 13:22:36', '2024-03-27 14:12:07'); +INSERT INTO eventmesh_dashboard_test.acl (id, cluster_id, principal, operation, permission_type, host, resource_type, + resource_name, pattern_type, create_time, update_time) +VALUES (4, 0, '', 0, '0', '', '0', 'source_name1', 1, '2024-03-27 13:22:36', '2024-03-27 14:12:07'); From 7ad307d184891ab1b0b5137a4f44f349ad3c8f4c Mon Sep 17 00:00:00 2001 From: ykh <1029354657@qq.com> Date: Mon, 1 Apr 2024 11:48:41 +0800 Subject: [PATCH 02/14] feat: add service user and acl --- .gitignore | 1 + eventmesh-dashboard-console/pom.xml | 38 +++++------ .../console/entity/acl/AclEntity.java | 2 +- .../console/mapper/acl/AclMapper.java | 8 +-- .../src/main/resources/application-dev.yml | 4 +- .../main/resources/eventmesh-dashboard.sql | 6 +- .../console/mapper/acl/AclMapperTest.java | 6 +- .../serviceuser/ServiceUserMapperTest.java | 67 +++++++++++++++++++ .../src/test/resources/acl-test.sql | 4 +- 9 files changed, 103 insertions(+), 33 deletions(-) create mode 100644 eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/serviceuser/ServiceUserMapperTest.java diff --git a/.gitignore b/.gitignore index 7f22e5ac..56a44770 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ bin/ *.iws *.iml *.ipr +*.http out/ !**/src/main/**/out/ !**/src/test/**/out/ diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml index c68e5a8e..78dca277 100644 --- a/eventmesh-dashboard-console/pom.xml +++ b/eventmesh-dashboard-console/pom.xml @@ -81,25 +81,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/acl/AclEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/acl/AclEntity.java index ea7d32f2..78b7d7da 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/acl/AclEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/acl/AclEntity.java @@ -33,7 +33,7 @@ public class AclEntity extends BaseEntity { private static final long serialVersionUID = 6057071983428111947L; private Long id; private Long clusterId; - private String principal; + private String pattern; private Integer operation; private Integer permissionType; private String host; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapper.java index ab242f10..e2e5021b 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/acl/AclMapper.java @@ -35,9 +35,9 @@ public interface AclMapper { @Insert({ "