bugfix historical chart time expression format error (#822)

模块：监控历史图表详情，bug修复，时间表达式格式：小时h 天D 周W 月M 例如：7D表示7天，3M表示3个月模块：manager，路径拼接多出“文件分隔符” Signed-off-by: sunqinbo <[email protected]> --------- Signed-off-by: sunqinbo <[email protected]>
apache · Mar 31, 2023 · 39a808d · 39a808d
1 parent b9303d5
commit 39a808d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java b/manager/src/main/java/com/usthe/manager/service/impl/AppServiceImpl.java
@@ -182,11 +182,11 @@ public List<Hierarchy> getAllAppHierarchy(String lang) {
     @Override
     public String getMonitorDefineFileContent(String app) {
         String classpath = this.getClass().getClassLoader().getResource("").getPath();
-        String defineAppPath = classpath + File.separator + "define" + File.separator + "app-" + app + ".yml";
+        String defineAppPath = classpath + "define" + File.separator + "app-" + app + ".yml";
         File defineAppFile = new File(defineAppPath);
         if (!defineAppFile.exists() || !defineAppFile.isFile()) {
             classpath = this.getClass().getResource(File.separator).getPath();
-            defineAppPath = classpath + File.separator + "define" + File.separator + "app-" + app + ".yml";
+            defineAppPath = classpath + "define" + File.separator + "app-" + app + ".yml";
             defineAppFile = new File(defineAppPath);
             if (!defineAppFile.exists() || !defineAppFile.isFile()) {
                 try {
@@ -225,7 +225,7 @@ public void applyMonitorDefineYml(String ymlContent) {
         // app params verify
         verifyDefineAppContent(app);
         String classpath = this.getClass().getClassLoader().getResource("").getPath();
-        String defineAppPath = classpath + File.separator + "define" + File.separator + "app-" + app.getApp() + ".yml";
+        String defineAppPath = classpath + "define" + File.separator + "app-" + app.getApp() + ".yml";
         File defineAppFile = new File(defineAppPath);
         try {
             FileUtils.writeStringToFile(defineAppFile, ymlContent, StandardCharsets.UTF_8, false);
@@ -253,7 +253,7 @@ public void deleteMonitorDefine(String app) {
             throw new IllegalArgumentException("Can not delete define which has monitoring instances.");
         }
         String classpath = this.getClass().getClassLoader().getResource("").getPath();
-        String defineAppPath = classpath + File.separator + "define" + File.separator + "app-" + app + ".yml";
+        String defineAppPath = classpath + "define" + File.separator + "app-" + app + ".yml";
         File defineAppFile = new File(defineAppPath);
         if (defineAppFile.exists() && defineAppFile.isFile()) {
             defineAppFile.delete();
@@ -273,15 +273,15 @@ public void run(String... args) throws Exception {
             loadFromFile = false;
         } else {
             String classpath = rootUrl.getPath();
-            defineAppPath = classpath + File.separator + "define";
+            defineAppPath = classpath + "define";
             directory = new File(defineAppPath);
             if (!directory.exists() || directory.listFiles() == null) {
                 rootUrl = this.getClass().getResource(File.separator);
                 if (rootUrl == null) {
                     loadFromFile = false;
                 } else {
                     classpath = rootUrl.getPath();
-                    defineAppPath = classpath + File.separator + "define";
+                    defineAppPath = classpath + "define";
                     directory = new File(defineAppPath);
                     if (!directory.exists() || directory.listFiles() == null) {
                         loadFromFile = false;

diff --git a/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts b/web-app/src/app/routes/monitor/monitor-data-chart/monitor-data-chart.component.ts
@@ -106,7 +106,7 @@ export class MonitorDataChartComponent implements OnInit {
               }
             },
             onclick: () => {
-              this.loadData('1d');
+              this.loadData('1D');
             }
           },
           myPeriod1w: {
@@ -119,7 +119,7 @@ export class MonitorDataChartComponent implements OnInit {
               }
             },
             onclick: () => {
-              this.loadData('1w', true);
+              this.loadData('1W', true);
             }
           },
           myPeriod4w: {
@@ -132,7 +132,7 @@ export class MonitorDataChartComponent implements OnInit {
               }
             },
             onclick: () => {
-              this.loadData('4w', true);
+              this.loadData('1M', true);
             }
           },
           myPeriod3m: {
@@ -145,7 +145,7 @@ export class MonitorDataChartComponent implements OnInit {
               }
             },
             onclick: () => {
-              this.loadData('12w', true);
+              this.loadData('3M', true);
             }
           },
           myRefresh: {