Merge pull request #218 from lenboo/dev (652ec2b6) · Commits · SUMMER2020 / students / proj-2002251

.gitignore

+111 −0

Original line number	Diff line number	Diff line
		@@ -33,3 +33,114 @@ yarn.lock
		package-lock.json
		config.gypi
		test/coverage
		/docs/zh_CN/介绍
		/docs/zh_CN/贡献代码.md
		/escheduler-common/src/main/resources/zookeeper.properties
		escheduler-alert/logs/
		escheduler-alert/src/main/resources/alert.properties_bak
		escheduler-alert/src/main/resources/logback.xml
		escheduler-server/src/main/resources/logback.xml
		escheduler-ui/dist/css/common.16ac5d9.css
		escheduler-ui/dist/css/home/index.b444b91.css
		escheduler-ui/dist/css/login/index.5866c64.css
		escheduler-ui/dist/js/0.ac94e5d.js
		escheduler-ui/dist/js/0.ac94e5d.js.map
		escheduler-ui/dist/js/1.0b043a3.js
		escheduler-ui/dist/js/1.0b043a3.js.map
		escheduler-ui/dist/js/10.1bce3dc.js
		escheduler-ui/dist/js/10.1bce3dc.js.map
		escheduler-ui/dist/js/11.79f04d8.js
		escheduler-ui/dist/js/11.79f04d8.js.map
		escheduler-ui/dist/js/12.420daa5.js
		escheduler-ui/dist/js/12.420daa5.js.map
		escheduler-ui/dist/js/13.e5bae1c.js
		escheduler-ui/dist/js/13.e5bae1c.js.map
		escheduler-ui/dist/js/14.f2a0dca.js
		escheduler-ui/dist/js/14.f2a0dca.js.map
		escheduler-ui/dist/js/15.45373e8.js
		escheduler-ui/dist/js/15.45373e8.js.map
		escheduler-ui/dist/js/16.fecb0fc.js
		escheduler-ui/dist/js/16.fecb0fc.js.map
		escheduler-ui/dist/js/17.84be279.js
		escheduler-ui/dist/js/17.84be279.js.map
		escheduler-ui/dist/js/18.307ea70.js
		escheduler-ui/dist/js/18.307ea70.js.map
		escheduler-ui/dist/js/19.144db9c.js
		escheduler-ui/dist/js/19.144db9c.js.map
		escheduler-ui/dist/js/2.8b4ef29.js
		escheduler-ui/dist/js/2.8b4ef29.js.map
		escheduler-ui/dist/js/20.4c527e9.js
		escheduler-ui/dist/js/20.4c527e9.js.map
		escheduler-ui/dist/js/21.831b2a2.js
		escheduler-ui/dist/js/21.831b2a2.js.map
		escheduler-ui/dist/js/22.2b4bb2a.js
		escheduler-ui/dist/js/22.2b4bb2a.js.map
		escheduler-ui/dist/js/23.81467ef.js
		escheduler-ui/dist/js/23.81467ef.js.map
		escheduler-ui/dist/js/24.54a00e4.js
		escheduler-ui/dist/js/24.54a00e4.js.map
		escheduler-ui/dist/js/25.8d7bd36.js
		escheduler-ui/dist/js/25.8d7bd36.js.map
		escheduler-ui/dist/js/26.2ec5e78.js
		escheduler-ui/dist/js/26.2ec5e78.js.map
		escheduler-ui/dist/js/27.3ab48c2.js
		escheduler-ui/dist/js/27.3ab48c2.js.map
		escheduler-ui/dist/js/28.363088a.js
		escheduler-ui/dist/js/28.363088a.js.map
		escheduler-ui/dist/js/29.6c5853a.js
		escheduler-ui/dist/js/29.6c5853a.js.map
		escheduler-ui/dist/js/3.a0edb5b.js
		escheduler-ui/dist/js/3.a0edb5b.js.map
		escheduler-ui/dist/js/30.940fdd3.js
		escheduler-ui/dist/js/30.940fdd3.js.map
		escheduler-ui/dist/js/31.168a460.js
		escheduler-ui/dist/js/31.168a460.js.map
		escheduler-ui/dist/js/32.8df6594.js
		escheduler-ui/dist/js/32.8df6594.js.map
		escheduler-ui/dist/js/33.4480bbe.js
		escheduler-ui/dist/js/33.4480bbe.js.map
		escheduler-ui/dist/js/34.b407fe1.js
		escheduler-ui/dist/js/34.b407fe1.js.map
		escheduler-ui/dist/js/35.f340b0a.js
		escheduler-ui/dist/js/35.f340b0a.js.map
		escheduler-ui/dist/js/36.8880c2d.js
		escheduler-ui/dist/js/36.8880c2d.js.map
		escheduler-ui/dist/js/37.ea2a25d.js
		escheduler-ui/dist/js/37.ea2a25d.js.map
		escheduler-ui/dist/js/38.98a59ee.js
		escheduler-ui/dist/js/38.98a59ee.js.map
		escheduler-ui/dist/js/39.a5e958a.js
		escheduler-ui/dist/js/39.a5e958a.js.map
		escheduler-ui/dist/js/4.4ca44db.js
		escheduler-ui/dist/js/4.4ca44db.js.map
		escheduler-ui/dist/js/40.e187b1e.js
		escheduler-ui/dist/js/40.e187b1e.js.map
		escheduler-ui/dist/js/41.0e89182.js
		escheduler-ui/dist/js/41.0e89182.js.map
		escheduler-ui/dist/js/42.341047c.js
		escheduler-ui/dist/js/42.341047c.js.map
		escheduler-ui/dist/js/43.27b8228.js
		escheduler-ui/dist/js/43.27b8228.js.map
		escheduler-ui/dist/js/44.e8869bc.js
		escheduler-ui/dist/js/44.e8869bc.js.map
		escheduler-ui/dist/js/45.8d54901.js
		escheduler-ui/dist/js/45.8d54901.js.map
		escheduler-ui/dist/js/5.e1ed7f3.js
		escheduler-ui/dist/js/5.e1ed7f3.js.map
		escheduler-ui/dist/js/6.241ba07.js
		escheduler-ui/dist/js/6.241ba07.js.map
		escheduler-ui/dist/js/7.ab2e297.js
		escheduler-ui/dist/js/7.ab2e297.js.map
		escheduler-ui/dist/js/8.83ff814.js
		escheduler-ui/dist/js/8.83ff814.js.map
		escheduler-ui/dist/js/9.39cb29f.js
		escheduler-ui/dist/js/9.39cb29f.js.map
		escheduler-ui/dist/js/common.733e342.js
		escheduler-ui/dist/js/common.733e342.js.map
		escheduler-ui/dist/js/home/index.78a5d12.js
		escheduler-ui/dist/js/home/index.78a5d12.js.map
		escheduler-ui/dist/js/login/index.291b8e3.js
		escheduler-ui/dist/js/login/index.291b8e3.js.map
		escheduler-ui/dist/lib/external/
		escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
		/escheduler-dao/src/main/resources/dao/data_source.properties

CONTRIBUTING.md

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		EasyScheduler提交代码流程
		=====
		* 首先从远端仓库https://github.com/analysys/EasyScheduler.git fork一份代码到自己的仓库中

		* 远端仓库中目前有三个分支：
		* master 正常交付分支
		* dev 日常开发分支
		* branch-1.0.0 发布版本分支

		* 把自己仓库clone到本地

		`git clone https://github.com/**/EasyScheduler.git`

		* 添加远端仓库地址，命名为upstream

		` git remote add upstream https://github.com/analysys/EasyScheduler.git `

		* 查看仓库：

		` git remote -v`

		> 此时会有两个仓库：origin(自己的仓库)和upstream（远端仓库）

		* 获取远端仓库代码（已经是最新代码，就跳过）

		`git fetch upstream `

		* 更新远端仓库代码

		```
		git checkout upstream/dev

		git pull upstream dev
		```

		* 同步远端仓库代码到本地仓库

		```
		git checkout origin/dev
		git merge --no-ff upstream/dev

		```

		* 在本地修改代码以后，提交到自己仓库：

		`git ca -m 'test commit'`
		`git push`

		* 将修改提交到远端仓库

		* 在github页面，点击New pull request.
		<p align="center">
		<img src="http://geek.analysys.cn/static/upload/221/2019-04-02/90f3abbf-70ef-4334-b8d6-9014c9cf4c7f.png" width="60%" />
		</p>

		* 选择修改完的本地分支和要合并过去的分支，Create pull request.
		<p align="center">
		<img src="http://geek.analysys.cn/static/upload/221/2019-04-02/fe7eecfe-2720-4736-951b-b3387cf1ae41.png" width="60%" />
		</p>
		* 接下来由管理员负责将Merge完成此次pull request

Dockerfile

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		#Maintin by jimmy
		#Email: zhengge2012@gmail.com
		FROM anapsix/alpine-java:8_jdk
		WORKDIR /tmp
		RUN wget http://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
		RUN tar -zxvf apache-maven-3.6.1-bin.tar.gz && rm apache-maven-3.6.1-bin.tar.gz
		RUN mv apache-maven-3.6.1 /usr/lib/mvn
		RUN chown -R root:root /usr/lib/mvn
		RUN ln -s /usr/lib/mvn/bin/mvn /usr/bin/mvn
		RUN wget https://archive.apache.org/dist/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz
		RUN tar -zxvf zookeeper-3.4.6.tar.gz
		RUN mv zookeeper-3.4.6 /opt/zookeeper
		RUN rm -rf zookeeper-3.4.6.tar.gz
		RUN echo "export ZOOKEEPER_HOME=/opt/zookeeper" >>/etc/profile
		RUN echo "export PATH=$PATH:$ZOOKEEPER_HOME/bin" >>/etc/profile
		ADD conf/zoo.cfg /opt/zookeeper/conf/zoo.cfg
		#RUN source /etc/profile
		#RUN zkServer.sh start
		RUN apk add --no-cache git npm nginx mariadb mariadb-client mariadb-server-utils pwgen
		WORKDIR /opt
		RUN git clone https://github.com/analysys/EasyScheduler.git
		WORKDIR /opt/EasyScheduler
		RUN mvn -U clean package assembly:assembly -Dmaven.test.skip=true
		RUN mv /opt/EasyScheduler/target/escheduler-1.0.0-SNAPSHOT /opt/easyscheduler
		WORKDIR /opt/EasyScheduler/escheduler-ui
		RUN npm install
		RUN npm audit fix
		RUN npm run build
		RUN mkdir -p /opt/escheduler/front/server
		RUN cp -rfv dist/* /opt/escheduler/front/server
		WORKDIR /
		RUN rm -rf /opt/EasyScheduler
		#configure mysql server https://github.com/yobasystems/alpine-mariadb/tree/master/alpine-mariadb-amd64
		ADD conf/run.sh /scripts/run.sh
		RUN mkdir /docker-entrypoint-initdb.d && \
		mkdir /scripts/pre-exec.d && \
		mkdir /scripts/pre-init.d && \
		chmod -R 755 /scripts
		RUN rm -rf /var/cache/apk/*
		EXPOSE 8888
		ENTRYPOINT ["/scripts/run.sh"]

README.md

+13 −1

Original line number	Diff line number	Diff line
		@@ -45,12 +45,24 @@ Easy Scheduler

		更多文档请参考 <a href="https://analysys.github.io/easyscheduler_docs_cn/" target="_blank">easyscheduler中文在线文档</a>


		### 近期研发计划

		EasyScheduler的工作计划：<a href="https://github.com/analysys/EasyScheduler/projects/1" target="_blank">研发计划</a> ，其中 In Develop卡片下是1.0.2版本的功能，TODO卡片是待做事项(包括 feature ideas)

		### 贡献代码

		非常欢迎大家来参与贡献代码，提交代码流程请参考：
		https://github.com/analysys/EasyScheduler/blob/master/CONTRIBUTING.md


		### 感谢

		- Easy Scheduler使用了很多优秀的开源项目，比如google的guava、guice、grpc，netty，ali的bonecp，quartz，以及apache的众多开源项目等等，
		Easy Scheduler使用了很多优秀的开源项目，比如google的guava、guice、grpc，netty，ali的bonecp，quartz，以及apache的众多开源项目等等，
		正是由于站在这些开源项目的肩膀上，才有Easy Scheduler的诞生的可能。对此我们对使用的所有开源软件表示非常的感谢！我们也希望自己不仅是开源的受益者，也能成为开源的
		贡献者，于是我们决定把易调度贡献出来，并承诺长期维护。也希望对开源有同样热情和信念的伙伴加入进来，一起为开源献出一份力！


		### 帮助
		The fastest way to get response from our developers is to submit issues, or add our wechat : 510570367

conf/escheduler.conf

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		server {
		listen 8888;# 访问端口
		server_name localhost;
		#charset koi8-r;
		#access_log /var/log/nginx/host.access.log main;
		location / {
		root /opt/escheduler/front/server; # 静态文件目录
		index index.html index.html;
		}
		location /escheduler {
		proxy_pass http://127.0.0.1:12345; # 接口地址
		proxy_set_header Host $host;
		proxy_set_header X-Real-IP $remote_addr;
		proxy_set_header x_real_ipP $remote_addr;
		proxy_set_header remote_addr $remote_addr;
		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
		proxy_http_version 1.1;
		proxy_connect_timeout 4s;
		proxy_read_timeout 30s;
		proxy_send_timeout 12s;
		proxy_set_header Upgrade $http_upgrade;
		proxy_set_header Connection "upgrade";
		}
		#error_page 404 /404.html;
		# redirect server error pages to the static page /50x.html
		#
		error_page 500 502 503 504 /50x.html;
		location = /50x.html {
		root /usr/share/nginx/html;
		}
		}