Merge branch 'go-atomci:master' into master

8239b47b · 徐超越 · GitHub · 3c863d7a · 64ca9cbe · 8239b47b
6 changed file
--- a/internal/core/settings/registryhub.go
+++ b/internal/core/settings/registryhub.go
@@ -14,7 +14,7 @@ func TryLoginRegistry(basicUrl, username, password string, insecure bool) error
 	} else {
 		schema = "https"
 	}
-	url := fmt.Sprintf("%s://%s/v2", schema, strings.TrimRight(basicUrl, "/"))
+	url := fmt.Sprintf("%s://%s/v2/", schema, strings.TrimRight(basicUrl, "/"))
 	resp, err := http.Get(url)
 	if err != nil || resp.StatusCode != 401 {
 		return errors.New("error basicUrl")

--- a/web/build/webpack.base.conf.js
+++ b/web/build/webpack.base.conf.js
@@ -41,9 +41,9 @@ module.exports = {
    }
  },
  externals: {
-    'vue': 'Vue',
-    'vue-router': 'VueRouter',
-    'vue-resource':'VueResource',
+    // 'vue': 'Vue',
+    // 'vue-router': 'VueRouter',
+    // 'vue-resource':'VueResource',
  },
  module: {
    noParse:[/vue\.runtime\.min\.js$/, /vue\-resource\.min\.js$/,/vue\-router\.min\.js$/],

--- a/web/index.html
+++ b/web/index.html
@@ -12,8 +12,5 @@
  </head>
  <body>
    <div id='app'></div>
-    <script src="https://cdn.bootcdn.net/ajax/libs/vue/2.5.2/vue.runtime.min.js"></script>
-    <script src="https://cdn.bootcdn.net/ajax/libs/vue-resource/1.5.1/vue-resource.min.js"></script>
-    <script src="https://cdn.bootcdn.net/ajax/libs/vue-router/3.0.1/vue-router.min.js"></script>
  </body>
 </html>
--- a/web/package.json
+++ b/web/package.json
@@ -28,7 +28,7 @@
    "vue-codemirror": "^4.0.6",
    "vue-i18n": "^8.2.1",
    "vue-resource": "^1.5.1",
-    "vue-router": "^3.0.1",
+    "vue-router": "3.0.1",
    "vuex": "^3.0.1",
    "xterm": "^4.14.1",
    "xterm-addon-fit": "^0.5.0"

--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -89,7 +89,7 @@ export const asyncRoutes = [
            {
                path: '/settings/compile_env',
                component: () => import('@/views/setting/CompileEnv.vue'),
-                name: 'taskTemplate',
+                name: 'compileEnv',
                meta: { title: '编译环境', noCache: true }
            },
        ]

--- a/web/src/router/modules/projectDetailRouter.js
+++ b/web/src/router/modules/projectDetailRouter.js
@@ -18,7 +18,7 @@ export function projectDetailRouter() {
    },
    {
      path: '/project/:projectID/detail/app',
-      name: 'projectApp',
+      name: 'projectAppHome',
      component: Layout,
      meta: { title: '应用代码', noCache: true},
      children: [
@@ -46,7 +46,7 @@ export function projectDetailRouter() {
    },
    {
      path: '/project/:projectID/detail/ci',
-      name: 'projectCI',
+      name: 'projectCIHome',
      component: Layout,
      meta: { title: '构建部署', noCache: true },
      children: [
@@ -74,7 +74,7 @@ export function projectDetailRouter() {
    },
    {
      path: '/project/:projectID/detail/service',
-      name: 'projectService',
+      name: 'projectServiceHome',
      component: Layout,
      meta: { title: '应用服务', noCache: true },
      children: [
@@ -82,7 +82,6 @@ export function projectDetailRouter() {
          path: '/project/:projectID/detail/service',
          meta: { title: '应用服务', noCache: true },
          name: 'projectService',
-          iconCls: 'service',
          component: () => import('@/views/project/Service.vue'),
        },
        {