Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge dev-db to 1.2.0-release #1272

Merged
merged 65 commits into from
Nov 18, 2019
Merged

merge dev-db to 1.2.0-release #1272

Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
de99637
reset pgsql (#1178)
khadgarmage Nov 8, 2019
fd7268d
Ans UI upgrade to version 0.1.0 (#1181)
break60 Nov 8, 2019
5140535
Administrators group prohibit deletion (#1182)
break60 Nov 8, 2019
a92554f
fix master server shutdown error (#1177)
Technoboy- Nov 8, 2019
b5aab02
degrade zk version and add FourLetterWordMain class (#1183)
Technoboy- Nov 8, 2019
467ac35
fix ZKWorkerClient not close PathChildrenCache (#1185)
Technoboy- Nov 8, 2019
0ad41d9
add Transactional for createSession method (#1186)
Technoboy- Nov 8, 2019
ed90e19
dockerfile dao application.properties ,install.sh modify and applicat…
qiaozhanwei Nov 8, 2019
dc6b448
dockerfile startup.sh modify (#1189)
qiaozhanwei Nov 9, 2019
96713ec
remove docs (#1191)
qiaozhanwei Nov 9, 2019
760e863
dockerfile conf modify (#1192)
qiaozhanwei Nov 9, 2019
28396b8
dockerfile conf modify (#1193)
qiaozhanwei Nov 9, 2019
c0891ab
dockerfile email address change (#1194)
qiaozhanwei Nov 9, 2019
03ec04b
the alert module is modified in english (#1195)
qiaozhanwei Nov 11, 2019
1fad357
api server useless code and chinese modify (#1198)
qiaozhanwei Nov 11, 2019
cb8afbe
common，dao，server useless code and chinese modify (#1199)
qiaozhanwei Nov 11, 2019
48acc00
change chinese sql to english. (#1200)
lenboo Nov 11, 2019
a6e1850
change chinese to english (#1202)
qiaozhanwei Nov 11, 2019
c207c9d
remove unused code (#1204)
lenboo Nov 12, 2019
3a3d2e4
Modify webpack configuration (#1206)
break60 Nov 12, 2019
501a400
add more message for java-doc (#1209)
Technoboy- Nov 12, 2019
f925168
add java doc for common module (#1213)
davidzollo Nov 12, 2019
62aa170
dao method comments and useless code modify (#1214)
qiaozhanwei Nov 12, 2019
01c2b12
Change all Chinese names to English (#1207)
break60 Nov 12, 2019
7a2c088
add progress-bar-webpack-plugin (#1215)
break60 Nov 13, 2019
b280c30
Add method and parameters comments (#1220)
lgcareer Nov 13, 2019
0812993
add some notes (#1221)
lenboo Nov 13, 2019
3fd9e5c
master startup error bug fix (#1229)
qiaozhanwei Nov 13, 2019
d962dee
delete class App, let spring manage connectionFactory (#1233)
Technoboy- Nov 14, 2019
2f6d932
Merge branch '1.2.0-release' into dev-db
qiaozhanwei Nov 15, 2019
b03db9b
Merge pull request #1 from qiaozhanwei/dev-db
qiaozhanwei Nov 15, 2019
1a4b288
refactor masterServer and workerServer (#1244)
Technoboy- Nov 15, 2019
b941b29
ConnectionFactory add paging intercepter
Nov 15, 2019
8bfbaaa
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
Nov 15, 2019
dd7508a
ConnectionFactory add paging intercepter (#1250)
qiaozhanwei Nov 15, 2019
88befcb
remove spotbugs-annotations.jar LGPL protocol
Nov 15, 2019
a137592
remove spotbugs-annotations.jar LGPL protocol (#1251)
qiaozhanwei Nov 15, 2019
09dec3b
fix #1245, make scanCommand transactional (#1246)
Baoqi Nov 17, 2019
f13389d
fix the spring transaction not worker bug (#1252)
Technoboy- Nov 17, 2019
94e8da9
test
Nov 17, 2019
ef86be2
delete class MybatisPlusConfig (#1254)
Technoboy- Nov 17, 2019
cef6913
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
Nov 17, 2019
6c4acac
test
Nov 17, 2019
1bdd859
catch exception transaction method does not take effect to modify
Nov 17, 2019
d2e2a18
.evn rollback
Nov 17, 2019
bb1d725
DataSourceService rollback
Nov 17, 2019
c8b0c1f
make combined server works in new dev-db branch (#1257)
Baoqi Nov 17, 2019
b563ac4
LogViewServiceGrpc rollback
Nov 17, 2019
21bf3b8
catch exception transaction method does not take effect to modify (#1…
qiaozhanwei Nov 17, 2019
4ad37eb
dockerfile add application-api.properties and change application.prop…
Nov 17, 2019
4ace8ef
move batchDelete Process Define/Instance Outside for transactional (#…
Baoqi Nov 17, 2019
e3299e6
dockerfile add application-api.properties and change application.prop…
qiaozhanwei Nov 17, 2019
8eea6c1
Merge remote-tracking branch 'remotes/upstream/dev-db' into dev-db
Nov 17, 2019
e9dc1cc
server startup error modify
Nov 18, 2019
26b1eb2
server startup error modify (#1263)
qiaozhanwei Nov 18, 2019
886396f
data type convert error ，email send error bug fix
Nov 18, 2019
b1cccbe
Checkbox change background color and env to Chinese (#1264)
break60 Nov 18, 2019
4585830
data type convert error ，email send error bug fix (#1266)
qiaozhanwei Nov 18, 2019
906ac19
Remove space before and after login user name (#1267)
break60 Nov 18, 2019
ecd86bb
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
Nov 18, 2019
66269c0
Merge remote-tracking branch 'remotes/upstream/dev-db' into 1.2.0-rel…
Nov 18, 2019
a6ca354
Merge remote-tracking branch 'remotes/origin/dev-db' into 1.2.0-release
Nov 18, 2019
9090095
disable Import on Combined Server to solve API Server not work issue …
Baoqi Nov 18, 2019
b47d00c
Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.…
Nov 18, 2019
d9551a4
Merge remote-tracking branch 'remotes/upstream/dev-db' into 1.2.0-rel…
Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...cheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,19 @@
import org.apache.dolphinscheduler.server.rpc.LoggerServer;
import org.apache.dolphinscheduler.server.worker.WorkerServer;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

//@SpringBootApplication
//@ServletComponentScan
//@ComponentScan("org.apache.dolphinscheduler")
//@Import({MasterServer.class, WorkerServer.class})
//@EnableSwagger2
@SpringBootApplication
@ConditionalOnProperty(prefix = "server", name = "is-combined-server", havingValue = "true")
@ServletComponentScan
@ComponentScan("org.apache.dolphinscheduler")
@Import({MasterServer.class, WorkerServer.class})
@EnableSwagger2
public class CombinedApplicationServer extends SpringBootServletInitializer {

public static void main(String[] args) throws Exception {
Expand Down