Merge pull request #178 from alibaba/0.3.0

0.3.0
alibaba · Oct 26, 2018 · 04a4f35 · 04a4f35
2 parents 4ea44f5 + c32fbd9
commit 04a4f35
Show file tree

Hide file tree

Showing 118 changed files with 24,418 additions and 2,069 deletions.
diff --git a/console/src/main/resources/static/.vscode/settings.json b/console/src/main/resources/static/.vscode/settings.json
@@ -0,0 +1,24 @@
+{
+    "editor.tabSize": 2,
+    "editor.formatOnSave": true,
+    "[javascript]": {
+      "editor.formatOnSave": true,
+      "editor.formatOnPaste": false
+    },
+    "[javascriptreact]": {
+      "editor.formatOnSave": true,
+      "editor.formatOnPaste": false
+    },
+    "[typescript]": {
+      "editor.formatOnSave": true,
+      "editor.formatOnPaste": false
+    },
+    "[typescriptreact]": {
+      "editor.formatOnSave": true,
+      "editor.formatOnPaste": false
+    },
+    "[html]": {
+      "editor.formatOnSave": true
+    }
+  }
+
diff --git a/console/src/main/resources/static/build.js b/console/src/main/resources/static/build.js
@@ -26,18 +26,13 @@ const spawnAsync = (...args) => new Promise((resolve, reject) => {
 });
 
 spawnAsync('roadhog', ['build'])
-.then(() => {
-    const _buildDir = path.join(__dirname, buildDir);
-    if (!fs.statSync(_buildDir).isDirectory()) {
-        return;
-    }
-    let fileList = fs.readdirSync(_buildDir, "utf8");
-    fileList.forEach((fileName) => {
-        if (fileName === "." || fileName === "..") {
-            return;
-        }
-        const _buildPath = path.join(buildDir, fileName);
-        const _targetPath = path.join(targetDir, fileName);
-        fs.writeFileSync(_targetPath, fs.readFileSync(_buildPath, "utf8"), "utf8");
-    })
-});
+    .then(() => {
+        // 复制index.js
+        const copyFileList = ['index.js', 'index.css'];
+        copyFileList.forEach((fileName) => {
+            const _srcFileName = path.join(buildDir, fileName);
+            const _targetFileName = path.join(targetDir, fileName);
+
+            fs.writeFileSync(_targetFileName, fs.readFileSync(_srcFileName, "utf8"), "utf8");
+        });
+    });
diff --git a/console/src/main/resources/static/i18ndoc.js b/console/src/main/resources/static/i18ndoc.js
diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html
@@ -20,23 +20,15 @@
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<title>Nacos</title>
 	<link rel="shortcut icon" href="//www.aliyun.com/favicon.ico" type="image/x-icon" />
-	<link rel="stylesheet" href="//g.alicdn.com/aliyun/console-base/0.0.18/app.css">
-	<link rel="stylesheet" type="text/css" href="//g.alicdn.com/aliyun/console/1.3.63/styles/bootstrap/bootstrap.css">
-	<link rel="stylesheet" type="text/css" href="//g.alicdn.com/aliyun/console/1.3.63/styles/console1412.css">
-	<link rel="stylesheet" type="text/css" href="//g.alicdn.com/cm/edas/2.132.6/styles/edas/edas.console.css">
+	<link rel="stylesheet" type="text/css" href="public/css/bootstrap.css">
+	<link rel="stylesheet" type="text/css" href="public/css/console1412.css">
 	<!-- 第三方css开始 -->
-	<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.css">
-	<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/merge.css">
-	<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/bootstrap.css">
-	<link rel="stylesheet" type="text/css" href="//g.alicdn.com/cm-design/simpleMVC/public/styles/icons/icon.css">
-	<link rel="stylesheet" type="text/css" href="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/font-awesome.css">
-	<link rel="stylesheet" type="text/css" href="index.css">
-
+	<link rel="stylesheet" type="text/css" href="public/css/codemirror.css">
+	<link rel="stylesheet" type="text/css" href="public/css/merge.css">
+	<link rel="stylesheet" type="text/css" href="public/css/icon.css">
+	<link rel="stylesheet" type="text/css" href="public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-	<script src="//g.alicdn.com/cm-design/simplemvc-cdn/0.0.67/jquery.js"></script>
-	<!-- i18nJs开始 -->
-	<script src="i18ndoc.js"></script>
-	<!-- i18nJs结束 -->
+	<link rel="stylesheet" type="text/css" href="index.css">
 </head>
 
 <body>
@@ -45,18 +37,18 @@
 	<div id="other"></div>
 
 	<!-- 第三方js开始 -->
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.64/naruto/lib/codemirror.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/javascript.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/xml.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.fullscreen.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.lint.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.lib.json-lint.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.addone.json-lint.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/codemirror.lib.clike-lint.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/diff_match_patch.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/merge.js"></script>
-	<script src="//g.alicdn.com/EFDP/naruto-cdn/0.0.52/naruto/lib/loader.js"></script>
-
+	<script src="public/js/jquery.js"></script>
+	<script src="public/js/codemirror.js"></script>
+	<script src="public/js/javascript.js"></script>
+	<script src="public/js/xml.js"></script>
+	<script src="public/js/codemirror.addone.fullscreen.js"></script>
+	<script src="public/js/codemirror.addone.lint.js"></script>
+	<script src="public/js/codemirror.lib.json-lint.js"></script>
+	<script src="public/js/codemirror.addone.json-lint.js"></script>
+	<script src="public/js/codemirror.lib.clike-lint.js"></script>
+	<script src="public/js/diff_match_patch.js"></script>
+	<script src="public/js/merge.js"></script>
+	<script src="public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
 	<script src="index.js"></script>
 </body>

diff --git a/console/src/main/resources/static/index.js b/console/src/main/resources/static/index.js
diff --git a/console/src/main/resources/static/package.json b/console/src/main/resources/static/package.json
@@ -31,4 +31,4 @@
     "husky": "^0.12.0",
     "roadhog": "^2.0.0"
   }
-}
+}