Skip to content

I
ibzrt
提交 5766fbf2 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_qyk 发布系统代码

上级 a7f91ed9
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 879 行增加 和 532 行删除
app_Web/README.md
浏览文件 @ 5766fbf2
......@@ -117,7 +117,9 @@ $ yarn build
|─ ─ favicon.ico 图标
​ |─ ─ src 工程文件夹
|─ ─ assets 静态资源
|─ ─ codelist 动态代码表服务
|─ ─ components 基础组件，主要包含编辑器组件和其他全局使用的组件
|─ ─ counter 计数器服务
|─ ─ engine 引擎文件，主要封装了内置视图的内置逻辑
|─ ─ environments 环境文件
​ |─ ─ interface 接口文件
......@@ -150,6 +152,7 @@ $ yarn build
|─ ─ YYY-ui-logic-base.ts 应用实体界面处理逻辑文件
|─ ─ YYY-ui-logic.ts 自定义应用实体界面处理逻辑文件
|─ ─ utils 工具类文件
|─ ─ utilservice 应用功能服务
|─ ─ widgets 部件文件夹
|─ ─ appde 应用实体名称
​ |─ ─ XXX 部件名称
......
app_Web/package.json
浏览文件 @ 5766fbf2
......@@ -24,6 +24,7 @@
"element-ui": "^2.13.0",
"file-saver": "^2.0.2",
"font-awesome": "^4.7.0",
"ibiz-gantt-elastic": "^1.0.6",
"interactjs": "^1.9.4",
"moment": "^2.24.0",
"path-to-regexp": "^6.1.0",
......
app_Web/src/components/app-user/app-user.vue
浏览文件 @ 5766fbf2
......@@ -81,9 +81,16 @@ export default class AppUser extends Vue {
* @memberof AppUser
*/
public logout() {
localStorage.removeItem('user');
localStorage.removeItem('token');
this.$router.push({ name: 'login' });
const get: Promise<any> = this.$http.get('v7/logout');
get.then((response:any) =>{
if (response && response.status === 200) {
localStorage.removeItem('user');
localStorage.removeItem('token');
this.$router.push({ name: 'login' });
}
}).catch((error: any) =>{
console.error(error);
})
}
}
</script>
......
app_Web/src/pages/dict/ibzdict-grid-view/ibzdict-grid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview ibzdict-grid-view'>
<div class='view-container degridview ibzdict-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdictgridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入字典名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/dict/ibzdict-item-grid-view/ibzdict-item-grid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview ibzdict-item-grid-view'>
<div class='view-container degridview ibzdict-item-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdictitemgridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入栏目显示值" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview ibzdepartment-grid-view'>
<div class='view-container degridview ibzdepartment-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdepartmentgridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入部门名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview ibzemployee-grid-view'>
<div class='view-container degridview ibzemployee-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzemployeegridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入姓名" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview ibzorganization-grid-view'>
<div class='view-container degridview ibzorganization-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationgridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview sys-role-permissiongrid-view'>
<div class='view-container degridview sys-role-permissiongrid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissiongridview"></app-studioaction>
<card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
<div class='content-container'>
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入角色权限关系表名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview sys-rolegrid-view'>
<div class='view-container degridview sys-rolegrid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_rolegridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入角色表名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview sys-user-rolegrid-view'>
<div class='view-container degridview sys-user-rolegrid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_rolegridview"></app-studioaction>
<card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
<div class='content-container'>
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入用户角色关系表名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview wfgroup-grid-view'>
<div class='view-container degridview wfgroup-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="wfgroupgridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入组名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue
浏览文件 @ 5766fbf2
<template>
<div class='view-container degridview wfmember-grid-view'>
<div class='view-container degridview wfmember-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="wfmembergridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入组成员名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/yarn.lock
浏览文件 @ 5766fbf2
......@@ -3626,6 +3626,11 @@ date-fns@^1.27.2:
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
dayjs@^1.8.16:
version "1.8.27"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.27.tgz#a8ae63ee990af28c05c430f0e160ae835a0fbbf8"
integrity sha512-Jpa2acjWIeOkg8KURUHICk0EqnEFSSF5eMEscsOgyJ92ZukXwmpmRkPSUka7KHSfbj5eKH30ieosYip+ky9emQ==
de-indent@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
......@@ -5204,6 +5209,17 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
ibiz-gantt-elastic@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.6.tgz#1e74b0c1a684d90a6d1b203606ad52fcf613f799"
integrity sha512-8sHiSh4dRMzOQxVvKj0OeJEAoIbLeqChfMRJ4Tabum+1qYTFqZC3LNBDxg4O+xBGPi4iMBqeBjssosi25FZpOA==
dependencies:
dayjs "^1.8.16"
resize-observer-polyfill "^1.5.1"
vue "^2.6.10"
vue-slider-component "^3.0.40"
vue-switches "^2.0.1"
iconv-lite@0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
......@@ -8623,7 +8639,7 @@ requires-port@^1.0.0:
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
resize-observer-polyfill@^1.5.0:
resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
......@@ -10115,6 +10131,13 @@ vue-loader@^15.7.2:
vue-hot-reload-api "^2.3.0"
vue-style-loader "^4.1.0"
vue-property-decorator@^8.0.0:
version "8.4.2"
resolved "https://registry.yarnpkg.com/vue-property-decorator/-/vue-property-decorator-8.4.2.tgz#016e17f259f73bc547e77a50ce282ba18db4ee41"
integrity sha512-IqbARlvgPE2pzKfbecKxsu2yEH0Wv7hfHR6m4eZA3LTnNw9hveAX77vDfLFyTeMISS5N7Kucp/xRSHjcQ6bAfQ==
dependencies:
vue-class-component "^7.1.0"
vue-property-decorator@^8.3.0:
version "8.3.0"
resolved "https://registry.yarnpkg.com/vue-property-decorator/-/vue-property-decorator-8.3.0.tgz#536f027dc7d626f37c8d85a2dc02f0a6cb979440"
......@@ -10127,6 +10150,13 @@ vue-router@^3.1.3:
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.4.tgz#98a6a4dd38fca0db3b9f3c04bfbd008a3b6d958d"
integrity sha512-pX2BGvZg5/MOXbJoYsRppoZM+0B4LSszvIXQvLPZ7govbgbBorYQ4JHx99lDTjzEBkbTyKfRG+ru1VCnMuVcUg==
vue-slider-component@^3.0.40:
version "3.1.3"
resolved "https://registry.yarnpkg.com/vue-slider-component/-/vue-slider-component-3.1.3.tgz#f5e61cdbd7b677840f7286ee590c6450469f71fb"
integrity sha512-SPFb1I3G2a4thIwghvVNhcvPGCUz6PIZR1ClwtvN4MT44ZUzvqCMDS7osdKz0hdKu4kfanxET8qZn826A/XPxA==
dependencies:
vue-property-decorator "^8.0.0"
vue-style-loader@^4.1.0:
version "4.1.2"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"
......@@ -10135,6 +10165,13 @@ vue-style-loader@^4.1.0:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
vue-switches@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/vue-switches/-/vue-switches-2.0.1.tgz#f23436259c7fe4ffca9c4a6df49ac78941e20a20"
integrity sha512-rDqBtK3TKy1pEvyZeWmnSHVeXqAcn+ozch7LiNThBzr1QMjg5rhvqBY7uWeli/baDDslf6CXmBJbHPwASJLqoA==
dependencies:
vue "^2.2.6"
vue-template-compiler@^2.6.10:
version "2.6.11"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080"
......@@ -10148,7 +10185,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
vue@^2.6.10:
vue@^2.2.6, vue@^2.6.10:
version "2.6.11"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
......
config.xml
浏览文件 @ 5766fbf2
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibzrt/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzrt/
mvn clean package -Pweb
cd ibzrt-app/ibzrt-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile
浏览文件 @ 5766fbf2
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
EXPOSE 30000
EXPOSE 8080
ADD ibzrt-app-web.jar /ibzrt-app-web.jar
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
浏览文件 @ 5766fbf2
......@@ -3,11 +3,9 @@ services:
ibzrt-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports:
- "30000:30000"
- "8080:8080"
networks:
- agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
deploy:
mode: replicated
replicas: 1
......@@ -15,4 +13,5 @@ services:
networks:
agent_network:
driver: overlay
attachable: true
\ No newline at end of file
attachable: true
ibzrt-boot/pom.xml
浏览文件 @ 5766fbf2
......@@ -24,6 +24,11 @@
<artifactId>ibzrt-provider-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.ibizlab</groupId>
<artifactId>ibzrt-provider-api2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.ibizlab</groupId>
<artifactId>ibzrt-app-web</artifactId>
......
ibzrt-boot/src/main/resources/application.yml
浏览文件 @ 5766fbf2
spring:
profiles:
include: sys , web-dev, api-dev, dev
include: sys , web-dev, api-dev,api2-dev, dev
application:
name: ibzrt
main:
......
ibzrt-core/src/main/java/cn/ibizlab/core/dict/client/IBZDictFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface IBZDictFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/ibzdicts/searchdefault")
Page<IBZDict> searchDefault(IBZDictSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/ibzdicts/searchdefault")
Page<IBZDict> searchDefault(@RequestBody IBZDictSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/dict/client/IBZDictItemFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface IBZDictItemFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/ibzdictitems/searchdefault")
Page<IBZDictItem> searchDefault(IBZDictItemSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems/searchdefault")
Page<IBZDictItem> searchDefault(@RequestBody IBZDictItemSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDict.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -107,8 +109,3 @@ public class IBZDict extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDictItem.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -200,8 +202,3 @@ public class IBZDictItem extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/IBZDepartmentFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,13 +64,13 @@ public interface IBZDepartmentFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/searchcurdept")
Page<IBZDepartment> searchCurDept(IBZDepartmentSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/searchcurdept")
Page<IBZDepartment> searchCurDept(@RequestBody IBZDepartmentSearchContext context);
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/searchdefault")
Page<IBZDepartment> searchDefault(IBZDepartmentSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/searchdefault")
Page<IBZDepartment> searchDefault(@RequestBody IBZDepartmentSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/IBZEmployeeFeignClient.java
浏览文件 @ 5766fbf2
......@@ -68,8 +68,8 @@ public interface IBZEmployeeFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/searchdefault")
Page<IBZEmployee> searchDefault(IBZEmployeeSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/searchdefault")
Page<IBZEmployee> searchDefault(@RequestBody IBZEmployeeSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/ou/client/IBZOrganizationFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,18 +64,18 @@ public interface IBZOrganizationFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/searchdefault")
Page<IBZOrganization> searchDefault(IBZOrganizationSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/searchdefault")
Page<IBZOrganization> searchDefault(@RequestBody IBZOrganizationSearchContext context);
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/searchselectporg")
Page<IBZOrganization> searchSelectPOrg(IBZOrganizationSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/searchselectporg")
Page<IBZOrganization> searchSelectPOrg(@RequestBody IBZOrganizationSearchContext context);
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/searchselectsorg")
Page<IBZOrganization> searchSelectSOrg(IBZOrganizationSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/searchselectsorg")
Page<IBZOrganization> searchSelectSOrg(@RequestBody IBZOrganizationSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -204,8 +206,3 @@ public class IBZDepartment extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -520,8 +522,3 @@ public class IBZEmployee extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -162,8 +164,3 @@ public class IBZOrganization extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PERMISSIONFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_PERMISSIONFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/searchdefault")
Page<SYS_PERMISSION> searchDefault(SYS_PERMISSIONSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/searchdefault")
Page<SYS_PERMISSION> searchDefault(@RequestBody SYS_PERMISSIONSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PSAPPMENUITEMFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_PSAPPMENUITEMFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/searchdefault")
Page<SYS_PSAPPMENUITEM> searchDefault(SYS_PSAPPMENUITEMSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/searchdefault")
Page<SYS_PSAPPMENUITEM> searchDefault(@RequestBody SYS_PSAPPMENUITEMSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PSDEOPPRIVFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_PSDEOPPRIVFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/searchdefault")
Page<SYS_PSDEOPPRIV> searchDefault(SYS_PSDEOPPRIVSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/searchdefault")
Page<SYS_PSDEOPPRIV> searchDefault(@RequestBody SYS_PSDEOPPRIVSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PSSYSTEMFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_PSSYSTEMFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_pssystems/searchdefault")
Page<SYS_PSSYSTEM> searchDefault(SYS_PSSYSTEMSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_pssystems/searchdefault")
Page<SYS_PSSYSTEM> searchDefault(@RequestBody SYS_PSSYSTEMSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_PSSYSUNIRESFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_PSSYSUNIRESFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_pssysunires/searchdefault")
Page<SYS_PSSYSUNIRES> searchDefault(SYS_PSSYSUNIRESSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_pssysunires/searchdefault")
Page<SYS_PSSYSUNIRES> searchDefault(@RequestBody SYS_PSSYSUNIRESSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_ROLEFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_ROLEFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/searchdefault")
Page<SYS_ROLE> searchDefault(SYS_ROLESearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/searchdefault")
Page<SYS_ROLE> searchDefault(@RequestBody SYS_ROLESearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_ROLE_PERMISSIONFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_ROLE_PERMISSIONFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/searchdefault")
Page<SYS_ROLE_PERMISSION> searchDefault(SYS_ROLE_PERMISSIONSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/searchdefault")
Page<SYS_ROLE_PERMISSION> searchDefault(@RequestBody SYS_ROLE_PERMISSIONSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_USERFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_USERFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_users/searchdefault")
Page<SYS_USER> searchDefault(SYS_USERSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_users/searchdefault")
Page<SYS_USER> searchDefault(@RequestBody SYS_USERSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/client/SYS_USER_ROLEFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface SYS_USER_ROLEFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/searchdefault")
Page<SYS_USER_ROLE> searchDefault(SYS_USER_ROLESearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/searchdefault")
Page<SYS_USER_ROLE> searchDefault(@RequestBody SYS_USER_ROLESearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -140,8 +142,3 @@ public class SYS_PERMISSION extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSAPPMENUITEM.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -189,8 +191,3 @@ public class SYS_PSAPPMENUITEM extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSDEOPPRIV.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -216,8 +218,3 @@ public class SYS_PSDEOPPRIV extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSTEM.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -57,8 +59,3 @@ public class SYS_PSSYSTEM extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSUNIRES.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -90,8 +92,3 @@ public class SYS_PSSYSUNIRES extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -104,8 +106,3 @@ public class SYS_ROLE extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE_PERMISSION.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -164,8 +166,3 @@ public class SYS_ROLE_PERMISSION extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_USER.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -92,8 +94,3 @@ public class SYS_USER extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_USER_ROLE.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -150,8 +152,3 @@ public class SYS_USER_ROLE extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFGroupFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFGroupFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/searchdefault")
Page<WFGroup> searchDefault(WFGroupSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/searchdefault")
Page<WFGroup> searchDefault(@RequestBody WFGroupSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFMemberFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFMemberFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wfmembers/searchdefault")
Page<WFMember> searchDefault(WFMemberSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/searchdefault")
Page<WFMember> searchDefault(@RequestBody WFMemberSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFProcessDefinitionFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFProcessDefinitionFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/searchdefault")
Page<WFProcessDefinition> searchDefault(WFProcessDefinitionSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/searchdefault")
Page<WFProcessDefinition> searchDefault(@RequestBody WFProcessDefinitionSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFProcessInstanceFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFProcessInstanceFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wfprocessinstances/searchdefault")
Page<WFProcessInstance> searchDefault(WFProcessInstanceSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessinstances/searchdefault")
Page<WFProcessInstance> searchDefault(@RequestBody WFProcessInstanceSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFProcessNodeFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFProcessNodeFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wfprocessnodes/searchdefault")
Page<WFProcessNode> searchDefault(WFProcessNodeSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessnodes/searchdefault")
Page<WFProcessNode> searchDefault(@RequestBody WFProcessNodeSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFREModelFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFREModelFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wfremodels/searchdefault")
Page<WFREModel> searchDefault(WFREModelSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/searchdefault")
Page<WFREModel> searchDefault(@RequestBody WFREModelSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFSystemFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFSystemFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wfsystems/searchdefault")
Page<WFSystem> searchDefault(WFSystemSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/searchdefault")
Page<WFSystem> searchDefault(@RequestBody WFSystemSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFTaskFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFTaskFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wftasks/searchdefault")
Page<WFTask> searchDefault(WFTaskSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wftasks/searchdefault")
Page<WFTask> searchDefault(@RequestBody WFTaskSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFTaskWayFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFTaskWayFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wftaskways/searchdefault")
Page<WFTaskWay> searchDefault(WFTaskWaySearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wftaskways/searchdefault")
Page<WFTaskWay> searchDefault(@RequestBody WFTaskWaySearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFUserFeignClient.java
浏览文件 @ 5766fbf2
......@@ -64,8 +64,8 @@ public interface WFUserFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/wfusers/searchdefault")
Page<WFUser> searchDefault(WFUserSearchContext context);
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/searchdefault")
Page<WFUser> searchDefault(@RequestBody WFUserSearchContext context);
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -79,8 +81,3 @@ public class WFGroup extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFMember.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -113,8 +115,3 @@ public class WFMember extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessDefinition.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -141,8 +143,3 @@ public class WFProcessDefinition extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessInstance.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -131,8 +133,3 @@ public class WFProcessInstance extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessNode.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -88,8 +90,3 @@ public class WFProcessNode extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFREModel.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -72,8 +74,3 @@ public class WFREModel extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFSystem.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -57,8 +59,3 @@ public class WFSystem extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTask.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -118,8 +120,3 @@ public class WFTask extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTaskWay.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -146,8 +148,3 @@ public class WFTaskWay extends EntityClient implements Serializable {
}
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFUser.java
浏览文件 @ 5766fbf2
......@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.util.DigestUtils;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.annotation.DEField;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
......@@ -73,8 +75,3 @@ public class WFUser extends EntityClient implements Serializable {
}
ibzrt-core/src/main/resources/liquibase/changelog/20190625112530_init_ibizsys.xml
浏览文件 @ 5766fbf2
......@@ -56,6 +56,7 @@
<column name="FONTSIZE" type="VARCHAR2(10 BYTE)"/>
<column name="LANG" type="VARCHAR2(100 BYTE)"/>
<column name="MEMO" type="VARCHAR2(500 BYTE)"/>
<column name="SUPERUSER" type="INTEGER"/>
</createTable>
</changeSet>
<changeSet author="Think (generated)" id="1561433044682-3">
......@@ -65,6 +66,7 @@
<column name="USERNAME" value="系统管理员"/>
<column name="USERCODE" value="0100"/>
<column name="LOGINNAME" value="ibzadmin"/>
<column name="SUPERUSER" value="1"/>
<column name="PASSWORD" value="123456"/>
<column name="DOMAINS" value="100000"/>
<column name="MDEPTID"/>
......
ibzrt-core/src/main/resources/liquibase/h2.xml
浏览文件 @ 5766fbf2
......@@ -5,7 +5,6 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<include file="changelog/20190625112530_init_ibizsys.xml" relativeToChangelogFile="true"/>
<include file="changelog/20190817112530_init_ibizsys_audit.xml" relativeToChangelogFile="true"/>
<include file="h2_table.xml" relativeToChangelogFile="true"/>
<include file="view.xml" relativeToChangelogFile="true"/>
......
ibzrt-core/src/main/resources/permission/systemResource.json
浏览文件 @ 5766fbf2
{
"unires":[
],
"predefineddatarange":[{"id":"ALL","name":"全部数据"},{"id":"CURORG","name":"当前单位"},{"id":"PORG","name":"上级单位"},{"id":"SORG","name":"下级单位"},{"id":"CURORGDEPT","name":"当前部门"},{"id":"PORGDEPT","name":"上级部门"},{"id":"SORGDEPT","name":"下级部门"}],
"entities":[
{
"dename":"SYS_ROLE_PERMISSION",
"delogicname":"角色权限关系",
"sysmoudle":{"id":"UAA","name":"uaa"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
, {
"dename":"SYS_USER",
"delogicname":"系统用户",
"sysmoudle":{"id":"UAA","name":"uaa"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
, {
"dename":"IBZDictItem",
"delogicname":"字典项目",
"sysmoudle":{"id":"DICT","name":"dict"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
}
, {
"dename":"WFMember",
"delogicname":"成员",
"sysmoudle":{"id":"WORKFLOW","name":"workflow"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
, {
"dename":"IBZDict",
"delogicname":"数据字典",
"sysmoudle":{"id":"DICT","name":"dict"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
}
, {
"dename":"WFUser",
"delogicname":"用户",
"sysmoudle":{"id":"WORKFLOW","name":"workflow"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
, {
"dename":"IBZOrganization",
"delogicname":"单位机构",
"sysmoudle":{"id":"OU","name":"ou"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"},{"id":"SelectPOrg" , "name":"查询上级单位"},{"id":"SelectSOrg" , "name":"查询下级单位"}],
"deaction":[{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"curorg","name":"当前单位"},{"id":"porg","name":"上级单位"},{"id":"sorg","name":"下级单位"} ]
}
, {
"dename":"WFGroup",
"delogicname":"角色/用户组",
"sysmoudle":{"id":"WORKFLOW","name":"workflow"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
, {
"dename":"SYS_USER_ROLE",
"delogicname":"用户角色关系",
"sysmoudle":{"id":"UAA","name":"uaa"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
, {
"dename":"SYS_ROLE",
"delogicname":"系统角色",
"sysmoudle":{"id":"UAA","name":"uaa"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
, {
"dename":"IBZDepartment",
"delogicname":"部门",
"sysmoudle":{"id":"OU","name":"ou"},
"dedataset":[{"id":"CurDept" , "name":"CurDept"},{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"curorg","name":"当前单位"},{"id":"porg","name":"上级单位"},{"id":"sorg","name":"下级单位"} ]
}
, {
"dename":"SYS_PERMISSION",
"delogicname":"权限/资源",
"sysmoudle":{"id":"UAA","name":"uaa"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
, {
"dename":"IBZEmployee",
"delogicname":"人员",
"sysmoudle":{"id":"OU","name":"ou"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"InitPwd" , "name":"初始化密码" , "type":"USERCUSTOM" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"curorg","name":"当前单位"},{"id":"porg","name":"上级单位"},{"id":"sorg","name":"下级单位"} ]
}
],
"appmenus":[
......
ibzrt-dependencies/pom.xml
浏览文件 @ 5766fbf2
......@@ -71,6 +71,9 @@
<!--反序列化工具-->
<kryo.version>4.0.2</kryo.version>
<!--httpClient -->
<openfeign-httpclient.version>11.0</openfeign-httpclient.version>
</properties>
<dependencyManagement>
......@@ -250,6 +253,11 @@
<version>${kryo.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-httpclient</artifactId>
<version>${openfeign-httpclient.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
......
ibzrt-provider/ibzrt-provider-api/src/main/docker/ibzrt-provider-api.yaml
浏览文件 @ 5766fbf2
......@@ -13,4 +13,5 @@ services:
networks:
agent_network:
driver: overlay
attachable: true
\ No newline at end of file
attachable: true
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/config/apiSecurityConfig.java
浏览文件 @ 5766fbf2
......@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
@Profile("api-prod")
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class apiSecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java
浏览文件 @ 5766fbf2
......@@ -83,7 +83,7 @@ public class IBZDepartmentResource {
@PreAuthorize("hasPermission('Remove',{#ibzdepartment_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasPermission(#ibzdepartment_id,'Remove',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "Remove", tags = {"IBZDepartment" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}")
......@@ -143,7 +143,6 @@ public class IBZDepartmentResource {
IBZDepartmentDTO dto = ibzdepartmentMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "createBatch", tags = {"IBZDepartment" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/batch")
......@@ -161,7 +160,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentMapping.toDto(ibzdepartmentService.getDraft(new IBZDepartment())));
}
@PreAuthorize("hasPermission('Get',{#context,'CurDept',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZDepartment-CurDept-all')")
@ApiOperation(value = "fetchCurDept", tags = {"IBZDepartment" } ,notes = "fetchCurDept")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/fetchcurdept")
public ResponseEntity<List<IBZDepartmentDTO>> fetchCurDept(IBZDepartmentSearchContext context) {
......@@ -174,16 +173,16 @@ public class IBZDepartmentResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'CurDept',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZDepartment-CurDept-all')")
@ApiOperation(value = "searchCurDept", tags = {"IBZDepartment" } ,notes = "searchCurDept")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/searchcurdept")
public ResponseEntity<Page<IBZDepartmentDTO>> searchCurDept(IBZDepartmentSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/searchcurdept")
public ResponseEntity<Page<IBZDepartmentDTO>> searchCurDept(@RequestBody IBZDepartmentSearchContext context) {
Page<IBZDepartment> domains = ibzdepartmentService.searchCurDept(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdepartmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZDepartment-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZDepartment" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/fetchdefault")
public ResponseEntity<List<IBZDepartmentDTO>> fetchDefault(IBZDepartmentSearchContext context) {
......@@ -196,10 +195,10 @@ public class IBZDepartmentResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZDepartment-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"IBZDepartment" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/searchdefault")
public ResponseEntity<Page<IBZDepartmentDTO>> searchDefault(IBZDepartmentSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/searchdefault")
public ResponseEntity<Page<IBZDepartmentDTO>> searchDefault(@RequestBody IBZDepartmentSearchContext context) {
Page<IBZDepartment> domains = ibzdepartmentService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdepartmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......@@ -321,8 +320,8 @@ public class IBZDepartmentResource {
}
@ApiOperation(value = "searchCurDeptByIBZOrganization", tags = {"IBZDepartment" } ,notes = "searchCurDeptByIBZOrganization")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchcurdept")
public ResponseEntity<Page<IBZDepartmentDTO>> searchIBZDepartmentCurDeptByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZDepartmentSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchcurdept")
public ResponseEntity<Page<IBZDepartmentDTO>> searchIBZDepartmentCurDeptByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentSearchContext context) {
context.setN_orgid_eq(ibzorganization_id);
Page<IBZDepartment> domains = ibzdepartmentService.searchCurDept(context) ;
return ResponseEntity.status(HttpStatus.OK)
......@@ -343,8 +342,8 @@ public class IBZDepartmentResource {
}
@ApiOperation(value = "searchDEFAULTByIBZOrganization", tags = {"IBZDepartment" } ,notes = "searchDEFAULTByIBZOrganization")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchdefault")
public ResponseEntity<Page<IBZDepartmentDTO>> searchIBZDepartmentDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZDepartmentSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchdefault")
public ResponseEntity<Page<IBZDepartmentDTO>> searchIBZDepartmentDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentSearchContext context) {
context.setN_orgid_eq(ibzorganization_id);
Page<IBZDepartment> domains = ibzdepartmentService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDictItemResource.java
浏览文件 @ 5766fbf2
......@@ -103,7 +103,7 @@ public class IBZDictItemResource {
@PreAuthorize("hasPermission('Remove',{#ibzdictitem_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasPermission(#ibzdictitem_id,'Remove',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "Remove", tags = {"IBZDictItem" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdictitems/{ibzdictitem_id}")
......@@ -143,7 +143,6 @@ public class IBZDictItemResource {
IBZDictItemDTO dto = ibzdictitemMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "createBatch", tags = {"IBZDictItem" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdictitems/batch")
......@@ -161,7 +160,7 @@ public class IBZDictItemResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdictitemMapping.toDto(ibzdictitemService.getDraft(new IBZDictItem())));
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZDictItem-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZDictItem" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdictitems/fetchdefault")
public ResponseEntity<List<IBZDictItemDTO>> fetchDefault(IBZDictItemSearchContext context) {
......@@ -174,10 +173,10 @@ public class IBZDictItemResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZDictItem-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"IBZDictItem" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdictitems/searchdefault")
public ResponseEntity<Page<IBZDictItemDTO>> searchDefault(IBZDictItemSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzdictitems/searchdefault")
public ResponseEntity<Page<IBZDictItemDTO>> searchDefault(@RequestBody IBZDictItemSearchContext context) {
Page<IBZDictItem> domains = ibzdictitemService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdictitemMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......@@ -299,8 +298,8 @@ public class IBZDictItemResource {
}
@ApiOperation(value = "searchDEFAULTByIBZDict", tags = {"IBZDictItem" } ,notes = "searchDEFAULTByIBZDict")
@RequestMapping(method= RequestMethod.GET , value="/ibzdicts/{ibzdict_id}/ibzdictitems/searchdefault")
public ResponseEntity<Page<IBZDictItemDTO>> searchIBZDictItemDefaultByIBZDict(@PathVariable("ibzdict_id") String ibzdict_id,IBZDictItemSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzdicts/{ibzdict_id}/ibzdictitems/searchdefault")
public ResponseEntity<Page<IBZDictItemDTO>> searchIBZDictItemDefaultByIBZDict(@PathVariable("ibzdict_id") String ibzdict_id, @RequestBody IBZDictItemSearchContext context) {
context.setN_dictid_eq(ibzdict_id);
Page<IBZDictItem> domains = ibzdictitemService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDictResource.java
浏览文件 @ 5766fbf2
......@@ -65,7 +65,6 @@ public class IBZDictResource {
IBZDictDTO dto = ibzdictMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "createBatch", tags = {"IBZDict" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdicts/batch")
......@@ -77,7 +76,7 @@ public class IBZDictResource {
@PreAuthorize("hasPermission('Remove',{#ibzdict_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasPermission(#ibzdict_id,'Remove',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "Remove", tags = {"IBZDict" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdicts/{ibzdict_id}")
......@@ -161,7 +160,7 @@ public class IBZDictResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdictService.checkKey(ibzdictMapping.toDomain(ibzdictdto)));
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZDict-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZDict" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdicts/fetchdefault")
public ResponseEntity<List<IBZDictDTO>> fetchDefault(IBZDictSearchContext context) {
......@@ -174,10 +173,10 @@ public class IBZDictResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZDict-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"IBZDict" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdicts/searchdefault")
public ResponseEntity<Page<IBZDictDTO>> searchDefault(IBZDictSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzdicts/searchdefault")
public ResponseEntity<Page<IBZDictDTO>> searchDefault(@RequestBody IBZDictSearchContext context) {
Page<IBZDict> domains = ibzdictService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdictMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java
浏览文件 @ 5766fbf2
......@@ -55,7 +55,7 @@ public class IBZEmployeeResource {
@PreAuthorize("hasPermission('Remove',{#ibzemployee_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasPermission(#ibzemployee_id,'Remove',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "Remove", tags = {"IBZEmployee" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{ibzemployee_id}")
......@@ -165,7 +165,6 @@ public class IBZEmployeeResource {
IBZEmployeeDTO dto = ibzemployeeMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "createBatch", tags = {"IBZEmployee" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/batch")
......@@ -174,7 +173,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZEmployee-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZEmployee" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzemployees/fetchdefault")
public ResponseEntity<List<IBZEmployeeDTO>> fetchDefault(IBZEmployeeSearchContext context) {
......@@ -187,10 +186,10 @@ public class IBZEmployeeResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZEmployee-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"IBZEmployee" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchDefault(IBZEmployeeSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchDefault(@RequestBody IBZEmployeeSearchContext context) {
Page<IBZEmployee> domains = ibzemployeeService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzemployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......@@ -323,8 +322,8 @@ public class IBZEmployeeResource {
}
@ApiOperation(value = "searchDEFAULTByIBZDepartment", tags = {"IBZEmployee" } ,notes = "searchDEFAULTByIBZDepartment")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZEmployeeSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeSearchContext context) {
context.setN_mdeptid_eq(ibzdepartment_id);
Page<IBZEmployee> domains = ibzemployeeService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......@@ -458,8 +457,8 @@ public class IBZEmployeeResource {
}
@ApiOperation(value = "searchDEFAULTByIBZOrganization", tags = {"IBZEmployee" } ,notes = "searchDEFAULTByIBZOrganization")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZEmployeeSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeSearchContext context) {
context.setN_orgid_eq(ibzorganization_id);
Page<IBZEmployee> domains = ibzemployeeService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......@@ -594,8 +593,8 @@ public class IBZEmployeeResource {
}
@ApiOperation(value = "searchDEFAULTByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" } ,notes = "searchDEFAULTByIBZOrganizationIBZDepartment")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZEmployeeSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeSearchContext context) {
context.setN_mdeptid_eq(ibzdepartment_id);
Page<IBZEmployee> domains = ibzemployeeService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/IBZOrganizationResource.java
浏览文件 @ 5766fbf2
......@@ -102,7 +102,6 @@ public class IBZOrganizationResource {
IBZOrganizationDTO dto = ibzorganizationMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "createBatch", tags = {"IBZOrganization" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/batch")
......@@ -114,7 +113,7 @@ public class IBZOrganizationResource {
@PreAuthorize("hasPermission('Remove',{#ibzorganization_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasPermission(#ibzorganization_id,'Remove',{this.getEntity(),'ServiceApi'})")
@ApiOperation(value = "Remove", tags = {"IBZOrganization" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}")
......@@ -161,7 +160,7 @@ public class IBZOrganizationResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZOrganization-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZOrganization" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchdefault")
public ResponseEntity<List<IBZOrganizationDTO>> fetchDefault(IBZOrganizationSearchContext context) {
......@@ -174,16 +173,16 @@ public class IBZOrganizationResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZOrganization-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"IBZOrganization" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/searchdefault")
public ResponseEntity<Page<IBZOrganizationDTO>> searchDefault(IBZOrganizationSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchdefault")
public ResponseEntity<Page<IBZOrganizationDTO>> searchDefault(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasPermission('Get',{#context,'SelectPOrg',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZOrganization-SelectPOrg-all')")
@ApiOperation(value = "fetch查询上级单位", tags = {"IBZOrganization" } ,notes = "fetch查询上级单位")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchselectporg")
public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectPOrg(IBZOrganizationSearchContext context) {
......@@ -196,16 +195,16 @@ public class IBZOrganizationResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'SelectPOrg',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZOrganization-SelectPOrg-all')")
@ApiOperation(value = "search查询上级单位", tags = {"IBZOrganization" } ,notes = "search查询上级单位")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/searchselectporg")
public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectPOrg(IBZOrganizationSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchselectporg")
public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectPOrg(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectPOrg(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasPermission('Get',{#context,'SelectSOrg',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZOrganization-SelectSOrg-all')")
@ApiOperation(value = "fetch查询下级单位", tags = {"IBZOrganization" } ,notes = "fetch查询下级单位")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchselectsorg")
public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectSOrg(IBZOrganizationSearchContext context) {
......@@ -218,10 +217,10 @@ public class IBZOrganizationResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'SelectSOrg',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-IBZOrganization-SelectSOrg-all')")
@ApiOperation(value = "search查询下级单位", tags = {"IBZOrganization" } ,notes = "search查询下级单位")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/searchselectsorg")
public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectSOrg(IBZOrganizationSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchselectsorg")
public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectSOrg(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectSOrg(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PERMISSIONResource.java
浏览文件 @ 5766fbf2
......@@ -80,7 +80,7 @@ public class SYS_PERMISSIONResource {
@PreAuthorize("hasPermission('Remove',{#sys_permission_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_PERMISSION-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_PERMISSION" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/{sys_permission_id}")
......@@ -98,7 +98,7 @@ public class SYS_PERMISSIONResource {
@PreAuthorize("hasPermission(#sys_permission_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_PERMISSION-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_PERMISSION" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/{sys_permission_id}")
......@@ -110,7 +110,7 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#sys_permission_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_PERMISSION-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_PERMISSION" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
......@@ -121,7 +121,7 @@ public class SYS_PERMISSIONResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_PERMISSION-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_PERMISSION" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions")
......@@ -131,8 +131,7 @@ public class SYS_PERMISSIONResource {
SYS_PERMISSIONDTO dto = sys_permissionMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_PERMISSION-Create-all')")
@ApiOperation(value = "createBatch", tags = {"SYS_PERMISSION" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
......@@ -152,7 +151,7 @@ public class SYS_PERMISSIONResource {
@PreAuthorize("hasPermission(#sys_permission_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_PERMISSION-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_PERMISSION" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/{sys_permission_id}")
public ResponseEntity<SYS_PERMISSIONDTO> get(@PathVariable("sys_permission_id") String sys_permission_id) {
......@@ -161,7 +160,7 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_PERMISSION-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PERMISSION" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_permissions/fetchdefault")
public ResponseEntity<List<SYS_PERMISSIONDTO>> fetchDefault(SYS_PERMISSIONSearchContext context) {
......@@ -174,10 +173,10 @@ public class SYS_PERMISSIONResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_PERMISSION-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PERMISSION" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_permissions/searchdefault")
public ResponseEntity<Page<SYS_PERMISSIONDTO>> searchDefault(SYS_PERMISSIONSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_permissions/searchdefault")
public ResponseEntity<Page<SYS_PERMISSIONDTO>> searchDefault(@RequestBody SYS_PERMISSIONSearchContext context) {
Page<SYS_PERMISSION> domains = sys_permissionService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLEResource.java
浏览文件 @ 5766fbf2
......@@ -71,7 +71,7 @@ public class SYS_ROLEResource {
@PreAuthorize("hasPermission(#sys_role_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_ROLE" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/{sys_role_id}")
......@@ -83,7 +83,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#sys_role_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_ROLE" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
......@@ -94,7 +94,7 @@ public class SYS_ROLEResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_ROLE" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles")
......@@ -104,8 +104,7 @@ public class SYS_ROLEResource {
SYS_ROLEDTO dto = sys_roleMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE-Create-all')")
@ApiOperation(value = "createBatch", tags = {"SYS_ROLE" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
......@@ -116,7 +115,7 @@ public class SYS_ROLEResource {
@PreAuthorize("hasPermission(#sys_role_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_ROLE" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}")
public ResponseEntity<SYS_ROLEDTO> get(@PathVariable("sys_role_id") String sys_role_id) {
......@@ -128,7 +127,7 @@ public class SYS_ROLEResource {
@PreAuthorize("hasPermission('Remove',{#sys_role_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_ROLE" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/{sys_role_id}")
......@@ -161,7 +160,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(sys_roleService.checkKey(sys_roleMapping.toDomain(sys_roledto)));
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_ROLE" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_roles/fetchdefault")
public ResponseEntity<List<SYS_ROLEDTO>> fetchDefault(SYS_ROLESearchContext context) {
......@@ -174,10 +173,10 @@ public class SYS_ROLEResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_ROLE" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_roles/searchdefault")
public ResponseEntity<Page<SYS_ROLEDTO>> searchDefault(SYS_ROLESearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_roles/searchdefault")
public ResponseEntity<Page<SYS_ROLEDTO>> searchDefault(@RequestBody SYS_ROLESearchContext context) {
Page<SYS_ROLE> domains = sys_roleService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_roleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLE_PERMISSIONResource.java
浏览文件 @ 5766fbf2
......@@ -55,7 +55,7 @@ public class SYS_ROLE_PERMISSIONResource {
@PreAuthorize("hasPermission(#sys_role_permission_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE_PERMISSION-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_ROLE_PERMISSION" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/{sys_role_permission_id}")
public ResponseEntity<SYS_ROLE_PERMISSIONDTO> get(@PathVariable("sys_role_permission_id") String sys_role_permission_id) {
......@@ -67,7 +67,7 @@ public class SYS_ROLE_PERMISSIONResource {
@PreAuthorize("hasPermission('Remove',{#sys_role_permission_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE_PERMISSION-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_ROLE_PERMISSION" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_role_permissions/{sys_role_permission_id}")
......@@ -94,7 +94,7 @@ public class SYS_ROLE_PERMISSIONResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE_PERMISSION-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_ROLE_PERMISSION" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions")
......@@ -104,8 +104,7 @@ public class SYS_ROLE_PERMISSIONResource {
SYS_ROLE_PERMISSIONDTO dto = sys_role_permissionMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE_PERMISSION-Create-all')")
@ApiOperation(value = "createBatch", tags = {"SYS_ROLE_PERMISSION" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
......@@ -141,7 +140,7 @@ public class SYS_ROLE_PERMISSIONResource {
@PreAuthorize("hasPermission(#sys_role_permission_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE_PERMISSION-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_ROLE_PERMISSION" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_role_permissions/{sys_role_permission_id}")
......@@ -153,7 +152,7 @@ public class SYS_ROLE_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#sys_role_permission_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE_PERMISSION-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_ROLE_PERMISSION" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_role_permissions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
......@@ -161,7 +160,7 @@ public class SYS_ROLE_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE_PERMISSION-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_role_permissions/fetchdefault")
public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchDefault(SYS_ROLE_PERMISSIONSearchContext context) {
......@@ -174,10 +173,10 @@ public class SYS_ROLE_PERMISSIONResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_ROLE_PERMISSION-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_role_permissions/searchdefault")
public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchDefault(SYS_ROLE_PERMISSIONSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_role_permissions/searchdefault")
public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchDefault(@RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
Page<SYS_ROLE_PERMISSION> domains = sys_role_permissionService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_role_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......@@ -299,8 +298,8 @@ public class SYS_ROLE_PERMISSIONResource {
}
@ApiOperation(value = "searchDEFAULTBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchDEFAULTBySYS_PERMISSION")
@RequestMapping(method= RequestMethod.GET , value="/sys_permissions/{sys_permission_id}/sys_role_permissions/searchdefault")
public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchSYS_ROLE_PERMISSIONDefaultBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id,SYS_ROLE_PERMISSIONSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_permissions/{sys_permission_id}/sys_role_permissions/searchdefault")
public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchSYS_ROLE_PERMISSIONDefaultBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
context.setN_sys_permissionid_eq(sys_permission_id);
Page<SYS_ROLE_PERMISSION> domains = sys_role_permissionService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......@@ -423,8 +422,8 @@ public class SYS_ROLE_PERMISSIONResource {
}
@ApiOperation(value = "searchDEFAULTBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchDEFAULTBySYS_ROLE")
@RequestMapping(method= RequestMethod.GET , value="/sys_roles/{sys_role_id}/sys_role_permissions/searchdefault")
public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchSYS_ROLE_PERMISSIONDefaultBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id,SYS_ROLE_PERMISSIONSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_roles/{sys_role_id}/sys_role_permissions/searchdefault")
public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchSYS_ROLE_PERMISSIONDefaultBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
context.setN_sys_roleid_eq(sys_role_id);
Page<SYS_ROLE_PERMISSION> domains = sys_role_permissionService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_USERResource.java
浏览文件 @ 5766fbf2
......@@ -55,7 +55,7 @@ public class SYS_USERResource {
@PreAuthorize("hasPermission('Remove',{#sys_user_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_USER" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/{sys_user_id}")
......@@ -73,7 +73,7 @@ public class SYS_USERResource {
@PreAuthorize("hasPermission(#sys_user_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_USER" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/{sys_user_id}")
......@@ -85,7 +85,7 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#sys_user_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_USER" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
......@@ -105,7 +105,7 @@ public class SYS_USERResource {
@PreAuthorize("hasPermission(#sys_user_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_USER" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_users/{sys_user_id}")
public ResponseEntity<SYS_USERDTO> get(@PathVariable("sys_user_id") String sys_user_id) {
......@@ -142,7 +142,7 @@ public class SYS_USERResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_USER" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users")
......@@ -152,8 +152,7 @@ public class SYS_USERResource {
SYS_USERDTO dto = sys_userMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER-Create-all')")
@ApiOperation(value = "createBatch", tags = {"SYS_USER" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
......@@ -161,7 +160,7 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_USER" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_users/fetchdefault")
public ResponseEntity<List<SYS_USERDTO>> fetchDefault(SYS_USERSearchContext context) {
......@@ -174,10 +173,10 @@ public class SYS_USERResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_USER" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_users/searchdefault")
public ResponseEntity<Page<SYS_USERDTO>> searchDefault(SYS_USERSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_users/searchdefault")
public ResponseEntity<Page<SYS_USERDTO>> searchDefault(@RequestBody SYS_USERSearchContext context) {
Page<SYS_USER> domains = sys_userService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_userMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_USER_ROLEResource.java
浏览文件 @ 5766fbf2
......@@ -73,7 +73,7 @@ public class SYS_USER_ROLEResource {
@PreAuthorize("hasPermission(#sys_user_role_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER_ROLE-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_USER_ROLE" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_user_roles/{sys_user_role_id}")
......@@ -85,7 +85,7 @@ public class SYS_USER_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#sys_user_role_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER_ROLE-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_USER_ROLE" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_user_roles/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
......@@ -96,7 +96,7 @@ public class SYS_USER_ROLEResource {
@PreAuthorize("hasPermission('Remove',{#sys_user_role_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER_ROLE-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_USER_ROLE" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_user_roles/{sys_user_role_id}")
......@@ -114,7 +114,7 @@ public class SYS_USER_ROLEResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER_ROLE-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_USER_ROLE" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles")
......@@ -124,8 +124,7 @@ public class SYS_USER_ROLEResource {
SYS_USER_ROLEDTO dto = sys_user_roleMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER_ROLE-Create-all')")
@ApiOperation(value = "createBatch", tags = {"SYS_USER_ROLE" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
......@@ -136,7 +135,7 @@ public class SYS_USER_ROLEResource {
@PreAuthorize("hasPermission(#sys_user_role_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER_ROLE-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_USER_ROLE" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/{sys_user_role_id}")
public ResponseEntity<SYS_USER_ROLEDTO> get(@PathVariable("sys_user_role_id") String sys_user_role_id) {
......@@ -161,7 +160,7 @@ public class SYS_USER_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER_ROLE-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_USER_ROLE" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_user_roles/fetchdefault")
public ResponseEntity<List<SYS_USER_ROLEDTO>> fetchDefault(SYS_USER_ROLESearchContext context) {
......@@ -174,10 +173,10 @@ public class SYS_USER_ROLEResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-SYS_USER_ROLE-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_USER_ROLE" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_user_roles/searchdefault")
public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchDefault(SYS_USER_ROLESearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_user_roles/searchdefault")
public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchDefault(@RequestBody SYS_USER_ROLESearchContext context) {
Page<SYS_USER_ROLE> domains = sys_user_roleService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_user_roleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......@@ -299,8 +298,8 @@ public class SYS_USER_ROLEResource {
}
@ApiOperation(value = "searchDEFAULTBySYS_ROLE", tags = {"SYS_USER_ROLE" } ,notes = "searchDEFAULTBySYS_ROLE")
@RequestMapping(method= RequestMethod.GET , value="/sys_roles/{sys_role_id}/sys_user_roles/searchdefault")
public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchSYS_USER_ROLEDefaultBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id,SYS_USER_ROLESearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_roles/{sys_role_id}/sys_user_roles/searchdefault")
public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchSYS_USER_ROLEDefaultBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_USER_ROLESearchContext context) {
context.setN_sys_roleid_eq(sys_role_id);
Page<SYS_USER_ROLE> domains = sys_user_roleService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......@@ -423,8 +422,8 @@ public class SYS_USER_ROLEResource {
}
@ApiOperation(value = "searchDEFAULTBySYS_USER", tags = {"SYS_USER_ROLE" } ,notes = "searchDEFAULTBySYS_USER")
@RequestMapping(method= RequestMethod.GET , value="/sys_users/{sys_user_id}/sys_user_roles/searchdefault")
public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchSYS_USER_ROLEDefaultBySYS_USER(@PathVariable("sys_user_id") String sys_user_id,SYS_USER_ROLESearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/sys_users/{sys_user_id}/sys_user_roles/searchdefault")
public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchSYS_USER_ROLEDefaultBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody SYS_USER_ROLESearchContext context) {
context.setN_sys_userid_eq(sys_user_id);
Page<SYS_USER_ROLE> domains = sys_user_roleService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFGroupResource.java
浏览文件 @ 5766fbf2
......@@ -55,7 +55,7 @@ public class WFGroupResource {
@PreAuthorize("hasPermission('Remove',{#wfgroup_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Remove-all')")
@ApiOperation(value = "Remove", tags = {"WFGroup" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}")
......@@ -89,7 +89,7 @@ public class WFGroupResource {
@PreAuthorize("hasPermission(#wfgroup_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Get-all')")
@ApiOperation(value = "Get", tags = {"WFGroup" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}")
public ResponseEntity<WFGroupDTO> get(@PathVariable("wfgroup_id") String wfgroup_id) {
......@@ -101,7 +101,7 @@ public class WFGroupResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Create-all')")
@ApiOperation(value = "Create", tags = {"WFGroup" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups")
......@@ -111,8 +111,7 @@ public class WFGroupResource {
WFGroupDTO dto = wfgroupMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Create-all')")
@ApiOperation(value = "createBatch", tags = {"WFGroup" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
......@@ -141,7 +140,7 @@ public class WFGroupResource {
@PreAuthorize("hasPermission(#wfgroup_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Update-all')")
@ApiOperation(value = "Update", tags = {"WFGroup" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}")
......@@ -153,7 +152,7 @@ public class WFGroupResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#wfgroup_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"WFGroup" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
......@@ -161,7 +160,7 @@ public class WFGroupResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"WFGroup" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfgroups/fetchdefault")
public ResponseEntity<List<WFGroupDTO>> fetchDefault(WFGroupSearchContext context) {
......@@ -174,10 +173,10 @@ public class WFGroupResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"WFGroup" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfgroups/searchdefault")
public ResponseEntity<Page<WFGroupDTO>> searchDefault(WFGroupSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/wfgroups/searchdefault")
public ResponseEntity<Page<WFGroupDTO>> searchDefault(@RequestBody WFGroupSearchContext context) {
Page<WFGroup> domains = wfgroupService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(wfgroupMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFMemberResource.java
浏览文件 @ 5766fbf2
......@@ -55,7 +55,7 @@ public class WFMemberResource {
@PreAuthorize("hasPermission('Remove',{#wfmember_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFMember-Remove-all')")
@ApiOperation(value = "Remove", tags = {"WFMember" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfmembers/{wfmember_id}")
......@@ -107,7 +107,7 @@ public class WFMemberResource {
@PreAuthorize("hasPermission(#wfmember_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFMember-Update-all')")
@ApiOperation(value = "Update", tags = {"WFMember" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/{wfmember_id}")
......@@ -119,7 +119,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#wfmember_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFMember-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"WFMember" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) {
......@@ -130,7 +130,7 @@ public class WFMemberResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFMember-Create-all')")
@ApiOperation(value = "Create", tags = {"WFMember" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/wfmembers")
......@@ -140,8 +140,7 @@ public class WFMemberResource {
WFMemberDTO dto = wfmemberMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFMember-Create-all')")
@ApiOperation(value = "createBatch", tags = {"WFMember" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) {
......@@ -152,7 +151,7 @@ public class WFMemberResource {
@PreAuthorize("hasPermission(#wfmember_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFMember-Get-all')")
@ApiOperation(value = "Get", tags = {"WFMember" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/wfmembers/{wfmember_id}")
public ResponseEntity<WFMemberDTO> get(@PathVariable("wfmember_id") String wfmember_id) {
......@@ -161,7 +160,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFMember-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"WFMember" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfmembers/fetchdefault")
public ResponseEntity<List<WFMemberDTO>> fetchDefault(WFMemberSearchContext context) {
......@@ -174,10 +173,10 @@ public class WFMemberResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFMember-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"WFMember" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchDefault(WFMemberSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchDefault(@RequestBody WFMemberSearchContext context) {
Page<WFMember> domains = wfmemberService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(wfmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......@@ -299,8 +298,8 @@ public class WFMemberResource {
}
@ApiOperation(value = "searchDEFAULTByWFGroup", tags = {"WFMember" } ,notes = "searchDEFAULTByWFGroup")
@RequestMapping(method= RequestMethod.GET , value="/wfgroups/{wfgroup_id}/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id,WFMemberSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/wfgroups/{wfgroup_id}/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberSearchContext context) {
context.setN_groupid_eq(wfgroup_id);
Page<WFMember> domains = wfmemberService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......@@ -423,8 +422,8 @@ public class WFMemberResource {
}
@ApiOperation(value = "searchDEFAULTByWFUser", tags = {"WFMember" } ,notes = "searchDEFAULTByWFUser")
@RequestMapping(method= RequestMethod.GET , value="/wfusers/{wfuser_id}/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id,WFMemberSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/wfusers/{wfuser_id}/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberSearchContext context) {
context.setN_userid_eq(wfuser_id);
Page<WFMember> domains = wfmemberService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFProcessDefinitionResource.java
浏览文件 @ 5766fbf2
......@@ -64,7 +64,7 @@ public class WFProcessDefinitionResource {
@PreAuthorize("hasPermission('Remove',{#wfprocessdefinition_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFProcessDefinition-Remove-all')")
@ApiOperation(value = "Remove", tags = {"WFProcessDefinition" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
......@@ -98,7 +98,7 @@ public class WFProcessDefinitionResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFProcessDefinition-Create-all')")
@ApiOperation(value = "Create", tags = {"WFProcessDefinition" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions")
......@@ -108,8 +108,7 @@ public class WFProcessDefinitionResource {
WFProcessDefinitionDTO dto = wfprocessdefinitionMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFProcessDefinition-Create-all')")
@ApiOperation(value = "createBatch", tags = {"WFProcessDefinition" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
......@@ -129,7 +128,7 @@ public class WFProcessDefinitionResource {
@PreAuthorize("hasPermission(#wfprocessdefinition_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFProcessDefinition-Update-all')")
@ApiOperation(value = "Update", tags = {"WFProcessDefinition" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
......@@ -141,7 +140,7 @@ public class WFProcessDefinitionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#wfprocessdefinition_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFProcessDefinition-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"WFProcessDefinition" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
......@@ -152,7 +151,7 @@ public class WFProcessDefinitionResource {
@PreAuthorize("hasPermission(#wfprocessdefinition_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFProcessDefinition-Get-all')")
@ApiOperation(value = "Get", tags = {"WFProcessDefinition" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
public ResponseEntity<WFProcessDefinitionDTO> get(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id) {
......@@ -161,7 +160,7 @@ public class WFProcessDefinitionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFProcessDefinition-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"WFProcessDefinition" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfprocessdefinitions/fetchdefault")
public ResponseEntity<List<WFProcessDefinitionDTO>> fetchDefault(WFProcessDefinitionSearchContext context) {
......@@ -174,10 +173,10 @@ public class WFProcessDefinitionResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFProcessDefinition-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"WFProcessDefinition" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfprocessdefinitions/searchdefault")
public ResponseEntity<Page<WFProcessDefinitionDTO>> searchDefault(WFProcessDefinitionSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/wfprocessdefinitions/searchdefault")
public ResponseEntity<Page<WFProcessDefinitionDTO>> searchDefault(@RequestBody WFProcessDefinitionSearchContext context) {
Page<WFProcessDefinition> domains = wfprocessdefinitionService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(wfprocessdefinitionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFREModelResource.java
浏览文件 @ 5766fbf2
......@@ -55,7 +55,7 @@ public class WFREModelResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFREModel-Create-all')")
@ApiOperation(value = "Create", tags = {"WFREModel" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels")
......@@ -65,8 +65,7 @@ public class WFREModelResource {
WFREModelDTO dto = wfremodelMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFREModel-Create-all')")
@ApiOperation(value = "createBatch", tags = {"WFREModel" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
......@@ -77,7 +76,7 @@ public class WFREModelResource {
@PreAuthorize("hasPermission(#wfremodel_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFREModel-Get-all')")
@ApiOperation(value = "Get", tags = {"WFREModel" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/wfremodels/{wfremodel_id}")
public ResponseEntity<WFREModelDTO> get(@PathVariable("wfremodel_id") String wfremodel_id) {
......@@ -105,7 +104,7 @@ public class WFREModelResource {
@PreAuthorize("hasPermission(#wfremodel_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFREModel-Update-all')")
@ApiOperation(value = "Update", tags = {"WFREModel" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/{wfremodel_id}")
......@@ -117,7 +116,7 @@ public class WFREModelResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#wfremodel_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFREModel-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"WFREModel" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
......@@ -137,7 +136,7 @@ public class WFREModelResource {
@PreAuthorize("hasPermission('Remove',{#wfremodel_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFREModel-Remove-all')")
@ApiOperation(value = "Remove", tags = {"WFREModel" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfremodels/{wfremodel_id}")
......@@ -161,7 +160,7 @@ public class WFREModelResource {
return ResponseEntity.status(HttpStatus.OK).body(wfremodelService.checkKey(wfremodelMapping.toDomain(wfremodeldto)));
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFREModel-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"WFREModel" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfremodels/fetchdefault")
public ResponseEntity<List<WFREModelDTO>> fetchDefault(WFREModelSearchContext context) {
......@@ -174,10 +173,10 @@ public class WFREModelResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFREModel-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"WFREModel" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfremodels/searchdefault")
public ResponseEntity<Page<WFREModelDTO>> searchDefault(WFREModelSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/wfremodels/searchdefault")
public ResponseEntity<Page<WFREModelDTO>> searchDefault(@RequestBody WFREModelSearchContext context) {
Page<WFREModel> domains = wfremodelService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(wfremodelMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFSystemResource.java
浏览文件 @ 5766fbf2
......@@ -71,7 +71,7 @@ public class WFSystemResource {
@PreAuthorize("hasPermission('Remove',{#wfsystem_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFSystem-Remove-all')")
@ApiOperation(value = "Remove", tags = {"WFSystem" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/{wfsystem_id}")
......@@ -89,7 +89,7 @@ public class WFSystemResource {
@PreAuthorize("hasPermission(#wfsystem_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFSystem-Get-all')")
@ApiOperation(value = "Get", tags = {"WFSystem" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/wfsystems/{wfsystem_id}")
public ResponseEntity<WFSystemDTO> get(@PathVariable("wfsystem_id") String wfsystem_id) {
......@@ -110,7 +110,7 @@ public class WFSystemResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFSystem-Create-all')")
@ApiOperation(value = "Create", tags = {"WFSystem" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems")
......@@ -120,8 +120,7 @@ public class WFSystemResource {
WFSystemDTO dto = wfsystemMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFSystem-Create-all')")
@ApiOperation(value = "createBatch", tags = {"WFSystem" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
......@@ -141,7 +140,7 @@ public class WFSystemResource {
@PreAuthorize("hasPermission(#wfsystem_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFSystem-Update-all')")
@ApiOperation(value = "Update", tags = {"WFSystem" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/{wfsystem_id}")
......@@ -153,7 +152,7 @@ public class WFSystemResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#wfsystem_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFSystem-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"WFSystem" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
......@@ -161,7 +160,7 @@ public class WFSystemResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFSystem-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"WFSystem" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfsystems/fetchdefault")
public ResponseEntity<List<WFSystemDTO>> fetchDefault(WFSystemSearchContext context) {
......@@ -174,10 +173,10 @@ public class WFSystemResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFSystem-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"WFSystem" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfsystems/searchdefault")
public ResponseEntity<Page<WFSystemDTO>> searchDefault(WFSystemSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/wfsystems/searchdefault")
public ResponseEntity<Page<WFSystemDTO>> searchDefault(@RequestBody WFSystemSearchContext context) {
Page<WFSystem> domains = wfsystemService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(wfsystemMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFUserResource.java
浏览文件 @ 5766fbf2
......@@ -55,7 +55,7 @@ public class WFUserResource {
@PreAuthorize("hasPermission(#wfuser_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Update-all')")
@ApiOperation(value = "Update", tags = {"WFUser" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}")
......@@ -67,7 +67,7 @@ public class WFUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission(#wfuser_id,'Update',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Update-all')")
@ApiOperation(value = "UpdateBatch", tags = {"WFUser" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
......@@ -87,7 +87,7 @@ public class WFUserResource {
@PreAuthorize("hasPermission(#wfuser_id,'Get',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Get-all')")
@ApiOperation(value = "Get", tags = {"WFUser" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}")
public ResponseEntity<WFUserDTO> get(@PathVariable("wfuser_id") String wfuser_id) {
......@@ -99,7 +99,7 @@ public class WFUserResource {
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Create-all')")
@ApiOperation(value = "Create", tags = {"WFUser" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers")
......@@ -109,8 +109,7 @@ public class WFUserResource {
WFUserDTO dto = wfuserMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('','Create',{this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Create-all')")
@ApiOperation(value = "createBatch", tags = {"WFUser" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
......@@ -146,7 +145,7 @@ public class WFUserResource {
@PreAuthorize("hasPermission('Remove',{#wfuser_id,{this.getEntity(),'ServiceApi'}})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Remove-all')")
@ApiOperation(value = "Remove", tags = {"WFUser" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}")
......@@ -161,7 +160,7 @@ public class WFUserResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"WFUser" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfusers/fetchdefault")
public ResponseEntity<List<WFUserDTO>> fetchDefault(WFUserSearchContext context) {
......@@ -174,10 +173,10 @@ public class WFUserResource {
.body(list);
}
@PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'ServiceApi'})")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"WFUser" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfusers/searchdefault")
public ResponseEntity<Page<WFUserDTO>> searchDefault(WFUserSearchContext context) {
@RequestMapping(method= RequestMethod.POST , value="/wfusers/searchdefault")
public ResponseEntity<Page<WFUserDTO>> searchDefault(@RequestBody WFUserSearchContext context) {
Page<WFUser> domains = wfuserService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(wfuserMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/swagger/SwaggerConfiguration.java
浏览文件 @ 5766fbf2
......@@ -64,6 +64,24 @@ public class SwaggerConfiguration {
.build()
;
}
@Bean
public Docket api2Docket() {
return new Docket(DocumentationType.SWAGGER_2)
.groupName("api2")
.pathMapping("/")
.apiInfo(
new ApiInfoBuilder()
.title("api2")
.version("1")
.build()
)
.select()
.apis(RequestHandlerSelectors.basePackage("cn.ibizlab.api2"))
//.paths(or(regex("/rest/api2/.*")))
.paths(PathSelectors.any())
.build()
;
}
private void removeDefaultPlugin() {
......
ibzrt-provider/ibzrt-provider-api2/pom.xml 0 → 100644
浏览文件 @ 5766fbf2
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ibzrt-provider</artifactId>
<groupId>cn.ibizlab</groupId>
<version>1.0.0.0</version>
</parent>
<artifactId>ibzrt-provider-api2</artifactId>
<name>Ibzrt Microservice api2</name>
<description> api2</description>
<dependencies>
<dependency>
<groupId>cn.ibizlab</groupId>
<artifactId>ibzrt-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<properties>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties>
<profiles>
<profile>
<id>api2</id>
<build>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/**</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<finalName>ibzrt-provider-api2</finalName>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<mainClass>cn.ibizlab.api2.ibzrtapi2Application</mainClass>
<outputDirectory>../../</outputDirectory>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
ibzrt-provider/ibzrt-provider-api2/src/main/docker/Dockerfile 0 → 100644
浏览文件 @ 5766fbf2
FROM openjdk:8-jre-alpine
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBZ_SLEEP=0 \
JAVA_OPTS=""
CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-provider-api2.jar
EXPOSE 8081
ADD ibzrt-provider-api2.jar /ibzrt-provider-api2.jar
ibzrt-provider/ibzrt-provider-api2/src/main/docker/ibzrt-provider-api2.yaml 0 → 100644
浏览文件 @ 5766fbf2
version: "3.2"
services:
ibzrt-provider-api2:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-provider-api2:latest
ports:
- "8081:8081"
networks:
- agent_network
deploy:
mode: replicated
replicas: 1
networks:
agent_network:
driver: overlay
attachable: true
ibzrt-provider/ibzrt-provider-api2/src/main/java/cn/ibizlab/api2/config/api2AutoConfiguration.java 0 → 100644
浏览文件 @ 5766fbf2
package cn.ibizlab.api2.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import org.springframework.web.servlet.DispatcherServlet;
@Configuration
@ConditionalOnClass(api2RestConfiguration.class)
@ConditionalOnWebApplication
@EnableConfigurationProperties(api2ServiceProperties.class)
public class api2AutoConfiguration implements ApplicationContextAware{
protected ApplicationContext applicationContext;
public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
// @Bean
// public ServletRegistrationBean api2Servlet() {
// AnnotationConfigWebApplicationContext dispatcherServletConfiguration = new AnnotationConfigWebApplicationContext();
// dispatcherServletConfiguration.setParent(applicationContext);
// dispatcherServletConfiguration.register(api2RestConfiguration.class);
// DispatcherServlet servlet = new DispatcherServlet(dispatcherServletConfiguration);
// String path = "/api2";
// String urlMapping = (path.endsWith("/") ? path + "*" : path + "/*");
// ServletRegistrationBean registrationBean = new ServletRegistrationBean(servlet, urlMapping);
// registrationBean.setName("api2");
// return registrationBean;
// }
}
ibzrt-provider/ibzrt-provider-api2/src/main/java/cn/ibizlab/api2/config/api2RestConfiguration.java 0 → 100644
浏览文件 @ 5766fbf2
package cn.ibizlab.api2.config;
import org.springframework.context.annotation.ComponentScan;
@ComponentScan("cn.ibizlab.api2")
public class api2RestConfiguration {
}
ibzrt-provider/ibzrt-provider-api2/src/main/java/cn/ibizlab/api2/config/api2SecurityConfig.java 0 → 100644
浏览文件 @ 5766fbf2
package cn.ibizlab.api2.config;
import cn.ibizlab.util.security.AuthenticationEntryPoint;
import cn.ibizlab.util.security.AuthorizationTokenFilter;
import cn.ibizlab.util.service.AuthenticationUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.core.GrantedAuthorityDefaults;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.context.annotation.Profile;
import org.springframework.beans.factory.annotation.Qualifier;
@Profile("api2-prod")
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class api2SecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
private AuthenticationEntryPoint unauthorizedHandler;
@Autowired
private AuthenticationUserService userDetailsService;
/**
* 自定义基于JWT的安全过滤器
*/
@Autowired
AuthorizationTokenFilter authenticationTokenFilter;
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
auth
.userDetailsService(userDetailsService)
.passwordEncoder(passwordEncoderBean());
}
@Bean
GrantedAuthorityDefaults grantedAuthorityDefaults() {
// Remove the ROLE_ prefix
return new GrantedAuthorityDefaults("");
}
@Bean
public PasswordEncoder passwordEncoderBean() {
return new BCryptPasswordEncoder();
}
@Bean
@Override
public AuthenticationManager authenticationManagerBean() throws Exception {
return super.authenticationManagerBean();
}
@Override
protected void configure(HttpSecurity httpSecurity) throws Exception {
httpSecurity
// 禁用 CSRF
.csrf().disable()
// 授权异常
.exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
// 不创建会话
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
// 过滤请求
.authorizeRequests()
.antMatchers(
HttpMethod.GET,
"/*.html",
"/**/*.html",
"/**/*.css",
"/**/*.js",
"/**/*.ico",
"/**/assets/**",
"/**/css/**",
"/**/fonts/**",
"/**/js/**",
"/**/img/**",
"/",
"/webjars/**",
"/swagger-resources/**",
"/v2/**"
).permitAll()
// 服务中暂时只为重构用户身份，不进行身份认证
.anyRequest().permitAll()
// 防止iframe 造成跨域
.and().headers().frameOptions().disable();
httpSecurity
.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
}
}
ibzrt-provider/ibzrt-provider-api2/src/main/java/cn/ibizlab/api2/config/api2ServiceProperties.java 0 → 100644
浏览文件 @ 5766fbf2
package cn.ibizlab.api2.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import lombok.Data;
@ConfigurationProperties(prefix = "service.api2")
@Data
public class api2ServiceProperties {
private boolean enabled;
private boolean auth;
}
\ No newline at end of file
ibzrt-provider/ibzrt-provider-api2/src/main/java/cn/ibizlab/api2/ibzrtapi2Application.java 0 → 100644
浏览文件 @ 5766fbf2
package cn.ibizlab.api2;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.cloud.openfeign.EnableFeignClients;
import java.util.List;
@Slf4j
@EnableDiscoveryClient
@Configuration
@EnableTransactionManagement
@ComponentScan(basePackages = {"cn.ibizlab"})
@EnableMongoRepositories(basePackages = {"cn.ibizlab"})
@MapperScan("cn.ibizlab.*.mapper")
@SpringBootApplication(exclude = {
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
})
@EnableFeignClients(basePackages = {"cn.ibizlab" })
public class ibzrtapi2Application extends WebMvcConfigurerAdapter{
public static void main(String[] args) {
SpringApplication.run(ibzrtapi2Application.class, args);
}
@Override
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
super.addArgumentResolvers(argumentResolvers);
argumentResolvers.add(new cn.ibizlab.util.web.SearchContextHandlerMethodArgumentResolver());
}
}
ibzrt-provider/pom.xml
浏览文件 @ 5766fbf2
此差异已折叠。
ibzrt-util/pom.xml
浏览文件 @ 5766fbf2
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或