Skip to content

Commit 0381fc9

Browse files
qq254963746qq254963746
committed
Merge pull request !90 from 胡贵/develop
2 parents 38d6a17 + 5c3de24 commit 0381fc9

File tree

53 files changed

+373
-548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+373
-548
lines changed

‎build.cmd‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,22 @@ md "%BASE_HOME%\dist\%DIST_BIN_DIR%"
1313

1414
set LTS_Bin_Dir=%BASE_HOME%dist\%DIST_BIN_DIR%
1515

16-
set JobTracker_Startup_Dir=%BASE_HOME%\lts-startup\lts-startup-jobtracker
17-
cd %JobTracker_Startup_Dir%
18-
start mvn assembly:assembly -DskipTests
19-
echo "LTS: mvn assembly:assembly -DskipTests"
16+
set Startup_Dir=%BASE_HOME%\lts-startup\lts-startup
17+
cd %Startup_Dir%
18+
start mvn clean assembly:assembly -DskipTests -Pdefault
19+
echo "LTS: mvn clean assembly:assembly -DskipTests -Pdefault"
2020
echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
2121

22-
xcopy /e /y "%JobTracker_Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
22+
xcopy /e /y "%Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
2323
cd ..\..\
2424

25-
set LTS_Admin_Startup_Dir=%BASE_HOME%/lts-startup/lts-startup-admin
26-
cd %LTS_Admin_Startup_Dir%
27-
start mvn assembly:assembly -DskipTests
28-
echo "LTS: mvn assembly:assembly -DskipTests"
25+
cd %Startup_Dir%
26+
start mvn clean assembly:assembly -DskipTests -Plts-admin
27+
echo "LTS: mvn clean assembly:assembly -DskipTests -Plts-admin"
2928
echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
3029

31-
xcopy /e /y "%LTS_Admin_Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
32-
xcopy /e /y "%BASE_HOME%\lts-admin\target\lts-admin-%VERSION%.war" "%LTS_Bin_Dir%\lts-admin\lts-admin.war"
30+
xcopy /e /y "%Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%\war\lib"
3331
cd ..\..\
3432

35-
set TaskTracker_Startup_Dir=%BASE_HOME%\lts-startup\lts-startup-tasktracker
36-
cd %TaskTracker_Startup_Dir%
37-
start mvn assembly:assembly -DskipTests
38-
echo "LTS: mvn assembly:assembly -DskipTests"
39-
echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
40-
41-
xcopy /e /y "%TaskTracker_Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
42-
cd ..\..\
43-
44-
set LTS_Monitor_Startup_Dir=%BASE_HOME%\lts-monitor
45-
cd %LTS_Monitor_Startup_Dir%
46-
start mvn assembly:assembly -DskipTests
47-
echo "LTS: mvn assembly:assembly -DskipTests"
48-
echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
49-
50-
xcopy /e /y "%LTS_Monitor_Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
33+
xcopy /e /y "%BASE_HOME%\lts-admin\target\lts-admin-%VERSION%.war" "%LTS_Bin_Dir%\war\lts-admin.war"
5134
cd ..\..\

‎build.sh‎

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,22 @@ cd $LTS_Bin_Dir
1010

1111
mvn clean install -U -DskipTests
1212

13-
Dist_Bin_Dir="lts-$VERSION-bin"
14-
mkdir -p $LTS_Bin_Dir/dist/$Dist_Bin_Dir
15-
16-
# JobTracker 的打包
17-
JobTracker_Startup_Dir="$LTS_Bin_Dir/lts-startup/lts-startup-jobtracker"
18-
cd $JobTracker_Startup_Dir
19-
mvn assembly:assembly -DskipTests
20-
21-
# LTS-Admin 打包
22-
LTS_Admin_Startup_Dir="$LTS_Bin_Dir/lts-startup/lts-startup-admin"
23-
cd $LTS_Admin_Startup_Dir
24-
mvn assembly:assembly -DskipTests
25-
26-
# TaskTracker 打包
27-
TaskTracker_Startup_Dir="$LTS_Bin_Dir/lts-startup/lts-startup-tasktracker"
28-
cd $TaskTracker_Startup_Dir
29-
mvn assembly:assembly -DskipTests
30-
31-
# LTS-Monitor 打包
32-
LTS_Monitor_Startup_Dir="$LTS_Bin_Dir/lts-monitor"
33-
cd $LTS_Monitor_Startup_Dir
34-
mvn assembly:assembly -DskipTests
35-
36-
37-
cp -rf $JobTracker_Startup_Dir/target/lts-bin/lts/* $LTS_Bin_Dir/dist/$Dist_Bin_Dir
38-
cp -rf $LTS_Admin_Startup_Dir/target/lts-bin/lts/* $LTS_Bin_Dir/dist/$Dist_Bin_Dir
39-
cp -rf $TaskTracker_Startup_Dir/target/lts-bin/lts/* $LTS_Bin_Dir/dist/$Dist_Bin_Dir
40-
cp -rf $LTS_Monitor_Startup_Dir/target/lts-bin/lts/* $LTS_Bin_Dir/dist/$Dist_Bin_Dir
41-
cp -rf $LTS_Bin_Dir/lts-admin/target/lts-admin-$VERSION.war $LTS_Bin_Dir/dist/$Dist_Bin_Dir/lts-admin/lts-admin.war
42-
43-
# cd $LTS_Bin_Dir/dist
44-
# zip -r $Dist_Bin_Dir.zip $Dist_Bin_Dir/*
45-
# rm -rf $Dist_Bin_Dir
13+
Dist_Bin_Dir="$LTS_Bin_Dir/dist/lts-$VERSION-bin"
14+
mkdir -p $Dist_Bin_Dir
15+
16+
Dist_Bin_Dir="$(cd "$(dirname "${Dist_Bin_Dir}/.")"; pwd)"
17+
18+
mkdir -p $Dist_Bin_Dir
19+
20+
# 打包
21+
Startup_Dir="$LTS_Bin_Dir/lts-startup/"
22+
cd $Startup_Dir
23+
mvn clean assembly:assembly -DskipTests -Pdefault
24+
25+
cp -rf $Startup_Dir/target/lts-bin/lts/* $Dist_Bin_Dir
26+
27+
mkdir -p $Dist_Bin_Dir/war/jetty/lib
28+
mvn clean assembly:assembly -DskipTests -Plts-admin
29+
cp -rf $Startup_Dir/target/lts-bin/lts/lib $Dist_Bin_Dir/war/jetty
30+
cp -rf $LTS_Bin_Dir/lts-admin/target/lts-admin-$VERSION.war $Dist_Bin_Dir/war/lts-admin.war
4631

‎lts-admin/src/main/resources/spring-core.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
http://www.springframework.org/schema/context/spring-context-4.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"
1010
>
1111

12-
<context:component-scan base-package="com.lts">
12+
<context:component-scan base-package="com.lts.admin">
1313
<context:exclude-filter type="regex" expression="com.lts.admin.web.*"/>
1414
</context:component-scan>
1515

‎lts-core/src/main/java/com/lts/core/support/bean/JdkCompiler.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ public JdkCompiler() {
3535
// options.add("-target");
3636
// options.add("1.6");
3737
StandardJavaFileManager manager = compiler.getStandardFileManager(diagnosticCollector, null, null);
38-
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
38+
ClassLoader loader = Thread.currentThread().getContextClassLoader();
39+
if (loader.getClass().getName().equals("org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedWebappClassLoader")) {
40+
loader = loader.getParent();
41+
}
3942
if (loader instanceof URLClassLoader
4043
&& (!loader.getClass().getName().equals("sun.misc.Launcher$AppClassLoader"))) {
4144
try {
@@ -49,9 +52,10 @@ public JdkCompiler() {
4952
throw new IllegalStateException(e.getMessage(), e);
5053
}
5154
}
55+
final ClassLoader finalLoader = loader;
5256
classLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoaderImpl>() {
5357
public ClassLoaderImpl run() {
54-
return new ClassLoaderImpl(loader);
58+
return new ClassLoaderImpl(finalLoader);
5559
}
5660
});
5761
javaFileManager = new JavaFileManagerImpl(manager, classLoader);

‎lts-core/src/main/java/com/lts/queue/mongo/MongoSchedulerJobQueue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public boolean updateLastGenerateTriggerTime(String jobId, Long lastGenerateTrig
3737
@Override
3838
public List<JobPo> getNeedGenerateJobPos(Long checkTime, int topSize) {
3939
Query<JobPo> query = template.createQuery(JobPo.class);
40-
query.field("relyOnPrevCycle").equal(true);
40+
query.field("relyOnPrevCycle").equal(false);
4141
query.field("lastGenerateTriggerTime").equal(checkTime);
4242
query.offset(0).limit(topSize);
4343
return query.asList();

‎lts-jobtracker/src/main/java/com/lts/jobtracker/processor/JobCancelProcessor.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public RemotingCommand processRequest(Channel channel, RemotingCommand request)
3434
String taskId = jobCancelRequest.getTaskId();
3535
String taskTrackerNodeGroup = jobCancelRequest.getTaskTrackerNodeGroup();
3636
JobPo jobPo = appContext.getCronJobQueue().getJob(taskTrackerNodeGroup, taskId);
37+
if (jobPo == null) {
38+
jobPo = appContext.getRepeatJobQueue().getJob(taskTrackerNodeGroup, taskId);
39+
}
3740
if (jobPo == null) {
3841
jobPo = appContext.getExecutableJobQueue().getJob(taskTrackerNodeGroup, taskId);
3942
}

‎lts-monitor/pom.xml‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,53 +17,11 @@
1717
<artifactId>lts-core</artifactId>
1818
<version>${project.parent.version}</version>
1919
</dependency>
20-
<dependency>
21-
<groupId>com.alibaba</groupId>
22-
<artifactId>fastjson</artifactId>
23-
</dependency>
24-
<dependency>
25-
<groupId>mysql</groupId>
26-
<artifactId>mysql-connector-java</artifactId>
27-
</dependency>
28-
<dependency>
29-
<groupId>com.alibaba</groupId>
30-
<artifactId>druid</artifactId>
31-
</dependency>
32-
<dependency>
33-
<groupId>io.netty</groupId>
34-
<artifactId>netty-all</artifactId>
35-
</dependency>
3620
<dependency>
3721
<groupId>log4j</groupId>
3822
<artifactId>log4j</artifactId>
39-
</dependency>
40-
<dependency>
41-
<groupId>junit</groupId>
42-
<artifactId>junit</artifactId>
43-
<scope>test</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>com.github.sgroschupf</groupId>
47-
<artifactId>zkclient</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>redis.clients</groupId>
51-
<artifactId>jedis</artifactId>
23+
<scope>provided</scope>
5224
</dependency>
5325
</dependencies>
5426

55-
<build>
56-
<plugins>
57-
<plugin>
58-
<artifactId>maven-assembly-plugin</artifactId>
59-
<version>2.5.3</version>
60-
<configuration>
61-
<finalName>lts</finalName>
62-
<descriptors>
63-
<descriptor>release.xml</descriptor>
64-
</descriptors>
65-
</configuration>
66-
</plugin>
67-
</plugins>
68-
</build>
6927
</project>

‎lts-monitor/release.xml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎lts-monitor/src/test/java/com/lts/monitor/MonitorAgentStartupTest.java‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎lts-startup/lts-startup-admin/pom.xml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)