ibiz4j 部署微服务接口

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -2,11 +2,11 @@
 FROM openjdk:8-jre-alpine
 
 ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
-    IBZ_SLEEP=0 \
+    IBIZ_SLEEP=0 \
     JAVA_OPTS=""
 
-CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
-    sleep ${IBZ_SLEEP} && \
+CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
+    sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
 EXPOSE 8080

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java

@@ -40,7 +40,7 @@ public class SysRole extends EntityMP implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 角色表标识
+     * 角色标识
      */
     @DEField(name = "sys_roleid" , isKeyField=true)
     @TableId(value= "sys_roleid",type=IdType.UUID)
@@ -48,7 +48,7 @@ public class SysRole extends EntityMP implements Serializable {
     @JsonProperty("roleid")
     private String roleid;
     /**
-     * 角色表名称
+     * 角色名称
      */
     @DEField(name = "sys_rolename")
     @TableField(value = "sys_rolename")
@@ -84,7 +84,7 @@ public class SysRole extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [角色表名称]
+     * 设置 [角色名称]
      */
     public void setRolename(String rolename){
         this.rolename = rolename ;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java

@@ -40,7 +40,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 用户角色关系表标识
+     * 用户角色关系标识
      */
     @DEField(name = "sys_user_roleid" , isKeyField=true)
     @TableId(value= "sys_user_roleid",type=IdType.UUID)
@@ -48,7 +48,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @JsonProperty("userroleid")
     private String userroleid;
     /**
-     * 角色表标识
+     * 角色标识
      */
     @DEField(name = "sys_roleid")
     @TableField(value = "sys_roleid")
@@ -115,7 +115,7 @@ public class SysUserRole extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [角色表标识]
+     * 设置 [角色标识]
      */
     public void setRoleid(String roleid){
         this.roleid = roleid ;
@@ -130,7 +130,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     }
 
     /**
-     * 获取 [用户角色关系表标识]
+     * 获取 [用户角色关系标识]
      */
     public String getUserroleid(){
         if(ObjectUtils.isEmpty(userroleid)){

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRoleSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.core.uaa.domain.SysRole;
 @Data
 public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
 
-	private String n_sys_rolename_isnotnull;//[角色表名称]
+	private String n_sys_rolename_isnotnull;//[角色名称]
 	public void setN_sys_rolename_isnotnull(String n_sys_rolename_isnotnull) {
         this.n_sys_rolename_isnotnull = n_sys_rolename_isnotnull;
         if(!ObjectUtils.isEmpty(this.n_sys_rolename_isnotnull)){
@@ -36,7 +36,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
 			}
         }
     }
-	private String n_sys_rolename_isnull;//[角色表名称]
+	private String n_sys_rolename_isnull;//[角色名称]
 	public void setN_sys_rolename_isnull(String n_sys_rolename_isnull) {
         this.n_sys_rolename_isnull = n_sys_rolename_isnull;
         if(!ObjectUtils.isEmpty(this.n_sys_rolename_isnull)){
@@ -45,7 +45,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
 			}
         }
     }
-	private String n_sys_rolename_like;//[角色表名称]
+	private String n_sys_rolename_like;//[角色名称]
 	public void setN_sys_rolename_like(String n_sys_rolename_like) {
         this.n_sys_rolename_like = n_sys_rolename_like;
         if(!ObjectUtils.isEmpty(this.n_sys_rolename_like)){

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserRoleSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.core.uaa.domain.SysUserRole;
 @Data
 public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> {
 
-	private String n_sys_roleid_eq;//[角色表标识]
+	private String n_sys_roleid_eq;//[角色标识]
 	public void setN_sys_roleid_eq(String n_sys_roleid_eq) {
         this.n_sys_roleid_eq = n_sys_roleid_eq;
         if(!ObjectUtils.isEmpty(this.n_sys_roleid_eq)){

ibzuaa-core/src/main/java/cn/ibizlab/core/util/config/XxlJobConfig.java

+package cn.ibizlab.core.util.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+/**
+ * xxl-job config
+ *  分布式任务调度平台XXL-JOB配置加载
+ * @author xuxueli 2017-04-28
+ */
+@Configuration
+public class XxlJobConfig {
+    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+    @Value("${xxl.job.admin.addresses:}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.accessToken:}")
+    private String accessToken;
+
+    @Value("${xxl.job.executor.appname:ibzuaa}")
+    private String appName;
+
+    @Value("${xxl.job.executor.ip:127.0.0.1}")
+    private String ip;
+
+   @Value("${xxl.job.executor.port:9999}")
+   private int port;
+
+    @Value("${xxl.job.executor.logpath:/app/joblog}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays:-1}")
+    private int logRetentionDays;
+
+    @Bean(initMethod = "start", destroyMethod = "destroy")
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        if(!StringUtils.isEmpty(adminAddresses)){
+            logger.info(">>>>>>>>>>> xxl-job config init.");
+            logger.info(">>>>>>>>>>> adminAddresses:"+adminAddresses);
+            logger.info(">>>>>>>>>>> appName:"+appName);
+            logger.info(">>>>>>>>>>> ip:"+ip);
+            logger.info(">>>>>>>>>>> port:"+port);
+            XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+            xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+            xxlJobSpringExecutor.setAppName(appName);
+            xxlJobSpringExecutor.setIp(ip);
+            xxlJobSpringExecutor.setPort(port);
+            xxlJobSpringExecutor.setAccessToken(accessToken);
+            xxlJobSpringExecutor.setLogPath(logPath);
+            xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+            return xxlJobSpringExecutor;
+        }
+        
+        logger.info(">>>>>>>>>>> xxl-job config not init.");
+        return null;
+    }
+
+    /**
+     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+     *
+     *      1、引入依赖：
+     *          <dependency>
+     *             <groupId>org.springframework.cloud</groupId>
+     *             <artifactId>spring-cloud-commons</artifactId>
+     *             <version>${version}"</version>
+     *         </dependency>
+     *
+     *      2、配置文件，或者容器启动变量
+     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+     *
+     *      3、获取IP
+     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+     */
+}

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -50,7 +50,7 @@
 
 
     <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-59-3">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-62-3">
         <createTable tableName="IBZUSER_ROLE">
                 <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
@@ -68,7 +68,7 @@
 
 
     <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-85-4">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role-89-4">
         <createTable tableName="IBZROLE">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -126,7 +126,7 @@
        <addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-59-9">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-62-9">
        <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_ROLE]外键关系 -->

ibzuaa-dependencies/pom.xml

@@ -74,6 +74,9 @@
         <!--httpClient -->
         <openfeign-httpclient.version>11.0</openfeign-httpclient.version>
 
+        <!--xxl-job定时服务 -->
+        <xxl-job.version>2.1.0</xxl-job.version>
+
     </properties>
 
     <dependencyManagement>
@@ -249,6 +252,12 @@
                 <version>${openfeign-httpclient.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.xuxueli</groupId>
+                <artifactId>xxl-job-core</artifactId>
+                <version>${xxl-job.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -308,6 +317,12 @@
             <artifactId>h2</artifactId>
         </dependency>
 
+        <!--xxl-job定时服务 -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+        </dependency>
+
         <!--  Error -->
 
         <!--  Security  -->

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -2,11 +2,11 @@
 FROM openjdk:8-jre-alpine
 
 ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
-    IBZ_SLEEP=0 \
+    IBIZ_SLEEP=0 \
     JAVA_OPTS=""
 
-CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
-    sleep ${IBZ_SLEEP} && \
+CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
+    sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
 EXPOSE 40002

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysAuthLogResource.java

@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysAuthLogService;
 import cn.ibizlab.core.uaa.filter.SysAuthLogSearchContext;
 
 @Slf4j
-@Api(tags = {"SysAuthLog" })
+@Api(tags = {"认证日志" })
 @RestController("api-sysauthlog")
 @RequestMapping("")
 public class SysAuthLogResource {
@@ -46,14 +46,14 @@ public class SysAuthLogResource {
     @Lazy
     public SysAuthLogMapping sysauthlogMapping;
 
-    @ApiOperation(value = "GetDraft", tags = {"SysAuthLog" },  notes = "GetDraft")
+    @ApiOperation(value = "获取认证日志草稿", tags = {"认证日志" },  notes = "获取认证日志草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/sysauthlogs/getdraft")
     public ResponseEntity<SysAuthLogDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sysauthlogMapping.toDto(sysauthlogService.getDraft(new SysAuthLog())));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Update-all')")
-    @ApiOperation(value = "Update", tags = {"SysAuthLog" },  notes = "Update")
+    @ApiOperation(value = "更新认证日志", tags = {"认证日志" },  notes = "更新认证日志")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysauthlogs/{sysauthlog_id}")
     @Transactional
     public ResponseEntity<SysAuthLogDTO> update(@PathVariable("sysauthlog_id") String sysauthlog_id, @RequestBody SysAuthLogDTO sysauthlogdto) {
@@ -65,7 +65,7 @@ public class SysAuthLogResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Update-all')")
-    @ApiOperation(value = "UpdateBatch", tags = {"SysAuthLog" },  notes = "UpdateBatch")
+    @ApiOperation(value = "批量更新认证日志", tags = {"认证日志" },  notes = "批量更新认证日志")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysauthlogs/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
         sysauthlogService.updateBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
@@ -73,7 +73,7 @@ public class SysAuthLogResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Remove-all')")
-    @ApiOperation(value = "Remove", tags = {"SysAuthLog" },  notes = "Remove")
+    @ApiOperation(value = "删除认证日志", tags = {"认证日志" },  notes = "删除认证日志")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sysauthlogs/{sysauthlog_id}")
     @Transactional
     public ResponseEntity<Boolean> remove(@PathVariable("sysauthlog_id") String sysauthlog_id) {
@@ -81,7 +81,7 @@ public class SysAuthLogResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Remove-all')")
-    @ApiOperation(value = "RemoveBatch", tags = {"SysAuthLog" },  notes = "RemoveBatch")
+    @ApiOperation(value = "批量删除认证日志", tags = {"认证日志" },  notes = "批量删除认证日志")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sysauthlogs/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         sysauthlogService.removeBatch(ids);
@@ -89,7 +89,7 @@ public class SysAuthLogResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Create-all')")
-    @ApiOperation(value = "Create", tags = {"SysAuthLog" },  notes = "Create")
+    @ApiOperation(value = "新建认证日志", tags = {"认证日志" },  notes = "新建认证日志")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs")
     @Transactional
     public ResponseEntity<SysAuthLogDTO> create(@RequestBody SysAuthLogDTO sysauthlogdto) {
@@ -100,21 +100,21 @@ public class SysAuthLogResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Create-all')")
-    @ApiOperation(value = "createBatch", tags = {"SysAuthLog" },  notes = "createBatch")
+    @ApiOperation(value = "批量新建认证日志", tags = {"认证日志" },  notes = "批量新建认证日志")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
         sysauthlogService.createBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "CheckKey", tags = {"SysAuthLog" },  notes = "CheckKey")
+    @ApiOperation(value = "检查认证日志", tags = {"认证日志" },  notes = "检查认证日志")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SysAuthLogDTO sysauthlogdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.checkKey(sysauthlogMapping.toDomain(sysauthlogdto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Get-all')")
-    @ApiOperation(value = "Get", tags = {"SysAuthLog" },  notes = "Get")
+    @ApiOperation(value = "获取认证日志", tags = {"认证日志" },  notes = "获取认证日志")
 	@RequestMapping(method = RequestMethod.GET, value = "/sysauthlogs/{sysauthlog_id}")
     public ResponseEntity<SysAuthLogDTO> get(@PathVariable("sysauthlog_id") String sysauthlog_id) {
         SysAuthLog domain = sysauthlogService.get(sysauthlog_id);
@@ -123,14 +123,14 @@ public class SysAuthLogResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Save-all')")
-    @ApiOperation(value = "Save", tags = {"SysAuthLog" },  notes = "Save")
+    @ApiOperation(value = "保存认证日志", tags = {"认证日志" },  notes = "保存认证日志")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/save")
     public ResponseEntity<Boolean> save(@RequestBody SysAuthLogDTO sysauthlogdto) {
         return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.save(sysauthlogMapping.toDomain(sysauthlogdto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Save-all')")
-    @ApiOperation(value = "SaveBatch", tags = {"SysAuthLog" },  notes = "SaveBatch")
+    @ApiOperation(value = "批量保存认证日志", tags = {"认证日志" },  notes = "批量保存认证日志")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
         sysauthlogService.saveBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
@@ -138,7 +138,7 @@ public class SysAuthLogResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Default-all')")
-	@ApiOperation(value = "fetchDEFAULT", tags = {"SysAuthLog" } ,notes = "fetchDEFAULT")
+	@ApiOperation(value = "获取DEFAULT", tags = {"认证日志" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sysauthlogs/fetchdefault")
 	public ResponseEntity<List<SysAuthLogDTO>> fetchDefault(SysAuthLogSearchContext context) {
         Page<SysAuthLog> domains = sysauthlogService.searchDefault(context) ;
@@ -151,7 +151,7 @@ public class SysAuthLogResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysAuthLog-Default-all')")
-	@ApiOperation(value = "searchDEFAULT", tags = {"SysAuthLog" } ,notes = "searchDEFAULT")
+	@ApiOperation(value = "查询DEFAULT", tags = {"认证日志" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sysauthlogs/searchdefault")
 	public ResponseEntity<Page<SysAuthLogDTO>> searchDefault(@RequestBody SysAuthLogSearchContext context) {
         Page<SysAuthLog> domains = sysauthlogService.searchDefault(context) ;

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysPermissionResource.java

@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysPermissionService;
 import cn.ibizlab.core.uaa.filter.SysPermissionSearchContext;
 
 @Slf4j
-@Api(tags = {"SysPermission" })
+@Api(tags = {"权限/资源" })
 @RestController("api-syspermission")
 @RequestMapping("")
 public class SysPermissionResource {
@@ -47,28 +47,28 @@ public class SysPermissionResource {
     public SysPermissionMapping syspermissionMapping;
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Save-all')")
-    @ApiOperation(value = "Save", tags = {"SysPermission" },  notes = "Save")
+    @ApiOperation(value = "保存权限/资源", tags = {"权限/资源" },  notes = "保存权限/资源")
 	@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/save")
     public ResponseEntity<Boolean> save(@RequestBody SysPermissionDTO syspermissiondto) {
         return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.save(syspermissionMapping.toDomain(syspermissiondto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Save-all')")
-    @ApiOperation(value = "SaveBatch", tags = {"SysPermission" },  notes = "SaveBatch")
+    @ApiOperation(value = "批量保存权限/资源", tags = {"权限/资源" },  notes = "批量保存权限/资源")
 	@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
         syspermissionService.saveBatch(syspermissionMapping.toDomain(syspermissiondtos));
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "GetDraft", tags = {"SysPermission" },  notes = "GetDraft")
+    @ApiOperation(value = "获取权限/资源草稿", tags = {"权限/资源" },  notes = "获取权限/资源草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/syspermissions/getdraft")
     public ResponseEntity<SysPermissionDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(syspermissionMapping.toDto(syspermissionService.getDraft(new SysPermission())));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Remove-all')")
-    @ApiOperation(value = "Remove", tags = {"SysPermission" },  notes = "Remove")
+    @ApiOperation(value = "删除权限/资源", tags = {"权限/资源" },  notes = "删除权限/资源")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/{syspermission_id}")
     @Transactional
     public ResponseEntity<Boolean> remove(@PathVariable("syspermission_id") String syspermission_id) {
@@ -76,7 +76,7 @@ public class SysPermissionResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Remove-all')")
-    @ApiOperation(value = "RemoveBatch", tags = {"SysPermission" },  notes = "RemoveBatch")
+    @ApiOperation(value = "批量删除权限/资源", tags = {"权限/资源" },  notes = "批量删除权限/资源")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         syspermissionService.removeBatch(ids);
@@ -84,7 +84,7 @@ public class SysPermissionResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Update-all')")
-    @ApiOperation(value = "Update", tags = {"SysPermission" },  notes = "Update")
+    @ApiOperation(value = "更新权限/资源", tags = {"权限/资源" },  notes = "更新权限/资源")
 	@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}")
     @Transactional
     public ResponseEntity<SysPermissionDTO> update(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysPermissionDTO syspermissiondto) {
@@ -96,7 +96,7 @@ public class SysPermissionResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Update-all')")
-    @ApiOperation(value = "UpdateBatch", tags = {"SysPermission" },  notes = "UpdateBatch")
+    @ApiOperation(value = "批量更新权限/资源", tags = {"权限/资源" },  notes = "批量更新权限/资源")
 	@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
         syspermissionService.updateBatch(syspermissionMapping.toDomain(syspermissiondtos));
@@ -104,7 +104,7 @@ public class SysPermissionResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Create-all')")
-    @ApiOperation(value = "Create", tags = {"SysPermission" },  notes = "Create")
+    @ApiOperation(value = "新建权限/资源", tags = {"权限/资源" },  notes = "新建权限/资源")
 	@RequestMapping(method = RequestMethod.POST, value = "/syspermissions")
     @Transactional
     public ResponseEntity<SysPermissionDTO> create(@RequestBody SysPermissionDTO syspermissiondto) {
@@ -115,21 +115,21 @@ public class SysPermissionResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Create-all')")
-    @ApiOperation(value = "createBatch", tags = {"SysPermission" },  notes = "createBatch")
+    @ApiOperation(value = "批量新建权限/资源", tags = {"权限/资源" },  notes = "批量新建权限/资源")
 	@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
         syspermissionService.createBatch(syspermissionMapping.toDomain(syspermissiondtos));
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "CheckKey", tags = {"SysPermission" },  notes = "CheckKey")
+    @ApiOperation(value = "检查权限/资源", tags = {"权限/资源" },  notes = "检查权限/资源")
 	@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SysPermissionDTO syspermissiondto) {
         return  ResponseEntity.status(HttpStatus.OK).body(syspermissionService.checkKey(syspermissionMapping.toDomain(syspermissiondto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Get-all')")
-    @ApiOperation(value = "Get", tags = {"SysPermission" },  notes = "Get")
+    @ApiOperation(value = "获取权限/资源", tags = {"权限/资源" },  notes = "获取权限/资源")
 	@RequestMapping(method = RequestMethod.GET, value = "/syspermissions/{syspermission_id}")
     public ResponseEntity<SysPermissionDTO> get(@PathVariable("syspermission_id") String syspermission_id) {
         SysPermission domain = syspermissionService.get(syspermission_id);
@@ -138,7 +138,7 @@ public class SysPermissionResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Default-all')")
-	@ApiOperation(value = "fetchDEFAULT", tags = {"SysPermission" } ,notes = "fetchDEFAULT")
+	@ApiOperation(value = "获取DEFAULT", tags = {"权限/资源" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/syspermissions/fetchdefault")
 	public ResponseEntity<List<SysPermissionDTO>> fetchDefault(SysPermissionSearchContext context) {
         Page<SysPermission> domains = syspermissionService.searchDefault(context) ;
@@ -151,7 +151,7 @@ public class SysPermissionResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Default-all')")
-	@ApiOperation(value = "searchDEFAULT", tags = {"SysPermission" } ,notes = "searchDEFAULT")
+	@ApiOperation(value = "查询DEFAULT", tags = {"权限/资源" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/syspermissions/searchdefault")
 	public ResponseEntity<Page<SysPermissionDTO>> searchDefault(@RequestBody SysPermissionSearchContext context) {
         Page<SysPermission> domains = syspermissionService.searchDefault(context) ;

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysRoleResource.java

@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysRoleService;
 import cn.ibizlab.core.uaa.filter.SysRoleSearchContext;
 
 @Slf4j
-@Api(tags = {"SysRole" })
+@Api(tags = {"系统角色" })
 @RestController("api-sysrole")
 @RequestMapping("")
 public class SysRoleResource {
@@ -47,14 +47,14 @@ public class SysRoleResource {
     public SysRoleMapping sysroleMapping;
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Save-all')")
-    @ApiOperation(value = "Save", tags = {"SysRole" },  notes = "Save")
+    @ApiOperation(value = "保存系统角色", tags = {"系统角色" },  notes = "保存系统角色")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysroles/save")
     public ResponseEntity<Boolean> save(@RequestBody SysRoleDTO sysroledto) {
         return ResponseEntity.status(HttpStatus.OK).body(sysroleService.save(sysroleMapping.toDomain(sysroledto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Save-all')")
-    @ApiOperation(value = "SaveBatch", tags = {"SysRole" },  notes = "SaveBatch")
+    @ApiOperation(value = "批量保存系统角色", tags = {"系统角色" },  notes = "批量保存系统角色")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysroles/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
         sysroleService.saveBatch(sysroleMapping.toDomain(sysroledtos));
@@ -62,7 +62,7 @@ public class SysRoleResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Update-all')")
-    @ApiOperation(value = "Update", tags = {"SysRole" },  notes = "Update")
+    @ApiOperation(value = "更新系统角色", tags = {"系统角色" },  notes = "更新系统角色")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}")
     @Transactional
     public ResponseEntity<SysRoleDTO> update(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRoleDTO sysroledto) {
@@ -74,7 +74,7 @@ public class SysRoleResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Update-all')")
-    @ApiOperation(value = "UpdateBatch", tags = {"SysRole" },  notes = "UpdateBatch")
+    @ApiOperation(value = "批量更新系统角色", tags = {"系统角色" },  notes = "批量更新系统角色")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
         sysroleService.updateBatch(sysroleMapping.toDomain(sysroledtos));
@@ -82,7 +82,7 @@ public class SysRoleResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Create-all')")
-    @ApiOperation(value = "Create", tags = {"SysRole" },  notes = "Create")
+    @ApiOperation(value = "新建系统角色", tags = {"系统角色" },  notes = "新建系统角色")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysroles")
     @Transactional
     public ResponseEntity<SysRoleDTO> create(@RequestBody SysRoleDTO sysroledto) {
@@ -93,7 +93,7 @@ public class SysRoleResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Create-all')")
-    @ApiOperation(value = "createBatch", tags = {"SysRole" },  notes = "createBatch")
+    @ApiOperation(value = "批量新建系统角色", tags = {"系统角色" },  notes = "批量新建系统角色")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysroles/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
         sysroleService.createBatch(sysroleMapping.toDomain(sysroledtos));
@@ -101,7 +101,7 @@ public class SysRoleResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Get-all')")
-    @ApiOperation(value = "Get", tags = {"SysRole" },  notes = "Get")
+    @ApiOperation(value = "获取系统角色", tags = {"系统角色" },  notes = "获取系统角色")
 	@RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}")
     public ResponseEntity<SysRoleDTO> get(@PathVariable("sysrole_id") String sysrole_id) {
         SysRole domain = sysroleService.get(sysrole_id);
@@ -110,7 +110,7 @@ public class SysRoleResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Remove-all')")
-    @ApiOperation(value = "Remove", tags = {"SysRole" },  notes = "Remove")
+    @ApiOperation(value = "删除系统角色", tags = {"系统角色" },  notes = "删除系统角色")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}")
     @Transactional
     public ResponseEntity<Boolean> remove(@PathVariable("sysrole_id") String sysrole_id) {
@@ -118,27 +118,27 @@ public class SysRoleResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Remove-all')")
-    @ApiOperation(value = "RemoveBatch", tags = {"SysRole" },  notes = "RemoveBatch")
+    @ApiOperation(value = "批量删除系统角色", tags = {"系统角色" },  notes = "批量删除系统角色")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         sysroleService.removeBatch(ids);
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "GetDraft", tags = {"SysRole" },  notes = "GetDraft")
+    @ApiOperation(value = "获取系统角色草稿", tags = {"系统角色" },  notes = "获取系统角色草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/sysroles/getdraft")
     public ResponseEntity<SysRoleDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sysroleMapping.toDto(sysroleService.getDraft(new SysRole())));
     }
 
-    @ApiOperation(value = "CheckKey", tags = {"SysRole" },  notes = "CheckKey")
+    @ApiOperation(value = "检查系统角色", tags = {"系统角色" },  notes = "检查系统角色")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysroles/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SysRoleDTO sysroledto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sysroleService.checkKey(sysroleMapping.toDomain(sysroledto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Default-all')")
-	@ApiOperation(value = "fetchDEFAULT", tags = {"SysRole" } ,notes = "fetchDEFAULT")
+	@ApiOperation(value = "获取DEFAULT", tags = {"系统角色" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sysroles/fetchdefault")
 	public ResponseEntity<List<SysRoleDTO>> fetchDefault(SysRoleSearchContext context) {
         Page<SysRole> domains = sysroleService.searchDefault(context) ;
@@ -151,7 +151,7 @@ public class SysRoleResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Default-all')")
-	@ApiOperation(value = "searchDEFAULT", tags = {"SysRole" } ,notes = "searchDEFAULT")
+	@ApiOperation(value = "查询DEFAULT", tags = {"系统角色" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sysroles/searchdefault")
 	public ResponseEntity<Page<SysRoleDTO>> searchDefault(@RequestBody SysRoleSearchContext context) {
         Page<SysRole> domains = sysroleService.searchDefault(context) ;

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysUserResource.java

@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysUserService;
 import cn.ibizlab.core.uaa.filter.SysUserSearchContext;
 
 @Slf4j
-@Api(tags = {"SysUser" })
+@Api(tags = {"系统用户" })
 @RestController("api-sysuser")
 @RequestMapping("")
 public class SysUserResource {
@@ -47,7 +47,7 @@ public class SysUserResource {
     public SysUserMapping sysuserMapping;
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Remove-all')")
-    @ApiOperation(value = "Remove", tags = {"SysUser" },  notes = "Remove")
+    @ApiOperation(value = "删除系统用户", tags = {"系统用户" },  notes = "删除系统用户")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/{sysuser_id}")
     @Transactional
     public ResponseEntity<Boolean> remove(@PathVariable("sysuser_id") String sysuser_id) {
@@ -55,7 +55,7 @@ public class SysUserResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Remove-all')")
-    @ApiOperation(value = "RemoveBatch", tags = {"SysUser" },  notes = "RemoveBatch")
+    @ApiOperation(value = "批量删除系统用户", tags = {"系统用户" },  notes = "批量删除系统用户")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         sysuserService.removeBatch(ids);
@@ -63,7 +63,7 @@ public class SysUserResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Update-all')")
-    @ApiOperation(value = "Update", tags = {"SysUser" },  notes = "Update")
+    @ApiOperation(value = "更新系统用户", tags = {"系统用户" },  notes = "更新系统用户")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysusers/{sysuser_id}")
     @Transactional
     public ResponseEntity<SysUserDTO> update(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserDTO sysuserdto) {
@@ -75,21 +75,21 @@ public class SysUserResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Update-all')")
-    @ApiOperation(value = "UpdateBatch", tags = {"SysUser" },  notes = "UpdateBatch")
+    @ApiOperation(value = "批量更新系统用户", tags = {"系统用户" },  notes = "批量更新系统用户")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysusers/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
         sysuserService.updateBatch(sysuserMapping.toDomain(sysuserdtos));
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "CheckKey", tags = {"SysUser" },  notes = "CheckKey")
+    @ApiOperation(value = "检查系统用户", tags = {"系统用户" },  notes = "检查系统用户")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysusers/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody SysUserDTO sysuserdto) {
         return  ResponseEntity.status(HttpStatus.OK).body(sysuserService.checkKey(sysuserMapping.toDomain(sysuserdto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Get-all')")
-    @ApiOperation(value = "Get", tags = {"SysUser" },  notes = "Get")
+    @ApiOperation(value = "获取系统用户", tags = {"系统用户" },  notes = "获取系统用户")
 	@RequestMapping(method = RequestMethod.GET, value = "/sysusers/{sysuser_id}")
     public ResponseEntity<SysUserDTO> get(@PathVariable("sysuser_id") String sysuser_id) {
         SysUser domain = sysuserService.get(sysuser_id);
@@ -98,28 +98,28 @@ public class SysUserResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Save-all')")
-    @ApiOperation(value = "Save", tags = {"SysUser" },  notes = "Save")
+    @ApiOperation(value = "保存系统用户", tags = {"系统用户" },  notes = "保存系统用户")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysusers/save")
     public ResponseEntity<Boolean> save(@RequestBody SysUserDTO sysuserdto) {
         return ResponseEntity.status(HttpStatus.OK).body(sysuserService.save(sysuserMapping.toDomain(sysuserdto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Save-all')")
-    @ApiOperation(value = "SaveBatch", tags = {"SysUser" },  notes = "SaveBatch")
+    @ApiOperation(value = "批量保存系统用户", tags = {"系统用户" },  notes = "批量保存系统用户")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysusers/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
         sysuserService.saveBatch(sysuserMapping.toDomain(sysuserdtos));
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @ApiOperation(value = "GetDraft", tags = {"SysUser" },  notes = "GetDraft")
+    @ApiOperation(value = "获取系统用户草稿", tags = {"系统用户" },  notes = "获取系统用户草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/sysusers/getdraft")
     public ResponseEntity<SysUserDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(sysuserMapping.toDto(sysuserService.getDraft(new SysUser())));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Create-all')")
-    @ApiOperation(value = "Create", tags = {"SysUser" },  notes = "Create")
+    @ApiOperation(value = "新建系统用户", tags = {"系统用户" },  notes = "新建系统用户")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysusers")
     @Transactional
     public ResponseEntity<SysUserDTO> create(@RequestBody SysUserDTO sysuserdto) {
@@ -130,7 +130,7 @@ public class SysUserResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Create-all')")
-    @ApiOperation(value = "createBatch", tags = {"SysUser" },  notes = "createBatch")
+    @ApiOperation(value = "批量新建系统用户", tags = {"系统用户" },  notes = "批量新建系统用户")
 	@RequestMapping(method = RequestMethod.POST, value = "/sysusers/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
         sysuserService.createBatch(sysuserMapping.toDomain(sysuserdtos));
@@ -138,7 +138,7 @@ public class SysUserResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Default-all')")
-	@ApiOperation(value = "fetchDEFAULT", tags = {"SysUser" } ,notes = "fetchDEFAULT")
+	@ApiOperation(value = "获取DEFAULT", tags = {"系统用户" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sysusers/fetchdefault")
 	public ResponseEntity<List<SysUserDTO>> fetchDefault(SysUserSearchContext context) {
         Page<SysUser> domains = sysuserService.searchDefault(context) ;
@@ -151,7 +151,7 @@ public class SysUserResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUser-Default-all')")
-	@ApiOperation(value = "searchDEFAULT", tags = {"SysUser" } ,notes = "searchDEFAULT")
+	@ApiOperation(value = "查询DEFAULT", tags = {"系统用户" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/sysusers/searchdefault")
 	public ResponseEntity<Page<SysUserDTO>> searchDefault(@RequestBody SysUserSearchContext context) {
         Page<SysUser> domains = sysuserService.searchDefault(context) ;

ibzuaa-util/src/main/java/cn/ibizlab/util/domain/IBZConfig.java

+package cn.ibizlab.util.domain;
+
+import cn.ibizlab.util.helper.DataObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.*;
+import org.springframework.util.DigestUtils;
+import org.springframework.util.StringUtils;
+
+import java.sql.Timestamp;
+
+@TableName(value = "IBZCFG")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class IBZConfig {
+
+    /**
+     * 配置标识
+     * 系统+配置类型+引用对象+用户标识联合主键
+     */
+    @TableId
+    private String cfgId;
+
+    /**
+     * 系统标识
+     */
+    private String systemId;
+
+    /**
+     * 配置类型
+     * 门户配置/表格自定义配置/自定义查询...消费方自定义
+     */
+    private String cfgType;
+
+    /**
+     * 引用对象
+     * 门户页标识/具体表格视图标识...消费方具体使用位置的标识
+     */
+    private String targetType;
+
+    /**
+     * 用户标识
+     * 默认当前登录者
+     */
+    private String userId;
+
+    /**
+     * 配置
+     * JSONObject
+     */
+    private String cfg;
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(format="yyyy-MM-dd HH:mm:ss")
+    private Timestamp updateDate;
+
+    public String getCfgId()
+    {
+        if(StringUtils.isEmpty(cfgId)&&
+                (!(StringUtils.isEmpty(systemId)))&&
+                (!(StringUtils.isEmpty(cfgType)))&&
+                (!(StringUtils.isEmpty(targetType)))&&
+                (!(StringUtils.isEmpty(userId))))
+        {
+            cfgId= DigestUtils.md5DigestAsHex((systemId+"||"+cfgType+"||"+targetType+"||"+userId).getBytes());
+        }
+        return cfgId;
+    }
+
+
+}

ibzuaa-util/src/main/java/cn/ibizlab/util/mapper/IBZConfigMapper.java

+package cn.ibizlab.util.mapper;
+
+import cn.ibizlab.util.domain.IBZConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface IBZConfigMapper extends BaseMapper<IBZConfig>{
+
+}
\ No newline at end of file

ibzuaa-util/src/main/java/cn/ibizlab/util/rest/AppController.java

 package cn.ibizlab.util.rest;
 
+import cn.ibizlab.util.errors.BadRequestAlertException;
+import cn.ibizlab.util.service.IBZConfigService;
 import com.alibaba.fastjson.JSONObject;
 import cn.ibizlab.util.security.AuthenticationUser;
 import cn.ibizlab.util.service.AuthenticationUserService;
@@ -8,9 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -23,6 +24,10 @@ public class AppController {
 	@Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
+    @Value("${ibiz.systemid:ibzuaa}")
+	private String systemId;
+
+
 	@Autowired
 	private AuthenticationUserService userDetailsService;
 
@@ -39,10 +44,10 @@ public class AppController {
 				while(it.hasNext()) {
 					GrantedAuthority authority = (GrantedAuthority)it.next();
 					String strAuthority=authority.getAuthority();
-					if(strAuthority.startsWith("UNIRES"))
-						uniRes.add(strAuthority);
-					else if(strAuthority.startsWith("APPMENU"))
-						appMenu.add(strAuthority);
+					if(strAuthority.startsWith("UNIRES_"+systemId))
+						uniRes.add(strAuthority.substring(systemId.length()+8));
+					else if(strAuthority.startsWith("APPMENU_"+systemId))
+						appMenu.add(strAuthority.substring(systemId.length()+9));
 				}
 		}
 		appData.put("unires",uniRes);
@@ -57,4 +62,23 @@ public class AppController {
 			userDetailsService.resetByUsername(AuthenticationUser.getAuthenticationUser().getUsername());
     	}
     }
+
+    @Autowired
+	private IBZConfigService ibzConfigService;
+
+	@RequestMapping(method = RequestMethod.PUT, value = "/configs/{configType}/{targetType}")
+	public ResponseEntity<Boolean> saveConfig(@PathVariable("configType") String configType, @PathVariable("targetType") String targetType, @RequestBody JSONObject config) {
+		String userId=AuthenticationUser.getAuthenticationUser().getUserid();
+		if(StringUtils.isEmpty(userId))
+			throw new BadRequestAlertException("保存配置失败，参数缺失","IBZConfig",configType);
+		return ResponseEntity.ok(ibzConfigService.saveConfig(configType,targetType,userId,config));
+	}
+
+	@RequestMapping(method = RequestMethod.GET, value = "/configs/{configType}/{targetType}")
+	public ResponseEntity<JSONObject> getConfig(@PathVariable("configType") String configType, @PathVariable("targetType") String targetType) {
+		String userId=AuthenticationUser.getAuthenticationUser().getUserid();
+		if(StringUtils.isEmpty(userId))
+			throw new BadRequestAlertException("获取配置失败，参数缺失","IBZConfig",configType);
+		return ResponseEntity.ok(ibzConfigService.getConfig(configType,targetType,userId));
+	}
 }

ibzuaa-util/src/main/java/cn/ibizlab/util/service/IBZConfigService.java

+package cn.ibizlab.util.service;
+
+import cn.ibizlab.util.domain.IBZConfig;
+import cn.ibizlab.util.errors.BadRequestAlertException;
+import cn.ibizlab.util.helper.DataObject;
+import cn.ibizlab.util.mapper.IBZConfigMapper;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+@Slf4j
+@Service
+public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> implements IService<IBZConfig> {
+
+
+    @Value("${ibiz.systemid:ibzuaa}")
+	private String systemId;
+
+    @Cacheable( value="ibzou_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
+    public JSONObject getConfig(String cfgType,String targetType,String userId)
+    {
+        if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))
+            throw new BadRequestAlertException("获取配置失败，参数缺失","IBZConfig",cfgType);
+        IBZConfig config=this.getOne(Wrappers.query(IBZConfig.builder().systemId(systemId).cfgType(cfgType).targetType(targetType).userId(userId).build()),false);
+        if(config==null)
+            return new JSONObject();
+        else
+            return JSON.parseObject(config.getCfg());
+    }
+
+    @CacheEvict( value="ibzou_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
+    public boolean saveConfig(String cfgType,String targetType,String userId,JSONObject config)
+    {
+        if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))
+            throw new BadRequestAlertException("保存配置失败，参数缺失","IBZConfig",cfgType);
+        String cfg="{}";
+        if(config!=null)
+            cfg=JSONObject.toJSONString(config);
+        return this.saveOrUpdate(IBZConfig.builder().systemId(systemId).cfgType(cfgType).targetType(targetType).userId(userId).cfg(cfg).updateDate(DataObject.getNow()).build());
+    }
+
+    @CacheEvict( value="ibzou_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
+    public void resetConfig(String cfgType,String targetType,String userId)
+    {
+        if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))
+            throw new BadRequestAlertException("重置配置失败，参数缺失","IBZConfig",cfgType);
+        this.remove(Wrappers.query(IBZConfig.builder().systemId(systemId).cfgType(cfgType).targetType(targetType).userId(userId).build()));
+    }
+
+}
\ No newline at end of file

ibzuaa-util/src/main/resources/application-sys.yml

@@ -85,3 +85,16 @@ ibiz:
   enablePermissionValid: false
   cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
 
+#xxl-job定时服务
+xxl:
+  job:
+    accessToken:
+    admin:
+      addresses: #127.0.0.1
+    executor:
+      appname: ibzuaa
+      ip:
+      port: 9999
+      logpath: /app/joblog
+      logretentiondays: -1
+