Toggle navigation
Toggle navigation
This project
Loading...
Sign in
ops
/
monitor-service
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
qinchao
7 years ago
Commit
85e3a81c828688f66ec3ddd7611e8f1a71029bf0
1 parent
c6416b6e
项目列表挪到后台
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
152 additions
and
95 deletions
monitor-service-common/src/main/java/com/monitor/common/contants/ProjectOnline.java
monitor-service-common/src/main/java/com/monitor/common/contants/ProjectOnlineResponse.java
monitor-service-model/src/main/java/com/monitor/model/domain/Project.java
monitor-service-other/src/main/java/com/monitor/other/worksystem/ctrl/ReleaseWorkCtrl.java
monitor-service-switch/src/main/java/com/monitor/switchs/projectRestart/common/ProjectOnline.java
monitor-service-switch/src/main/java/com/monitor/switchs/projectRestart/ctrl/JavaRestartCtrl.java
monitor-service-switch/src/main/java/com/monitor/switchs/projectRestart/service/impl/JavaProjectStatusLoaderTask.java
monitor-service-switch/src/main/java/com/monitor/switchs/projectRestart/task/ProjectStatusTask.java
monitor-service-common/src/main/java/com/monitor/common/contants/ProjectOnline.java
0 → 100644
View file @
85e3a81
package
com
.
monitor
.
common
.
contants
;
import
com.monitor.model.domain.Project
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
public
class
ProjectOnline
{
private
final
static
String
JAVA_ENV_QCLOUD_AZ1
=
"qcloud"
;
private
final
static
String
JAVA_ENV_QCLOUD_AZ2
=
"qcloudaz2"
;
private
final
static
String
JAVA_ENV_QCLOUD_AZ3
=
"qcloudaz3"
;
public
final
static
String
JAVA_ENV_ALL
=
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_AZ2
+
","
+
JAVA_ENV_QCLOUD_AZ3
;
///// 暂时只有media有
private
final
static
String
JAVA_ENV_QCLOUD_ENV_GRAY
=
"qcloud_gray"
;
private
static
List
<
Project
>
JAVA_LIST
=
new
ArrayList
<>();
static
{
// java 核心服务
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-activity"
,
"129"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-wechat"
,
"248"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-sns"
,
"125"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-erp-gateway"
,
"977"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-message"
,
"123"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"uic"
,
"439"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-users"
,
"134"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-resources"
,
"122"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-promotion"
,
"140"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-product"
,
"143"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-order"
,
"124"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-brower"
,
"131"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-bigdata"
,
"144"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-gateway"
,
"126"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-risk"
,
"932"
,
"yoho30"
,
JAVA_ENV_ALL
,
"java 核心服务"
,
true
));
//只有qcloud : java服务-单中心
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-push"
,
"137"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
,
"java服务-单中心"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"cms_push"
,
"514"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
,
"java服务-单中心"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-social"
,
"353"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
,
"java服务-单中心"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-union"
,
"133"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
,
"java服务-单中心"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-crm"
,
"275"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
,
"java服务-单中心"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-task"
,
"138"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
,
"java服务-单中心"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-message-controller"
,
"684"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
,
"java服务-单中心"
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-message-sender"
,
"685"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
,
"java服务-单中心"
,
true
));
//只有灰度环境: 媒体java (灰度)
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-now"
,
"690"
,
"YOHONow"
,
JAVA_ENV_QCLOUD_ENV_GRAY
,
"媒体java (灰度)"
,
false
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-mars"
,
"737"
,
"media"
,
JAVA_ENV_QCLOUD_ENV_GRAY
,
"媒体java (灰度)"
,
false
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohomars-platform"
,
"764"
,
"media"
,
JAVA_ENV_QCLOUD_ENV_GRAY
,
"媒体java (灰度)"
,
false
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohonow-platform"
,
"775"
,
"media"
,
JAVA_ENV_QCLOUD_ENV_GRAY
,
"媒体java (灰度)"
,
false
));
//JAVA_LIST.add(new Project("1","yoho-cobar","461","yoho30"));
//JAVA_LIST.add(new Project("1","yohobuy-global","679","yoho30"));
//JAVA_LIST.add(new Project("1","mars_push","494","yoho30"));
//JAVA_LIST.add(new Project("1","yoho-union-recomand","789","yoho30"));
//只有qcloud、 qcloud灰度。 线下店java服务
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-shops"
,
"490"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_ENV_GRAY
,
"线下店java服务"
,
false
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-portal-gateway"
,
"557"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_ENV_GRAY
,
"线下店java服务"
,
false
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-extendstore"
,
"852"
,
"yoho30"
,
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_ENV_GRAY
,
"线下店java服务"
,
false
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yoho-search-service"
,
"12"
,
"yoho-search"
,
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_AZ2
,
""
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yoho-search-consumer"
,
"8"
,
"yoho-search"
,
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_AZ2
,
""
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yoho-search-producer"
,
"7"
,
"yoho-search"
,
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_AZ2
,
""
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yoho-search-adaptor"
,
"13"
,
"yoho-search"
,
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_AZ2
,
""
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yohomars-search-service"
,
"554"
,
"yoho-search"
,
JAVA_ENV_QCLOUD_AZ1
,
""
,
true
));
JAVA_LIST
.
add
(
new
Project
(
"3"
,
"yohobuy-platform"
,
"110"
,
"platform"
,
JAVA_ENV_QCLOUD_AZ1
+
","
+
JAVA_ENV_QCLOUD_ENV_GRAY
,
""
,
true
));
}
public
static
List
<
Project
>
getJavaList
()
{
return
JAVA_LIST
;
}
/**
* 中心切换之后,需要
*/
public
static
List
<
Project
>
getNeedRestartJavaList
()
{
return
JAVA_LIST
.
stream
().
filter
(
p
->
p
.
isNeedRestartAfterSwitch
()).
collect
(
Collectors
.
toList
());
}
}
...
...
monitor-service-common/src/main/java/com/monitor/common/contants/ProjectOnlineResponse.java
0 → 100644
View file @
85e3a81
package
com
.
monitor
.
common
.
contants
;
import
com.monitor.model.domain.Project
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
ProjectOnlineResponse
{
//java 环境列表串
private
String
javaEnvAll
;
private
List
<
Project
>
javaList
;
}
...
...
monitor-service-model/src/main/java/com/monitor/model/domain/Project.java
View file @
85e3a81
package
com
.
monitor
.
model
.
domain
;
import
lombok.Data
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
/**
* Created by zhengyouwei on 2016/6/29.
*/
@Data
public
class
Project
{
private
String
order
;
//顺序
...
...
@@ -13,47 +20,41 @@ public class Project {
private
String
group
;
//项目支持的发布环境,add by craig.qin 2018/4/9
private
List
<
String
>
supportEnvList
=
new
ArrayList
<>();
private
String
groupType
;
//类型--方便前端分类展示
//菜单:java重启 功能使用:获取需要重启的java项目
private
boolean
needRestartAfterSwitch
;
public
Project
(){
}
public
Project
(
String
order
,
String
name
,
String
projectid
,
String
group
){
/*
public Project(String order, String name, String projectid, String group){
this.order = order;
this.name = name;
this.projectid = projectid;
this.group = group;
}
this.supportEnvList.addAll(ProjectOnline.getJavaEnvListALL());
}*/
public
String
getOrder
()
{
return
order
;
}
public
void
setOrder
(
String
order
)
{
public
Project
(
String
order
,
String
name
,
String
projectid
,
String
group
,
String
supportEnv
,
String
groupType
,
boolean
needRestartAfterSwitch
){
this
.
order
=
order
;
}
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
String
getProjectid
()
{
return
projectid
;
}
public
void
setProjectid
(
String
projectid
)
{
this
.
projectid
=
projectid
;
this
.
group
=
group
;
this
.
supportEnvList
.
addAll
(
Arrays
.
asList
(
supportEnv
.
split
(
","
)));
this
.
groupType
=
groupType
;
this
.
needRestartAfterSwitch
=
needRestartAfterSwitch
;
}
public
String
getGroup
()
{
return
group
;
}
public
void
setGroup
(
String
group
)
{
/*public Project(String order, String name, String projectid, String group,List<String> supportEnvs){
this.order = order;
this.name = name;
this.projectid = projectid;
this.group = group;
}
this.supportEnvList.addAll(supportEnvs);
}*/
}
...
...
monitor-service-other/src/main/java/com/monitor/other/worksystem/ctrl/ReleaseWorkCtrl.java
View file @
85e3a81
...
...
@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSONObject;
import
com.model.PendingJob
;
import
com.model.ReleaseWorkJob
;
import
com.model.User
;
import
com.monitor.common.contants.ProjectOnline
;
import
com.monitor.common.contants.ProjectOnlineResponse
;
import
com.monitor.model.domain.Project
;
import
com.monitor.model.page.PageRequest
;
import
com.monitor.model.response.BaseResponse
;
import
com.monitor.model.page.PageResponse
;
...
...
@@ -54,6 +57,18 @@ public class ReleaseWorkCtrl {
@Autowired
UserMapper
userMapper
;
@RequestMapping
(
"/loadJavaProjectOnline"
)
@ResponseBody
public
BaseResponse
<
List
<
Project
>>
loadJavaProjectOnline
()
{
BaseResponse
resp
=
new
BaseResponse
();
ProjectOnlineResponse
pro
=
new
ProjectOnlineResponse
();
pro
.
setJavaEnvAll
(
ProjectOnline
.
JAVA_ENV_ALL
);
pro
.
setJavaList
(
ProjectOnline
.
getJavaList
());
resp
.
setData
(
pro
);
return
resp
;
}
/**
* 查询发布工单列表
*
...
...
monitor-service-switch/src/main/java/com/monitor/switchs/projectRestart/common/ProjectOnline.java
deleted
100644 → 0
View file @
c6416b6
package
com
.
monitor
.
switchs
.
projectRestart
.
common
;
import
com.monitor.model.domain.Project
;
import
java.util.ArrayList
;
import
java.util.List
;
public
class
ProjectOnline
{
private
static
List
<
Project
>
JAVA_LIST
=
new
ArrayList
<
Project
>();
static
{
//核心服务
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-activity"
,
"129"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-wechat"
,
"248"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-sns"
,
"125"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-erp-gateway"
,
"977"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-message"
,
"123"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"uic"
,
"439"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-users"
,
"134"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-resources"
,
"122"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-promotion"
,
"140"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-product"
,
"143"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-order"
,
"124"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-brower"
,
"131"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-bigdata"
,
"144"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-gateway"
,
"126"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-risk"
,
"932"
,
"yoho30"
));
//单中心
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-push"
,
"137"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"cms_push"
,
"514"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-social"
,
"353"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-union"
,
"133"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-crm"
,
"275"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yohobuy-task"
,
"138"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-message-controller"
,
"684"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"1"
,
"yoho-message-sender"
,
"685"
,
"yoho30"
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yoho-search-service"
,
"12"
,
"yoho-search"
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yoho-search-consumer"
,
"8"
,
"yoho-search"
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yoho-search-producer"
,
"7"
,
"yoho-search"
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yohomars-search-service"
,
"554"
,
"yoho-search"
));
JAVA_LIST
.
add
(
new
Project
(
"2"
,
"yoho-search-adaptor"
,
"13"
,
"yoho-search"
));
JAVA_LIST
.
add
(
new
Project
(
"3"
,
"yohobuy-platform"
,
"110"
,
"platform"
));
//JAVA_LIST.add(new Project("1","mars_push","494","yoho30"));
}
public
static
List
<
Project
>
getNeedRestartJavaList
()
{
return
JAVA_LIST
;
}
}
monitor-service-switch/src/main/java/com/monitor/switchs/projectRestart/ctrl/JavaRestartCtrl.java
View file @
85e3a81
...
...
@@ -4,7 +4,7 @@ import com.monitor.model.domain.*;
import
com.monitor.model.page.PageRequest
;
import
com.monitor.model.response.BaseResponse
;
import
com.monitor.model.page.PageResponse
;
import
com.monitor.
switchs.projectRestart.common
.ProjectOnline
;
import
com.monitor.
common.contants
.ProjectOnline
;
import
com.monitor.switchs.projectRestart.common.RestartProcessStore
;
import
com.monitor.switchs.projectRestart.service.RestartService
;
import
org.slf4j.Logger
;
...
...
monitor-service-switch/src/main/java/com/monitor/switchs/projectRestart/service/impl/JavaProjectStatusLoaderTask.java
View file @
85e3a81
...
...
@@ -2,20 +2,15 @@ package com.monitor.switchs.projectRestart.service.impl;
import
com.monitor.common.ProjectConstant
;
import
com.monitor.model.domain.JavaProjectStatus
;
import
com.monitor.model.domain.Project
;
import
com.monitor.model.response.BaseResponse
;
import
com.monitor.switchs.CommodUtil
;
import
com.monitor.switchs.projectRestart.common.IpStatus
;
import
com.monitor.switchs.projectRestart.common.ProjectOnline
;
import
org.springframework.scheduling.annotation.EnableScheduling
;
import
org.springframework.scheduling.annotation.Scheduled
;
import
org.springframework.stereotype.Component
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.concurrent.ConcurrentHashMap
;
/**
...
...
monitor-service-switch/src/main/java/com/monitor/switchs/projectRestart/task/ProjectStatusTask.java
View file @
85e3a81
package
com
.
monitor
.
switchs
.
projectRestart
.
task
;
import
com.monitor.model.domain.Project
;
import
com.monitor.switchs.projectRestart.common.ProjectOnline
;
import
com.monitor.switchs.projectRestart.common.RestartProcessStore
;
import
com.monitor.switchs.projectRestart.service.RestartService
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.scheduling.annotation.Scheduled
;
import
org.springframework.stereotype.Component
;
...
...
Please
register
or
login
to post a comment