提交 0b88be5e 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码

上级 1410da84
......@@ -27,7 +27,7 @@
"file-saver": "^2.0.2",
"font-awesome": "^4.7.0",
"ibiz-gantt-elastic": "^1.0.17",
"ibiz-vue-lib": "^0.1.10",
"ibiz-vue-lib": "^0.1.13",
"interactjs": "^1.9.4",
"moment": "^2.24.0",
"path-to-regexp": "^6.1.0",
......
......@@ -73,7 +73,9 @@ import AppWFApproval from './components/app-wf-approval/app-wf-approval.vue'
import Breadcrumb from './components/app-breadcrumb/app-breadcrumb.vue'
import AppTransfer from './components/app-transfer/app-transfer.vue'
import ContextMenuDrag from './components/context-menu-drag/context-menu-drag.vue'
import AppOrgSelect from './components/app-org-select/app-org-select.vue'
import AppDepartmentSelect from './components/app-department-select/app-department-select.vue'
import AppGroupSelect from './components/app-group-select/app-group-select.vue'
// 全局挂载UI实体服务注册中心
window['uiServiceRegister'] = uiServiceRegister;
// 全局挂载功能服务注册中心
......@@ -153,10 +155,10 @@ export const AppComponents = {
v.component('context-menu',ContextMenu);
v.component('app-column-format',AppColumnFormat);
v.component('app-quick-group',AppQuickGroup);
v.component('app-org-select',() => import('./components/app-org-select/app-org-select.vue'));
v.component('app-department-select',() => import('./components/app-department-select/app-department-select.vue'));
v.component('app-group-select',() => import('./components/app-group-select/app-group-select.vue'));
v.component('app-group-picker',() => import('./components/app-group-picker/app-group-picker.vue'));
v.component('app-org-select',AppOrgSelect);
v.component('app-department-select',AppDepartmentSelect);
v.component('app-group-select',AppGroupSelect);
v.component('app-group-picker',AppGroupPicker);
v.component('app-wf-approval',AppWFApproval);
v.component('app-breadcrumb',Breadcrumb);
v.component('app-transfer',AppTransfer);
......
......@@ -6,8 +6,6 @@
<script lang="ts">
import { Vue, Component, Watch, Prop, Model } from 'vue-property-decorator';
import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
import {IBizSelectTree} from 'ibiz-vue-lib';
@Component({
})
export default class AppDepartmentSelect extends Vue {
......
......@@ -19,17 +19,14 @@
import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
import { Subject } from 'rxjs';
import { Http } from '../../utils';
import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
import {IBizSelectTree} from 'ibiz-vue-lib';
import {IBizGroupCard} from 'ibiz-vue-lib';
@Component({})
export default class IBizGroupPicker extends Vue {
export default class AppGroupPicker extends Vue {
/**
* 视图上下文参数
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
@Prop() viewdata: any;
......@@ -37,7 +34,7 @@ export default class IBizGroupPicker extends Vue {
* 视图参数
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
@Prop() viewparam: any;
......@@ -45,7 +42,7 @@ export default class IBizGroupPicker extends Vue {
* 多选
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected multiple: boolean = false;
......@@ -53,7 +50,7 @@ export default class IBizGroupPicker extends Vue {
* 加载树url
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected treeurl:any;
......@@ -61,7 +58,7 @@ export default class IBizGroupPicker extends Vue {
* 加载人员url
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected url:any;
......@@ -69,7 +66,7 @@ export default class IBizGroupPicker extends Vue {
* 树数据集
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected treeItems: any[] = [];
......@@ -77,7 +74,7 @@ export default class IBizGroupPicker extends Vue {
* 分组表数据集
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected cardItems: any[] = [];
......@@ -85,7 +82,7 @@ export default class IBizGroupPicker extends Vue {
* 视图上下文参数对象
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected viewData: any;
......@@ -93,7 +90,7 @@ export default class IBizGroupPicker extends Vue {
* 视图参数对象
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected viewParam: any;
......@@ -101,7 +98,7 @@ export default class IBizGroupPicker extends Vue {
* 树选中值
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected treeSelectVal: string = '';
......@@ -109,7 +106,7 @@ export default class IBizGroupPicker extends Vue {
* 分组表选中集合
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected cardSelctVal: any = [];
......@@ -117,7 +114,7 @@ export default class IBizGroupPicker extends Vue {
* 数据选中集合
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
protected selects: any[] = [];
......@@ -125,7 +122,7 @@ export default class IBizGroupPicker extends Vue {
* 是否显示树
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
get showTree() {
if(this.viewParam) {
......@@ -137,7 +134,7 @@ export default class IBizGroupPicker extends Vue {
* 生命周期
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
public created() {
if(!this.viewdata || !this.viewparam) {
......@@ -161,7 +158,7 @@ export default class IBizGroupPicker extends Vue {
* 加载数据
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
public load() {
if(this.showTree) {
......@@ -175,7 +172,7 @@ export default class IBizGroupPicker extends Vue {
* 加载树数据
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
public loadTree() {
let orgid = this.viewParam.filtervalue;
......@@ -194,7 +191,7 @@ export default class IBizGroupPicker extends Vue {
* 加载分组表数据
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
public loadGroupData(key: string) {
let tempUrl = this.url.replace('${selected-orgid}',key);
......@@ -212,7 +209,7 @@ export default class IBizGroupPicker extends Vue {
* 树选中
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
public treeSelect(event: any) {
if(!event || JSON.parse(event).length == 0) {
......@@ -226,7 +223,7 @@ export default class IBizGroupPicker extends Vue {
* 分组表选中
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
public groupSelect(event: any) {
if (!event || !event.select) {
......@@ -258,7 +255,7 @@ export default class IBizGroupPicker extends Vue {
* 确认
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
public onOK() {
this.$emit('close', this.selects);
......@@ -268,7 +265,7 @@ export default class IBizGroupPicker extends Vue {
* 取消
*
* @type {*}
* @memberof IBizGroupPicker
* @memberof AppGroupPicker
*/
public onCancel() {
this.$emit('close');
......
......@@ -23,12 +23,12 @@ import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
import { Subject } from 'rxjs';
@Component({})
export default class IBizGroupSelect extends Vue {
export default class AppGroupSelect extends Vue {
/**
* 名称标识
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() name!: string;
......@@ -36,7 +36,7 @@ export default class IBizGroupSelect extends Vue {
* 树加载地址
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() treeurl?:boolean;
......@@ -44,7 +44,7 @@ export default class IBizGroupSelect extends Vue {
* 数据接口地址
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() url!: string;
......@@ -52,7 +52,7 @@ export default class IBizGroupSelect extends Vue {
* 多选
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop({default: false}) multiple?: boolean;
......@@ -60,7 +60,7 @@ export default class IBizGroupSelect extends Vue {
* 数据对象
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() data: any;
......@@ -68,7 +68,7 @@ export default class IBizGroupSelect extends Vue {
* 过滤属性标识
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() filter?: string;
......@@ -76,7 +76,7 @@ export default class IBizGroupSelect extends Vue {
* 是否启用
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() disabled?: boolean;
......@@ -84,7 +84,7 @@ export default class IBizGroupSelect extends Vue {
* 值
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() value: any;
......@@ -92,7 +92,7 @@ export default class IBizGroupSelect extends Vue {
* 上下文参数
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() context: any;
......@@ -100,7 +100,7 @@ export default class IBizGroupSelect extends Vue {
* 关联属性
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() valueitem: any;
......@@ -108,7 +108,7 @@ export default class IBizGroupSelect extends Vue {
* 填充属性
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Prop() fillmap: any;
......@@ -116,7 +116,7 @@ export default class IBizGroupSelect extends Vue {
* 选中项集合
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
protected selects: any[] = [];
......@@ -124,7 +124,7 @@ export default class IBizGroupSelect extends Vue {
* 值变化
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
@Watch('value')
onValueChange(newVal: any) {
......@@ -154,7 +154,7 @@ export default class IBizGroupSelect extends Vue {
* 单选时选中名称
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
get selectName() {
if(this.selects.length > 0) {
......@@ -166,11 +166,11 @@ export default class IBizGroupSelect extends Vue {
* 打开选择视图
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
public openView() {
const view: any = {
viewname: 'ibiz-group-picker',
viewname: 'app-group-picker',
title: '分组选择'
};
const context: any = JSON.parse(JSON.stringify(this.context));
......@@ -208,7 +208,7 @@ export default class IBizGroupSelect extends Vue {
* 选择视图关闭
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
public openViewClose(result: any) {
this.selects = [];
......@@ -222,7 +222,7 @@ export default class IBizGroupSelect extends Vue {
* 数据删除
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
public remove(item: any) {
this.selects.splice(this.selects.indexOf(item), 1);
......@@ -233,7 +233,7 @@ export default class IBizGroupSelect extends Vue {
* 设置值
*
* @type {*}
* @memberof IBizGroupSelect
* @memberof AppGroupSelect
*/
public setValue() {
let item: any = {};
......
......@@ -6,8 +6,6 @@
<script lang = 'ts'>
import { Vue, Component, Prop, Watch } from "vue-property-decorator";
import { Http } from '@/utils';
import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
import {IBizSelectTree} from 'ibiz-vue-lib';
@Component({})
export default class AppOrgSelect extends Vue {
......
......@@ -131,7 +131,7 @@ export default class JobsInfoEditViewBase extends Vue {
* @type {string}
* @memberof JobsInfoEditViewBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -193,7 +193,7 @@ export default class JobsInfoGridViewBase extends Vue {
* @type {string}
* @memberof JobsInfoGridViewBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -115,7 +115,7 @@ export default class JobsLogEditViewBase extends Vue {
* @type {string}
* @memberof JobsLogEditViewBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -141,7 +141,7 @@ export default class JobsLogGridViewBase extends Vue {
* @type {string}
* @memberof JobsLogGridViewBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -131,7 +131,7 @@ export default class JobsRegistryEditViewBase extends Vue {
* @type {string}
* @memberof JobsRegistryEditViewBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -171,7 +171,7 @@ export default class JobsRegistryGridViewBase extends Vue {
* @type {string}
* @memberof JobsRegistryGridViewBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -4,13 +4,14 @@ import VueRouter from 'vue-router';
import App from '@/App.vue';
import ElementUi from 'element-ui';
import ViewUI from 'view-design';
import ibizLab from 'ibiz-vue-lib';
import { Interceptors } from '@/utils';
import {Print} from '@/utils/print';
import i18n from '@/locale'
import 'element-ui/lib/theme-chalk/index.css';
import 'view-design/dist/styles/iview.css';
import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
import '@/styles/default.less';
// 模拟数据
......@@ -31,6 +32,7 @@ Vue.config.errorHandler = function (err: any, vm: any, info: any) {
}
Vue.config.productionTip = false;
Vue.use(Print);
Vue.use(ibizLab);
Vue.use(Vuex);
Vue.use(VueRouter);;
Vue.use(ElementUi, {
......
......@@ -64,14 +64,14 @@
// tab分页模式首页布局
.index_tab_content{
.view-container {
>.view-container {
height: calc(100% - 65px);
margin: 0px 12px;
}
}
// 面包屑模式首页布局
.index_route_content{
.view-container {
>.view-container {
height: calc(100% - 36px);
margin: 12px;
}
......
......@@ -250,7 +250,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string}
* @memberof MainBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -206,7 +206,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string}
* @memberof MainBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -181,7 +181,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string}
* @memberof MainBase
*/
@Inject('navModel')
@Inject({from:'navModel',default: 'tab'})
public navModel!:string;
/**
......
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibztask/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibztask/
mvn clean package -Pweb
cd ibztask-app/ibztask-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibztask-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
......@@ -9,6 +9,6 @@ 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
EXPOSE 30005
EXPOSE 8080
ADD ibztask-app-web.jar /ibztask-app-web.jar
......@@ -3,22 +3,9 @@ services:
ibztask-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibztask-app-web:latest
ports:
- "30005:30005"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30005
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.102.211:8848
deploy:
resources:
limits:
......
......@@ -158,9 +158,9 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Override
@Transactional
public JobsInfo stop(JobsInfo et) {
et.set("Next_time","0");
et.set("Last_time","0");
et.set("Status","1");
et.set("Next_time","0");
update(et);
return et;
}
......
......@@ -173,7 +173,7 @@ public class JobsInfoResource {
return ResponseEntity.status(HttpStatus.OK).body(jobsinfodto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsInfo-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsInfo-searchDefault-all')")
@ApiOperation(value = "获取DEFAULT", tags = {"任务信息" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/jobsinfos/fetchdefault")
public ResponseEntity<List<JobsInfoDTO>> fetchDefault(JobsInfoSearchContext context) {
......@@ -186,7 +186,7 @@ public class JobsInfoResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsInfo-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsInfo-searchDefault-all')")
@ApiOperation(value = "查询DEFAULT", tags = {"任务信息" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/jobsinfos/searchdefault")
public ResponseEntity<Page<JobsInfoDTO>> searchDefault(@RequestBody JobsInfoSearchContext context) {
......
......@@ -137,7 +137,7 @@ public class JobsLockResource {
return ResponseEntity.status(HttpStatus.OK).body(jobslockMapping.toDto(jobslockService.getDraft(new JobsLock())));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLock-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLock-searchDefault-all')")
@ApiOperation(value = "获取DEFAULT", tags = {"任务锁" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/jobslocks/fetchdefault")
public ResponseEntity<List<JobsLockDTO>> fetchDefault(JobsLockSearchContext context) {
......@@ -150,7 +150,7 @@ public class JobsLockResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLock-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLock-searchDefault-all')")
@ApiOperation(value = "查询DEFAULT", tags = {"任务锁" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/jobslocks/searchdefault")
public ResponseEntity<Page<JobsLockDTO>> searchDefault(@RequestBody JobsLockSearchContext context) {
......
......@@ -137,7 +137,7 @@ public class JobsLogResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLog-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLog-searchDefault-all')")
@ApiOperation(value = "获取DEFAULT", tags = {"任务调度日志" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/jobslogs/fetchdefault")
public ResponseEntity<List<JobsLogDTO>> fetchDefault(JobsLogSearchContext context) {
......@@ -150,7 +150,7 @@ public class JobsLogResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLog-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLog-searchDefault-all')")
@ApiOperation(value = "查询DEFAULT", tags = {"任务调度日志" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/jobslogs/searchdefault")
public ResponseEntity<Page<JobsLogDTO>> searchDefault(@RequestBody JobsLogSearchContext context) {
......
......@@ -137,7 +137,7 @@ public class JobsRegistryResource {
return ResponseEntity.status(HttpStatus.OK).body(jobsregistryMapping.toDto(jobsregistryService.getDraft(new JobsRegistry())));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsRegistry-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsRegistry-searchDefault-all')")
@ApiOperation(value = "获取DEFAULT", tags = {"任务注册信息" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/jobsregistries/fetchdefault")
public ResponseEntity<List<JobsRegistryDTO>> fetchDefault(JobsRegistrySearchContext context) {
......@@ -150,7 +150,7 @@ public class JobsRegistryResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsRegistry-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsRegistry-searchDefault-all')")
@ApiOperation(value = "查询DEFAULT", tags = {"任务注册信息" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/jobsregistries/searchdefault")
public ResponseEntity<Page<JobsRegistryDTO>> searchDefault(@RequestBody JobsRegistrySearchContext context) {
......
package cn.ibizlab.util.client;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.*;
@Component
public class IBZWFFallback implements IBZWFFeignClient {
......@@ -15,4 +15,9 @@ public class IBZWFFallback implements IBZWFFeignClient {
public List<String> getbusinesskeysByUserId(String system, String userId, String entity, String processDefinitionKey, String taskDefinitionKey) {
return null;
}
@Override
public Boolean deployBpmnFile(List<Map<String, Object>> bpmnfiles) {
return null;
}
}
......@@ -2,7 +2,7 @@ package cn.ibizlab.util.client;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.*;
@FeignClient(value = "ibzwf-api",fallback = IBZWFFallback.class)
public interface IBZWFFeignClient
......@@ -15,4 +15,7 @@ public interface IBZWFFeignClient
@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks")
List<String> getbusinesskeysByUserId(@PathVariable("system") String system,@PathVariable("userId") String userId,
@PathVariable("entity") String entity,@PathVariable("processDefinitionKey") String processDefinitionKey,@PathVariable("taskDefinitionKey") String taskDefinitionKey);
@RequestMapping(method = RequestMethod.POST, value = "/deploybpmn")
Boolean deployBpmnFile(@RequestBody List<Map<String,Object>> bpmnfiles);
}
......@@ -11,7 +11,9 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.springframework.util.DigestUtils;
import java.io.InputStream;
import java.util.*;
/**
* 权限:向uaa同步当前系统菜单、权限资源任务类
......@@ -21,15 +23,14 @@ import java.io.InputStream;
@ConditionalOnProperty( name = "ibiz.enablePermissionValid", havingValue = "true")
public class PermissionSyncJob implements ApplicationRunner {
@Autowired
@Lazy
private IBZUAAFeignClient client;
@Value("${ibiz.systemid:ibztask}")
private String systemId;
@Override
public void run(ApplicationArguments args) {
try {
......@@ -40,6 +41,7 @@ public class PermissionSyncJob implements ApplicationRunner {
system.put("pssystemid",systemId);
system.put("pssystemname",systemId);
system.put("sysstructure",JSONObject.parseObject(permissionResult));
system.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes()));
if(client.syncSysAuthority(system)){
log.info("向[UAA]同步系统资源成功");
}else{
......@@ -49,5 +51,6 @@ public class PermissionSyncJob implements ApplicationRunner {
catch (Exception ex) {
log.error(String.format("向[UAA]同步系统资源失败,请检查[UAA]服务是否正常! [%s]",ex));
}
}
}
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册