reghao 2 лет назад
Родитель
Сommit
22a5eda2f8

+ 0 - 32
manager/pom.xml

@@ -168,38 +168,6 @@
             <artifactId>commons-io</artifactId>
             <artifactId>commons-io</artifactId>
             <version>2.6</version>
             <version>2.6</version>
         </dependency>
         </dependency>
-
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>cdn20180510</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.8.0</version>
-        </dependency>
-
-        <!--<dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-            <version>2.7.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
-            <version>2.12.0</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.reghao.tnb.account</groupId>
-            <artifactId>account-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.reghao.tnb.content</groupId>
-            <artifactId>content-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>-->
     </dependencies>
     </dependencies>
 
 
     <profiles>
     <profiles>

+ 0 - 29
manager/src/main/java/cn/reghao/devops/manager/admin/controller/BiliApiController.java

@@ -1,29 +0,0 @@
-package cn.reghao.devops.manager.admin.controller;
-
-import cn.reghao.jutil.jdk.result.WebResult;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author reghao
- * @date 2019-08-30 18:49:15
- */
-@Slf4j
-@Api(tags = "bili api")
-@RestController
-@RequestMapping("/api/bili")
-public class BiliApiController {
-    @PostMapping("/site/notice")
-    public String siteNotice(String content) {
-        return WebResult.success();
-    }
-
-    @GetMapping("/post/category")
-    public String videoCategory() {
-        return WebResult.success();
-    }
-}

+ 0 - 133
manager/src/main/java/cn/reghao/devops/manager/admin/controller/BiliController.java

@@ -1,133 +0,0 @@
-package cn.reghao.devops.manager.admin.controller;
-
-import cn.reghao.devops.manager.util.db.PageSort;
-import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.jutil.jdk.result.WebResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collections;
-
-/**
- * @author reghao
- * @date 2019-08-30 18:49:15
- */
-@Slf4j
-@Api(tags = "bili page")
-@Controller
-@RequestMapping("/bili")
-public class BiliController {
-    /*@DubboReference(check = false)
-    private UserQuery userQuery;
-    @DubboReference(check = false)
-    private PostQuery postQuery;*/
-
-    @ApiOperation(value = "站点配置")
-    @GetMapping(value = "/site/config")
-    public String siteConfig(String username, Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        int pageNumber = pageRequest.getPageNumber();
-        int pageSize = pageRequest.getPageSize();
-        PageList<?> pageList = PageList.empty();
-        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
-        return "/admin/site/config";
-    }
-
-    @ApiOperation(value = "账户")
-    @GetMapping(value = "/site/account")
-    public String appLogPage(String screenName, Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        int pageNumber = pageRequest.getPageNumber();
-        int pageSize = pageRequest.getPageSize();
-
-        /*PageList<UserInfo> pageList = userQuery.getUsers(pageNumber+1);
-        Page<UserInfo> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());*/
-
-        model.addAttribute("page", Page.empty());
-        model.addAttribute("list", Collections.emptyList());
-        return "/admin/site/account";
-    }
-
-    @ApiOperation(value = "账户 VIP 页面")
-    @GetMapping(value = "/site/account/vip/{userId}")
-    public String accountVipPage(@PathVariable("userId") long userId, Model model) {
-        return "/admin/site/uservip";
-    }
-
-    @ApiOperation(value = "账户 VIP 页面")
-    @PostMapping(value = "/site/account/status/{userId}")
-    @ResponseBody
-    public String setAccountStatus(@PathVariable("userId") long userId) {
-        return WebResult.success();
-    }
-
-    @GetMapping("/post/category")
-    public String categoryPage(Model model) {
-        return "/admin/site/videocategory";
-    }
-
-    @ApiOperation(value = "视频稿件")
-    @GetMapping("/post/video")
-    public String videoPage(@RequestParam(value = "title", required = false) String title, Model model) {
-        if (title != null) {
-            model.addAttribute("title", title);
-        }
-
-        PageRequest pageRequest = PageSort.pageRequest();
-        int pageNumber = pageRequest.getPageNumber();
-        int pageSize = pageRequest.getPageSize();
-
-        /*PageList<VideoPostInfo> pageList = postQuery.getVideoPosts(pageNumber+1);
-        Page<VideoPostInfo> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());*/
-
-        model.addAttribute("page", Page.empty());
-        model.addAttribute("list", Collections.emptyList());
-        return "/admin/site/videolist";
-    }
-
-    @ApiOperation(value = "视频预览")
-    @GetMapping("/post/video/preview/{videoId}")
-    public String videoPreviewPage(@PathVariable("videoId") String videoId, Model model) {
-
-        model.addAttribute("videoInfo", null);
-        return "/admin/site/videopreview";
-    }
-
-    @ApiOperation(value = "视频资源")
-    @GetMapping("/post/video/resource/{videoId}")
-    public String videoResourcePage(@PathVariable("videoId") String videoId, Model model) {
-        return "/admin/site/videoresource";
-    }
-
-    @ApiOperation(value = "视频状态")
-    @GetMapping("/post/video/status/{videoId}")
-    public String videoStatusPage(@PathVariable("videoId") String videoId, Model model) {
-        return "/admin/site/videostatus";
-    }
-
-    @GetMapping("/post/audio")
-    public String audioPage(Model model) {
-        model.addAttribute("page", Page.empty());
-        model.addAttribute("list", Collections.emptyList());
-        return "/admin/site/videolist";
-    }
-
-    @GetMapping("/post/image")
-    public String imagePage(Model model) {
-        model.addAttribute("page", Page.empty());
-        model.addAttribute("list", Collections.emptyList());
-        return "/admin/site/videolist";
-    }
-}

+ 0 - 59
manager/src/main/java/cn/reghao/devops/manager/admin/controller/SpiderApiController.java

@@ -1,59 +0,0 @@
-package cn.reghao.devops.manager.admin.controller;
-
-import cn.reghao.devops.manager.admin.model.ChartData;
-import cn.reghao.devops.manager.admin.model.ChartResult;
-import cn.reghao.jutil.jdk.result.WebResult;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-11-04 14:31:54
- */
-@Slf4j
-@Api(tags = "spider api")
-@RestController
-@RequestMapping("/api/spider")
-public class SpiderApiController {
-    @GetMapping(value = "/chart", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String spiderChart() {
-        List<String> xAxisNames = new ArrayList<>();
-        xAxisNames.add("Mon1");
-        xAxisNames.add("Tue1");
-        xAxisNames.add("Wed1");
-        xAxisNames.add("Thu1");
-        xAxisNames.add("Fri1");
-        xAxisNames.add("Sat1");
-        xAxisNames.add("Sun1");
-
-        LocalDate now = LocalDate.now();
-        int month = now.getMonthValue();
-        int day = now.getDayOfMonth();
-        String monthDay = String.format("%s-%s", month, day);
-        LocalDate pre1 = now.minusDays(1);
-
-        List<String> names = new ArrayList<>();
-        names.add("BiliVideoDataParser");
-        names.add("BiliCommentDataParser");
-
-        List<ChartData> list = new ArrayList<>();
-        List<Integer> data1 = List.of(2038, 120, 220, 214, 125, 117, 210);
-        ChartData chartData1 = new ChartData("BiliVideoDataParser", "line", data1);
-        list.add(chartData1);
-
-        List<Integer> data2 = List.of(135, 147, 150, 230, 224, 218, 2360);
-        ChartData chartData2 = new ChartData("BiliCommentDataParser", "line", data2);
-        list.add(chartData2);
-
-        ChartResult chartResult = new ChartResult(xAxisNames, names, list);
-        return WebResult.success(chartResult);
-    }
-}

+ 0 - 45
manager/src/main/java/cn/reghao/devops/manager/admin/controller/SpiderController.java

@@ -1,45 +0,0 @@
-package cn.reghao.devops.manager.admin.controller;
-
-import cn.reghao.devops.manager.util.db.PageSort;
-import cn.reghao.jutil.jdk.db.PageList;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author reghao
- * @date 2023-11-04 14:31:54
- */
-@Slf4j
-@Api(tags = "spider page")
-@Controller
-@RequestMapping("/spider")
-public class SpiderController {
-    @GetMapping("/chart")
-    public String spiderChart(Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        PageList<?> pageList = PageList.empty();
-        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
-        return "/admin/spider/chart";
-    }
-
-    @GetMapping("/url")
-    public String categoryPage(Model model) {
-        PageRequest pageRequest = PageSort.pageRequest();
-        PageList<?> pageList = PageList.empty();
-        Page<?> page = new PageImpl<>(pageList.getList(), pageRequest, pageList.getTotalSize());
-
-        model.addAttribute("page", page);
-        model.addAttribute("list", page.getContent());
-        return "/admin/spider/index";
-    }
-}

+ 0 - 16
manager/src/main/java/cn/reghao/devops/manager/admin/model/ChartData.java

@@ -1,16 +0,0 @@
-package cn.reghao.devops.manager.admin.model;
-
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-11-04 15:43:40
- */
-@AllArgsConstructor
-public class ChartData {
-    private String name;
-    private String type;
-    private List<Integer> data;
-}

+ 0 - 16
manager/src/main/java/cn/reghao/devops/manager/admin/model/ChartResult.java

@@ -1,16 +0,0 @@
-package cn.reghao.devops.manager.admin.model;
-
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-12-04 13:50:44
- */
-@AllArgsConstructor
-public class ChartResult {
-    private List<String> xAxisNames;
-    private List<String> names;
-    private List<ChartData> list;
-}

+ 2 - 3
manager/src/main/java/cn/reghao/devops/manager/app/controller/AppLogController.java → manager/src/main/java/cn/reghao/devops/manager/log/controller/AppLogController.java

@@ -1,12 +1,11 @@
-package cn.reghao.devops.manager.app.controller;
+package cn.reghao.devops.manager.log.controller;
 
 
-import cn.reghao.devops.manager.app.service.LoggingService;
+import cn.reghao.devops.manager.log.service.LoggingService;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import java.text.ParseException;
 import java.text.ParseException;

+ 2 - 2
manager/src/main/java/cn/reghao/devops/manager/app/service/LoggingService.java → manager/src/main/java/cn/reghao/devops/manager/log/service/LoggingService.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.manager.app.service;
+package cn.reghao.devops.manager.log.service;
 
 
 import cn.reghao.devops.model.NginxLog;
 import cn.reghao.devops.model.NginxLog;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
@@ -21,7 +21,7 @@ import java.util.*;
 public class LoggingService {
 public class LoggingService {
     public List getChartData() throws ParseException {
     public List getChartData() throws ParseException {
         TextFile textFile = new TextFile();
         TextFile textFile = new TextFile();
-        String filePath = "/home/reghao/Downloads/api.iquizoo.com.access.log-20231108";
+        String filePath = "api.reghao.cn.access.log";
         List<String> list = textFile.read(filePath);
         List<String> list = textFile.read(filePath);
 
 
         List<NginxLog> nginxLogs = new ArrayList<>();
         List<NginxLog> nginxLogs = new ArrayList<>();

+ 0 - 15
manager/src/main/java/cn/reghao/devops/manager/util/ConsulNode.java

@@ -1,15 +0,0 @@
-package cn.reghao.devops.manager.util;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2023-02-24 11:46:50
- */
-@AllArgsConstructor
-@Getter
-public class ConsulNode {
-    private String dc;
-    private String address;
-}

+ 0 - 88
manager/src/main/java/cn/reghao/devops/manager/util/ConsulService.java

@@ -1,88 +0,0 @@
-package cn.reghao.devops.manager.util;
-
-import cn.reghao.jutil.jdk.http.WebClient;
-import cn.reghao.jutil.jdk.http.WebRequest;
-import cn.reghao.jutil.jdk.http.WebResponse;
-import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-02-22 17:29:13
- */
-@Service
-public class ConsulService {
-    private final WebRequest webRequest = new WebClient();
-    private final String host = "http://s75.iquizoo.com:8500";
-
-    public List<ConsulNode> getNodes() {
-        List<ConsulNode> nodes = new ArrayList<>();
-        String api = String.format("%s/%s", host, "v1/catalog/nodes");
-        WebResponse webResponse = webRequest.get(api);
-        if (webResponse.getStatusCode() == 200) {
-            JsonArray jsonArray = JsonConverter.jsonToJsonElement(webResponse.getBody()).getAsJsonArray();
-            for (JsonElement jsonElement : jsonArray) {
-                JsonObject jsonObject = jsonElement.getAsJsonObject();
-                String dc = jsonObject.get("Datacenter").getAsString();
-                String address = jsonObject.get("Address").getAsString();
-                nodes.add(new ConsulNode(dc, address));
-            }
-        }
-        return nodes;
-    }
-
-    public List<String> getServices() {
-        String api = String.format("%s/%s", host, "v1/catalog/services");
-        WebResponse webResponse = webRequest.get(api);
-        if (webResponse.getStatusCode() == 200) {
-            JsonObject jsonObject = JsonConverter.jsonToJsonElement(webResponse.getBody()).getAsJsonObject();
-            return new ArrayList<>(jsonObject.keySet());
-        }
-        return Collections.emptyList();
-    }
-
-    public List<String> getCriticalServices() {
-        String api = String.format("%s/%s", host, "v1/health/state/critical");
-        WebResponse webResponse = webRequest.get(api);
-        if (webResponse.getStatusCode() == 200) {
-            JsonObject jsonObject = JsonConverter.jsonToJsonElement(webResponse.getBody()).getAsJsonObject();
-            return new ArrayList<>(jsonObject.keySet());
-        }
-        return Collections.emptyList();
-    }
-
-    public void deregister(String service) throws URISyntaxException, IOException, InterruptedException {
-        String url = "http://s75.iquizoo.com:8500/v1/agent/service/deregister/" + service;
-        HttpRequest.Builder builder = HttpRequest.newBuilder(new URI(url)).version(HttpClient.Version.HTTP_1_1);
-
-        HttpRequest httpRequest = builder.PUT(HttpRequest.BodyPublishers.noBody()).build();
-        HttpClient httpClient = HttpClient.newBuilder().build();
-        HttpResponse<String> httpResponse = httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString());
-        int statusCode = httpResponse.statusCode();
-        String body = httpResponse.body();
-    }
-
-    public static void main(String[] args) throws URISyntaxException, IOException, InterruptedException {
-        ConsulService consulService = new ConsulService();
-        //List<String> list = consulService.getCriticalServices();
-        //System.out.println(list);
-        String service = "FileGrpcService_172_16_45_66_8104";
-        service = "FileService-WebApi_172_16_45_66_8004";
-        consulService.deregister(service);
-    }
-}

+ 0 - 76
manager/src/main/java/cn/reghao/devops/manager/util/aliyun/AliyunCdn.java

@@ -1,76 +0,0 @@
-package cn.reghao.devops.manager.util.aliyun;
-
-import com.aliyun.cdn20180510.Client;
-import com.aliyun.cdn20180510.models.DescribeRefreshTasksRequest;
-import com.aliyun.cdn20180510.models.DescribeRefreshTasksResponse;
-import com.aliyun.cdn20180510.models.RefreshObjectCachesRequest;
-import com.aliyun.cdn20180510.models.RefreshObjectCachesResponse;
-import com.aliyun.tea.TeaModel;
-import com.aliyun.teaopenapi.models.Config;
-
-import java.util.Map;
-
-public class AliyunCdn {
-    private final Client client;
-
-    public AliyunCdn() throws Exception {
-        String accessKeyId = "LTAI5tAH6NQD3wcARukkSuNd";
-        String accessKeySecret = "v13JyqOFbtELD1I17r3bvAXaySJw4L";
-        Config config = new Config()
-                // 必填,您的 AccessKey ID
-                .setAccessKeyId(accessKeyId)
-                // 必填,您的 AccessKey Secret
-                .setAccessKeySecret(accessKeySecret);
-        config.endpoint = "cdn.aliyuncs.com";
-        this.client = new Client(config);
-    }
-
-    /**
-     * 刷新 aliyun-cdn 缓存
-     *
-     * @param
-     * @return
-     * @date 2023-12-18 16:24:01
-     */
-    public void refreshObjectCaches(String objectType, String objectPath) throws Exception {
-        RefreshObjectCachesRequest req = new RefreshObjectCachesRequest();
-        // 此参数为刷新的类型, 其值可以为File或Directory。默认值:File。
-        req.objectType = objectType;
-        // 加速的文件位置,wdtest.licai.cn为配置的域名,后加加速的文件名
-        req.objectPath = objectPath;
-        RefreshObjectCachesResponse resp = client.refreshObjectCaches(req);
-        Map<String, Object> map = TeaModel.buildMap(resp);
-        Map<String, Object> map1 = (Map<String, Object>)map.get("body");
-        String taskId = (String) map1.get("RefreshTaskId");
-        describeRefreshTasks(taskId);
-    }
-
-    /**
-     * 获取 aliyun-cdn 缓存缓存刷新任务状态
-     *
-     * @param
-     * @return
-     * @date 2023-12-18 16:24:19
-     */
-    public void describeRefreshTasks(String taskId) throws Exception {
-        DescribeRefreshTasksRequest request = new DescribeRefreshTasksRequest();
-        request.taskId = taskId;
-        try {
-            DescribeRefreshTasksResponse resp = client.describeRefreshTasks(request);
-            Map<String, Object> map = TeaModel.buildMap(resp);
-            System.out.println();
-        } catch (Exception error) {
-            error.printStackTrace();
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        AliyunCdn aliyunCdn = new AliyunCdn();
-        String objectType = "Directory";
-        String objectPath = "http://dnkt.iquizoo.com/";
-        aliyunCdn.refreshObjectCaches(objectType, objectPath);
-
-        String taskId = "17442221351";
-        aliyunCdn.describeRefreshTasks(taskId);
-    }
-}

+ 0 - 106
manager/src/main/java/cn/reghao/devops/manager/util/aliyun/AliyunOss.java

@@ -1,106 +0,0 @@
-package cn.reghao.devops.manager.util.aliyun;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.model.*;
-
-/**
- * @author reghao
- * @date 2023-12-18 16:50:50
- */
-public class AliyunOss {
-    private final String bucketName = "iquizoo";
-    private final OSS ossClient;
-
-    public AliyunOss() {
-        String endpoint = "http://oss-cn-hangzhou.aliyuncs.com";
-        String accessKeyId = "jYk8lOKwSCorFEz7";
-        String accessKeySecret = "hzSrcew08V5zk58kVVgInV7OqbHyVc";
-        this.ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
-    }
-
-    public void uploadObject(String objectName, File file) throws IOException {
-        System.out.println("Uploading a new object to OSS from a file\n");
-        PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectName, file);
-        ObjectMetadata objectMetadata = new ObjectMetadata();
-        objectMetadata.setObjectAcl(CannedAccessControlList.PublicRead);
-        putObjectRequest.setMetadata(objectMetadata);
-        ossClient.putObject(putObjectRequest);
-    }
-
-    public void downloadObject(String objectName) throws IOException {
-        System.out.println("Downloading an object");
-        OSSObject object = ossClient.getObject(bucketName, objectName);
-        System.out.println("Content-Type: "  + object.getObjectMetadata().getContentType());
-        displayTextInputStream(object.getObjectContent());
-    }
-
-    private void displayTextInputStream(InputStream input) throws IOException {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(input));
-        while (true) {
-            String line = reader.readLine();
-            if (line == null) break;
-
-            System.out.println("    " + line);
-        }
-        System.out.println();
-
-        reader.close();
-    }
-
-    public void deleteObject(String objectName) {
-        ossClient.deleteObject(bucketName, objectName);
-    }
-
-    public void listObjects(String prefix) {
-        System.out.println("Listing objects");
-            ObjectListing objectListing = ossClient.listObjects(bucketName, prefix);
-            for (OSSObjectSummary objectSummary : objectListing.getObjectSummaries()) {
-                String objectName = objectSummary.getKey();
-                long size = objectSummary.getSize();
-                if (size != 0) {
-                    deleteObject(objectName);
-                }
-
-                System.out.println(" - " + objectSummary.getKey() + "  " + "(size = " + objectSummary.getSize() + ")");
-            }
-            System.out.println();
-    }
-
-    public void close() {
-        ossClient.shutdown();
-    }
-
-    public static void main(String[] args) throws IOException {
-        String accessKeyId = System.getenv("ACCESS_KEY_ID");
-        String accessKeySecret = System.getenv("ACCESS_KEY_SECRET");
-        AliyunOss aliyunOss = new AliyunOss();
-
-        /*String baseDir = "/home/reghao/data/image/";
-        File dir = new File(baseDir);
-        for (File file : dir.listFiles()) {
-            if (file.isDirectory()) {
-                continue;
-            }
-
-            String filename = file.getName();
-            String objectName = String.format("%s%s", objectNamePrefix, filename);
-            uploadObject(objectName, file);
-
-            String url = String.format("https://static.cdn.iquizoo.com/%s", objectName);
-            System.out.println("url: " + url);
-        }*/
-
-        /*String objectName = "dev/test/1.txt";
-        File file = createSampleFile();*/
-
-        String objectNamePrefix = "dev/1/";
-        aliyunOss.listObjects(objectNamePrefix);
-    }
-}

+ 0 - 13
manager/src/test/java/AppConfigTest.java

@@ -11,8 +11,6 @@ import cn.reghao.devops.manager.notification.model.po.EmailAccount;
 import cn.reghao.devops.manager.notification.model.po.NotifyReceiver;
 import cn.reghao.devops.manager.notification.model.po.NotifyReceiver;
 import cn.reghao.devops.manager.notification.service.notifier.ding.DingMsg;
 import cn.reghao.devops.manager.notification.service.notifier.ding.DingMsg;
 import cn.reghao.devops.manager.notification.service.notifier.email.EmailMsg;
 import cn.reghao.devops.manager.notification.service.notifier.email.EmailMsg;
-import cn.reghao.devops.manager.util.ConsulNode;
-import cn.reghao.devops.manager.util.ConsulService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.RunWith;
@@ -21,8 +19,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.junit4.SpringRunner;
 
 
-import java.util.List;
-
 /**
 /**
  * @author reghao
  * @author reghao
  * @date 2022-08-17 15:53:04
  * @date 2022-08-17 15:53:04
@@ -71,15 +67,6 @@ public class AppConfigTest {
         Thread.sleep(3600_000);
         Thread.sleep(3600_000);
     }
     }
 
 
-    @Autowired
-    ConsulService consulService;
-    @Test
-    public void consulTest() {
-        List<ConsulNode> nodes = consulService.getNodes();
-        List<String> serviceIds = consulService.getServices();
-        System.out.println();
-    }
-
     @Autowired
     @Autowired
     AppBuildingRepository buildingRepository;
     AppBuildingRepository buildingRepository;
     @Autowired
     @Autowired