[Feature][scaleph-engine-doris] add doris instance steps form web (#652)

* fix: user resource * fix: user resource * feature: add doris instance steps form
flowerfine · Dec 2, 2023 · b3e1116 · b3e1116
1 parent 3bf44c5
commit b3e1116
Show file tree

Hide file tree

Showing 19 changed files with 305 additions and 47 deletions.
diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java
@@ -61,6 +61,14 @@ public ResponseEntity<ResponseVO<WsDorisInstanceDTO>> selectOne(@PathVariable("i
         return new ResponseEntity(ResponseVO.success(dto), HttpStatus.OK);
     }
 
+    @Logging
+    @GetMapping("fromTemplate")
+    @Operation(summary = "根据模板创建实例", description = "根据模板创建实例")
+    public ResponseEntity<ResponseVO<WsDorisInstanceDTO>> fromTemplate(@RequestParam("templateId") Long templateId) {
+        WsDorisInstanceDTO cluster = wsDorisInstanceService.fromTemplate(templateId);
+        return new ResponseEntity(ResponseVO.success(cluster), HttpStatus.OK);
+    }
+
     @Logging
     @PostMapping("asYaml")
     @Operation(summary = "转换实例信息", description = "转换实例信息")

diff --git a/...h-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.java b/...h-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.java
@@ -20,12 +20,17 @@
 
 import cn.sliew.scaleph.dao.entity.master.security.SecResourceWeb;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 资源-web Mapper 接口
  */
 @Repository
 public interface SecResourceWebMapper extends BaseMapper<SecResourceWeb> {
 
+    List<SecResourceWeb> listByPidAndUserId(@Param("pid") Long pid, @Param("userId") Long userId, @Param("name") String name);
+
 }
diff --git a/...o/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml b/...o/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml
@@ -50,4 +50,20 @@
         update_time,
         `type`, pid, `name`, `path`, redirect, layout, icon, `component`, remark
     </sql>
+
+    <select id="listByPidAndUserId" resultMap="BaseResultMap">
+        SELECT
+        t1.*
+        FROM
+        sec_resource_web t1
+        JOIN sec_resource_web_role t2 ON t1.id = t2.resource_web_id
+        JOIN sec_role t3 ON t2.role_id = t3.id AND t3.`status` = '1'
+        JOIN sec_user_role t4 ON t3.id = t4.role_id
+        WHERE
+        t1.pid = #{pid}
+        AND t4.user_id = #{userId}
+        <if test="name != null and name != ''">
+            AND t1.`name` like CONCAT('%', #{name}, '%')
+        </if>
+    </select>
 </mapper>
diff --git a/.../src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java b/.../src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java
@@ -19,6 +19,7 @@
 package cn.sliew.scaleph.engine.doris.service.impl;
 
 import cn.sliew.milky.common.util.JacksonUtil;
+import cn.sliew.scaleph.common.dict.common.YesOrNo;
 import cn.sliew.scaleph.common.util.UUIDUtil;
 import cn.sliew.scaleph.dao.entity.master.ws.WsDorisInstance;
 import cn.sliew.scaleph.dao.mapper.master.ws.WsDorisInstanceMapper;
@@ -27,9 +28,11 @@
 import cn.sliew.scaleph.engine.doris.service.WsDorisTemplateService;
 import cn.sliew.scaleph.engine.doris.service.convert.WsDorisInstanceConvert;
 import cn.sliew.scaleph.engine.doris.service.dto.WsDorisInstanceDTO;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisTemplateDTO;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceAddParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceListParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceUpdateParam;
+import cn.sliew.scaleph.engine.doris.service.resource.cluster.DorisClusterConverter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -73,19 +76,28 @@ public WsDorisInstanceDTO selectOne(Long id) {
 
     @Override
     public WsDorisInstanceDTO fromTemplate(Long templateId) {
-        return null;
+        WsDorisTemplateDTO wsDorisTemplateDTO = wsDorisTemplateService.selectOne(templateId);
+        WsDorisInstanceDTO wsDorisInstanceDTO = new WsDorisInstanceDTO();
+        wsDorisInstanceDTO.setAdmin(wsDorisTemplateDTO.getAdmin());
+        wsDorisInstanceDTO.setFeSpec(wsDorisTemplateDTO.getFeSpec());
+        wsDorisInstanceDTO.setBeSpec(wsDorisTemplateDTO.getBeSpec());
+        wsDorisInstanceDTO.setCnSpec(wsDorisTemplateDTO.getCnSpec());
+        wsDorisInstanceDTO.setBrokerSpec(wsDorisTemplateDTO.getBrokerSpec());
+        wsDorisInstanceDTO.setRemark("generated from template-" + wsDorisTemplateDTO.getName());
+        return wsDorisInstanceDTO;
     }
 
     @Override
     public DorisCluster asYaml(WsDorisInstanceDTO dto) {
-        return null;
+        return DorisClusterConverter.INSTANCE.convertTo(dto);
     }
 
     @Override
     public int insert(WsDorisInstanceAddParam param) {
         WsDorisInstance record = new WsDorisInstance();
         BeanUtils.copyProperties(param, record);
         record.setInstanceId(UUIDUtil.randomUUId());
+        record.setDeployed(YesOrNo.NO);
         if (param.getAdmin() != null) {
             record.setAdmin(JacksonUtil.toJsonString(param.getAdmin()));
         }

diff --git a/...in/java/cn/sliew/scaleph/engine/doris/service/resource/cluster/DorisClusterConverter.java b/...in/java/cn/sliew/scaleph/engine/doris/service/resource/cluster/DorisClusterConverter.java
@@ -0,0 +1,73 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.resource.cluster;
+
+import cn.sliew.scaleph.config.resource.ResourceLabels;
+import cn.sliew.scaleph.engine.doris.operator.DorisCluster;
+import cn.sliew.scaleph.engine.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisInstanceDTO;
+import cn.sliew.scaleph.kubernetes.resource.ResourceConverter;
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import org.springframework.util.StringUtils;
+
+import java.util.Map;
+
+public enum DorisClusterConverter implements ResourceConverter<WsDorisInstanceDTO, DorisCluster> {
+    INSTANCE;
+
+    @Override
+    public DorisCluster convertTo(WsDorisInstanceDTO source) {
+        DorisCluster cluster = new DorisCluster();
+        ObjectMetaBuilder builder = new ObjectMetaBuilder(true);
+        String name = StringUtils.hasText(source.getInstanceId()) ? source.getInstanceId() : source.getName();
+        builder.withName(name);
+        builder.withNamespace(source.getNamespace());
+        builder.withLabels(Map.of(ResourceLabels.SCALEPH_LABEL_NAME, source.getName()));
+        cluster.setMetadata(builder.build());
+        DorisClusterSpec spec = new DorisClusterSpec();
+        spec.setFeSpec(source.getFeSpec());
+        spec.setBeSpec(source.getBeSpec());
+        spec.setCnSpec(source.getCnSpec());
+        spec.setBrokerSpec(source.getBrokerSpec());
+        spec.setAdminUser(source.getAdmin());
+        cluster.setSpec(spec);
+        return cluster;
+    }
+
+    @Override
+    public WsDorisInstanceDTO convertFrom(DorisCluster target) {
+        WsDorisInstanceDTO dto = new WsDorisInstanceDTO();
+        String name = target.getMetadata().getName();
+        if (target.getMetadata().getLabels() != null) {
+            Map<String, String> labels = target.getMetadata().getLabels();
+            name = labels.computeIfAbsent(ResourceLabels.SCALEPH_LABEL_NAME, key -> target.getMetadata().getName());
+        }
+        dto.setName(name);
+        dto.setInstanceId(target.getMetadata().getName());
+        dto.setNamespace(target.getMetadata().getNamespace());
+
+        DorisClusterSpec spec = target.getSpec();
+        dto.setFeSpec(spec.getFeSpec());
+        dto.setBeSpec(spec.getBeSpec());
+        dto.setCnSpec(spec.getCnSpec());
+        dto.setBrokerSpec(spec.getBrokerSpec());
+        dto.setAdmin(spec.getAdminUser());
+        return dto;
+    }
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecResourceWebService.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecResourceWebService.java
@@ -20,7 +20,9 @@
 
 import cn.sliew.scaleph.common.dict.security.ResourceType;
 import cn.sliew.scaleph.security.service.dto.SecResourceWebDTO;
-import cn.sliew.scaleph.security.service.param.*;
+import cn.sliew.scaleph.security.service.param.SecResourceWebAddParam;
+import cn.sliew.scaleph.security.service.param.SecResourceWebListParam;
+import cn.sliew.scaleph.security.service.param.SecResourceWebUpdateParam;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
@@ -33,6 +35,8 @@ public interface SecResourceWebService {
 
     List<SecResourceWebDTO> listByPid(Long pid, String name);
 
+    List<SecResourceWebDTO> listByPidAndUserId(Long pid, Long userId, String name);
+
     int insert(SecResourceWebAddParam param);
 
     int update(SecResourceWebUpdateParam param);

diff --git a/...ecurity/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java b/...ecurity/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
@@ -21,17 +21,20 @@
 import cn.sliew.scaleph.dao.entity.master.security.*;
 import cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebRoleMapper;
 import cn.sliew.scaleph.dao.mapper.master.security.SecUserRoleMapper;
+import cn.sliew.scaleph.security.authentication.UserDetailInfo;
 import cn.sliew.scaleph.security.service.SecAuthorizeService;
 import cn.sliew.scaleph.security.service.SecResourceWebService;
 import cn.sliew.scaleph.security.service.convert.SecResourceWebWithAuthorizeConvert;
 import cn.sliew.scaleph.security.service.convert.SecRoleConvert;
 import cn.sliew.scaleph.security.service.convert.SecUserConvert;
 import cn.sliew.scaleph.security.service.dto.*;
 import cn.sliew.scaleph.security.service.param.*;
+import cn.sliew.scaleph.security.util.SecurityUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -47,17 +50,17 @@ public class SecAuthorizeServiceImpl implements SecAuthorizeService {
     private SecResourceWebRoleMapper secResourceWebRoleMapper;
     @Autowired
     private SecUserRoleMapper secUserRoleMapper;
+    @Autowired
+    private UserDetailsService userDetailsService;
 
-    /**
-     * fixme 这里没有获取用户自己的资源，先获取的所有资源
-     */
     @Override
     public List<UmiRoute> getWebRoute() {
-        return buildRouteByPid(0L);
+        UserDetailInfo userDetails = (UserDetailInfo) userDetailsService.loadUserByUsername(SecurityUtil.getCurrentUserName());
+        return buildRouteByPid(0L, userDetails.getUser().getId());
     }
 
-    private List<UmiRoute> buildRouteByPid(Long pid) {
-        List<SecResourceWebDTO> secResourceWebDTOS = secResourceWebService.listByPid(pid, null);
+    private List<UmiRoute> buildRouteByPid(Long pid, Long userId) {
+        List<SecResourceWebDTO> secResourceWebDTOS = secResourceWebService.listByPidAndUserId(pid, userId, null);
         List<UmiRoute> routes = new ArrayList<>(secResourceWebDTOS.size());
         for (SecResourceWebDTO secResourceWebDTO : secResourceWebDTOS) {
             UmiRoute route = new UmiRoute();
@@ -66,7 +69,7 @@ private List<UmiRoute> buildRouteByPid(Long pid) {
             route.setRedirect(secResourceWebDTO.getRedirect());
             route.setIcon(secResourceWebDTO.getIcon());
             route.setComponent(secResourceWebDTO.getComponent());
-            List<UmiRoute> childRoutes = buildRouteByPid(secResourceWebDTO.getId());
+            List<UmiRoute> childRoutes = buildRouteByPid(secResourceWebDTO.getId(), userId);
             if (CollectionUtils.isEmpty(childRoutes) == false) {
                 route.setRoutes(childRoutes);
             }

diff --git a/...urity/src/main/java/cn/sliew/scaleph/security/service/impl/SecResourceWebServiceImpl.java b/...urity/src/main/java/cn/sliew/scaleph/security/service/impl/SecResourceWebServiceImpl.java
@@ -82,6 +82,12 @@ public List<SecResourceWebDTO> listByPid(Long pid, String name) {
         return SecResourceWebConvert.INSTANCE.toDto(list);
     }
 
+    @Override
+    public List<SecResourceWebDTO> listByPidAndUserId(Long pid, Long userId, String name) {
+        List<SecResourceWeb> list = secResourceWebMapper.listByPidAndUserId(pid, userId, name);
+        return SecResourceWebConvert.INSTANCE.toDto(list);
+    }
+
     @Override
     public int insert(SecResourceWebAddParam param) {
         SecResourceWeb record = BeanUtil.copy(param, new SecResourceWeb());

diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/vo/OnlineUserVO.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/vo/OnlineUserVO.java
@@ -30,6 +30,7 @@
  */
 @Data
 public class OnlineUserVO {
+    private Long userId;
     private String userName;
     private String email;
     private String ipAddress;

diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/OnlineUserService.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/OnlineUserService.java
@@ -63,6 +63,7 @@ public class OnlineUserService {
     public void insert(UserDetailInfo userInfo, String token) {
         OnlineUserVO onlineUser = new OnlineUserVO();
         onlineUser.setToken(token);
+        onlineUser.setUserId(userInfo.getUser().getId());
         onlineUser.setEmail(userInfo.getUser().getEmail());
         onlineUser.setIpAddress(userInfo.getLoginIpAddress());
         onlineUser.setLoginTime(userInfo.getLoginTime());
@@ -94,6 +95,11 @@ public void insert(UserDetailInfo userInfo, String token) {
         redisUtil.set(Constants.ONLINE_TOKEN_KEY + token, onlineUser, time);
     }
 
+    public OnlineUserVO getOnlineUser(String token) {
+        //用户在线且有效，获取用户的权限信息 只要在redis中存在数据则认为是有效在线用户
+        return (OnlineUserVO) redisUtil.get(Constants.ONLINE_TOKEN_KEY + token);
+    }
+
     /**
      * 登出用户
      *

diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java
@@ -71,9 +71,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             throws IOException, ServletException {
         HttpServletRequest httpServletRequest = (HttpServletRequest) request;
         String token = resolveToken(httpServletRequest);
-        //用户在线且有效，获取用户的权限信息 只要在redis中存在数据则认为是有效在线用户
-        OnlineUserVO onlineUser =
-                (OnlineUserVO) redisUtil.get(Constants.ONLINE_TOKEN_KEY + token);
+        OnlineUserVO onlineUser = onlineUserService.getOnlineUser(token);
         if (onlineUser != null) {
             long time =
                     onlineUser.getRemember() ? properties.getLongTokenValidityInSeconds() / 1000 :

diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -946,10 +946,13 @@ export default {
   'pages.project.doris.instance': 'Instance',
   'pages.project.doris.instance.name': '名称',
   'pages.project.doris.instance.namespace': '命名空间',
+  'pages.project.doris.instance.deployed': '是否部署？',
   'pages.project.doris.instance.steps': '创建实例',
   'pages.project.doris.instance.steps.base': '基础信息',
   'pages.project.doris.instance.steps.base.cluster': 'Cluster',
   'pages.project.doris.instance.steps.base.template': 'Template',
+  'pages.project.doris.instance.steps.component': '集群组件',
+  'pages.project.doris.instance.steps.yaml': 'YAML',
 
 
   'Run': '运行',

diff --git a/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts b/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts
@@ -2,9 +2,9 @@ import {WsDorisInstance, WsDorisTemplate} from "@/services/project/typings";
 import {Effect, Reducer} from "umi";
 import YAML from "yaml";
 import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+import {WsDorisInstanceService} from "@/services/project/WsDorisInstanceService";
 
 export interface StateType {
-  template: WsDorisTemplate,
   instance: WsDorisInstance,
   instanceYaml: string
   instanceYamlWithDefault: string
@@ -28,32 +28,32 @@ const model: ModelType = {
   namespace: "dorisInstanceSteps",
 
   state: {
-    template: null,
-    templateYaml: null,
-    templateYamlWithDefault: null
+    instance: null,
+    instanceYaml: null,
+    instanceYamlWithDefault: null
   },
 
   effects: {
-    *editTemplate({payload}, {call, put}) {
-      const {data} = yield call(WsDorisTemplateService.asYaml, payload);
-      const response = yield call(WsDorisTemplateService.asYaml, payload);
-      yield put({type: 'updateTemplate',
+    *editInstance({payload}, {call, put}) {
+      const {data} = yield call(WsDorisInstanceService.asYaml, payload);
+      const response = yield call(WsDorisInstanceService.asYaml, payload);
+      yield put({type: 'updateInstance',
         payload: {
-          template: payload,
-          templateYaml: YAML.stringify(data),
-          templateYamlWithDefault: YAML.stringify(response.data)
+          instance: payload,
+          instanceYaml: YAML.stringify(data),
+          instanceYamlWithDefault: YAML.stringify(response.data)
         }
       });
     },
   },
 
   reducers: {
-    updateTemplate(state, {payload}) {
+    updateInstance(state, {payload}) {
       return {
         ...state,
-        template: payload.template,
-        templateYaml: payload.templateYaml,
-        templateYamlWithDefault: payload.templateYamlWithDefault,
+        instance: payload.instance,
+        instanceYaml: payload.instanceYaml,
+        instanceYamlWithDefault: payload.instanceYamlWithDefault,
       };
     },
   },