zhouweidong@lab.ibiz5.com 部署微服务接口

config.xml

@@ -37,6 +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      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAuthLogServiceImpl.java

@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
 public class SysAuthLogServiceImpl extends ServiceImpl<SysAuthLogMapper, SysAuthLog> implements ISysAuthLogService {
 
 
-    private int batchSize = 500;
+    protected int batchSize = 500;
 
     @Override
     public SysAuthLog getDraft(SysAuthLog et) {

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPSSystemServiceImpl.java

@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
 public class SysPSSystemServiceImpl extends ServiceImpl<SysPSSystemMapper, SysPSSystem> implements ISysPSSystemService {
 
 
-    private int batchSize = 500;
+    protected int batchSize = 500;
 
     @Override
     public boolean checkKey(SysPSSystem et) {

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPermissionServiceImpl.java

@@ -46,9 +46,9 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 
     @Autowired
     @Lazy
-    private cn.ibizlab.core.uaa.service.ISysRolePermissionService sysrolepermissionService;
+    protected cn.ibizlab.core.uaa.service.ISysRolePermissionService sysrolepermissionService;
 
-    private int batchSize = 500;
+    protected int batchSize = 500;
 
     @Override
     @Transactional

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRolePermissionServiceImpl.java

@@ -46,12 +46,12 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
 
     @Autowired
     @Lazy
-    private cn.ibizlab.core.uaa.service.ISysPermissionService syspermissionService;
+    protected cn.ibizlab.core.uaa.service.ISysPermissionService syspermissionService;
     @Autowired
     @Lazy
-    private cn.ibizlab.core.uaa.service.ISysRoleService sysroleService;
+    protected cn.ibizlab.core.uaa.service.ISysRoleService sysroleService;
 
-    private int batchSize = 500;
+    protected int batchSize = 500;
 
     @Override
     @Transactional

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java

@@ -46,12 +46,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Autowired
     @Lazy
-    private cn.ibizlab.core.uaa.service.ISysRolePermissionService sysrolepermissionService;
+    protected cn.ibizlab.core.uaa.service.ISysRolePermissionService sysrolepermissionService;
     @Autowired
     @Lazy
-    private cn.ibizlab.core.uaa.service.ISysUserRoleService sysuserroleService;
+    protected cn.ibizlab.core.uaa.service.ISysUserRoleService sysuserroleService;
 
-    private int batchSize = 500;
+    protected int batchSize = 500;
 
     @Override
     @Transactional

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserRoleServiceImpl.java

@@ -46,12 +46,12 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
 
     @Autowired
     @Lazy
-    private cn.ibizlab.core.uaa.service.ISysRoleService sysroleService;
+    protected cn.ibizlab.core.uaa.service.ISysRoleService sysroleService;
     @Autowired
     @Lazy
-    private cn.ibizlab.core.uaa.service.ISysUserService sysuserService;
+    protected cn.ibizlab.core.uaa.service.ISysUserService sysuserService;
 
-    private int batchSize = 500;
+    protected int batchSize = 500;
 
     @Override
     public boolean checkKey(SysUserRole et) {

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserServiceImpl.java

@@ -46,9 +46,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Autowired
     @Lazy
-    private cn.ibizlab.core.uaa.service.ISysUserRoleService sysuserroleService;
+    protected cn.ibizlab.core.uaa.service.ISysUserRoleService sysuserroleService;
 
-    private int batchSize = 500;
+    protected int batchSize = 500;
 
     @Override
     @Transactional

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

@@ -5,6 +5,7 @@ import cn.ibizlab.util.helper.UniqueNameGenerator;
 
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
 import org.apache.ibatis.mapping.DatabaseIdProvider;
 import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
 import org.springframework.context.annotation.Bean;
@@ -42,7 +43,14 @@ public class MybatisConfiguration {
      */
     @Bean
     public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求  默认false
+        // paginationInterceptor.setOverflow(false);
+        // 设置最大单页限制数量，默认 500 条，-1 不受限制
+        paginationInterceptor.setLimit(-1);
+        // 开启 count 的 join 优化,只针对部分 left join
+        paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
+        return paginationInterceptor;
     }
 
 }
\ No newline at end of file

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

-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${dbinst.getUserName()}  [in template "CODETEMPL_zh_CN" at line 28, column 24]
-----
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+
+
+    <!--输出实体[SYS_AUTHLOG]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-38-1">
+        <createTable tableName="IBZAUTHLOG">
\ No newline at end of file
+                <column name="LOGID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
+                </column>
+                <column name="USERNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="PERSONNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="DOMAIN" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="AUTHTIME" remarks="" type="DATETIME">
+                </column>
+                <column name="IPADDR" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="MACADDR" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="USERAGENT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="AUTHCODE" remarks="" type="VARCHAR(15)">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+
+
+    <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-93-2">
+        <createTable tableName="IBZROLE_PERMISSION">
+                <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
+                </column>
+                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
+                </column>
+                <column name="CREATEDATE" remarks="" type="DATETIME">
+                </column>
+                <column name="UPDATEDATE" remarks="" type="DATETIME">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+
+
+    <!--输出实体[SYS_USER_ROLE]数据结构 -->
+    <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"/>
+                </column>
+                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="SYS_USERID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="CREATEDATE" remarks="" type="DATETIME">
+                </column>
+                <column name="UPDATEDATE" remarks="" type="DATETIME">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+    <!--输出实体[SYS_ROLE]数据结构 -->
+    <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"/>
+                </column>
+                <column name="SYS_ROLENAME" remarks="" type="VARCHAR(200)">
+                </column>
+                <column name="MEMO" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="CREATEDATE" remarks="" type="DATETIME">
+                </column>
+                <column name="UPDATEDATE" remarks="" type="DATETIME">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+    <!--输出实体[SYS_PSSYSTEM]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-36-5">
+        <createTable tableName="IBZPSSYSTEM">
+                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
+                </column>
+                <column name="PSSYSTEMNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="SYSSTRUCTURE" remarks="" type="TEXT(1048576)">
+                </column>
+                <column name="APPS" remarks="" type="TEXT(1048576)">
+                </column>
+                <column name="MD5CHECK" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="SHOWORDER" remarks="" type="INT">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+    <!--输出实体[SYS_PERMISSION]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-6">
+        <createTable tableName="IBZPERMISSION">
+                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
+                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
+                </column>
+                <column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
+                </column>
+                <column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="ENABLE" remarks="" type="INT">
+                </column>
+                <column name="CREATEDATE" remarks="" type="DATETIME">
+                </column>
+                <column name="UPDATEDATE" remarks="" type="DATETIME">
+                </column>
+        </createTable>
+    </changeSet>
+
+        <!--输出实体[SYS_AUTHLOG]外键关系 -->
+        <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
+    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-93-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-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]外键关系 -->
+        <!--输出实体[SYS_PSSYSTEM]外键关系 -->
+        <!--输出实体[SYS_PERMISSION]外键关系 -->
+
+</databaseChangeLog>

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

@@ -9,6 +9,6 @@ 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 8081
+EXPOSE 40002
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,9 +3,22 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40002:40002"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40002
+      - 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
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

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

@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.uaa.domain.SysApp;
 import cn.ibizlab.core.uaa.service.ISysAppService;
 import cn.ibizlab.core.uaa.filter.SysAppSearchContext;
+import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
 @Api(tags = {"应用" })

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

@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.uaa.domain.SysAuthLog;
 import cn.ibizlab.core.uaa.service.ISysAuthLogService;
 import cn.ibizlab.core.uaa.filter.SysAuthLogSearchContext;
+import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
 @Api(tags = {"认证日志" })

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

@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.uaa.domain.SysPermission;
 import cn.ibizlab.core.uaa.service.ISysPermissionService;
 import cn.ibizlab.core.uaa.filter.SysPermissionSearchContext;
+import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
 @Api(tags = {"权限/资源" })
@@ -83,6 +84,7 @@ public class SysPermissionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @VersionCheck(entity = "syspermission" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysPermission-Update-all')")
     @ApiOperation(value = "更新权限/资源", tags = {"权限/资源" },  notes = "更新权限/资源")
 	@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}")

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

@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.uaa.domain.SysRolePermission;
 import cn.ibizlab.core.uaa.service.ISysRolePermissionService;
 import cn.ibizlab.core.uaa.filter.SysRolePermissionSearchContext;
+import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
 @Api(tags = {"角色权限关系" })
@@ -117,6 +118,7 @@ public class SysRolePermissionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @VersionCheck(entity = "sysrolepermission" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Update-all')")
     @ApiOperation(value = "更新角色权限关系", tags = {"角色权限关系" },  notes = "更新角色权限关系")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysrolepermissions/{sysrolepermission_id}")
@@ -242,6 +244,7 @@ public class SysRolePermissionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @VersionCheck(entity = "sysrolepermission" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Update-all')")
     @ApiOperation(value = "根据权限/资源更新角色权限关系", tags = {"角色权限关系" },  notes = "根据权限/资源更新角色权限关系")
 	@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}/sysrolepermissions/{sysrolepermission_id}")
@@ -374,6 +377,7 @@ public class SysRolePermissionResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @VersionCheck(entity = "sysrolepermission" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Update-all')")
     @ApiOperation(value = "根据系统角色更新角色权限关系", tags = {"角色权限关系" },  notes = "根据系统角色更新角色权限关系")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysrolepermissions/{sysrolepermission_id}")

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

@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.uaa.domain.SysRole;
 import cn.ibizlab.core.uaa.service.ISysRoleService;
 import cn.ibizlab.core.uaa.filter.SysRoleSearchContext;
+import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
 @Api(tags = {"系统角色" })
@@ -61,6 +62,7 @@ public class SysRoleResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @VersionCheck(entity = "sysrole" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRole-Update-all')")
     @ApiOperation(value = "更新系统角色", tags = {"系统角色" },  notes = "更新系统角色")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}")

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

@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.uaa.domain.SysUser;
 import cn.ibizlab.core.uaa.service.ISysUserService;
 import cn.ibizlab.core.uaa.filter.SysUserSearchContext;
+import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
 @Api(tags = {"系统用户" })

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

@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.uaa.domain.SysUserRole;
 import cn.ibizlab.core.uaa.service.ISysUserRoleService;
 import cn.ibizlab.core.uaa.filter.SysUserRoleSearchContext;
+import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
 @Api(tags = {"用户角色关系" })
@@ -58,6 +59,7 @@ public class SysUserRoleResource {
         return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(new SysUserRole())));
     }
 
+    @VersionCheck(entity = "sysuserrole" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUserRole-Update-all')")
     @ApiOperation(value = "更新用户角色关系", tags = {"用户角色关系" },  notes = "更新用户角色关系")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysuserroles/{sysuserrole_id}")
@@ -172,6 +174,7 @@ public class SysUserRoleResource {
         return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(domain)));
     }
 
+    @VersionCheck(entity = "sysuserrole" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUserRole-Update-all')")
     @ApiOperation(value = "根据系统角色更新用户角色关系", tags = {"用户角色关系" },  notes = "根据系统角色更新用户角色关系")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysuserroles/{sysuserrole_id}")
@@ -304,6 +307,7 @@ public class SysUserRoleResource {
         return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(domain)));
     }
 
+    @VersionCheck(entity = "sysuserrole" , versionfield = "updatedate")
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysUserRole-Update-all')")
     @ApiOperation(value = "根据系统用户更新用户角色关系", tags = {"用户角色关系" },  notes = "根据系统用户更新用户角色关系")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sysusers/{sysuser_id}/sysuserroles/{sysuserrole_id}")

ibzuaa-util/src/main/java/cn/ibizlab/util/annotation/VersionCheck.java

+package cn.ibizlab.util.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD})
+public @interface VersionCheck
+{
+	String entity();
+	String versionfield();
+}
+

ibzuaa-util/src/main/java/cn/ibizlab/util/aspect/VersionCheckAspect.java

+package cn.ibizlab.util.aspect;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import cn.ibizlab.util.annotation.VersionCheck;
+import cn.ibizlab.util.domain.EntityBase;
+import cn.ibizlab.util.errors.BadRequestAlertException;
+import cn.ibizlab.util.helper.RuleUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.core.annotation.Order;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import java.lang.reflect.Field;
+
+/**
+ * 数据库版本检查
+ */
+@Aspect
+@Order(0)
+@Component
+public class VersionCheckAspect
+{
+    private final ExpressionParser parser = new SpelExpressionParser();
+
+    @SneakyThrows
+    @Before("execution(* cn.ibizlab.*.rest.*.update(..)) &&  @annotation(versionCheck)")
+    public void BeforeUpdate(JoinPoint point, VersionCheck versionCheck){
+        EvaluationContext context = new StandardEvaluationContext();
+        Object[] args = point.getArgs();
+        Object id=args[0];
+        Object dto=args[1];
+        if(ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(dto))
+            return;
+        String versionField=versionCheck.versionfield();
+        if(StringUtils.isEmpty(versionCheck))
+            return;
+        context.setVariable("dto",dto);
+        Expression newExp = parser.parseExpression(String.format("#dto.%s",versionField));
+        Object newVersion=newExp.getValue(context);
+        if(ObjectUtils.isEmpty(newVersion))
+            return;
+        //进行版本检查
+        Object oldVersion =getDBVersion(versionCheck,getService(point.getTarget(),versionCheck.entity()),id);
+        if(!ObjectUtils.isEmpty(oldVersion)){
+            if(RuleUtils.gt(newVersion,oldVersion))
+                throw new BadRequestAlertException("数据已变更，可能后台数据已被修改，请重新加载数据","VersionCheckAspect","versionCheck");
+        }
+    }
+
+    /**
+     * 获取实体服务对象
+     * @param resource
+     * @param entity
+     * @return
+     */
+    @SneakyThrows
+    private Object getService(Object resource,String entity){
+        Object service = null;
+        Field[] fields= resource.getClass().getDeclaredFields();
+        for(Field field : fields){
+            if(field.getModifiers()==1 && field.getName().equalsIgnoreCase(String.format("%sService",entity))){
+                service=field.get(resource);
+                break;
+            }
+        }
+        return service;
+    }
+
+    /**
+     * 获取数据库版本
+     * @param versionCheck
+     * @param service
+     * @param id
+     * @return
+     */
+    @SneakyThrows
+    private Object getDBVersion(VersionCheck versionCheck,Object service,Object id){
+        Object dbVersion=null;
+        String versionField=versionCheck.versionfield();
+        if(!ObjectUtils.isEmpty(service)){
+            EvaluationContext oldContext = new StandardEvaluationContext();
+            oldContext.setVariable("service",service);
+            oldContext.setVariable("id",id);
+            Expression oldExp = parser.parseExpression("#service.get(#id)");
+            EntityBase oldEntity =oldExp.getValue(oldContext, EntityBase.class);
+            return oldEntity.get(versionField);
+        }
+        return dbVersion;
+    }
+}

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

@@ -55,6 +55,10 @@ public class AppController {
 		appData.put("unires",uniRes);
     	appData.put("appmenu",appMenu);
 		appData.put("enablepermissionvalid",enablePermissionValid);
+		if(curUser.getSuperuser()==1)
+			appData.put("enablepermissionvalid",false);
+		else
+			appData.put("enablepermissionvalid",enablePermissionValid);
 		return ResponseEntity.status(HttpStatus.OK).body(appData);
 	}