Skip to content

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

zhouweidong@lab.ibiz5.com 部署微服务应用

上级 4c8af2d8
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 231 行增加 和 720 行删除
app_web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue
浏览文件 @ 53c4ecb6
......@@ -25,7 +25,6 @@
<el-table-column show-overflow-tooltip :prop="'username'" :label="$t('entities.sysauthlog.main_grid.columns.username')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysauthlog.main_grid.columns.username')}}
</span>
</template>
......@@ -38,7 +37,6 @@
<el-table-column show-overflow-tooltip :prop="'personname'" :label="$t('entities.sysauthlog.main_grid.columns.personname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysauthlog.main_grid.columns.personname')}}
</span>
</template>
......@@ -51,7 +49,6 @@
<el-table-column show-overflow-tooltip :prop="'authtime'" :label="$t('entities.sysauthlog.main_grid.columns.authtime')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysauthlog.main_grid.columns.authtime')}}
</span>
</template>
......@@ -64,7 +61,6 @@
<el-table-column show-overflow-tooltip :prop="'authcode'" :label="$t('entities.sysauthlog.main_grid.columns.authcode')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysauthlog.main_grid.columns.authcode')}}
</span>
</template>
......@@ -79,7 +75,6 @@
<el-table-column show-overflow-tooltip :prop="'ipaddr'" :label="$t('entities.sysauthlog.main_grid.columns.ipaddr')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysauthlog.main_grid.columns.ipaddr')}}
</span>
</template>
......@@ -92,7 +87,6 @@
<el-table-column show-overflow-tooltip :prop="'macaddr'" :label="$t('entities.sysauthlog.main_grid.columns.macaddr')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysauthlog.main_grid.columns.macaddr')}}
</span>
</template>
......@@ -105,7 +99,6 @@
<el-table-column show-overflow-tooltip :prop="'useragent'" :label="$t('entities.sysauthlog.main_grid.columns.useragent')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysauthlog.main_grid.columns.useragent')}}
</span>
</template>
......@@ -118,7 +111,6 @@
<el-table-column show-overflow-tooltip :prop="'domain'" :label="$t('entities.sysauthlog.main_grid.columns.domain')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysauthlog.main_grid.columns.domain')}}
</span>
</template>
......
app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
浏览文件 @ 53c4ecb6
......@@ -25,7 +25,6 @@
<el-table-column show-overflow-tooltip :prop="'sys_permissionid'" :label="$t('entities.syspermission.main_grid.columns.sys_permissionid')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.syspermission.main_grid.columns.sys_permissionid')}}
</span>
</template>
......@@ -38,7 +37,6 @@
<el-table-column show-overflow-tooltip :prop="'sys_permissionname'" :label="$t('entities.syspermission.main_grid.columns.sys_permissionname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.syspermission.main_grid.columns.sys_permissionname')}}
</span>
</template>
......
app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue
浏览文件 @ 53c4ecb6
......@@ -25,7 +25,6 @@
<el-table-column show-overflow-tooltip :prop="'sys_rolename'" :label="$t('entities.sysrolepermission.main_grid.columns.sys_rolename')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysrolepermission.main_grid.columns.sys_rolename')}}
</span>
</template>
......@@ -45,7 +44,6 @@
<el-table-column show-overflow-tooltip :prop="'sys_permissionname'" :label="$t('entities.sysrolepermission.main_grid.columns.sys_permissionname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysrolepermission.main_grid.columns.sys_permissionname')}}
</span>
</template>
......@@ -65,7 +63,6 @@
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.sysrolepermission.main_grid.columns.updatedate')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysrolepermission.main_grid.columns.updatedate')}}
</span>
</template>
......
app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
浏览文件 @ 53c4ecb6
......@@ -25,7 +25,6 @@
<el-table-column show-overflow-tooltip :prop="'sys_roleid'" :label="$t('entities.sysrole.main_grid.columns.sys_roleid')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysrole.main_grid.columns.sys_roleid')}}
</span>
</template>
......@@ -38,7 +37,6 @@
<el-table-column show-overflow-tooltip :prop="'sys_rolename'" :label="$t('entities.sysrole.main_grid.columns.sys_rolename')" :width="350" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysrole.main_grid.columns.sys_rolename')}}
</span>
</template>
......@@ -51,7 +49,6 @@
<el-table-column show-overflow-tooltip :prop="'memo'" :label="$t('entities.sysrole.main_grid.columns.memo')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysrole.main_grid.columns.memo')}}
</span>
</template>
......@@ -64,7 +61,6 @@
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.sysrole.main_grid.columns.updatedate')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysrole.main_grid.columns.updatedate')}}
</span>
</template>
......
app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue
浏览文件 @ 53c4ecb6
......@@ -25,7 +25,6 @@
<el-table-column show-overflow-tooltip :prop="'sys_username'" :label="$t('entities.sysuserrole.main_grid.columns.sys_username')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysuserrole.main_grid.columns.sys_username')}}
</span>
</template>
......@@ -45,7 +44,6 @@
<el-table-column show-overflow-tooltip :prop="'sys_rolename'" :label="$t('entities.sysuserrole.main_grid.columns.sys_rolename')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysuserrole.main_grid.columns.sys_rolename')}}
</span>
</template>
......@@ -65,7 +63,6 @@
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.sysuserrole.main_grid.columns.updatedate')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysuserrole.main_grid.columns.updatedate')}}
</span>
</template>
......
app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
浏览文件 @ 53c4ecb6
......@@ -25,7 +25,6 @@
<el-table-column show-overflow-tooltip :prop="'userid'" :label="$t('entities.sysuser.main_grid.columns.userid')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysuser.main_grid.columns.userid')}}
</span>
</template>
......@@ -38,7 +37,6 @@
<el-table-column show-overflow-tooltip :prop="'username'" :label="$t('entities.sysuser.main_grid.columns.username')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysuser.main_grid.columns.username')}}
</span>
</template>
......@@ -51,7 +49,6 @@
<el-table-column show-overflow-tooltip :prop="'personname'" :label="$t('entities.sysuser.main_grid.columns.personname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysuser.main_grid.columns.personname')}}
</span>
</template>
......
config.xml
浏览文件 @ 53c4ecb6
......@@ -37,6 +37,11 @@
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
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>
</hudson.tasks.Shell>
</builders>
......
ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
浏览文件 @ 53c4ecb6
......@@ -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
浏览文件 @ 53c4ecb6
......@@ -3,9 +3,23 @@ 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
- SERVER_PORT=30002
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- ABC=1
- DEC=2
deploy:
mode: replicated
replicas: 1
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysAuthLogResource.java
浏览文件 @ 53c4ecb6
......@@ -22,6 +22,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.util.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.access.prepost.PostAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
......@@ -47,7 +48,6 @@ public class SysAuthLogResource {
public SysAuthLogDTO permissionDTO=new SysAuthLogDTO();
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SysAuthLog" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sysauthlogs/getdraft")
public ResponseEntity<SysAuthLogDTO> getDraft() {
......@@ -60,13 +60,13 @@ public class SysAuthLogResource {
@Transactional
public ResponseEntity<SysAuthLogDTO> update(@PathVariable("sysauthlog_id") String sysauthlog_id, @RequestBody SysAuthLogDTO sysauthlogdto) {
SysAuthLog domain = sysauthlogMapping.toDomain(sysauthlogdto);
domain.setLogid(sysauthlog_id);
sysauthlogService.update(domain);
SysAuthLogDTO dto = sysauthlogMapping.toDto(domain);
domain .setLogid(sysauthlog_id);
sysauthlogService.update(domain );
SysAuthLogDTO dto = sysauthlogMapping.toDto(domain );
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.sysauthlogMapping,#sysauthlogdtos})")
//@PreAuthorize("hasPermission('Update',{'Sql',this.sysauthlogMapping,#sysauthlogdtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SysAuthLog" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sysauthlogs/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
......@@ -82,7 +82,7 @@ public class SysAuthLogResource {
return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.remove(sysauthlog_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.sysauthlogMapping,this.permissionDTO,#ids})")
//@PreAuthorize("hasPermission('Remove',{'Sql',this.sysauthlogMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SysAuthLog" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysauthlogs/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -101,7 +101,7 @@ public class SysAuthLogResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.sysauthlogMapping,#sysauthlogdtos})")
//@PreAuthorize("hasPermission('Create',{'Sql',this.sysauthlogMapping,#sysauthlogdtos})")
@ApiOperation(value = "createBatch", tags = {"SysAuthLog" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
......@@ -109,7 +109,6 @@ public class SysAuthLogResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SysAuthLog" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysAuthLogDTO sysauthlogdto) {
......@@ -132,7 +131,7 @@ public class SysAuthLogResource {
return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.save(sysauthlogMapping.toDomain(sysauthlogdto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.sysauthlogMapping,#sysauthlogdtos})")
//@PreAuthorize("hasPermission('Save',{'Sql',this.sysauthlogMapping,#sysauthlogdtos})")
@ApiOperation(value = "SaveBatch", tags = {"SysAuthLog" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysPermissionResource.java
浏览文件 @ 53c4ecb6
......@@ -22,6 +22,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.util.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.access.prepost.PostAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
......@@ -54,7 +55,7 @@ public class SysPermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.save(syspermissionMapping.toDomain(syspermissiondto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.syspermissionMapping,#syspermissiondtos})")
//@PreAuthorize("hasPermission('Save',{'Sql',this.syspermissionMapping,#syspermissiondtos})")
@ApiOperation(value = "SaveBatch", tags = {"SysPermission" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
......@@ -62,7 +63,6 @@ public class SysPermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SysPermission" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/syspermissions/getdraft")
public ResponseEntity<SysPermissionDTO> getDraft() {
......@@ -77,7 +77,7 @@ public class SysPermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.remove(syspermission_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.syspermissionMapping,this.permissionDTO,#ids})")
//@PreAuthorize("hasPermission('Remove',{'Sql',this.syspermissionMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SysPermission" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -91,13 +91,13 @@ public class SysPermissionResource {
@Transactional
public ResponseEntity<SysPermissionDTO> update(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysPermissionDTO syspermissiondto) {
SysPermission domain = syspermissionMapping.toDomain(syspermissiondto);
domain.setPermissionid(syspermission_id);
syspermissionService.update(domain);
SysPermissionDTO dto = syspermissionMapping.toDto(domain);
domain .setPermissionid(syspermission_id);
syspermissionService.update(domain );
SysPermissionDTO dto = syspermissionMapping.toDto(domain );
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.syspermissionMapping,#syspermissiondtos})")
//@PreAuthorize("hasPermission('Update',{'Sql',this.syspermissionMapping,#syspermissiondtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SysPermission" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
......@@ -116,7 +116,7 @@ public class SysPermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.syspermissionMapping,#syspermissiondtos})")
//@PreAuthorize("hasPermission('Create',{'Sql',this.syspermissionMapping,#syspermissiondtos})")
@ApiOperation(value = "createBatch", tags = {"SysPermission" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
......@@ -124,7 +124,6 @@ public class SysPermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SysPermission" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysPermissionDTO syspermissiondto) {
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysRoleResource.java
浏览文件 @ 53c4ecb6
......@@ -22,6 +22,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.util.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.access.prepost.PostAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
......@@ -54,7 +55,7 @@ public class SysRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(sysroleService.save(sysroleMapping.toDomain(sysroledto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.sysroleMapping,#sysroledtos})")
//@PreAuthorize("hasPermission('Save',{'Sql',this.sysroleMapping,#sysroledtos})")
@ApiOperation(value = "SaveBatch", tags = {"SysRole" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
......@@ -68,13 +69,13 @@ public class SysRoleResource {
@Transactional
public ResponseEntity<SysRoleDTO> update(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRoleDTO sysroledto) {
SysRole domain = sysroleMapping.toDomain(sysroledto);
domain.setRoleid(sysrole_id);
sysroleService.update(domain);
SysRoleDTO dto = sysroleMapping.toDto(domain);
domain .setRoleid(sysrole_id);
sysroleService.update(domain );
SysRoleDTO dto = sysroleMapping.toDto(domain );
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.sysroleMapping,#sysroledtos})")
//@PreAuthorize("hasPermission('Update',{'Sql',this.sysroleMapping,#sysroledtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SysRole" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
......@@ -93,7 +94,7 @@ public class SysRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.sysroleMapping,#sysroledtos})")
//@PreAuthorize("hasPermission('Create',{'Sql',this.sysroleMapping,#sysroledtos})")
@ApiOperation(value = "createBatch", tags = {"SysRole" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
......@@ -118,7 +119,7 @@ public class SysRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(sysroleService.remove(sysrole_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.sysroleMapping,this.permissionDTO,#ids})")
//@PreAuthorize("hasPermission('Remove',{'Sql',this.sysroleMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SysRole" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -126,14 +127,12 @@ public class SysRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SysRole" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sysroles/getdraft")
public ResponseEntity<SysRoleDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sysroleMapping.toDto(sysroleService.getDraft(new SysRole())));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SysRole" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysRoleDTO sysroledto) {
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysUserResource.java
浏览文件 @ 53c4ecb6
......@@ -22,6 +22,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.util.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.access.prepost.PostAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
......@@ -55,7 +56,7 @@ public class SysUserResource {
return ResponseEntity.status(HttpStatus.OK).body(sysuserService.remove(sysuser_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.sysuserMapping,this.permissionDTO,#ids})")
//@PreAuthorize("hasPermission('Remove',{'Sql',this.sysuserMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SysUser" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -69,13 +70,13 @@ public class SysUserResource {
@Transactional
public ResponseEntity<SysUserDTO> update(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserDTO sysuserdto) {
SysUser domain = sysuserMapping.toDomain(sysuserdto);
domain.setUserid(sysuser_id);
sysuserService.update(domain);
SysUserDTO dto = sysuserMapping.toDto(domain);
domain .setUserid(sysuser_id);
sysuserService.update(domain );
SysUserDTO dto = sysuserMapping.toDto(domain );
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.sysuserMapping,#sysuserdtos})")
//@PreAuthorize("hasPermission('Update',{'Sql',this.sysuserMapping,#sysuserdtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SysUser" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sysusers/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
......@@ -83,7 +84,6 @@ public class SysUserResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SysUser" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysUserDTO sysuserdto) {
......@@ -106,7 +106,7 @@ public class SysUserResource {
return ResponseEntity.status(HttpStatus.OK).body(sysuserService.save(sysuserMapping.toDomain(sysuserdto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.sysuserMapping,#sysuserdtos})")
//@PreAuthorize("hasPermission('Save',{'Sql',this.sysuserMapping,#sysuserdtos})")
@ApiOperation(value = "SaveBatch", tags = {"SysUser" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
......@@ -114,7 +114,6 @@ public class SysUserResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SysUser" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sysusers/getdraft")
public ResponseEntity<SysUserDTO> getDraft() {
......@@ -132,7 +131,7 @@ public class SysUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.sysuserMapping,#sysuserdtos})")
//@PreAuthorize("hasPermission('Create',{'Sql',this.sysuserMapping,#sysuserdtos})")
@ApiOperation(value = "createBatch", tags = {"SysUser" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或