Merge branch 'master' into develop

This commit is contained in:
yanlinly 2019-03-27 10:09:51 +08:00 committed by GitHub
commit 074d243f63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,16 +19,17 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<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" type="text/css" href="console-fe/public/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="console-fe/public/css/console1412.css">
<link rel="shortcut icon" href="//www.aliyun.com/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="css/console1412.css">
<!-- 第三方css开始 -->
<link rel="stylesheet" type="text/css" href="console-fe/public/css/codemirror.css">
<link rel="stylesheet" type="text/css" href="console-fe/public/css/merge.css">
<link rel="stylesheet" type="text/css" href="console-fe/public/css/icon.css">
<link rel="stylesheet" type="text/css" href="console-fe/public/css/font-awesome.css">
<link rel="stylesheet" type="text/css" href="css/codemirror.css">
<link rel="stylesheet" type="text/css" href="css/merge.css">
<link rel="stylesheet" type="text/css" href="css/icon.css">
<link rel="stylesheet" type="text/css" href="css/font-awesome.css">
<!-- 第三方css结束 -->
<link href="css/main.css" rel="stylesheet"></head>
</head>
<body>
<div id="root" style="overflow:hidden"></div>
@ -36,18 +37,19 @@
<div id="other"></div>
<!-- 第三方js开始 -->
<script src="console-fe/public/js/jquery.js"></script>
<script src="console-fe/public/js/codemirror.js"></script>
<script src="console-fe/public/js/javascript.js"></script>
<script src="console-fe/public/js/xml.js"></script>
<script src="console-fe/public/js/codemirror.addone.fullscreen.js"></script>
<script src="console-fe/public/js/codemirror.addone.lint.js"></script>
<script src="console-fe/public/js/codemirror.lib.json-lint.js"></script>
<script src="console-fe/public/js/codemirror.addone.json-lint.js"></script>
<script src="console-fe/public/js/codemirror.lib.clike-lint.js"></script>
<script src="console-fe/public/js/diff_match_patch.js"></script>
<script src="console-fe/public/js/merge.js"></script>
<script src="console-fe/public/js/loader.js"></script>
<script src="js/jquery.js"></script>
<script src="js/codemirror.js"></script>
<script src="js/javascript.js"></script>
<script src="js/xml.js"></script>
<script src="js/codemirror.addone.fullscreen.js"></script>
<script src="js/codemirror.addone.lint.js"></script>
<script src="js/codemirror.lib.json-lint.js"></script>
<script src="js/codemirror.addone.json-lint.js"></script>
<script src="js/codemirror.lib.clike-lint.js"></script>
<script src="js/diff_match_patch.js"></script>
<script src="js/merge.js"></script>
<script src="js/loader.js"></script>
<!-- 第三方js结束 -->
<script type="text/javascript" src="js/main.js"></script></body>