Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
byit-myth-job
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyuan
byit-myth-job
Commits
0e27fb58
Commit
0e27fb58
authored
Mar 24, 2020
by
guo_minglei@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
admin添加运行信息
parent
13143559
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
86 additions
and
5 deletions
+86
-5
pom.xml
byit-myth-admin/pom.xml
+4
-0
RedisConfig.java
...myth-admin/src/main/java/com/byit/config/RedisConfig.java
+19
-0
ApiNodeServiceImpl.java
...c/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
+8
-0
application-dev.yml
byit-myth-admin/src/main/resources/application-dev.yml
+14
-0
application-local.yml
byit-myth-admin/src/main/resources/application-local.yml
+12
-0
application-pro.yml
byit-myth-admin/src/main/resources/application-pro.yml
+12
-0
application-test.yml
byit-myth-admin/src/main/resources/application-test.yml
+12
-0
RedisConfig.java
...tor-server/src/main/java/com/byit/config/RedisConfig.java
+4
-4
application-dev.yml
...th-executor-server/src/main/resources/application-dev.yml
+1
-1
No files found.
byit-myth-admin/pom.xml
View file @
0e27fb58
...
@@ -53,6 +53,10 @@
...
@@ -53,6 +53,10 @@
<version>
1.0-SNAPSHOT
</version>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-redis
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
byit-myth-admin/src/main/java/com/byit/config/RedisConfig.java
0 → 100644
View file @
0e27fb58
package
com
.
byit
.
config
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.redis.connection.RedisConnectionFactory
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.data.redis.serializer.StringRedisSerializer
;
@Configuration
public
class
RedisConfig
{
@Bean
StringRedisTemplate
stringRedisTemplate
(
RedisConnectionFactory
connectionFactory
){
StringRedisTemplate
stringRedisTemplate
=
new
StringRedisTemplate
();
stringRedisTemplate
.
setConnectionFactory
(
connectionFactory
);
stringRedisTemplate
.
setDefaultSerializer
(
new
StringRedisSerializer
());
return
stringRedisTemplate
;
}
}
byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
View file @
0e27fb58
...
@@ -2,12 +2,14 @@ package com.byit.service.impl;
...
@@ -2,12 +2,14 @@ package com.byit.service.impl;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.byit.dto.plugin.RunLog
;
import
com.byit.dto.plugin.RunNode
;
import
com.byit.dto.plugin.RunNode
;
import
com.byit.enums.NodePropertyEnum
;
import
com.byit.enums.NodePropertyEnum
;
import
com.byit.mapper.JobTaskScheduleMapper
;
import
com.byit.mapper.JobTaskScheduleMapper
;
import
com.byit.model.JobTaskSchedule
;
import
com.byit.model.JobTaskSchedule
;
import
com.byit.service.ApiNodeService
;
import
com.byit.service.ApiNodeService
;
import
com.byit.utils.ValidationUtil
;
import
com.byit.utils.ValidationUtil
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -23,6 +25,9 @@ public class ApiNodeServiceImpl implements ApiNodeService {
...
@@ -23,6 +25,9 @@ public class ApiNodeServiceImpl implements ApiNodeService {
@Resource
@Resource
private
JobTaskScheduleMapper
jobTaskScheduleMapper
;
private
JobTaskScheduleMapper
jobTaskScheduleMapper
;
@Resource
private
StringRedisTemplate
stringRedisTemplate
;
@Override
@Override
public
String
runNode
(
String
param
)
{
public
String
runNode
(
String
param
)
{
...
@@ -50,6 +55,9 @@ public class ApiNodeServiceImpl implements ApiNodeService {
...
@@ -50,6 +55,9 @@ public class ApiNodeServiceImpl implements ApiNodeService {
jobTaskScheduleMapper
.
saveJobTaskSchedule
(
schedule
);
jobTaskScheduleMapper
.
saveJobTaskSchedule
(
schedule
);
RunLog
runLog
=
RunLog
.
builder
().
isEnd
(
false
).
runLog
(
"等待服务器分配资源"
).
build
();
stringRedisTemplate
.
convertAndSend
(
runId
,
JSON
.
toJSONString
(
runLog
));
return
runId
;
return
runId
;
}
}
}
}
byit-myth-admin/src/main/resources/application-dev.yml
View file @
0e27fb58
...
@@ -14,6 +14,18 @@ spring:
...
@@ -14,6 +14,18 @@ spring:
properties
:
properties
:
from
:
huangfusuper@163.com
from
:
huangfusuper@163.com
redis
:
database
:
0
host
:
10.0.120.218
port
:
6379
password
:
pool
:
max-active
:
8
max-wait
:
30
max-idle
:
8
min-idle
:
0
timeout
:
60000
mybatis
:
mybatis
:
mapper-locations
:
/mapper/*.xml
mapper-locations
:
/mapper/*.xml
...
@@ -39,3 +51,5 @@ file:
...
@@ -39,3 +51,5 @@ file:
myth-job
:
myth-job
:
filestystem
:
FASTDFS
filestystem
:
FASTDFS
byit-myth-admin/src/main/resources/application-local.yml
View file @
0e27fb58
...
@@ -14,6 +14,18 @@ spring:
...
@@ -14,6 +14,18 @@ spring:
properties
:
properties
:
from
:
huangfusuper@163.com
from
:
huangfusuper@163.com
redis
:
database
:
0
host
:
10.0.120.218
port
:
6379
password
:
pool
:
max-active
:
8
max-wait
:
30
max-idle
:
8
min-idle
:
0
timeout
:
60000
mybatis
:
mybatis
:
mapper-locations
:
/mapper/*.xml
mapper-locations
:
/mapper/*.xml
...
...
byit-myth-admin/src/main/resources/application-pro.yml
View file @
0e27fb58
...
@@ -14,6 +14,18 @@ spring:
...
@@ -14,6 +14,18 @@ spring:
properties
:
properties
:
from
:
huangfusuper@163.com
from
:
huangfusuper@163.com
redis
:
database
:
0
host
:
${Redis_IP}
port
:
${Redis_port}
password
:
pool
:
max-active
:
8
max-wait
:
30
max-idle
:
8
min-idle
:
0
timeout
:
60000
mybatis
:
mybatis
:
mapper-locations
:
/mapper/*.xml
mapper-locations
:
/mapper/*.xml
...
...
byit-myth-admin/src/main/resources/application-test.yml
View file @
0e27fb58
...
@@ -14,6 +14,18 @@ spring:
...
@@ -14,6 +14,18 @@ spring:
properties
:
properties
:
from
:
huangfusuper@163.com
from
:
huangfusuper@163.com
redis
:
database
:
0
host
:
${Redis_IP}
port
:
${Redis_port}
password
:
pool
:
max-active
:
8
max-wait
:
30
max-idle
:
8
min-idle
:
0
timeout
:
60000
mybatis
:
mybatis
:
mapper-locations
:
/mapper/*.xml
mapper-locations
:
/mapper/*.xml
...
...
byit-myth-executor/myth-executor-server/src/main/java/com/byit/config/RedisConfig.java
View file @
0e27fb58
...
@@ -11,9 +11,9 @@ public class RedisConfig {
...
@@ -11,9 +11,9 @@ public class RedisConfig {
@Bean
@Bean
StringRedisTemplate
stringRedisTemplate
(
RedisConnectionFactory
connectionFactory
){
StringRedisTemplate
stringRedisTemplate
(
RedisConnectionFactory
connectionFactory
){
//
StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
StringRedisTemplate
stringRedisTemplate
=
new
StringRedisTemplate
();
//
stringRedisTemplate.setConnectionFactory(connectionFactory);
stringRedisTemplate
.
setConnectionFactory
(
connectionFactory
);
//
stringRedisTemplate.setDefaultSerializer(new StringRedisSerializer());
stringRedisTemplate
.
setDefaultSerializer
(
new
StringRedisSerializer
());
return
new
StringRedisTemplate
(
connectionFactory
)
;
return
stringRedisTemplate
;
}
}
}
}
byit-myth-executor/myth-executor-server/src/main/resources/application-dev.yml
View file @
0e27fb58
...
@@ -20,7 +20,7 @@ myth-job:
...
@@ -20,7 +20,7 @@ myth-job:
spring
:
spring
:
redis
:
redis
:
database
:
0
database
:
0
host
:
10.0.1
01.133
host
:
10.0.1
20.218
port
:
6379
port
:
6379
password
:
password
:
pool
:
pool
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment