Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
47e7f57e
提交
47e7f57e
编写于
5月 19, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
laizhilong 发布系统代码
上级
e128c996
变更
39
隐藏空白字符变更
内嵌
并排
正在显示
39 个修改的文件
包含
142 行增加
和
52 行删除
+142
-52
package.json
app_web/package.json
+1
-0
app-user.vue
app_web/src/components/app-user/app-user.vue
+10
-3
sys-permissiongrid-view-base.vue
.../sys-permissiongrid-view/sys-permissiongrid-view-base.vue
+2
-2
sys-role-permissiongrid-view-base.vue
...permissiongrid-view/sys-role-permissiongrid-view-base.vue
+2
-2
sys-rolegrid-view-base.vue
...rc/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue
+2
-2
sys-user-rolegrid-view-base.vue
...aa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue
+2
-2
sys-usergrid-view-base.vue
...rc/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue
+2
-2
yarn.lock
app_web/yarn.lock
+39
-2
SYS_PERMISSION.java
.../main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java
+3
-0
SYS_PSAPPMENUITEM.java
...in/java/cn/ibizlab/core/uaa/domain/SYS_PSAPPMENUITEM.java
+3
-0
SYS_PSDEOPPRIV.java
.../main/java/cn/ibizlab/core/uaa/domain/SYS_PSDEOPPRIV.java
+3
-0
SYS_PSSYSTEM.java
...rc/main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSTEM.java
+3
-0
SYS_PSSYSUNIRES.java
...main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSUNIRES.java
+3
-0
SYS_ROLE.java
...re/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE.java
+3
-0
SYS_ROLE_PERMISSION.java
.../java/cn/ibizlab/core/uaa/domain/SYS_ROLE_PERMISSION.java
+3
-0
SYS_USER.java
...re/src/main/java/cn/ibizlab/core/uaa/domain/SYS_USER.java
+3
-0
SYS_USER_ROLE.java
...c/main/java/cn/ibizlab/core/uaa/domain/SYS_USER_ROLE.java
+3
-0
SYS_PERMISSIONServiceImpl.java
...zlab/core/uaa/service/impl/SYS_PERMISSIONServiceImpl.java
+1
-1
SYS_PSAPPMENUITEMServiceImpl.java
...b/core/uaa/service/impl/SYS_PSAPPMENUITEMServiceImpl.java
+1
-1
SYS_PSDEOPPRIVServiceImpl.java
...zlab/core/uaa/service/impl/SYS_PSDEOPPRIVServiceImpl.java
+1
-1
SYS_PSSYSTEMServiceImpl.java
...bizlab/core/uaa/service/impl/SYS_PSSYSTEMServiceImpl.java
+1
-1
SYS_PSSYSUNIRESServiceImpl.java
...lab/core/uaa/service/impl/SYS_PSSYSUNIRESServiceImpl.java
+1
-1
SYS_ROLEServiceImpl.java
...cn/ibizlab/core/uaa/service/impl/SYS_ROLEServiceImpl.java
+1
-1
SYS_ROLE_PERMISSIONServiceImpl.java
...core/uaa/service/impl/SYS_ROLE_PERMISSIONServiceImpl.java
+1
-1
SYS_USERServiceImpl.java
...cn/ibizlab/core/uaa/service/impl/SYS_USERServiceImpl.java
+1
-1
SYS_USER_ROLEServiceImpl.java
...izlab/core/uaa/service/impl/SYS_USER_ROLEServiceImpl.java
+1
-1
pom.xml
ibzuaa-dependencies/pom.xml
+8
-0
apiSecurityConfig.java
...rc/main/java/cn/ibizlab/api/config/apiSecurityConfig.java
+1
-0
SYS_PERMISSIONResource.java
...main/java/cn/ibizlab/api/rest/SYS_PERMISSIONResource.java
+2
-2
SYS_PSAPPMENUITEMResource.java
...n/java/cn/ibizlab/api/rest/SYS_PSAPPMENUITEMResource.java
+2
-2
SYS_PSDEOPPRIVResource.java
...main/java/cn/ibizlab/api/rest/SYS_PSDEOPPRIVResource.java
+2
-2
SYS_ROLEResource.java
...i/src/main/java/cn/ibizlab/api/rest/SYS_ROLEResource.java
+2
-2
SYS_ROLE_PERMISSIONResource.java
...java/cn/ibizlab/api/rest/SYS_ROLE_PERMISSIONResource.java
+6
-6
SYS_USERResource.java
...i/src/main/java/cn/ibizlab/api/rest/SYS_USERResource.java
+2
-2
SYS_USER_ROLEResource.java
.../main/java/cn/ibizlab/api/rest/SYS_USER_ROLEResource.java
+6
-6
pom.xml
ibzuaa-util/pom.xml
+5
-0
DEFieldDefaultValueAspect.java
...ava/cn/ibizlab/util/aspect/DEFieldDefaultValueAspect.java
+6
-6
SearchContextBase.java
...c/main/java/cn/ibizlab/util/filter/SearchContextBase.java
+2
-0
application-sys.yml
ibzuaa-util/src/main/resources/application-sys.yml
+2
-0
未找到文件。
app_web/package.json
浏览文件 @
47e7f57e
...
...
@@ -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
浏览文件 @
47e7f57e
...
...
@@ -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/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue
浏览文件 @
47e7f57e
<
template
>
<div
class=
'view-container degridview sys-permissiongrid-view'
>
<div
class=
'view-container degridview sys-permissiongrid-view'
>
<app-studioaction
:viewTitle=
"$t(model.srfTitle)"
viewName=
"sys_permissiongridview"
></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
浏览文件 @
47e7f57e
<
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
浏览文件 @
47e7f57e
<
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
浏览文件 @
47e7f57e
<
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/uaa/sys-usergrid-view/sys-usergrid-view-base.vue
浏览文件 @
47e7f57e
<
template
>
<div
class=
'view-container degridview sys-usergrid-view'
>
<div
class=
'view-container degridview sys-usergrid-view'
>
<app-studioaction
:viewTitle=
"$t(model.srfTitle)"
viewName=
"sys_usergridview"
></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
浏览文件 @
47e7f57e
...
...
@@ -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==
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[权限/资源]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSAPPMENUITEM.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[系统菜单项]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSDEOPPRIV.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[实体数据能力]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSTEM.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[实体]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSUNIRES.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[统一资源]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[系统角色]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE_PERMISSION.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[角色权限关系]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_USER.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[系统用户]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_USER_ROLE.java
浏览文件 @
47e7f57e
...
...
@@ -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
;
...
...
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
* 实体[用户角色关系]
*/
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PERMISSIONServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -120,7 +120,7 @@ public class SYS_PERMISSIONServiceImpl extends ServiceImpl<SYS_PERMISSIONMapper,
@Override
public
void
createBatch
(
List
<
SYS_PERMISSION
>
list
)
{
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
@Override
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSAPPMENUITEMServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -83,7 +83,7 @@ public class SYS_PSAPPMENUITEMServiceImpl extends ServiceImpl<SYS_PSAPPMENUITEMM
@Override
public
void
createBatch
(
List
<
SYS_PSAPPMENUITEM
>
list
)
{
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
@Override
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSDEOPPRIVServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -80,7 +80,7 @@ public class SYS_PSDEOPPRIVServiceImpl extends ServiceImpl<SYS_PSDEOPPRIVMapper,
@Override
public
void
createBatch
(
List
<
SYS_PSDEOPPRIV
>
list
)
{
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
@Override
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSSYSTEMServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -76,7 +76,7 @@ public class SYS_PSSYSTEMServiceImpl extends ServiceImpl<SYS_PSSYSTEMMapper, SYS
@Override
public
void
createBatch
(
List
<
SYS_PSSYSTEM
>
list
)
{
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
@Override
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSSYSUNIRESServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -132,7 +132,7 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
@Override
public
void
createBatch
(
List
<
SYS_PSSYSUNIRES
>
list
)
{
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_ROLEServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -107,7 +107,7 @@ public class SYS_ROLEServiceImpl extends ServiceImpl<SYS_ROLEMapper, SYS_ROLE> i
@Override
public
void
createBatch
(
List
<
SYS_ROLE
>
list
)
{
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
@Override
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_ROLE_PERMISSIONServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -97,7 +97,7 @@ public class SYS_ROLE_PERMISSIONServiceImpl extends ServiceImpl<SYS_ROLE_PERMISS
@Override
public
void
createBatch
(
List
<
SYS_ROLE_PERMISSION
>
list
)
{
list
.
forEach
(
item
->
fillParentData
(
item
));
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
@Override
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_USERServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -139,7 +139,7 @@ public class SYS_USERServiceImpl extends ServiceImpl<SYS_USERMapper, SYS_USER> i
@Override
public
void
createBatch
(
List
<
SYS_USER
>
list
)
{
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_USER_ROLEServiceImpl.java
浏览文件 @
47e7f57e
...
...
@@ -105,7 +105,7 @@ public class SYS_USER_ROLEServiceImpl extends ServiceImpl<SYS_USER_ROLEMapper, S
@Override
public
void
createBatch
(
List
<
SYS_USER_ROLE
>
list
)
{
list
.
forEach
(
item
->
fillParentData
(
item
));
saveBatch
(
list
,
batchSize
);
this
.
saveBatch
(
list
,
batchSize
);
}
@Override
...
...
ibzuaa-dependencies/pom.xml
浏览文件 @
47e7f57e
...
...
@@ -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>
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/config/apiSecurityConfig.java
浏览文件 @
47e7f57e
...
...
@@ -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
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PERMISSIONResource.java
浏览文件 @
47e7f57e
...
...
@@ -176,8 +176,8 @@ public class SYS_PERMISSIONResource {
@PreAuthorize
(
"hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"SYS_PERMISSION"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
value
=
"/sys_permissions/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_PERMISSIONDTO
>>
searchDefault
(
SYS_PERMISSIONSearchContext
context
)
{
@RequestMapping
(
method
=
RequestMethod
.
POS
T
,
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
()));
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PSAPPMENUITEMResource.java
浏览文件 @
47e7f57e
...
...
@@ -176,8 +176,8 @@ public class SYS_PSAPPMENUITEMResource {
@PreAuthorize
(
"hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"SYS_PSAPPMENUITEM"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
value
=
"/sys_psappmenuitems/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_PSAPPMENUITEMDTO
>>
searchDefault
(
SYS_PSAPPMENUITEMSearchContext
context
)
{
@RequestMapping
(
method
=
RequestMethod
.
POS
T
,
value
=
"/sys_psappmenuitems/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_PSAPPMENUITEMDTO
>>
searchDefault
(
@RequestBody
SYS_PSAPPMENUITEMSearchContext
context
)
{
Page
<
SYS_PSAPPMENUITEM
>
domains
=
sys_psappmenuitemService
.
searchDefault
(
context
)
;
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
body
(
new
PageImpl
(
sys_psappmenuitemMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PSDEOPPRIVResource.java
浏览文件 @
47e7f57e
...
...
@@ -176,8 +176,8 @@ public class SYS_PSDEOPPRIVResource {
@PreAuthorize
(
"hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"SYS_PSDEOPPRIV"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
value
=
"/sys_psdeopprivs/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_PSDEOPPRIVDTO
>>
searchDefault
(
SYS_PSDEOPPRIVSearchContext
context
)
{
@RequestMapping
(
method
=
RequestMethod
.
POS
T
,
value
=
"/sys_psdeopprivs/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_PSDEOPPRIVDTO
>>
searchDefault
(
@RequestBody
SYS_PSDEOPPRIVSearchContext
context
)
{
Page
<
SYS_PSDEOPPRIV
>
domains
=
sys_psdeopprivService
.
searchDefault
(
context
)
;
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
body
(
new
PageImpl
(
sys_psdeopprivMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLEResource.java
浏览文件 @
47e7f57e
...
...
@@ -176,8 +176,8 @@ public class SYS_ROLEResource {
@PreAuthorize
(
"hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"SYS_ROLE"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
value
=
"/sys_roles/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_ROLEDTO
>>
searchDefault
(
SYS_ROLESearchContext
context
)
{
@RequestMapping
(
method
=
RequestMethod
.
POS
T
,
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
()));
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLE_PERMISSIONResource.java
浏览文件 @
47e7f57e
...
...
@@ -176,8 +176,8 @@ public class SYS_ROLE_PERMISSIONResource {
@PreAuthorize
(
"hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"SYS_ROLE_PERMISSION"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
value
=
"/sys_role_permissions/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_ROLE_PERMISSIONDTO
>>
searchDefault
(
SYS_ROLE_PERMISSIONSearchContext
context
)
{
@RequestMapping
(
method
=
RequestMethod
.
POS
T
,
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 +299,8 @@ public class SYS_ROLE_PERMISSIONResource {
}
@ApiOperation
(
value
=
"searchDEFAULTBySYS_PERMISSION"
,
tags
=
{
"SYS_ROLE_PERMISSION"
}
,
notes
=
"searchDEFAULTBySYS_PERMISSION"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
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
.
POS
T
,
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 +423,8 @@ public class SYS_ROLE_PERMISSIONResource {
}
@ApiOperation
(
value
=
"searchDEFAULTBySYS_ROLE"
,
tags
=
{
"SYS_ROLE_PERMISSION"
}
,
notes
=
"searchDEFAULTBySYS_ROLE"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
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
.
POS
T
,
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
)
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_USERResource.java
浏览文件 @
47e7f57e
...
...
@@ -176,8 +176,8 @@ public class SYS_USERResource {
@PreAuthorize
(
"hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"SYS_USER"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
value
=
"/sys_users/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_USERDTO
>>
searchDefault
(
SYS_USERSearchContext
context
)
{
@RequestMapping
(
method
=
RequestMethod
.
POS
T
,
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
()));
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_USER_ROLEResource.java
浏览文件 @
47e7f57e
...
...
@@ -176,8 +176,8 @@ public class SYS_USER_ROLEResource {
@PreAuthorize
(
"hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"SYS_USER_ROLE"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
value
=
"/sys_user_roles/searchdefault"
)
public
ResponseEntity
<
Page
<
SYS_USER_ROLEDTO
>>
searchDefault
(
SYS_USER_ROLESearchContext
context
)
{
@RequestMapping
(
method
=
RequestMethod
.
POS
T
,
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 +299,8 @@ public class SYS_USER_ROLEResource {
}
@ApiOperation
(
value
=
"searchDEFAULTBySYS_ROLE"
,
tags
=
{
"SYS_USER_ROLE"
}
,
notes
=
"searchDEFAULTBySYS_ROLE"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
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
.
POS
T
,
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 +423,8 @@ public class SYS_USER_ROLEResource {
}
@ApiOperation
(
value
=
"searchDEFAULTBySYS_USER"
,
tags
=
{
"SYS_USER_ROLE"
}
,
notes
=
"searchDEFAULTBySYS_USER"
)
@RequestMapping
(
method
=
RequestMethod
.
GE
T
,
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
.
POS
T
,
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
)
...
...
ibzuaa-util/pom.xml
浏览文件 @
47e7f57e
...
...
@@ -85,5 +85,10 @@
<artifactId>
springfox-swagger-ui
</artifactId>
</dependency>
<dependency>
<groupId>
io.github.openfeign
</groupId>
<artifactId>
feign-httpclient
</artifactId>
</dependency>
</dependencies>
</project>
ibzuaa-util/src/main/java/cn/ibizlab/util/aspect/DEFieldDefaultValueAspect.java
浏览文件 @
47e7f57e
...
...
@@ -32,11 +32,11 @@ public class DEFieldDefaultValueAspect
* @param point
* @throws Exception
*/
@Before
(
value
=
"execution(* c
om.cntmtech.support
.core.*.service.*.create(..))"
)
@Before
(
value
=
"execution(* c
n.ibizlab
.core.*.service.*.create(..))"
)
public
void
BeforeCreate
(
JoinPoint
point
)
throws
Exception
{
fillDEFieldDefaultValue
(
point
);
}
@Before
(
value
=
"execution(* c
om.cntmtech.support
.core.*.service.*.createBatch(..))"
)
@Before
(
value
=
"execution(* c
n.ibizlab
.core.*.service.*.createBatch(..))"
)
public
void
BeforeCreateBatch
(
JoinPoint
point
)
throws
Exception
{
fillDEFieldDefaultValue
(
point
);
}
...
...
@@ -46,11 +46,11 @@ public class DEFieldDefaultValueAspect
* @param point
* @throws Exception
*/
@Before
(
value
=
"execution(* c
om.cntmtech.support
.core.*.service.*.update(..))"
)
@Before
(
value
=
"execution(* c
n.ibizlab
.core.*.service.*.update(..))"
)
public
void
BeforeUpdate
(
JoinPoint
point
)
throws
Exception
{
fillDEFieldDefaultValue
(
point
);
}
@Before
(
value
=
"execution(* c
om.cntmtech.support
.core.*.service.*.updateBatch(..))"
)
@Before
(
value
=
"execution(* c
n.ibizlab
.core.*.service.*.updateBatch(..))"
)
public
void
BeforeUpdateBatch
(
JoinPoint
point
)
throws
Exception
{
fillDEFieldDefaultValue
(
point
);
}
...
...
@@ -60,11 +60,11 @@ public class DEFieldDefaultValueAspect
* @param point
* @throws Exception
*/
@Before
(
value
=
"execution(* c
om.cntmtech.support
.core.*.service.*.save(..))"
)
@Before
(
value
=
"execution(* c
n.ibizlab
.core.*.service.*.save(..))"
)
public
void
BeforeSave
(
JoinPoint
point
)
throws
Exception
{
fillDEFieldDefaultValue
(
point
);
}
@Before
(
value
=
"execution(* c
om.cntmtech.support
.core.*.service.*.saveBatch(..))"
)
@Before
(
value
=
"execution(* c
n.ibizlab
.core.*.service.*.saveBatch(..))"
)
public
void
BeforeSaveBatch
(
JoinPoint
point
)
throws
Exception
{
fillDEFieldDefaultValue
(
point
);
}
...
...
ibzuaa-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java
浏览文件 @
47e7f57e
...
...
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.data.domain.PageRequest
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.util.StringUtils
;
...
...
@@ -54,6 +55,7 @@ public class SearchContextBase implements ISearchContext{
/**
* 排序对象
*/
@JsonIgnore
public
Sort
pageSort
;
/**
* 工作流步骤标识
...
...
ibzuaa-util/src/main/resources/application-sys.yml
浏览文件 @
47e7f57e
...
...
@@ -63,6 +63,8 @@ mybatis-plus:
#阿里sentinel熔断器
feign
:
httpclient
:
enabled
:
true
sentinel
:
enabled
:
true
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录