Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wk1234123
DolphinScheduler
提交
1b5b1e25
DolphinScheduler
项目概览
wk1234123
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1b5b1e25
编写于
7月 16, 2019
作者:
B
Baoqi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
close 579, add combined server to simplify test
上级
bd30d48c
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
160 addition
and
10 deletion
+160
-10
escheduler-api/pom.xml
escheduler-api/pom.xml
+5
-3
escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java
...ain/java/cn/escheduler/api/CombinedApplicationServer.java
+54
-0
escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java
...ava/cn/escheduler/api/configuration/AppConfiguration.java
+1
-0
escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java
.../java/cn/escheduler/api/controller/MetricsController.java
+4
-0
escheduler-api/src/main/resources/combined_logback.xml
escheduler-api/src/main/resources/combined_logback.xml
+54
-0
escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java
.../src/main/java/cn/escheduler/server/rpc/LoggerServer.java
+1
-1
escheduler-ui/build/webpack.config.combined.js
escheduler-ui/build/webpack.config.combined.js
+26
-0
escheduler-ui/package.json
escheduler-ui/package.json
+2
-1
escheduler-ui/src/view/common/meta.inc
escheduler-ui/src/view/common/meta.inc
+4
-4
escheduler-ui/src/view/common/outro.inc
escheduler-ui/src/view/common/outro.inc
+1
-1
package.xml
package.xml
+8
-0
未找到文件。
escheduler-api/pom.xml
浏览文件 @
1b5b1e25
...
...
@@ -9,9 +9,11 @@
<packaging>
jar
</packaging>
<dependencies>
<dependency>
<dependency>
<groupId>
cn.analysys
</groupId>
<artifactId>
escheduler-alert
</artifactId>
</dependency>
<dependency>
<groupId>
cn.analysys
</groupId>
<artifactId>
escheduler-server
</artifactId>
<exclusions>
...
...
escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java
0 → 100644
浏览文件 @
1b5b1e25
/*
* 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.
*/
package
cn.escheduler.api
;
import
cn.escheduler.alert.AlertServer
;
import
cn.escheduler.dao.ProcessDao
;
import
cn.escheduler.server.master.MasterServer
;
import
cn.escheduler.server.rpc.LoggerServer
;
import
cn.escheduler.server.worker.WorkerServer
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.web.servlet.ServletComponentScan
;
import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.ComponentScan
;
import
springfox.documentation.swagger2.annotations.EnableSwagger2
;
@SpringBootApplication
@ServletComponentScan
@ComponentScan
(
"cn.escheduler"
)
@EnableSwagger2
public
class
CombinedApplicationServer
extends
SpringBootServletInitializer
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
ConfigurableApplicationContext
context
=
SpringApplication
.
run
(
ApiApplicationServer
.
class
,
args
);
ProcessDao
processDao
=
context
.
getBean
(
ProcessDao
.
class
);
MasterServer
master
=
new
MasterServer
(
processDao
);
master
.
run
(
processDao
);
WorkerServer
workerServer
=
new
WorkerServer
();
workerServer
.
run
();
LoggerServer
server
=
new
LoggerServer
();
server
.
start
();
AlertServer
alertServer
=
AlertServer
.
getInstance
();
alertServer
.
start
();
}
}
escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java
浏览文件 @
1b5b1e25
...
...
@@ -84,6 +84,7 @@ public class AppConfiguration implements WebMvcConfigurer {
registry
.
addResourceHandler
(
"/static/**"
).
addResourceLocations
(
"classpath:/static/"
);
registry
.
addResourceHandler
(
"doc.html"
).
addResourceLocations
(
"classpath:/META-INF/resources/"
);
registry
.
addResourceHandler
(
"/webjars/**"
).
addResourceLocations
(
"classpath:/META-INF/resources/webjars/"
);
registry
.
addResourceHandler
(
"/ui/**"
).
addResourceLocations
(
"file:ui/"
);
}
@Override
...
...
escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java
0 → 100644
浏览文件 @
1b5b1e25
package
cn.escheduler.api.controller
;
public
class
MetricsController
{
}
escheduler-api/src/main/resources/combined_logback.xml
0 → 100644
浏览文件 @
1b5b1e25
<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
<configuration
scan=
"true"
scanPeriod=
"120 seconds"
>
<property
name=
"log.base"
value=
"logs"
/>
<appender
name=
"STDOUT"
class=
"ch.qos.logback.core.ConsoleAppender"
>
<encoder>
<pattern>
%highlight([%level]) %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{10}:[%line] - %msg%n
</pattern>
<charset>
UTF-8
</charset>
</encoder>
</appender>
<appender
name=
"TASKLOGFILE"
class=
"cn.escheduler.server.worker.log.TaskLogAppender"
>
<filter
class=
"ch.qos.logback.classic.filter.ThresholdFilter"
>
<level>
INFO
</level>
</filter>
<filter
class=
"cn.escheduler.server.worker.log.TaskLogFilter"
></filter>
<file>
${log.base}/{processDefinitionId}/{processInstanceId}/{taskInstanceId}.log
</file>
<encoder>
<pattern>
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
</pattern>
<charset>
UTF-8
</charset>
</encoder>
<append>
true
</append>
</appender>
<appender
name=
"COMBINEDLOGFILE"
class=
"ch.qos.logback.core.rolling.RollingFileAppender"
>
<file>
${log.base}/escheduler-combined.log
</file>
<filter
class=
"cn.escheduler.server.worker.log.WorkerLogFilter"
>
<level>
INFO
</level>
</filter>
<rollingPolicy
class=
"ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"
>
<fileNamePattern>
${log.base}/escheduler-combined.%d{yyyy-MM-dd_HH}.%i.log
</fileNamePattern>
<maxHistory>
168
</maxHistory>
<maxFileSize>
200MB
</maxFileSize>
</rollingPolicy>
<encoder>
<pattern>
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
</pattern>
<charset>
UTF-8
</charset>
</encoder>
</appender>
<root
level=
"INFO"
>
<appender-ref
ref=
"STDOUT"
/>
<appender-ref
ref=
"TASKLOGFILE"
/>
<appender-ref
ref=
"COMBINEDLOGFILE"
/>
</root>
</configuration>
\ No newline at end of file
escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java
浏览文件 @
1b5b1e25
...
...
@@ -44,7 +44,7 @@ public class LoggerServer {
*/
private
Server
server
;
p
rivate
void
start
()
throws
IOException
{
p
ublic
void
start
()
throws
IOException
{
/* The port on which the server should run */
int
port
=
Constants
.
RPC_PORT
;
server
=
ServerBuilder
.
forPort
(
port
)
...
...
escheduler-ui/build/webpack.config.combined.js
0 → 100644
浏览文件 @
1b5b1e25
/*
* 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.
*/
const
merge
=
require
(
'
webpack-merge
'
)
const
prodConfig
=
require
(
'
./webpack.config.prod
'
)
const
config
=
merge
.
smart
(
prodConfig
,
{
output
:
{
publicPath
:
'
/escheduler/ui/
'
}
})
module
.
exports
=
config
escheduler-ui/package.json
浏览文件 @
1b5b1e25
...
...
@@ -10,7 +10,8 @@
"lint"
:
"standard
\"
**/*.{js,vue}
\"
"
,
"lint:fix"
:
"standard
\"
**/*.{js,vue}
\"
--fix"
,
"start"
:
"npm run dev"
,
"combo"
:
"node ./build/combo.js"
"combo"
:
"node ./build/combo.js"
,
"build:combined"
:
"npm run clean && cross-env NODE_ENV=production webpack --config ./build/webpack.config.combined.js"
},
"dependencies"
:
{
"autoprefixer"
:
"^9.1.0"
,
...
...
escheduler-ui/src/view/common/meta.inc
浏览文件 @
1b5b1e25
...
...
@@ -11,12 +11,12 @@
<meta
name=
"theme-color"
content=
"#4a8dee"
>
<meta
name=
"msapplication-navbutton-color"
content=
"#4a8dee"
>
<meta
name=
"viewport"
content=
"width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"
>
<link
rel=
"shortcut icon"
href=
"
/
images/favicon.ico"
/>
<link
href=
"
/
combo/1.0.0/base.css?v1.0.0.1"
rel=
"stylesheet"
>
<link
href=
"
/
combo/1.0.0/3rd.css?v1.0.0.1"
rel=
"stylesheet"
>
<link
rel=
"shortcut icon"
href=
"images/favicon.ico"
/>
<link
href=
"combo/1.0.0/base.css?v1.0.0.1"
rel=
"stylesheet"
>
<link
href=
"combo/1.0.0/3rd.css?v1.0.0.1"
rel=
"stylesheet"
>
<!--[if lt IE 9]>
<script src="
/
combo/1.0.0/es5.js"></script>
<script src="combo/1.0.0/es5.js"></script>
<![endif]-->
<script>
...
...
escheduler-ui/src/view/common/outro.inc
浏览文件 @
1b5b1e25
...
...
@@ -2,7 +2,7 @@
<!--<script src="https://s1.analysys.cn/libs/??jqueryui/1.12.1/jquery-ui.min.js,twitter-bootstrap/3.3.7/js/bootstrap.min.js,jsPlumb/2.8.5/js/jsplumb.min.js"></script> -->
<!--<script src="https://s1.analysys.cn/libs/??highlight.js/9.13.1/highlight.min.js,element-ui/2.4.9/index.js,clipboard.js/2.0.1/clipboard.min.js,d3/3.3.6/d3.min.js,dayjs/1.7.8/dayjs.min.js"></script> -->
<script
src=
"
/
combo/1.0.0/3rd.js?v1.0.0.1"
type=
"text/javascript"
></script>
<script
src=
"combo/1.0.0/3rd.js?v1.0.0.1"
type=
"text/javascript"
></script>
package.xml
浏览文件 @
1b5b1e25
...
...
@@ -34,6 +34,14 @@
<outputDirectory>
.
</outputDirectory>
</fileSet>
<fileSet>
<directory>
escheduler-ui/dist
</directory>
<includes>
<include>
**/*.*
</include>
</includes>
<outputDirectory>
./ui
</outputDirectory>
</fileSet>
<fileSet>
<directory>
sql
</directory>
<includes>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录