update

oss-api/src/main/java/cn/reghao/oss/api/dto/ObjectChannel.java

@@ -15,7 +15,6 @@ public class ObjectChannel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Integer channelId;
-    private String name;
     private String prefix;
     private Long maxSize;
     private Integer fileType;

oss-api/src/main/java/cn/reghao/oss/api/iface/ConsoleService.java

@@ -18,5 +18,5 @@ public interface ConsoleService {
 
     ObjectChannel getChannelById(int owner, int channelId);
     int getChannelIdByUrl(int loginUser, String url);
-    int getChannelScope(int channelId);
+    int getChannelScope(int loginUser, int channelId);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreNodePageController.java

@@ -21,7 +21,7 @@ import java.util.*;
 @RequestMapping("/store/node")
 public class StoreNodePageController {
     private final StoreNodeService storeNodeService;
-    private StoreChannelService storeChannelService;
+    private final StoreChannelService storeChannelService;
 
     public StoreNodePageController(StoreNodeService storeNodeService, StoreChannelService storeChannelService) {
         this.storeNodeService = storeNodeService;
@@ -47,16 +47,12 @@ public class StoreNodePageController {
             map.put("appName", appName);
             //List<AppConfig> list = appConfigQuery.query(map);
             List<String> list = Collections.emptyList();
-            model.addAttribute("env", env);
-            model.addAttribute("type", type);
             //model.addAttribute("page", page);
             model.addAttribute("list", list);
             return "/node/index";
         }
 
         List<StoreNode> list = storeNodeService.getByPage();
-        model.addAttribute("env", env);
-        model.addAttribute("type", type);
         //model.addAttribute("page", page);
         model.addAttribute("list", list);
         return "/node/index";

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/StoreObjectPageController.java

@@ -41,8 +41,6 @@ public class StoreObjectPageController {
         /*PageRequest pageRequest = PageSort.pageRequest();
         Page<DiskFile> page = Page.empty();*/
 
-        model.addAttribute("env", env);
-        model.addAttribute("type", type);
         /*model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());*/
         return "/object/index";

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UploadChannelController.java

@@ -44,11 +44,4 @@ public class UploadChannelController {
         uploadChannelService.updateScope(channelScopeDto);
         return WebResult.success();
     }
-
-    @ApiOperation(value = "修改通道是否返回 url")
-    @PostMapping(value = "/update/seturl", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String updateChannelProcess(@Validated ChannelProcessDto channelProcessDto) {
-        uploadChannelService.updateSeturl(channelProcessDto);
-        return WebResult.success();
-    }
 }

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UploadChannelPageController.java

@@ -6,6 +6,7 @@ import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.console.app.model.vo.KeyValue;
 import cn.reghao.oss.console.app.model.vo.UploadChannelVo;
+import cn.reghao.oss.console.app.model.vo.UserNodeVO;
 import cn.reghao.oss.console.app.service.UploadChannelService;
 import cn.reghao.oss.console.app.service.UserNodeService;
 import io.swagger.annotations.Api;
@@ -40,14 +41,6 @@ public class UploadChannelPageController {
     public String index(@RequestParam(value = "env", required = false) String env,
                         @RequestParam(value = "type", required = false) String type,
                         @RequestParam(value = "appName", required = false) String appName, Model model) throws Exception {
-        if (env == null) {
-            env = "test";
-        }
-
-        if (type == null) {
-            type = "test";
-        }
-
         /*PageRequest pageRequest = PageSort.pageRequest();
         int pageNumber = pageRequest.getPageNumber();
         int pageSize = pageRequest.getPageSize();*/
@@ -55,9 +48,6 @@ public class UploadChannelPageController {
         /*Sort sort = Sort.by(Sort.Direction.ASC, "channelId");
         PageRequest pageRequest1 = PageRequest.of(pageNumber, pageSize, sort);*/
         List<UploadChannelVo> list = uploadChannelService.getUploadChannels();
-
-        model.addAttribute("env", env);
-        model.addAttribute("type", type);
         //model.addAttribute("page", page);
         model.addAttribute("list", list);
         return "/channel/index";
@@ -88,13 +78,7 @@ public class UploadChannelPageController {
         sizeList.add(new KeyValue(1024L*1024*1024*20+"", "20GiB"));
 
         int loginUser = UserContext.getUserId();
-        List<KeyValue> storeNodes = userNodeService.getUserStoreNodes().stream()
-                .map(storeNode -> {
-                    int nodeId = storeNode.getId();
-                    String nodeAddr = storeNode.getNodeAddr();
-                    String domain = userNodeService.getUserNode(nodeId, loginUser).getDomain();
-                    return new KeyValue(nodeId+"", domain);
-                }).collect(Collectors.toList());
+        List<UserNodeVO> storeNodes = userNodeService.getUserStoreNodes(loginUser);
 
         model.addAttribute("objectTypes", objectTypes);
         model.addAttribute("objectScopes", objectScopes);
@@ -119,17 +103,4 @@ public class UploadChannelPageController {
         model.addAttribute("objectScopes", objectScopes);
         return "/channel/edit";
     }
-
-    @ApiOperation(value = "通道文件处理")
-    @GetMapping("/update/{id}")
-    public String editChannelScope1Page(@PathVariable("id") Integer id, Model model) {
-        UploadChannel uploadChannel = uploadChannelService.getUploadChannel(id);
-        List<KeyValue> list = new ArrayList<>();
-        list.add(new KeyValue("1", "处理文件"));
-        list.add(new KeyValue("0", "不处理文件"));
-
-        model.addAttribute("id", uploadChannel.getId());
-        model.addAttribute("list", list);
-        return "/channel/edit1";
-    }
 }

oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UserNodePageController.java

@@ -1,5 +1,6 @@
 package cn.reghao.oss.console.app.controller.page;
 
+import cn.reghao.oss.console.account.service.UserContext;
 import cn.reghao.oss.console.app.model.vo.KeyValue;
 import cn.reghao.oss.console.app.model.vo.UserNodeVO;
 import cn.reghao.oss.console.app.service.StoreNodeService;
@@ -36,9 +37,8 @@ public class UserNodePageController {
     public String userNodesPage(@RequestParam(value = "env", required = false) String env,
                               @RequestParam(value = "appType", required = false) String appType,
                               Model model) {
-        List<UserNodeVO> list = userNodeService.getUserStoreNodes1();
-        model.addAttribute("env", env);
-        model.addAttribute("type", appType);
+        int loginUser = UserContext.getUserId();
+        List<UserNodeVO> list = userNodeService.getUserStoreNodes(loginUser);
         model.addAttribute("list", list);
         return "/usernode/index1";
     }

oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/StoreNodeRepository.java

@@ -3,8 +3,6 @@ package cn.reghao.oss.console.app.db.mapper;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 
-import java.util.List;
-
 /**
  * @author reghao
  * @date 2024-07-02 18:15:11
@@ -12,5 +10,4 @@ import java.util.List;
 public interface StoreNodeRepository extends BaseMapper<StoreNode> {
     StoreNode findByNodeAddr(String nodeAddr);
     StoreNode findById(int id);
-    List<StoreNode> findAllById(List<Integer> list);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/UploadChannelRepository.java

@@ -12,9 +12,8 @@ import java.util.List;
 public interface UploadChannelRepository extends BaseMapper<UploadChannel> {
     int countByCreateBy(int createBy);
     List<UploadChannel> findByNodeIdAndCreateBy(int nodeId, int createBy);
-    UploadChannel findByChannelIdAndCreateBy(int channelId, int createBy);
-    UploadChannel findByPrefixAndCreateByAndNodeId(String prefix, int createBy, int nodeId);
-    UploadChannel findByPrefixAndNodeId(String prefix, int nodeId);
+    UploadChannel findByCreateByAndChannelId(int channelId, int createBy);
+    UploadChannel findByCreateByAndNodeIdAndPrefix(String prefix, int createBy, int nodeId);
     UploadChannel findById(int id);
     List<UploadChannel> findByCreateBy(int createBy);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UploadChannelRepository.java

@@ -11,10 +11,9 @@ import java.util.List;
  */
 public interface UploadChannelRepository extends JpaRepository<UploadChannel, Integer> {
     int countByCreateBy(int createBy);
-    List<UploadChannel> findByNodeIdAndCreateBy(int nodeId, int createBy);
-    UploadChannel findByChannelIdAndCreateBy(int channelId, int createBy);
-    UploadChannel findByPrefixAndCreateByAndNodeId(String prefix, int createBy, int nodeId);
-    UploadChannel findByPrefixAndNodeId(String prefix, int nodeId);
+    List<UploadChannel> findByCreateByAndNodeId(int createBy, int nodeId);
+    UploadChannel findByCreateByAndChannelId(int createBy, int channelId);
+    UploadChannel findByCreateByAndPrefix(int createBy, String prefix);
     UploadChannel findById(int id);
     List<UploadChannel> findByCreateBy(int createBy);
 }

oss-console/src/main/java/cn/reghao/oss/console/app/model/dto/UploadChannelDto.java

@@ -20,8 +20,6 @@ public class UploadChannelDto {
     private Long maxSize;
     @NotNull
     private Integer fileType;
-    @Length(min = 2, max = 20, message = "名字长度在 2~20 个字符之间")
-    private String name;
     @NotNull
     private Integer scope;
 }

oss-console/src/main/java/cn/reghao/oss/console/app/model/po/UploadChannel.java

@@ -19,8 +19,6 @@ import javax.persistence.Entity;
 @Entity
 public class UploadChannel extends BaseEntity {
     private Integer channelId;
-    private String name;
-    @Column(nullable = false, unique = true)
     private String prefix;
     private Long maxSize;
     private Integer fileType;
@@ -31,7 +29,6 @@ public class UploadChannel extends BaseEntity {
 
     public UploadChannel(int channelId, UploadChannelDto uploadChannelDto, int createBy) {
         this.channelId = channelId;
-        this.name = uploadChannelDto.getName();
         this.prefix = uploadChannelDto.getChannelPrefix();
         this.maxSize = uploadChannelDto.getMaxSize();
         this.fileType = uploadChannelDto.getFileType();

oss-console/src/main/java/cn/reghao/oss/console/app/model/vo/UploadChannelVo.java

@@ -13,7 +13,6 @@ import lombok.Getter;
 public class UploadChannelVo {
     private int id;
     private int channelId;
-    private String name;
     private String prefix;
     private String maxSize;
     private String fileType;
@@ -24,7 +23,6 @@ public class UploadChannelVo {
     public UploadChannelVo(UploadChannel uploadChannel, String maxSize, String bindDomain) {
         this.id = uploadChannel.getId();
         this.channelId = uploadChannel.getChannelId();
-        this.name = uploadChannel.getName();
         this.prefix = uploadChannel.getPrefix();
         this.maxSize = maxSize;
         this.fileType = ObjectType.getDescByCode(uploadChannel.getFileType());

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/ConsoleServiceImpl.java

@@ -86,13 +86,7 @@ public class ConsoleServiceImpl implements ConsoleService {
 
     @Override
     public int getChannelIdByUrl(int loginUser, String url) {
-        List<UserNode> list = userNodeService.getByUserId(loginUser);
-        List<UploadChannel> uploadChannels = new ArrayList<>();
-        for (UserNode userNode : list) {
-            int nodeId = userNode.getNodeId();
-            uploadChannels.addAll(uploadChannelService.getByNodeIdAndUserId(nodeId, loginUser));
-        }
-
+        List<UploadChannel> uploadChannels = uploadChannelService.getByCreateBy(loginUser);
         int idx = url.indexOf("/");
         String objectName = url.substring(idx);
         for (UploadChannel uploadChannel : uploadChannels) {
@@ -105,9 +99,8 @@ public class ConsoleServiceImpl implements ConsoleService {
     }
 
     @Override
-    public int getChannelScope(int channelId) {
-        int createBy = 1;
-        ObjectChannel objectChannel = uploadChannelService.getObjectChannelByChannelId(channelId, createBy);
+    public int getChannelScope(int loginUser, int channelId) {
+        ObjectChannel objectChannel = uploadChannelService.getObjectChannelByChannelId(channelId, loginUser);
         return objectChannel != null ? objectChannel.getScope() : -1;
     }
 }

oss-console/src/main/java/cn/reghao/oss/console/app/service/StoreChannelService.java

@@ -51,28 +51,22 @@ public class StoreChannelService {
             return Result.fail(String.format("store_node with id %s not exist", nodeId));
         }
 
-        //int createBy = 410;
         String channelPrefix = uploadChannelDto.getChannelPrefix();
-        UploadChannel uploadChannel = uploadChannelRepository.findByPrefixAndCreateByAndNodeId(channelPrefix, createBy, nodeId);
+        UploadChannel uploadChannel = uploadChannelRepository.findByCreateByAndPrefix(createBy, channelPrefix);
         if (uploadChannel != null) {
             return Result.fail(String.format("channel_prefix %s exist", channelPrefix));
         }
 
-        uploadChannel = uploadChannelRepository.findByPrefixAndNodeId(channelPrefix, nodeId);
-        if (uploadChannel != null) {
-            return Result.fail(String.format("someone has already created channel_prefix %s", channelPrefix));
-        }
-
-        int channelId = getNextChannelId(createBy);
+        int channelId = getNextChannelId(createBy, nodeId);
         uploadChannel = new UploadChannel(channelId, uploadChannelDto, createBy);
         uploadChannelRepository.save(uploadChannel);
         storeServiceWrapper.createChannel(channelId, channelPrefix);
         return Result.success();
     }
 
-    private int getNextChannelId(int userId) {
+    private int getNextChannelId(int createBy, int nodeId) {
         int channelId = 101;
-        int total = uploadChannelRepository.countByCreateBy(userId);
+        int total = uploadChannelRepository.countByCreateBy(createBy);
         return channelId + total;
     }
 
@@ -82,8 +76,6 @@ public class StoreChannelService {
             return null;
         }
 
-
-
         StoreInfo storeInfo = storeServiceWrapper.getStoreService(storeNode).getStoreInfo();
         List<StoreDiskDto> storeDiskDtos = storeInfo.getStoreDisks();
         List<StoreDisk> list = storeDiskDtos.stream()

oss-console/src/main/java/cn/reghao/oss/console/app/service/UploadChannelService.java

@@ -44,19 +44,6 @@ public class UploadChannelService {
         }
     }
 
-    public void updateSeturl(ChannelProcessDto channelProcessDto) {
-        int id = channelProcessDto.getId();
-        UploadChannel uploadChannel = uploadChannelRepository.findById(id);
-        if (uploadChannel != null) {
-            boolean seturl = channelProcessDto.getSeturl();
-            boolean current = uploadChannel.getSeturl();
-            if (seturl != current) {
-                uploadChannel.setSeturl(seturl);
-                uploadChannelRepository.save(uploadChannel);
-            }
-        }
-    }
-
     public List<UploadChannelVo> getUploadChannels() {
         int loginUser = UserContext.getUserId();
         List<UploadChannel> page = uploadChannelRepository.findByCreateBy(loginUser);
@@ -77,17 +64,17 @@ public class UploadChannelService {
     }
 
     public UploadChannel getByChannelIdAndCreateBy(int channelId, int createBy) {
-        return uploadChannelRepository.findByChannelIdAndCreateBy(channelId, createBy);
+        return uploadChannelRepository.findByCreateByAndChannelId(createBy, channelId);
     }
 
     public ObjectChannel getObjectChannelByChannelId(int channelId, int createBy) {
-        UploadChannel uploadChannel = uploadChannelRepository.findByChannelIdAndCreateBy(channelId, createBy);
+        UploadChannel uploadChannel = uploadChannelRepository.findByCreateByAndChannelId(createBy, channelId);
         return getObjectChannel(uploadChannel);
     }
 
     public ObjectChannel getObjectChannel(UploadChannel uploadChannel) {
         int channelId = uploadChannel.getChannelId();
-        String name = uploadChannel.getName();
+        //String name = uploadChannel.getName();
         String channelPrefix = uploadChannel.getPrefix();
         long maxSize = uploadChannel.getMaxSize();
         int fileType = uploadChannel.getFileType();
@@ -97,11 +84,11 @@ public class UploadChannelService {
 
         UserNode userNode = userNodeService.getUserNode(uploadChannel.getNodeId(), createBy);
         String domain = userNode.getDomain();
-        return new ObjectChannel(channelId, name, channelPrefix, maxSize, fileType, seturl, scope, domain, createBy);
+        return new ObjectChannel(channelId, channelPrefix, maxSize, fileType, seturl, scope, domain, createBy);
     }
 
     public StoreNode getStoreNodeByChannelId(int loginUser, int channelId) throws Exception {
-        UploadChannel uploadChannel = uploadChannelRepository.findByChannelIdAndCreateBy(channelId, loginUser);
+        UploadChannel uploadChannel = uploadChannelRepository.findByCreateByAndChannelId(loginUser, channelId);
         if (uploadChannel == null) {
             String errMsg = String.format("channel_id %s not exist", channelId);
             throw new Exception(errMsg);
@@ -121,13 +108,13 @@ public class UploadChannelService {
         return storeNode;
     }
 
-    public List<UploadChannel> getByNodeIdAndUserId(int nodeId, int userId) {
-        return uploadChannelRepository.findByNodeIdAndCreateBy(nodeId, userId);
+    public List<UploadChannel> getByCreateBy(int createBy) {
+        return uploadChannelRepository.findByCreateBy(createBy);
     }
 
     public List<UploadChannel> getByDomainAndCreateBy(String domain, int createBy) {
         StoreNode storeNode = userNodeService.getByDomain(domain);
         int nodeId = storeNode.getId();
-        return getByNodeIdAndUserId(nodeId, createBy);
+        return uploadChannelRepository.findByCreateByAndNodeId(createBy, nodeId);
     }
 }

oss-console/src/main/java/cn/reghao/oss/console/app/service/UserNodeService.java

@@ -9,6 +9,7 @@ import cn.reghao.oss.console.app.model.dto.UserNodeDto;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 import cn.reghao.oss.console.app.model.po.UserNode;
+import cn.reghao.oss.console.app.model.vo.KeyValue;
 import cn.reghao.oss.console.app.model.vo.UserNodeVO;
 import org.springframework.stereotype.Service;
 
@@ -56,7 +57,7 @@ public class UserNodeService {
         if (userNode != null) {
             int nodeId = userNode.getNodeId();
             int userId = UserContext.getUserId();
-            List<UploadChannel> uploadChannels = uploadChannelRepository.findByNodeIdAndCreateBy(nodeId, userId);
+            List<UploadChannel> uploadChannels = uploadChannelRepository.findByCreateByAndNodeId(userId, nodeId);
             if (!uploadChannels.isEmpty()) {
                 return Result.fail("UploadChannel exists");
             }
@@ -68,29 +69,13 @@ public class UserNodeService {
         return Result.fail("UserNode not exists");
     }
 
-    public List<UserNode> getByUserId(int userId) {
-        return userNodeRepository.findByCreateBy(userId);
-    }
-
     public StoreNode getByDomain(String domain) {
         UserNode userNode = userNodeRepository.findByDomain(domain);
         int id = userNode.getNodeId();
         return storeNodeRepository.findById(id);
     }
 
-    public List<StoreNode> getUserStoreNodes() {
-        int loginUser = UserContext.getUserId();
-        List<UserNode> list = userNodeRepository.findByCreateBy(loginUser);
-        if (list.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        List<Integer> nodeIds = list.stream().map(UserNode::getNodeId).collect(Collectors.toList());
-        return storeNodeRepository.findAllById(nodeIds);
-    }
-
-    public List<UserNodeVO> getUserStoreNodes1() {
-        int loginUser = UserContext.getUserId();
+    public List<UserNodeVO> getUserStoreNodes(int loginUser) {
         List<UserNode> list = userNodeRepository.findByCreateBy(loginUser);
         if (list.isEmpty()) {
             return Collections.emptyList();

oss-console/src/main/resources/templates/channel/add.html

@@ -15,7 +15,7 @@
                     <div class="layui-form-item">
                         <div class="layui-input-inline">
                             <select name="nodeId">
-                                <option th:each="item : ${storeNodes}" th:value="${item.key}">[[${item.value}]]</option>
+                                <option th:each="item : ${storeNodes}" th:value="${item.nodeId}">[[${item.domain}]]</option>
                             </select>
                         </div>
                     </div>
@@ -77,18 +77,6 @@
                     </div>
                 </td>
             </tr>
-            <tr>
-                <th>
-                    <label class="layui-form-label required">通道名字</label>
-                </th>
-                <td>
-                    <div class="layui-form-item">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="name" placeholder="请填写通道名字" required>
-                        </div>
-                    </div>
-                </td>
-            </tr>
             </tbody>
         </table>
         <div class="layui-form-item timo-finally">

oss-console/src/main/resources/templates/channel/index.html

@@ -14,15 +14,6 @@
     <div class="layui-card-body">
         <div class="layui-row timo-card-screen put-row">
             <div class="layui-row timo-card-screen put-row">
-                <div class="pull-left layui-form-pane">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">节点</label>
-                        <div class="layui-input-block timo-search-status">
-                            <select id="getPageByEnv" class="timo-search-select" name="env" onchange="getPageByCriteria()"
-                                    mo:dict="ENVIRONMENT" mo-selected="${env}"></select>
-                        </div>
-                    </div>
-                </div>
                 <div class="pull-right">
                     <div class="btn-group-right">
                         <button class="layui-btn open-popup" data-title="新增上传通道" th:attr="data-url=@{/store/channel/add}"
@@ -38,33 +29,24 @@
                 <thead>
                 <tr>
                     <th class="sortable" data-field="appName">Channel ID</th>
-                    <th class="sortable" data-field="appType">名字</th>
                     <th class="sortable" data-field="appId">前缀</th>
                     <th class="sortable" data-field="repoBranch">最大文件</th>
                     <th class="sortable" data-field="repoBranch">文件类型</th>
-                    <th class="sortable" data-field="repoBranch">是否返回 URL</th>
                     <th class="sortable" data-field="repoBranch">可见范围</th>
-                    <th class="sortable" data-field="appName">绑定域名</th>
-                    <th>操作</th>
+                    <th class="sortable" data-field="appName">绑定的域名</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr th:each="item:${list}">
                     <td th:text="${item.channelId}">Channel ID</td>
-                    <td th:text="${item.name}">名字</td>
                     <td th:text="${item.prefix}">前缀</td>
                     <td th:text="${item.maxSize}">最大文件</td>
                     <td th:text="${item.fileType}">文件类型</td>
-                    <td th:text="${item.seturl}">文件类型</td>
                     <td>
                         <a class="open-popup" data-title="修改 channel 可见范围" th:attr="data-url=@{'/store/channel/edit/'+${item.id}}"
                            data-size="640,480" href="#" th:text="${item.scope}"></a>
                     </td>
                     <td th:text="${item.bindDomain}">绑定域名</td>
-                    <td>
-                        <a class="open-popup" data-title="channel 文件处理" th:attr="data-url=@{'/store/channel/update/'+${item.id}}"
-                           data-size="640,480" href="#">编辑</a>
-                    </td>
                 </tr>
                 </tbody>
             </table>

oss-console/src/main/resources/templates/node/index.html

@@ -12,19 +12,6 @@
         <i class="layui-icon layui-icon-refresh refresh-btn"></i>
     </div>
     <div class="layui-card-body">
-        <div class="layui-row timo-card-screen put-row">
-            <div class="layui-row timo-card-screen put-row">
-                <div class="pull-left layui-form-pane">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">区域</label>
-                        <div class="layui-input-block timo-search-status">
-                            <select id="getPageByEnv" class="timo-search-select" name="env" onchange="getPageByCriteria()"
-                                    mo:dict="ENVIRONMENT" mo-selected="${env}"></select>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
         <div class="timo-table-wrap">
             <table class="layui-table timo-table">
                 <thead>

oss-console/src/main/resources/templates/object/index.html

@@ -14,15 +14,6 @@
     <div class="layui-card-body">
         <div class="layui-row timo-card-screen put-row">
             <div class="layui-row timo-card-screen put-row">
-                <div class="pull-left layui-form-pane">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">节点</label>
-                        <div class="layui-input-block timo-search-status">
-                            <select id="getPageByEnv" class="timo-search-select" name="env" onchange="getPageByCriteria()"
-                                    mo:dict="ENVIRONMENT" mo-selected="${env}"></select>
-                        </div>
-                    </div>
-                </div>
                 <div class="pull-right">
                     <div class="btn-group-right">
                         <button class="layui-btn open-popup" data-title="添加应用" th:attr="data-url=@{/app/bd/add}"

oss-console/src/main/resources/templates/usernode/index1.html

@@ -14,15 +14,6 @@
     <div class="layui-card-body">
         <div class="layui-row timo-card-screen put-row">
             <div class="layui-row timo-card-screen put-row">
-                <div class="pull-left layui-form-pane">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">区域</label>
-                        <div class="layui-input-block timo-search-status">
-                            <select id="getPageByEnv" class="timo-search-select" name="env" onchange="getPageByCriteria()"
-                                    mo:dict="ENVIRONMENT" mo-selected="${env}"></select>
-                        </div>
-                    </div>
-                </div>
                 <div class="pull-right">
                     <div class="btn-group-right">
                         <button class="layui-btn open-popup" data-title="添加节点" th:attr="data-url=@{/store/my/add}"