msb-public-java
/
xxl-job
mirror of https://gitee.com/xuxueli0323/xxl-job.git
4
2
Code Issues Projects Releases Wiki Activity

refactor(core): 统一使用 Response 类型替换 ReturnT

Browse Source 
- 将 JobCodeController 中的 ReturnT 替换为 Response
- 将 JobGroupController 中的 ReturnT 替换为 Response，并调整分页参数及返回结构
- 将 JobLogController 中的 ReturnT.SUCCESS_CODE 替换为 ResponseCode.CODE_202
- 将 LoginController 中的 ReturnT 替换为 Response
- 将 IndexController 中的 ReturnT 替换为 Response
- 将 EmailJobAlarm 中的 ReturnT.SUCCESS_CODE 替换为 ResponseCode.CODE_200
- 将 JobCompleter 中的 ReturnT 替换为 Response
- 将 JobCompleteHelper 中的 ReturnT.FAIL_CODE 替换为 ResponseCode.CODE_202
- 将 XxlJobServiceImpl 中的 ReturnT 替换为 Response，并优化空集合判断逻辑
- 将 XxlJobService 接口中的 ReturnT 替换为 Response
- 更新前端 JavaScript 文件以适配新的响应数据结构
3.3.0-release
xuxueli 3 months ago
parent 1570d92464
commit 66f6ae2a73
14 changed files with 94 additions and 83 deletions
Show Stats Download Patch File Download Diff File

6
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java
Unescape View File

@ -1,8 +1,8 @@
package com.xxl.job.admin.controller;
import com.xxl.job.admin.service.XxlJobService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.tool.response.Response;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@ -42,8 +42,8 @@ public class IndexController {
@RequestMapping("/chartInfo")
@ResponseBody
public ReturnT<Map<String, Object>> chartInfo(@RequestParam("startDate") Date startDate, @RequestParam("endDate") Date endDate) {
ReturnT<Map<String, Object>> chartInfo = xxlJobService.chartInfo(startDate, endDate);
public Response<Map<String, Object>> chartInfo(@RequestParam("startDate") Date startDate, @RequestParam("endDate") Date endDate) {
Response<Map<String, Object>> chartInfo = xxlJobService.chartInfo(startDate, endDate);
return chartInfo;
}

20
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobCodeController.java
Unescape View File

@ -6,9 +6,9 @@ import com.xxl.job.admin.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLogGlue;
import com.xxl.job.admin.util.I18nUtil;
import com.xxl.job.admin.util.JobGroupPermissionUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.tool.core.StringTool;
import com.xxl.tool.response.Response;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
@ -58,24 +58,24 @@ public class JobCodeController {
@RequestMapping("/save")
@ResponseBody
public ReturnT<String> save(HttpServletRequest request,
@RequestParam("id") int id,
@RequestParam("glueSource") String glueSource,
@RequestParam("glueRemark") String glueRemark) {
public Response<String> save(HttpServletRequest request,
@RequestParam("id") int id,
@RequestParam("glueSource") String glueSource,
@RequestParam("glueRemark") String glueRemark) {
// valid
if (StringTool.isBlank(glueSource)) {
return ReturnT.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_source")) );
return Response.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_source")) );
}
if (glueRemark==null) {
return ReturnT.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) );
return Response.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) );
}
if (glueRemark.length()<4 || glueRemark.length()>100) {
return ReturnT.ofFail(I18nUtil.getString("jobinfo_glue_remark_limit"));
return Response.ofFail(I18nUtil.getString("jobinfo_glue_remark_limit"));
}
XxlJobInfo existsJobInfo = xxlJobInfoMapper.loadById(id);
if (existsJobInfo == null) {
return ReturnT.ofFail( I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
return Response.ofFail( I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
}
// valid jobGroup permission
@ -103,7 +103,7 @@ public class JobCodeController {
// remove code backup more than 30
xxlJobLogGlueMapper.removeOld(existsJobInfo.getId(), 30);
return ReturnT.ofSuccess();
return Response.ofSuccess();
}
}

72
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java
Unescape View File

@ -12,6 +12,8 @@ import com.xxl.job.core.enums.RegistryConfig;
import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.tool.core.CollectionTool;
import com.xxl.tool.core.StringTool;
import com.xxl.tool.response.PageModel;
import com.xxl.tool.response.Response;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
@ -46,57 +48,57 @@ public class JobGroupController {
@RequestMapping("/pageList")
@ResponseBody
@XxlSso(role = Consts.ADMIN_ROLE)
public Map<String, Object> pageList(HttpServletRequest request,
@RequestParam(value = "start", required = false, defaultValue = "0") int start,
@RequestParam(value = "length", required = false, defaultValue = "10") int length,
@RequestParam("appname") String appname,
@RequestParam("title") String title) {
public Response<PageModel<XxlJobGroup>> pageList(HttpServletRequest request,
@RequestParam(required = false, defaultValue = "0") int offset,
@RequestParam(required = false, defaultValue = "10") int pagesize,
@RequestParam String appname,
@RequestParam String title) {
// page query
List<XxlJobGroup> list = xxlJobGroupMapper.pageList(start, length, appname, title);
int list_count = xxlJobGroupMapper.pageListCount(start, length, appname, title);
List<XxlJobGroup> list = xxlJobGroupMapper.pageList(offset, pagesize, appname, title);
int list_count = xxlJobGroupMapper.pageListCount(offset, pagesize, appname, title);
// package result
Map<String, Object> maps = new HashMap<String, Object>();
maps.put("recordsTotal", list_count); // 总记录数
maps.put("recordsFiltered", list_count); // 过滤后的总记录数
maps.put("data", list); // 分页列表
return maps;
PageModel<XxlJobGroup> pageModel = new PageModel<>();
pageModel.setPageData(list);
pageModel.setTotalCount(list_count);
return Response.ofSuccess(pageModel);
}
@RequestMapping("/save")
@ResponseBody
@XxlSso(role = Consts.ADMIN_ROLE)
public ReturnT<String> save(XxlJobGroup xxlJobGroup){
public Response<String> save(XxlJobGroup xxlJobGroup){
// valid
if (StringTool.isBlank(xxlJobGroup.getAppname())) {
return ReturnT.ofFail((I18nUtil.getString("system_please_input")+"AppName") );
return Response.ofFail((I18nUtil.getString("system_please_input")+"AppName") );
}
if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) {
return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_appname_length") );
return Response.ofFail( I18nUtil.getString("jobgroup_field_appname_length") );
}
if (xxlJobGroup.getAppname().contains(">") || xxlJobGroup.getAppname().contains("<")) {
return ReturnT.ofFail( "AppName"+I18nUtil.getString("system_unvalid") );
return Response.ofFail( "AppName"+I18nUtil.getString("system_unvalid") );
}
if (StringTool.isBlank(xxlJobGroup.getTitle())) {
return ReturnT.ofFail((I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
return Response.ofFail((I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
}
if (xxlJobGroup.getTitle().contains(">") || xxlJobGroup.getTitle().contains("<")) {
return ReturnT.ofFail(I18nUtil.getString("jobgroup_field_title")+I18nUtil.getString("system_unvalid") );
return Response.ofFail(I18nUtil.getString("jobgroup_field_title")+I18nUtil.getString("system_unvalid") );
}
if (xxlJobGroup.getAddressType()!=0) {
if (StringTool.isBlank(xxlJobGroup.getAddressList())) {
return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_addressType_limit") );
return Response.ofFail( I18nUtil.getString("jobgroup_field_addressType_limit") );
}
if (xxlJobGroup.getAddressList().contains(">") || xxlJobGroup.getAddressList().contains("<")) {
return ReturnT.ofFail(I18nUtil.getString("jobgroup_field_registryList")+I18nUtil.getString("system_unvalid") );
return Response.ofFail(I18nUtil.getString("jobgroup_field_registryList")+I18nUtil.getString("system_unvalid") );
}
String[] addresss = xxlJobGroup.getAddressList().split(",");
for (String item: addresss) {
if (StringTool.isBlank(item)) {
return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_registryList_unvalid") );
return Response.ofFail( I18nUtil.getString("jobgroup_field_registryList_unvalid") );
}
}
}
@ -105,22 +107,22 @@ public class JobGroupController {
xxlJobGroup.setUpdateTime(new Date());
int ret = xxlJobGroupMapper.save(xxlJobGroup);
return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail();
return (ret>0)?Response.ofSuccess():Response.ofFail();
}
@RequestMapping("/update")
@ResponseBody
@XxlSso(role = Consts.ADMIN_ROLE)
public ReturnT<String> update(XxlJobGroup xxlJobGroup){
public Response<String> update(XxlJobGroup xxlJobGroup){
// valid
if (StringTool.isBlank(xxlJobGroup.getAppname())) {
return ReturnT.ofFail((I18nUtil.getString("system_please_input")+"AppName") );
return Response.ofFail((I18nUtil.getString("system_please_input")+"AppName") );
}
if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) {
return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_appname_length") );
return Response.ofFail( I18nUtil.getString("jobgroup_field_appname_length") );
}
if (StringTool.isBlank(xxlJobGroup.getTitle())) {
return ReturnT.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
return Response.ofFail( (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
}
if (xxlJobGroup.getAddressType() == 0) {
// 0=自动注册
@ -134,12 +136,12 @@ public class JobGroupController {
} else {
// 1=手动录入
if (StringTool.isBlank(xxlJobGroup.getAddressList())) {
return ReturnT.ofFail( I18nUtil.getString("jobgroup_field_addressType_limit") );
return Response.ofFail( I18nUtil.getString("jobgroup_field_addressType_limit") );
}
String[] addresss = xxlJobGroup.getAddressList().split(",");
for (String item: addresss) {
if (StringTool.isBlank(item)) {
return ReturnT.ofFail(I18nUtil.getString("jobgroup_field_registryList_unvalid") );
return Response.ofFail(I18nUtil.getString("jobgroup_field_registryList_unvalid") );
}
}
}
@ -148,7 +150,7 @@ public class JobGroupController {
xxlJobGroup.setUpdateTime(new Date());
int ret = xxlJobGroupMapper.update(xxlJobGroup);
return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail();
return (ret>0)?Response.ofSuccess():Response.ofFail();
}
private List<String> findRegistryByAppName(String appnameParam){
@ -174,29 +176,29 @@ public class JobGroupController {
@RequestMapping("/remove")
@ResponseBody
@XxlSso(role = Consts.ADMIN_ROLE)
public ReturnT<String> remove(@RequestParam("id") int id){
public Response<String> remove(@RequestParam("id") int id){
// valid
int count = xxlJobInfoMapper.pageListCount(0, 10, id, -1, null, null, null);
if (count > 0) {
return ReturnT.ofFail( I18nUtil.getString("jobgroup_del_limit_0") );
return Response.ofFail( I18nUtil.getString("jobgroup_del_limit_0") );
}
List<XxlJobGroup> allList = xxlJobGroupMapper.findAll();
if (allList.size() == 1) {
return ReturnT.ofFail( I18nUtil.getString("jobgroup_del_limit_1") );
return Response.ofFail( I18nUtil.getString("jobgroup_del_limit_1") );
}
int ret = xxlJobGroupMapper.remove(id);
return (ret>0)?ReturnT.ofSuccess():ReturnT.ofFail();
return (ret>0)?Response.ofSuccess():Response.ofFail();
}
@RequestMapping("/loadById")
@ResponseBody
@XxlSso(role = Consts.ADMIN_ROLE)
public ReturnT<XxlJobGroup> loadById(@RequestParam("id") int id){
public Response<XxlJobGroup> loadById(@RequestParam("id") int id){
XxlJobGroup jobGroup = xxlJobGroupMapper.load(id);
return jobGroup!=null?ReturnT.ofSuccess(jobGroup):ReturnT.ofFail();
return jobGroup!=null?Response.ofSuccess(jobGroup):Response.ofFail();
}
}

3
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java
Unescape View File

@ -19,6 +19,7 @@ import com.xxl.tool.core.CollectionTool;
import com.xxl.tool.core.DateTool;
import com.xxl.tool.core.StringTool;
import com.xxl.tool.response.Response;
import com.xxl.tool.response.ResponseCode;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
@ -251,7 +252,7 @@ public class JobLogController {
}
if (ReturnT.SUCCESS_CODE == runResult.getCode()) {
log.setHandleCode(ReturnT.FAIL_CODE);
log.setHandleCode(ResponseCode.CODE_202.getCode());
log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():""));
log.setHandleTime(new Date());
XxlJobAdminBootstrap.getInstance().getJobCompleter().complete(log);

15
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/login/LoginController.java
Unescape View File

@ -3,7 +3,6 @@ package com.xxl.job.admin.controller.login;
import com.xxl.job.admin.mapper.XxlJobUserMapper;
import com.xxl.job.admin.model.XxlJobUser;
import com.xxl.job.admin.util.I18nUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.sso.core.annotation.XxlSso;
import com.xxl.sso.core.helper.XxlSsoHelper;
import com.xxl.sso.core.model.LoginInfo;
@ -50,7 +49,7 @@ public class LoginController {
@RequestMapping(value="/doLogin", method=RequestMethod.POST)
@ResponseBody
@XxlSso(login = false)
public ReturnT<String> doLogin(HttpServletRequest request,
public Response<String> doLogin(HttpServletRequest request,
HttpServletResponse response,
@RequestParam("userName") String userName,
@RequestParam("password") String password,
@ -59,36 +58,36 @@ public class LoginController {
// param
boolean ifRem = StringTool.isNotBlank(ifRemember) && "on".equals(ifRemember);
if (StringTool.isBlank(userName) || StringTool.isBlank(password)){
return ReturnT.ofFail( I18nUtil.getString("login_param_empty") );
return Response.ofFail( I18nUtil.getString("login_param_empty") );
}
// valid user、status
XxlJobUser xxlJobUser = xxlJobUserMapper.loadByUserName(userName);
if (xxlJobUser == null) {
return ReturnT.ofFail( I18nUtil.getString("login_param_unvalid") );
return Response.ofFail( I18nUtil.getString("login_param_unvalid") );
}
// valid passowrd
String passwordHash = SHA256Tool.sha256(password);
if (!passwordHash.equals(xxlJobUser.getPassword())) {
return ReturnT.ofFail( I18nUtil.getString("login_param_unvalid") );
return Response.ofFail( I18nUtil.getString("login_param_unvalid") );
}
// xxl-sso, do login
LoginInfo loginInfo = new LoginInfo(String.valueOf(xxlJobUser.getId()), UUIDTool.getSimpleUUID());
Response<String> result= XxlSsoHelper.loginWithCookie(loginInfo, response, ifRem);
return ReturnT.of(result.getCode(), result.getMsg());
return Response.of(result.getCode(), result.getMsg());
}
@RequestMapping(value="/logout", method=RequestMethod.POST)
@ResponseBody
@XxlSso(login = false)
public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response){
public Response<String> logout(HttpServletRequest request, HttpServletResponse response){
// xxl-sso, do logout
Response<String> result = XxlSsoHelper.logoutWithCookie(request, response);
return ReturnT.of(result.getCode(), result.getMsg());
return Response.of(result.getCode(), result.getMsg());
}
}

6
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/impl/EmailJobAlarm.java
Unescape View File

@ -6,7 +6,7 @@ import com.xxl.job.admin.model.XxlJobGroup;
import com.xxl.job.admin.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobLog;
import com.xxl.job.admin.util.I18nUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.tool.response.ResponseCode;
import jakarta.mail.internet.MimeMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -41,10 +41,10 @@ public class EmailJobAlarm implements JobAlarm {
// alarmContent
String alarmContent = "Alarm Job LogId=" + jobLog.getId();
if (jobLog.getTriggerCode() != ReturnT.SUCCESS_CODE) {
if (jobLog.getTriggerCode() != ResponseCode.CODE_200.getCode()) {
alarmContent += "<br>TriggerMsg=<br>" + jobLog.getTriggerMsg();
}
if (jobLog.getHandleCode()>0 && jobLog.getHandleCode() != ReturnT.SUCCESS_CODE) {
if (jobLog.getHandleCode()>0 && jobLog.getHandleCode() != ResponseCode.CODE_200.getCode()) {
alarmContent += "<br>HandleCode=" + jobLog.getHandleMsg();
}

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/complete/JobCompleter.java
Unescape View File

@ -7,9 +7,9 @@ import com.xxl.job.admin.model.XxlJobLog;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
import com.xxl.job.admin.util.I18nUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.context.XxlJobContext;
import com.xxl.tool.core.StringTool;
import com.xxl.tool.response.Response;
import jakarta.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -83,7 +83,7 @@ public class JobCompleter {
// trigger child job
XxlJobAdminBootstrap.getInstance().getJobTriggerPoolHelper().trigger(childJobId, TriggerTypeEnum.PARENT, -1, null, null, null);
ReturnT<String> triggerChildResult = ReturnT.ofSuccess();
Response<String> triggerChildResult = Response.ofSuccess();
// add msg
triggerChildMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg1"),

1
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/strategy/ExecutorRouteFailover.java
Unescape View File

@ -4,7 +4,6 @@ import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.scheduler.route.ExecutorRouter;
import com.xxl.job.admin.util.I18nUtil;
import com.xxl.job.core.biz.ExecutorBiz;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.biz.model.TriggerRequest;
import com.xxl.tool.response.Response;

4
xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java
Unescape View File

@ -4,9 +4,9 @@ import com.xxl.job.admin.model.XxlJobLog;
import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
import com.xxl.job.admin.util.I18nUtil;
import com.xxl.job.core.biz.model.HandleCallbackRequest;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.tool.core.DateTool;
import com.xxl.tool.response.Response;
import com.xxl.tool.response.ResponseCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -84,7 +84,7 @@ public class JobCompleteHelper {
jobLog.setId(logId);
jobLog.setHandleTime(new Date());
jobLog.setHandleCode(ReturnT.FAIL_CODE);
jobLog.setHandleCode(ResponseCode.CODE_202.getCode());
jobLog.setHandleMsg( I18nUtil.getString("joblog_lost_fail") );
XxlJobAdminBootstrap.getInstance().getJobCompleter().complete(jobLog);

3
xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java
Unescape View File

@ -5,6 +5,7 @@ import com.xxl.job.admin.model.XxlJobInfo;
import com.xxl.job.admin.model.XxlJobUser;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.response.Response;
import java.util.Date;
import java.util.Map;
@ -94,6 +95,6 @@ public interface XxlJobService {
* @param endDate
* @return
*/
public ReturnT<Map<String,Object>> chartInfo(Date startDate, Date endDate);
public Response<Map<String,Object>> chartInfo(Date startDate, Date endDate);
}

7
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
Unescape View File

@ -19,6 +19,7 @@ import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
import com.xxl.job.core.glue.GlueTypeEnum;
import com.xxl.sso.core.model.LoginInfo;
import com.xxl.tool.core.DateTool;
import com.xxl.tool.response.Response;
import jakarta.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -457,7 +458,7 @@ public class XxlJobServiceImpl implements XxlJobService {
}
@Override
public ReturnT<Map<String, Object>> chartInfo(Date startDate, Date endDate) {
public Response<Map<String, Object>> chartInfo(Date startDate, Date endDate) {
// process
List<String> triggerDayList = new ArrayList<String>();
@ -470,7 +471,7 @@ public class XxlJobServiceImpl implements XxlJobService {
List<XxlJobLogReport> logReportList = xxlJobLogReportMapper.queryLogReport(startDate, endDate);
if (logReportList!=null && logReportList.size()>0) {
if (logReportList!=null && !logReportList.isEmpty()) {
for (XxlJobLogReport item: logReportList) {
String day = DateTool.formatDate(item.getTriggerDay());
int triggerDayCountRunning = item.getRunningCount();
@ -505,7 +506,7 @@ public class XxlJobServiceImpl implements XxlJobService {
result.put("triggerCountSucTotal", triggerCountSucTotal);
result.put("triggerCountFailTotal", triggerCountFailTotal);
return ReturnT.ofSuccess(result);
return Response.ofSuccess(result);
}
}

18
xxl-job-admin/src/main/resources/static/js/index.js
Unescape View File

@ -57,8 +57,8 @@ $(function () {
dataType : "json",
success : function(data){
if (data.code == 200) {
lineChartInit(data)
pieChartInit(data);
lineChartInit(data.data)
pieChartInit(data.data);
} else {
layer.open({
title: I18n.system_tips ,
@ -106,7 +106,7 @@ $(function () {
{
type : 'category',
boundaryGap : false,
data : data.content.triggerDayList
data : data.triggerDayList
}
],
yAxis : [
@ -120,7 +120,7 @@ $(function () {
type:'line',
stack: 'Total',
areaStyle: {normal: {}},
data: data.content.triggerDayCountSucList
data: data.triggerDayCountSucList
},
{
name:I18n.joblog_status_fail,
@ -133,14 +133,14 @@ $(function () {
}
},
areaStyle: {normal: {}},
data: data.content.triggerDayCountFailList
data: data.triggerDayCountFailList
},
{
name:I18n.joblog_status_running,
type:'line',
stack: 'Total',
areaStyle: {normal: {}},
data: data.content.triggerDayCountRunningList
data: data.triggerDayCountRunningList
}
],
color:['#00A65A', '#c23632', '#F39C12']
@ -178,15 +178,15 @@ $(function () {
data:[
{
name:I18n.joblog_status_suc,
value:data.content.triggerCountSucTotal
value:data.triggerCountSucTotal
},
{
name:I18n.joblog_status_fail,
value:data.content.triggerCountFailTotal
value:data.triggerCountFailTotal
},
{
name:I18n.joblog_status_running,
value:data.content.triggerCountRunningTotal
value:data.triggerCountRunningTotal
}
],
itemStyle: {

12
xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
Unescape View File

@ -10,11 +10,19 @@ $(function() {
type:"post",
data : function ( d ) {
var obj = {};
obj.offset = d.start;
obj.pagesize = d.length;
obj.appname = $('#appname').val();
obj.title = $('#title').val();
obj.start = d.start;
obj.length = d.length;
return obj;
},
dataFilter: function (json ) {
var result = JSON.parse(json);
return JSON.stringify({
"recordsTotal": result.data.totalCount,
"recordsFiltered": result.data.totalCount,
"data": result.data.pageData
});
}
},
"searching": false,

6
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
Unescape View File

@ -312,9 +312,9 @@ $(function() {
success : function(data){
var html = '<div>';
if (data.code == 200 && data.content.registryList) {
for (var index in data.content.registryList) {
html += (parseInt(index)+1) + '. <span class="badge bg-green" >' + data.content.registryList[index] + '</span><br>';
if (data.code == 200 && data.data.registryList) {
for (var index in data.data.registryList) {
html += (parseInt(index)+1) + '. <span class="badge bg-green" >' + data.data.registryList[index] + '</span><br>';
}
}
html += '</div>';

Write Preview
Loading…
Cancel
Save