Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
3cef2236
提交
3cef2236
编写于
5月 12, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibizdev提交
上级
d5a18345
变更
18
显示空白字符变更
内嵌
并排
正在显示
18 个修改的文件
包含
107 行增加
和
13 行删除
+107
-13
app-user.vue
app_web/src/components/app-user/app-user.vue
+6
-0
main-grid-base.vue
...b/src/widgets/sys-permission/main-grid/main-grid-base.vue
+2
-0
main-grid.less
app_web/src/widgets/sys-permission/main-grid/main-grid.less
+17
-0
main-grid-base.vue
.../widgets/sys-role-permission/main-grid/main-grid-base.vue
+2
-0
main-grid.less
.../src/widgets/sys-role-permission/main-grid/main-grid.less
+17
-0
main-grid-base.vue
app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
+2
-0
main-grid.less
app_web/src/widgets/sys-role/main-grid/main-grid.less
+17
-0
main-grid-base.vue
...eb/src/widgets/sys-user-role/main-grid/main-grid-base.vue
+2
-0
main-grid.less
app_web/src/widgets/sys-user-role/main-grid/main-grid.less
+17
-0
main-grid-base.vue
app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
+2
-0
main-grid.less
app_web/src/widgets/sys-user/main-grid/main-grid.less
+17
-0
config.xml
config.xml
+0
-5
Dockerfile
ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
+1
-1
ibzuaa-app-web.yaml
...aa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
+1
-3
application-web-dev.yml
...ibzuaa-app-web/src/main/resources/application-web-dev.yml
+1
-1
application-web-prod.yml
...bzuaa-app-web/src/main/resources/application-web-prod.yml
+1
-1
PermissionSyncJob.java
.../src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
+1
-1
application-sys.yml
ibzuaa-util/src/main/resources/application-sys.yml
+1
-1
未找到文件。
app_web/src/components/app-user/app-user.vue
浏览文件 @
3cef2236
...
@@ -64,6 +64,12 @@ export default class AppUser extends Vue {
...
@@ -64,6 +64,12 @@ export default class AppUser extends Vue {
_user
.
avatar
=
this
.
$store
.
getters
.
getAppData
().
context
.
srfusericonpath
;
_user
.
avatar
=
this
.
$store
.
getters
.
getAppData
().
context
.
srfusericonpath
;
}
}
}
}
if
(
localStorage
.
getItem
(
"user"
)){
let
user
:
any
=
JSON
.
parse
(
localStorage
.
getItem
(
"user"
)
as
string
);
if
(
user
&&
user
.
personname
){
_user
.
name
=
user
.
personname
;
}
}
Object
.
assign
(
this
.
user
,
_user
,{
Object
.
assign
(
this
.
user
,
_user
,{
time
:
+
new
Date
time
:
+
new
Date
});
});
...
...
app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
浏览文件 @
3cef2236
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
ref='multipleTable' :data="items" :show-header="!isHideHeader">
ref='multipleTable' :data="items" :show-header="!isHideHeader">
<template
slot=
"empty"
>
<template
slot=
"empty"
>
无数据
无数据
<span
class=
"quick-toolbar"
>
</span>
</
template
>
</
template
>
<
template
v-if=
"!isSingleSelect"
>
<
template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
...
...
app_web/src/widgets/sys-permission/main-grid/main-grid.less
浏览文件 @
3cef2236
...
@@ -29,6 +29,9 @@
...
@@ -29,6 +29,9 @@
display: inline;
display: inline;
}
}
.el-table {
.el-table {
.quick-toolbar{
display: inline-block;
}
.el-tooltip{
.el-tooltip{
.ivu-form-item{
.ivu-form-item{
margin-bottom: unset !important;
margin-bottom: unset !important;
...
@@ -51,6 +54,20 @@
...
@@ -51,6 +54,20 @@
position: absolute;
position: absolute;
left: 0;
left: 0;
}
}
.batch-toolbar{
position: absolute;
left: 105px;
>.toolbar-container{
button {
font-size: 16px;
min-width: 32px;
height: 32px;
margin-right: 4px;
margin-top: 0;
margin-bottom: 0;
}
}
}
}
}
.el-table__body-wrapper{
.el-table__body-wrapper{
height: calc(100% - 45px) !important;
height: calc(100% - 45px) !important;
...
...
app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue
浏览文件 @
3cef2236
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
ref='multipleTable' :data="items" :show-header="!isHideHeader">
ref='multipleTable' :data="items" :show-header="!isHideHeader">
<template
slot=
"empty"
>
<template
slot=
"empty"
>
无数据
无数据
<span
class=
"quick-toolbar"
>
</span>
</
template
>
</
template
>
<
template
v-if=
"!isSingleSelect"
>
<
template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
...
...
app_web/src/widgets/sys-role-permission/main-grid/main-grid.less
浏览文件 @
3cef2236
...
@@ -29,6 +29,9 @@
...
@@ -29,6 +29,9 @@
display: inline;
display: inline;
}
}
.el-table {
.el-table {
.quick-toolbar{
display: inline-block;
}
.el-tooltip{
.el-tooltip{
.ivu-form-item{
.ivu-form-item{
margin-bottom: unset !important;
margin-bottom: unset !important;
...
@@ -51,6 +54,20 @@
...
@@ -51,6 +54,20 @@
position: absolute;
position: absolute;
left: 0;
left: 0;
}
}
.batch-toolbar{
position: absolute;
left: 105px;
>.toolbar-container{
button {
font-size: 16px;
min-width: 32px;
height: 32px;
margin-right: 4px;
margin-top: 0;
margin-bottom: 0;
}
}
}
}
}
.el-table__body-wrapper{
.el-table__body-wrapper{
height: calc(100% - 45px) !important;
height: calc(100% - 45px) !important;
...
...
app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
浏览文件 @
3cef2236
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
ref='multipleTable' :data="items" :show-header="!isHideHeader">
ref='multipleTable' :data="items" :show-header="!isHideHeader">
<template
slot=
"empty"
>
<template
slot=
"empty"
>
无数据
无数据
<span
class=
"quick-toolbar"
>
</span>
</
template
>
</
template
>
<
template
v-if=
"!isSingleSelect"
>
<
template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
...
...
app_web/src/widgets/sys-role/main-grid/main-grid.less
浏览文件 @
3cef2236
...
@@ -29,6 +29,9 @@
...
@@ -29,6 +29,9 @@
display: inline;
display: inline;
}
}
.el-table {
.el-table {
.quick-toolbar{
display: inline-block;
}
.el-tooltip{
.el-tooltip{
.ivu-form-item{
.ivu-form-item{
margin-bottom: unset !important;
margin-bottom: unset !important;
...
@@ -51,6 +54,20 @@
...
@@ -51,6 +54,20 @@
position: absolute;
position: absolute;
left: 0;
left: 0;
}
}
.batch-toolbar{
position: absolute;
left: 105px;
>.toolbar-container{
button {
font-size: 16px;
min-width: 32px;
height: 32px;
margin-right: 4px;
margin-top: 0;
margin-bottom: 0;
}
}
}
}
}
.el-table__body-wrapper{
.el-table__body-wrapper{
height: calc(100% - 45px) !important;
height: calc(100% - 45px) !important;
...
...
app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue
浏览文件 @
3cef2236
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
ref='multipleTable' :data="items" :show-header="!isHideHeader">
ref='multipleTable' :data="items" :show-header="!isHideHeader">
<template
slot=
"empty"
>
<template
slot=
"empty"
>
无数据
无数据
<span
class=
"quick-toolbar"
>
</span>
</
template
>
</
template
>
<
template
v-if=
"!isSingleSelect"
>
<
template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
...
...
app_web/src/widgets/sys-user-role/main-grid/main-grid.less
浏览文件 @
3cef2236
...
@@ -29,6 +29,9 @@
...
@@ -29,6 +29,9 @@
display: inline;
display: inline;
}
}
.el-table {
.el-table {
.quick-toolbar{
display: inline-block;
}
.el-tooltip{
.el-tooltip{
.ivu-form-item{
.ivu-form-item{
margin-bottom: unset !important;
margin-bottom: unset !important;
...
@@ -51,6 +54,20 @@
...
@@ -51,6 +54,20 @@
position: absolute;
position: absolute;
left: 0;
left: 0;
}
}
.batch-toolbar{
position: absolute;
left: 105px;
>.toolbar-container{
button {
font-size: 16px;
min-width: 32px;
height: 32px;
margin-right: 4px;
margin-top: 0;
margin-bottom: 0;
}
}
}
}
}
.el-table__body-wrapper{
.el-table__body-wrapper{
height: calc(100% - 45px) !important;
height: calc(100% - 45px) !important;
...
...
app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
浏览文件 @
3cef2236
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
ref='multipleTable' :data="items" :show-header="!isHideHeader">
ref='multipleTable' :data="items" :show-header="!isHideHeader">
<template
slot=
"empty"
>
<template
slot=
"empty"
>
无数据
无数据
<span
class=
"quick-toolbar"
>
</span>
</
template
>
</
template
>
<
template
v-if=
"!isSingleSelect"
>
<
template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
...
...
app_web/src/widgets/sys-user/main-grid/main-grid.less
浏览文件 @
3cef2236
...
@@ -29,6 +29,9 @@
...
@@ -29,6 +29,9 @@
display: inline;
display: inline;
}
}
.el-table {
.el-table {
.quick-toolbar{
display: inline-block;
}
.el-tooltip{
.el-tooltip{
.ivu-form-item{
.ivu-form-item{
margin-bottom: unset !important;
margin-bottom: unset !important;
...
@@ -51,6 +54,20 @@
...
@@ -51,6 +54,20 @@
position: absolute;
position: absolute;
left: 0;
left: 0;
}
}
.batch-toolbar{
position: absolute;
left: 105px;
>.toolbar-container{
button {
font-size: 16px;
min-width: 32px;
height: 32px;
margin-right: 4px;
margin-top: 0;
margin-bottom: 0;
}
}
}
}
}
.el-table__body-wrapper{
.el-table__body-wrapper{
height: calc(100% - 45px) !important;
height: calc(100% - 45px) !important;
...
...
config.xml
浏览文件 @
3cef2236
...
@@ -37,11 +37,6 @@
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibzuaa/
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/
cd ibzuaa/
mvn clean package -Pweb
cd ibzuaa-app/ibzuaa-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
浏览文件 @
3cef2236
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
EXPOSE
30002
EXPOSE
8080
ADD
ibzuaa-app-web.jar /ibzuaa-app-web.jar
ADD
ibzuaa-app-web.jar /ibzuaa-app-web.jar
ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
浏览文件 @
3cef2236
...
@@ -3,11 +3,9 @@ services:
...
@@ -3,11 +3,9 @@ services:
ibzuaa-app-web
:
ibzuaa-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
ports
:
ports
:
-
"
30002:30002
"
-
"
8080:8080
"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
SPRING_CLOUD_NACOS_DISCOVERY_IP
:
172.16.180.237
deploy
:
deploy
:
mode
:
replicated
mode
:
replicated
replicas
:
1
replicas
:
1
...
...
ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-dev.yml
浏览文件 @
3cef2236
server
:
server
:
port
:
30002
port
:
8080
\ No newline at end of file
\ No newline at end of file
ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-prod.yml
浏览文件 @
3cef2236
server
:
server
:
port
:
30002
port
:
8080
#zuul网关路由设置
#zuul网关路由设置
zuul
:
zuul
:
...
...
ibzuaa-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @
3cef2236
...
@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
...
@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value
(
"${ibiz.enablePermissionValid:false}"
)
@Value
(
"${ibiz.enablePermissionValid:false}"
)
boolean
enablePermissionValid
;
//是否开启权限校验
boolean
enablePermissionValid
;
//是否开启权限校验
@Value
(
"${ibiz.systemid:
EB948A46-DF8C-4BE3-8020-0ADA23440D3
1}"
)
@Value
(
"${ibiz.systemid:
2C40DFCD-0DF5-47BF-91A5-C45F810B000
1}"
)
private
String
systemId
;
private
String
systemId
;
@Override
@Override
...
...
ibzuaa-util/src/main/resources/application-sys.yml
浏览文件 @
3cef2236
...
@@ -81,6 +81,6 @@ ribbon:
...
@@ -81,6 +81,6 @@ ribbon:
#缓存模式:关闭缓存(无配置项)、本地缓存(enableCaffeineCache=true-默认)、caffeine+redis两级缓存(enableRedisCache=true)
#缓存模式:关闭缓存(无配置项)、本地缓存(enableCaffeineCache=true-默认)、caffeine+redis两级缓存(enableRedisCache=true)
ibiz
:
ibiz
:
enablePermissionValid
:
false
enablePermissionValid
:
false
enableCaffeineCache
:
fals
e
enableCaffeineCache
:
tru
e
#enableRedisCache: false
#enableRedisCache: false
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录