Browse Source

Merge remote-tracking branch 'upstream/dev' into dev

pull/1/MERGE
ligang 6 years ago
parent
commit
b6e1ac03ba
  1. 10
      docs/zh_CN/后端部署文档.md
  2. 2
      escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue

10
docs/zh_CN/后端部署文档.md

@ -3,7 +3,7 @@
## 基础软件安装 ## 基础软件安装
* [Mysql](https://blog.csdn.net/u011886447/article/details/79796802) (5.5+) : 必装 * [Mysql](http://geek.analysys.cn/topic/124) (5.5+) : 必装
* [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (1.8+) : 必装 * [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html) (1.8+) : 必装
* [ZooKeeper](https://www.jianshu.com/p/de90172ea680)(3.4.6) :必装 * [ZooKeeper](https://www.jianshu.com/p/de90172ea680)(3.4.6) :必装
* [Hadoop](https://blog.csdn.net/Evankaka/article/details/51612437)(2.6+) :选装, 如果需要使用到资源上传功能,MapReduce任务提交则需要配置Hadoop(上传的资源文件目前保存在Hdfs上) * [Hadoop](https://blog.csdn.net/Evankaka/article/details/51612437)(2.6+) :选装, 如果需要使用到资源上传功能,MapReduce任务提交则需要配置Hadoop(上传的资源文件目前保存在Hdfs上)
@ -145,6 +145,14 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL
## 启停服务 ## 启停服务
* 一键停止集群所有服务
` sh ./script/stop_all.sh`
* 一键开启集群所有服务
` sh ./script/start_all.sh`
* 启停Master * 启停Master
```启动master ```启动master

2
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue

@ -11,7 +11,7 @@
<x-radio-group v-model="type" size="small"> <x-radio-group v-model="type" size="small">
<x-radio :label="'MYSQL'">MYSQL</x-radio> <x-radio :label="'MYSQL'">MYSQL</x-radio>
<x-radio :label="'POSTGRESQL'">POSTGRESQL</x-radio> <x-radio :label="'POSTGRESQL'">POSTGRESQL</x-radio>
<x-radio :label="'HIVE'">HVIE</x-radio> <x-radio :label="'HIVE'">HIVE</x-radio>
<x-radio :label="'SPARK'">SPARK</x-radio> <x-radio :label="'SPARK'">SPARK</x-radio>
</x-radio-group> </x-radio-group>
</template> </template>

Loading…
Cancel
Save