Skip to content

I
ibztask
提交 b27d40ac 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码 [ibiz-task，任务调度]

上级 df9f5ddc
显示空白字符变更
内嵌 并排
正在显示 包含 71 行增加 和 35 行删除
app_web/src/locale/lanres/entities/jobs-info/jobs-info_BO_CN_base.ts
浏览文件 @ b27d40ac
......@@ -62,6 +62,7 @@ function getLocaleResourceBase(){
main_grid: {
columns: {
id: commonLogic.appcommonhandle("主键ID",null),
remark: commonLogic.appcommonhandle("备注",null),
app: commonLogic.appcommonhandle("服务名",null),
handler: commonLogic.appcommonhandle("执行器任务HANDLER",null),
cron: commonLogic.appcommonhandle("任务执行CRON",null),
......
app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts
浏览文件 @ b27d40ac
......@@ -62,6 +62,7 @@ function getLocaleResourceBase(){
main_grid: {
columns: {
id: commonLogic.appcommonhandle("主键ID",null),
remark: commonLogic.appcommonhandle("备注",null),
app: commonLogic.appcommonhandle("服务名",null),
handler: commonLogic.appcommonhandle("执行器任务HANDLER",null),
cron: commonLogic.appcommonhandle("任务执行CRON",null),
......
app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN_base.ts
浏览文件 @ b27d40ac
......@@ -62,6 +62,7 @@ function getLocaleResourceBase(){
main_grid: {
columns: {
id: commonLogic.appcommonhandle("主键ID",null),
remark: commonLogic.appcommonhandle("备注",null),
app: commonLogic.appcommonhandle("服务名",null),
handler: commonLogic.appcommonhandle("执行器任务HANDLER",null),
cron: commonLogic.appcommonhandle("任务执行CRON",null),
......
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
浏览文件 @ b27d40ac
......@@ -34,6 +34,18 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('remark')">
<el-table-column show-overflow-tooltip :prop="'remark'" :label="$t('entities.jobsinfo.main_grid.columns.remark')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.jobsinfo.main_grid.columns.remark')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.remark}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('app')">
<el-table-column show-overflow-tooltip :prop="'app'" :label="$t('entities.jobsinfo.main_grid.columns.app')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -698,6 +710,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'remark',
label: '备注',
langtag: 'entities.jobsinfo.main_grid.columns.remark',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'app',
label: '服务名',
......@@ -1474,7 +1495,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['id','app','handler','cron','last_time','next_time','status','timeout','update_time'];
let allColumns:Array<any> = ['id','remark','app','handler','cron','last_time','next_time','status','timeout','update_time'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1555,6 +1576,7 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((i+1)*100),
group: group.label,
id:'',
remark:'',
app:'',
handler:'',
cron:'',
......@@ -1590,6 +1612,7 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
id:'',
remark:'',
app:'',
handler:'',
cron:'',
......@@ -1645,6 +1668,7 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((groupIndex+1)*100),
group: group,
id:'',
remark:'',
app:'',
handler:'',
cron:'',
......
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
浏览文件 @ b27d40ac
......@@ -26,30 +26,15 @@ export default class MainModel {
]
}else{
return [
{
name: 'id',
prop: 'id',
dataType: 'TEXT',
},
{
name: 'cron',
prop: 'cron',
dataType: 'TEXT',
},
{
name: 'app',
prop: 'app',
dataType: 'TEXT',
},
{
name: 'next_time',
prop: 'next_time',
dataType: 'BIGINT',
},
{
name: 'update_time',
prop: 'update_time',
dataType: 'DATETIME',
name: 'remark',
prop: 'remark',
dataType: 'TEXT',
},
{
name: 'status',
......@@ -66,16 +51,36 @@ export default class MainModel {
prop: 'handler',
dataType: 'TEXT',
},
{
name: 'srfkey',
prop: 'id',
dataType: 'TEXT',
isEditable:true
},
{
name: 'srfdataaccaction',
prop: 'id',
dataType: 'TEXT',
},
{
name: 'srfkey',
name: 'id',
prop: 'id',
dataType: 'TEXT',
isEditable:true
},
{
name: 'cron',
prop: 'cron',
dataType: 'TEXT',
},
{
name: 'next_time',
prop: 'next_time',
dataType: 'BIGINT',
},
{
name: 'update_time',
prop: 'update_time',
dataType: 'DATETIME',
},
{
name: 'timeout',
......
ibztask-app/ibztask-app-web/src/main/docker/Dockerfile
浏览文件 @ b27d40ac
......@@ -6,11 +6,9 @@ ENV TZ=Asia/Shanghai \
IBIZ_SLEEP=0 \
JAVA_OPTS=""
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-app-web.jar
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibztask-app-web.jar
EXPOSE 8080
......
ibztask-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ b27d40ac
......@@ -4,7 +4,7 @@
<!--输出实体[JOBS_INFO]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_info-4-1">
<changeSet author="a_A_5d9d78509" id="tab-jobs_info-5-1">
<createTable tableName="JOBS_INFO">
<column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>
......
ibztask-provider/ibztask-provider-api/src/main/docker/Dockerfile
浏览文件 @ b27d40ac
......@@ -6,11 +6,9 @@ ENV TZ=Asia/Shanghai \
IBIZ_SLEEP=0 \
JAVA_OPTS=""
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-provider-api.jar
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibztask-provider-api.jar
EXPOSE 8081
......
ibztask-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
浏览文件 @ b27d40ac
......@@ -78,12 +78,14 @@ public class DELogicAspect {
EntityBase entity = null;
if ("remove".equalsIgnoreCase(action) || "get".equalsIgnoreCase(action)) {
entity = getEntity(service.getClass());
if(!ObjectUtils.isEmpty(entity)) {
String id = DEFieldCacheMap.getDEKeyField(entity.getClass());
if(StringUtils.isEmpty(id)) {
log.debug("无法获取实体主键属性[{}]",entity.getClass().getSimpleName());
return point.proceed();
}
entity.set(id, arg);
}
} else if (arg instanceof EntityBase) {
entity = (EntityBase) arg;
}
......@@ -187,7 +189,7 @@ public class DELogicAspect {
KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem).buildAll();
Results results = kieBuilder.getResults();
if (results.hasMessages(Message.Level.ERROR)) {
throw new BadRequestAlertException(String.format("编译实体处理逻辑 [%s] 发生异常, %s", logic.getName(), results.getMessages()), "LogicAspect", "reloadLogic");
throw new BadRequestAlertException(String.format("编译实体处理逻辑 [%s] 发生异常, %s", logic.getName(), results.getMessages()), "DELogicAspect", "reloadLogic");
}
KieContainer kieContainer = kieServices.newKieContainer(kieServices.getRepository().getDefaultReleaseId());
logic.setContainer(kieContainer);
......@@ -290,6 +292,7 @@ public class DELogicAspect {
logic.setMd5(getMd5(refFiles));
}
} catch (Exception e) {
log.error("执行处理逻辑失败"+e);
} finally {
try {
if (reader != null) {
......@@ -299,6 +302,7 @@ public class DELogicAspect {
bpmn.close();
}
} catch (Exception e) {
log.error("执行处理逻辑失败"+e);
}
}
return logic;
......@@ -326,7 +330,8 @@ public class DELogicAspect {
if(!ObjectUtils.isEmpty(service.getSuperclass()) && !service.getSuperclass().getName().equals(Object.class.getName())) {
return getEntity(service.getSuperclass());
}
throw new BadRequestAlertException("获取实体信息失败", "DELogicAspect", "getEntity");
log.error("获取实体信息失败，未能在[{}]中找到参数为实体类对象的行为，如create.update等",service.getSimpleName());
return null;
}
/**
......@@ -347,6 +352,7 @@ public class DELogicAspect {
buffer.append(strBpmn);
}
} catch (Exception e) {
log.error("处理逻辑版本检查失败"+e);
} finally {
if (bpmnFile != null) {
bpmnFile.close();
......@@ -359,6 +365,7 @@ public class DELogicAspect {
return null;
}
} catch (Exception e) {
log.error("处理逻辑版本检查失败"+e);
return null;
}
}
......@@ -418,6 +425,7 @@ public class DELogicAspect {
FileUtils.copyToFile(in, bpmn);
}
} catch (IOException e) {
log.error("执行处理逻辑失败，无法获取逻辑文件"+e);
} finally {
if (in != null) {
try {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或