Skip to content

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

ibizdev提交

上级 d055952c
隐藏空白字符变更
内嵌 并排
正在显示 包含 66 行增加 和 47 行删除
app_web/src/pages/uaa/sys-permissionedit-view/sys-permissionedit-view-base.vue
浏览文件 @ d5a18345
......@@ -250,7 +250,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
* @memberof SYS_PERMISSIONEditViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-permissionedit-view2/sys-permissionedit-view2-base.vue
浏览文件 @ d5a18345
......@@ -258,7 +258,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
* @memberof SYS_PERMISSIONEditView2Base
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue
浏览文件 @ d5a18345
......@@ -8,8 +8,8 @@
<div class='content-container'>
<div class='view-top-messages'>
</div>
<row style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
<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;' />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......@@ -53,7 +53,7 @@
</tooltip>
</div>
</div>
</row>
</div>
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
......@@ -281,7 +281,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
* @memberof SYS_PERMISSIONGridViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......@@ -309,6 +308,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
/**
* 视图引擎
*
......@@ -538,6 +538,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
_this.loadModel();
}
}
......
app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue
浏览文件 @ d5a18345
......@@ -250,7 +250,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
* @memberof SYS_ROLE_PERMISSIONEditViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue
浏览文件 @ d5a18345
......@@ -258,7 +258,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
* @memberof SYS_ROLE_PERMISSIONEditView2Base
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue
浏览文件 @ d5a18345
......@@ -5,8 +5,8 @@
<div class='content-container'>
<div class='view-top-messages'>
</div>
<row style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
<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;' />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......@@ -50,7 +50,7 @@
</tooltip>
</div>
</div>
</row>
</div>
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
......@@ -278,7 +278,6 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
* @memberof SYS_ROLE_PERMISSIONGridViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......@@ -306,6 +305,7 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
/**
* 视图引擎
*
......@@ -535,6 +535,7 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
_this.loadModel();
}
}
......
app_web/src/pages/uaa/sys-roleedit-view/sys-roleedit-view-base.vue
浏览文件 @ d5a18345
......@@ -250,7 +250,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
* @memberof SYS_ROLEEditViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-roleedit-view2/sys-roleedit-view2-base.vue
浏览文件 @ d5a18345
......@@ -258,7 +258,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
* @memberof SYS_ROLEEditView2Base
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue
浏览文件 @ d5a18345
......@@ -8,8 +8,8 @@
<div class='content-container'>
<div class='view-top-messages'>
</div>
<row style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
<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;' />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......@@ -53,7 +53,7 @@
</tooltip>
</div>
</div>
</row>
</div>
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
......@@ -281,7 +281,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
* @memberof SYS_ROLEGridViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......@@ -309,6 +308,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
/**
* 视图引擎
*
......@@ -538,6 +538,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
_this.loadModel();
}
}
......
app_web/src/pages/uaa/sys-user-roleedit-view/sys-user-roleedit-view-base.vue
浏览文件 @ d5a18345
......@@ -250,7 +250,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
* @memberof SYS_USER_ROLEEditViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue
浏览文件 @ d5a18345
......@@ -258,7 +258,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
* @memberof SYS_USER_ROLEEditView2Base
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue
浏览文件 @ d5a18345
......@@ -5,8 +5,8 @@
<div class='content-container'>
<div class='view-top-messages'>
</div>
<row style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
<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;' />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......@@ -50,7 +50,7 @@
</tooltip>
</div>
</div>
</row>
</div>
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
......@@ -278,7 +278,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
* @memberof SYS_USER_ROLEGridViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......@@ -306,6 +305,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
/**
* 视图引擎
*
......@@ -535,6 +535,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
_this.loadModel();
}
}
......
app_web/src/pages/uaa/sys-useredit-view/sys-useredit-view-base.vue
浏览文件 @ d5a18345
......@@ -250,7 +250,6 @@ export default class SYS_USEREditViewBase extends Vue {
* @memberof SYS_USEREditViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue
浏览文件 @ d5a18345
......@@ -258,7 +258,6 @@ export default class SYS_USEREditView2Base extends Vue {
* @memberof SYS_USEREditView2Base
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......
app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue
浏览文件 @ d5a18345
......@@ -8,8 +8,8 @@
<div class='content-container'>
<div class='view-top-messages'>
</div>
<row style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
<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;' />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......@@ -53,7 +53,7 @@
</tooltip>
</div>
</div>
</row>
</div>
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
......@@ -281,7 +281,6 @@ export default class SYS_USERGridViewBase extends Vue {
* @memberof SYS_USERGridViewBase
*/
public viewState: Subject<ViewState> = new Subject();
/**
* 工具栏模型
*
......@@ -309,6 +308,7 @@ export default class SYS_USERGridViewBase extends Vue {
/**
* 视图引擎
*
......@@ -538,6 +538,7 @@ export default class SYS_USERGridViewBase extends Vue {
_this.loadModel();
}
}
......
app_web/src/styles/default.less
浏览文件 @ d5a18345
......@@ -213,6 +213,17 @@
height: 100%;
}
}
>.view-card{
>.ivu-card-body{
>.content-container{
.quick-group-container,.quick-search-container,.quick-search-input{
float: left;
margin-top: 6px;
margin-bottom: 6px;
}
}
}
}
}
/*** END:多数据视图属性布局 ***/
......
app_web/src/utils/app-modal/app-modal.less
浏览文件 @ d5a18345
......@@ -10,6 +10,9 @@
.ivu-modal-body {
padding: 0;
height: calc(100% - 52px);
.view-container{
padding: 15px;
}
}
}
}
......
app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
浏览文件 @ d5a18345
......@@ -467,6 +467,8 @@ export default class MainBase extends Vue implements ControlInterface {
public stopRowClick: boolean = false;
/**
* 表格是否显示
*
......
app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue
浏览文件 @ d5a18345
......@@ -472,6 +472,8 @@ export default class MainBase extends Vue implements ControlInterface {
public stopRowClick: boolean = false;
/**
* 表格是否显示
*
......
app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
浏览文件 @ d5a18345
......@@ -479,6 +479,8 @@ export default class MainBase extends Vue implements ControlInterface {
public stopRowClick: boolean = false;
/**
* 表格是否显示
*
......
app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue
浏览文件 @ d5a18345
......@@ -486,6 +486,8 @@ export default class MainBase extends Vue implements ControlInterface {
public stopRowClick: boolean = false;
/**
* 表格是否显示
*
......
app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
浏览文件 @ d5a18345
......@@ -472,6 +472,8 @@ export default class MainBase extends Vue implements ControlInterface {
public stopRowClick: boolean = false;
/**
* 表格是否显示
*
......
config.xml
浏览文件 @ d5a18345
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/
mvn clean package -Papi
cd ibzuaa-provider/ibzuaa-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth
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>
</hudson.tasks.Shell>
</builders>
......
ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
浏览文件 @ d5a18345
......@@ -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 /ibzuaa-app-web.jar
EXPOSE 8080
EXPOSE 30002
ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar
ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
浏览文件 @ d5a18345
......@@ -3,9 +3,11 @@ services:
ibzuaa-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
ports:
- "8080:8080"
- "30002:30002"
networks:
- agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
deploy:
mode: replicated
replicas: 1
......
ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-dev.yml
浏览文件 @ d5a18345
server:
port: 8080
\ No newline at end of file
port: 30002
\ No newline at end of file
ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ d5a18345
server:
port: 8080
port: 30002
#zuul网关路由设置
zuul:
......
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile
浏览文件 @ d5a18345
......@@ -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 /ibzuaa-provider-api.jar
EXPOSE 40002
EXPOSE 8081
ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml
浏览文件 @ d5a18345
......@@ -3,11 +3,9 @@ services:
ibzuaa-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
ports:
- "40002:40002"
- "8081:8081"
networks:
- agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
deploy:
mode: replicated
replicas: 1
......
ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application-api-dev.yml
浏览文件 @ d5a18345
server:
port: 40002
\ No newline at end of file
port: 8081
\ No newline at end of file
ibzuaa-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ d5a18345
......@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
@Value("${ibiz.systemid:EB948A46-DF8C-4BE3-8020-0ADA23440D31}")
private String systemId;
@Override
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或