[Bug][Fix]Multiple cluster installation issues (#244)

* update gaodyu168 to datasophon * [Bug][Fix]Multiple cluster installation issues --------- Co-authored-by: gaodayu168 <gaodayu2022@163.com>
datavane · Apr 22, 2023 · bfc4617 · bfc4617
1 parent 07a29af
commit bfc4617
Show file tree

Hide file tree

Showing 243 changed files with 1,134 additions and 4,151 deletions.
diff --git a/README_CN.md b/README_CN.md
@@ -1,19 +1,19 @@
 <div align="center">
-         <a href="https://github.com/gaodayu168/datasophon" target="_blank" rel="noopener noreferrer">
+         <a href="https://github.com/datasophon/datasophon" target="_blank" rel="noopener noreferrer">
            <img src="website/static/img/logo.png" width="20%" height="20%" alt="DataSophon Logo" />
         </a>
  <h1>DataSophon</h1>
  <h3>帮助您更容易地管理和监控集群</h3>
 </div>
 
 <p align="center">
-  <img src="https://img.shields.io/github/release/gaodayu168/datasophon.svg">
-  <img src="https://img.shields.io/github/stars/gaodayu168/datasophon">
-  <img src="https://img.shields.io/github/forks/gaodayu168/datasophon">
+  <img src="https://img.shields.io/github/release/datasophon/datasophon.svg">
+  <img src="https://img.shields.io/github/stars/datasophon/datasophon">
+  <img src="https://img.shields.io/github/forks/datasophon/datasophon">
   <a href="https://www.apache.org/licenses/LICENSE-2.0.html"><img src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg"></a>
   <p align="center">
     <a href="https://datasophon.github.io/datasophon-website/">官网</a> |
-    <a href="https://github.com/gaodayu168/datasophon/blob/main/README.md">English</a>
+    <a href="https://github.com/datasophon/datasophon/blob/main/README.md">English</a>
   </p>
 </p>
 <h3>觉得不错的话，star fork下，欢迎社区开发者共建DataSophon</h3>
@@ -51,5 +51,5 @@ DataSophon也是个类似的管理平台，只不过与智子不同的是，智
 
 
 # 提问
-如果您有任何的疑问或需要支持、报告漏洞，请点击 [issue](https://github.com/gaodayu168/datasophon/issues/new/choose) 并提交您的问题, 我们将及时回复您。
+如果您有任何的疑问或需要支持、报告漏洞，请点击 [issue](https://github.com/datasophon/datasophon/issues/new/choose) 并提交您的问题, 我们将及时回复您。
 
diff --git a/datasophon-ui/docs/.vuepress/config.js b/datasophon-ui/docs/.vuepress/config.js
@@ -12,7 +12,7 @@ module.exports = {
     ['link', { rel: 'icon', href: '/favicon.ico' }]
   ],
   themeConfig: {
-    logo: '/brand.png',
+    logo: '/logo.png',
     repo: 'iczer/vue-antd-admin',
     docsDir: 'docs',
     editLinks: true,

diff --git a/datasophon-ui/public/favicon.ico b/datasophon-ui/public/favicon.ico
diff --git a/datasophon-ui/public/favicon1.ico b/datasophon-ui/public/favicon1.ico
diff --git a/datasophon-ui/public/index.html b/datasophon-ui/public/index.html
@@ -1,20 +1,3 @@
-<!--
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- -->
-
 <!--
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10

diff --git a/datasophon-ui/src/App.vue b/datasophon-ui/src/App.vue
@@ -1,20 +1,3 @@
-<!--
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- -->
-
 <!--
  * @Author: mjzhu
  * @describe: 

diff --git a/datasophon-ui/src/api/baseUrl.js b/datasophon-ui/src/api/baseUrl.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10

diff --git a/datasophon-ui/src/api/httpApi/cluster.js b/datasophon-ui/src/api/httpApi/cluster.js
@@ -1,24 +1,7 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10
- * @LastEditTime: 2022-11-25 16:51:51
+ * @LastEditTime: 2023-03-15 17:14:27
  * @FilePath: \ddh-ui\src\api\httpApi\cluster.js
  */
 import paths from '@/api/baseUrl'// 后台服务地址
@@ -42,5 +25,6 @@ export default {
   saveRack: path + '/cluster/rack/save',
   assginRack: path + '/api/cluster/host/assignRack',
   deleteRack: path + '/cluster/rack/delete',
+  deleteClusterRack: path + '/cluster/rack/delete',
   getRackList: path + '/cluster/rack/list',
 }
diff --git a/datasophon-ui/src/api/httpApi/host.js b/datasophon-ui/src/api/httpApi/host.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10

diff --git a/datasophon-ui/src/api/httpApi/index.js b/datasophon-ui/src/api/httpApi/index.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10

diff --git a/datasophon-ui/src/api/httpApi/services.js b/datasophon-ui/src/api/httpApi/services.js
@@ -1,24 +1,7 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10
- * @LastEditTime: 2022-08-15 14:09:47
+ * @LastEditTime: 2023-03-17 16:57:53
  * @FilePath: \ddh-ui\src\api\httpApi\services.js
  */
 import paths from '@/api/baseUrl'// 后台服务地址
@@ -45,4 +28,5 @@ export default {
   deleteQueue: path + '/cluster/yarn/queue/delete', // 队列删除
   updateQueue: path + '/cluster/yarn/queue/update', // 更新队列
   refreshQueues: path + '/cluster/yarn/queue/refreshQueues', // 刷新队列到Yarn
+  refreshQueuesYARN : path + '/cluster/queue/capacity/refreshToYarn'
 }
diff --git a/datasophon-ui/src/api/httpApi/system.js b/datasophon-ui/src/api/httpApi/system.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @describe: 

diff --git a/datasophon-ui/src/api/httpApi/user.js b/datasophon-ui/src/api/httpApi/user.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10

diff --git a/datasophon-ui/src/api/index.js b/datasophon-ui/src/api/index.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @describe: 

diff --git a/datasophon-ui/src/api/interceptors.js b/datasophon-ui/src/api/interceptors.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10

diff --git a/datasophon-ui/src/api/request.js b/datasophon-ui/src/api/request.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:22:10

diff --git a/datasophon-ui/src/api/services/api.js b/datasophon-ui/src/api/services/api.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 /*
  * @Author: mjzhu
  * @Date: 2022-05-24 10:28:22

diff --git a/datasophon-ui/src/api/services/dataSource.js b/datasophon-ui/src/api/services/dataSource.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 import {GOODS, GOODS_COLUMNS} from './api'
 import {METHOD, request} from '@/utils/request'
 
@@ -26,4 +9,4 @@ export async function goodsColumns() {
   return request(GOODS_COLUMNS, METHOD.GET)
 }
 
-export default {goodsList, goodsColumns}
+export default {goodsList, goodsColumns}
diff --git a/datasophon-ui/src/api/services/index.js b/datasophon-ui/src/api/services/index.js
@@ -1,20 +1,3 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
 import userService from './user'
 import dataSource from './dataSource'