Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tuoheng_oidc_admin/src/main/java/com/tuoheng/controller/op/RoleController.java

@@ -90,8 +90,4 @@ public class RoleController {
     public JsonResult savePermission(@RequestBody RoleMenuDto roleMenuDto) {
         return rolesService.savePermission(roleMenuDto);
     }
-
-
-
-
 }

tuoheng_oidc_admin/src/main/java/com/tuoheng/third/service/impl/ThirdServiceImpl.java

@@ -158,7 +158,7 @@ public class ThirdServiceImpl implements ThirdService {
                 break;
             //飞手
             case PilotConstant.PILOT_CLIENT:
-                url = String.format(Locale.ENGLISH, "%s%s", platform.getPlatformUrl(), FreeWayConstant.FIND_MENU);
+                url = String.format(Locale.ENGLISH, "%s%s", platform.getPlatformUrl(), PilotConstant.FIND_MENU);
             default:
                 break;
         }

tuoheng_oidc_admin/target/classes/application-prod.yml

@@ -69,5 +69,7 @@ spring:
 tuoheng:
   #airport配置地址
   airport-url: https://airport.t-aaron.com
+  #dsp配置地址
+  dsp-url: https://dsp-portal.t-aaron.com/api/web/dsp
   # 高德Key
   gaodeKey: 5a1f63e7563cba471a9d0773e218144a

tuoheng_oidc_admin/target/classes/mapper/AuthoritiesMapper.xml

@@ -13,7 +13,7 @@
         delete
         from authorities
         where user_id = #{userId}
-          and client_id = #{clientId}
+          and authority = #{clientId}
     </delete>
     <select id="selectByUserId" resultType="com.tuoheng.model.po.AuthoritiesPo">
         SELECT id, user_id, username, authority

tuoheng_oidc_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,59 +1,152 @@
-com\tuoheng\model\dto\Platform.class
-com\tuoheng\model\po\BasePo.class
-com\tuoheng\mapper\ClientUserMapper.class
+com\tuoheng\service\impl\AreaServiceImpl.class
+com\tuoheng\mapper\TenantItemMapper.class
 com\tuoheng\service\impl\PlatformServiceImpl.class
-com\tuoheng\config\http\HeadClientHttpRequestInterceptor.class
+com\tuoheng\mapper\TenantEmployMapper.class
+com\tuoheng\mapper\AreaMapper.class
+com\tuoheng\third\vo\RoleMenuListVo.class
+com\tuoheng\service\op\Impl\RolesServiceImpl.class
+com\tuoheng\service\op\Impl\RolePermissionServiceImpl.class
+com\tuoheng\service\op\RolesService.class
+com\tuoheng\third\service\impl\ThirdServiceImpl$3.class
 com\tuoheng\model\dto\LoginUser.class
 com\tuoheng\TuohengOidcAdminApplication.class
 com\tuoheng\controller\PlatformController.class
-com\tuoheng\model\dto\ClientDto.class
+com\tuoheng\constant\CommonConstant.class
 com\tuoheng\mapper\ClientMapper.class
+com\tuoheng\service\TenantService.class
+com\tuoheng\constant\PilotConstant.class
+com\tuoheng\model\param\UpdateUserPassDto.class
+com\tuoheng\model\po\ClientUserRolePo.class
+com\tuoheng\mapper\CityMapper.class
+com\tuoheng\config\http\RestProperties.class
+com\tuoheng\model\vo\MenuindexVo.class
+com\tuoheng\controller\ClientController.class
+com\tuoheng\until\RedisUtils.class
+com\tuoheng\model\entity\RolePermission.class
+com\tuoheng\model\vo\UserVo.class
+com\tuoheng\model\vo\RoleListVo.class
+com\tuoheng\model\query\TenantQuery.class
+com\tuoheng\mapper\PlatformMapper.class
+com\tuoheng\service\op\RolePermissionService.class
+com\tuoheng\service\CityService.class
+com\tuoheng\service\op\RoleMenuService.class
+com\tuoheng\model\entity\Permissions.class
+com\tuoheng\service\op\MenusService.class
+com\tuoheng\controller\DemoController.class
+com\tuoheng\constant\WaterWayConstant.class
+com\tuoheng\service\TenantEmployService.class
+com\tuoheng\config\MybatisPlusConfig.class
+com\tuoheng\common\ExceptionInterface.class
+com\tuoheng\third\vo\RoleMenuVo.class
+com\tuoheng\third\request\ThirdRequest.class
+com\tuoheng\model\param\CreateClientUserDto.class
+com\tuoheng\constant\DspConstant.class
+com\tuoheng\model\query\MenuQuery.class
+com\tuoheng\third\service\ThirdService.class
+com\tuoheng\model\request\AirportRequest.class
+com\tuoheng\enums\MarkTypeEnum.class
+com\tuoheng\config\http\RestTemplateConfig.class
+com\tuoheng\third\vo\ServiceExampleVo.class
+com\tuoheng\until\MapUtils.class
+com\tuoheng\service\impl\TenantServiceImpl.class
+com\tuoheng\model\dto\TTenant.class
+com\tuoheng\model\query\MarkerQuery.class
+com\tuoheng\third\service\impl\ThirdServiceImpl$1.class
+com\tuoheng\service\impl\ClientServiceImpl.class
+com\tuoheng\service\impl\TenantItemServiceImpl.class
+com\tuoheng\model\entity\TenantItem.class
+com\tuoheng\third\vo\MenuVo.class
+com\tuoheng\controller\CityController.class
+com\tuoheng\third\vo\IndustryVo.class
+com\tuoheng\model\po\TenantPo.class
+com\tuoheng\model\dto\UserBaseInfoDto.class
+com\tuoheng\common\BaseQuery.class
+com\tuoheng\model\dto\ClientRoleListDto.class
+com\tuoheng\mapper\op\RoleMenuMapper.class
+com\tuoheng\model\entity\RoleMenu.class
+com\tuoheng\model\param\GetUserInfoDto.class
+com\tuoheng\service\impl\TenantEmployServiceImpl.class
+com\tuoheng\model\dto\Platform.class
+com\tuoheng\model\po\BasePo.class
+com\tuoheng\mapper\ClientUserMapper.class
+com\tuoheng\mapper\op\PermissionsMapper.class
+com\tuoheng\config\http\HeadClientHttpRequestInterceptor.class
+com\tuoheng\service\op\PermissionsService.class
+com\tuoheng\model\dto\City.class
+com\tuoheng\model\query\CityQuery.class
+com\tuoheng\mapper\op\MenusMapper.class
+com\tuoheng\model\vo\CreateTenantVo.class
+com\tuoheng\model\dto\ClientDto.class
+com\tuoheng\constant\AirportConstant.class
 com\tuoheng\service\PlatformService.class
+com\tuoheng\controller\op\MenuController.class
 com\tuoheng\service\impl\Oauth2RegisteredClientServiceImpl.class
 com\tuoheng\until\EncryptUtil.class
-com\tuoheng\model\param\UpdateUserPassDto.class
 com\tuoheng\model\dto\OidcTenantDto.class
-com\tuoheng\model\po\ClientUserRolePo.class
 com\tuoheng\until\JsonResult.class
+com\tuoheng\third\service\impl\ThirdServiceImpl$2.class
 com\tuoheng\model\param\ClientRoleDto.class
 com\tuoheng\model\param\CreateClientTenantDto.class
-com\tuoheng\config\http\RestProperties.class
 com\tuoheng\common\ServiceException.class
+com\tuoheng\mapper\op\RolesMapper.class
 com\tuoheng\model\dto\ClientRoleInfoDto.class
+com\tuoheng\model\entity\TenantEmploy.class
 com\tuoheng\config\WebConfig.class
-com\tuoheng\controller\ClientController.class
+com\tuoheng\third\controller\ThirdController.class
 com\tuoheng\service\impl\ClientUserServiceImpl.class
+com\tuoheng\service\op\Impl\MenusServiceImpl.class
 com\tuoheng\service\CurrentUser.class
 com\tuoheng\controller\UserController.class
 com\tuoheng\service\ClientSevice.class
+com\tuoheng\service\impl\MarkerServiceImpl.class
 com\tuoheng\service\Oauth2RegisteredClientService.class
-com\tuoheng\until\RedisUtils.class
+com\tuoheng\controller\op\PermissionController.class
+com\tuoheng\service\MarkerService.class
 com\tuoheng\mapper\Oauth2RegisteredClientMapper.class
-com\tuoheng\model\query\TenantQuery.class
 com\tuoheng\until\CryptoUtil.class
+com\tuoheng\model\query\RoleQuery.class
+com\tuoheng\model\query\UserQuery.class
+com\tuoheng\model\vo\RolePermissionVo.class
 com\tuoheng\model\param\GetClientTenantRoleDto.class
-com\tuoheng\mapper\PlatformMapper.class
 com\tuoheng\model\vo\BusinessSystemVo.class
 com\tuoheng\constant\HhzUrlConstant.class
-com\tuoheng\controller\DemoController.class
-com\tuoheng\common\ExceptionInterface.class
+com\tuoheng\common\ServiceExceptionEnum.class
+com\tuoheng\model\vo\MarkerVo.class
+com\tuoheng\model\vo\OpPermissionsVo.class
 com\tuoheng\model\po\UserPo.class
-com\tuoheng\model\param\CreateClientUserDto.class
+com\tuoheng\service\TenantItemService.class
+com\tuoheng\service\impl\CityServiceImpl.class
 com\tuoheng\service\ClientUserSevice.class
-com\tuoheng\config\http\RestTemplateConfig.class
+com\tuoheng\model\dto\RoleMenuDto.class
+com\tuoheng\model\entity\Menu.class
+com\tuoheng\model\vo\MenuVo.class
 com\tuoheng\config\http\RestTemplateConfig$1.class
 com\tuoheng\model\param\UpdateUserClientRoleDto.class
-com\tuoheng\model\dto\TTenant.class
+com\tuoheng\model\dto\RoleDto.class
+com\tuoheng\controller\MarkerController.class
 com\tuoheng\controller\TenantController.class
 com\tuoheng\mapper\AuthoritiesMapper.class
-com\tuoheng\service\impl\ClientServiceImpl.class
+com\tuoheng\constant\FreeWayConstant.class
+com\tuoheng\mapper\op\RolePermissionMapper.class
+com\tuoheng\model\query\RoleClientQuery.class
+com\tuoheng\model\entity\Area.class
+com\tuoheng\model\dto\RoleMenuPermissionDto.class
+com\tuoheng\model\entity\Roles.class
 com\tuoheng\model\po\AuthoritiesPo.class
-com\tuoheng\model\po\TenantPo.class
-com\tuoheng\model\dto\UserBaseInfoDto.class
-com\tuoheng\common\BaseQuery.class
+com\tuoheng\config\OptimizationObjectMapper.class
+com\tuoheng\model\query\AreaQuery.class
+com\tuoheng\mapper\MarkerMapper.class
 com\tuoheng\model\vo\TenantVo.class
+com\tuoheng\service\op\Impl\PermissionsServiceImpl.class
+com\tuoheng\model\entity\Marker.class
+com\tuoheng\common\CommonConfig.class
+com\tuoheng\controller\op\RoleController.class
 com\tuoheng\config\LoginUserHandler.class
+com\tuoheng\service\AreaService.class
+com\tuoheng\common\ExceptionCatch.class
+com\tuoheng\service\op\Impl\RoleMenuServiceImpl.class
+com\tuoheng\third\service\impl\ThirdServiceImpl.class
 com\tuoheng\model\dto\Oauth2RegisteredClient.class
 com\tuoheng\mapper\ClientUserRoleMapper.class
+com\tuoheng\controller\AreaController.class
 com\tuoheng\mapper\TenantMapper.class
-com\tuoheng\model\param\GetUserInfoDto.class

tuoheng_oidc_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,58 +1,148 @@
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\PlatformMapper.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\TTenant.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\UpdateUserPassDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\OpPermissionsVo.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\query\TenantQuery.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\UserController.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\ClientRoleInfoDto.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\Platform.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\BusinessSystemVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\Impl\RolesServiceImpl.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\OidcTenantDto.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\AuthoritiesMapper.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\GetClientTenantRoleDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\vo\RoleMenuVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\Impl\MenusServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\RoleMenuDto.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\ClientUserServiceImpl.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\Oauth2RegisteredClientService.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\ClientUserRoleMapper.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\Oauth2RegisteredClientServiceImpl.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\ClientMapper.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\ClientDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\RolesService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\common\ServiceExceptionEnum.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\query\RoleQuery.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\Area.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\Marker.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\Impl\PermissionsServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\TenantItemService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\vo\MenuVo.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\common\BaseQuery.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\Oauth2RegisteredClientMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\MarkerVo.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\until\RedisUtils.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\TenantVo.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\po\AuthoritiesPo.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\TuohengOidcAdminApplication.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\ClientRoleDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\common\CommonConfig.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\until\EncryptUtil.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\po\UserPo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\query\AreaQuery.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\op\MenuController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\AreaController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\RolePermissionService.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\common\ServiceException.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\po\TenantPo.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\ClientSevice.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\po\ClientUserRolePo.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\http\RestTemplateConfig.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\CreateTenantVo.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\po\BasePo.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\PlatformController.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\TenantController.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\CurrentUser.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\common\ExceptionInterface.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\constant\CommonConstant.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\CityMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\controller\ThirdController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\ClientRoleListDto.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\PlatformService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\op\RoleMenuMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\TenantEmployServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\MybatisPlusConfig.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\AreaServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\OptimizationObjectMapper.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\WebConfig.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\http\RestProperties.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\vo\IndustryVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\vo\RoleMenuListVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\TenantItem.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\RoleListVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\RoleMenuPermissionDto.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\GetUserInfoDto.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\http\HeadClientHttpRequestInterceptor.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\CreateClientUserDto.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\constant\HhzUrlConstant.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\CreateClientTenantDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\MarkerService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\until\MapUtils.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\ClientUserMapper.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\Oauth2RegisteredClient.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\Roles.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\op\PermissionsMapper.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\UpdateUserClientRoleDto.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\PlatformServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\TenantService.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\until\CryptoUtil.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\ClientUserSevice.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\RoleMenu.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\constant\DspConstant.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\TenantServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\TenantItemMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\RolePermissionVo.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\until\JsonResult.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\TenantMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\TenantEmployService.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\LoginUser.java
-D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\ClientController.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\LoginUserHandler.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\UserBaseInfoDto.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\ClientServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\RoleMenuService.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\DemoController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\PlatformMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\UserVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\UpdateUserPassDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\UserController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\ClientRoleInfoDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\Menu.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\AuthoritiesMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\service\ThirdService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\Oauth2RegisteredClientService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\query\MarkerQuery.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\ClientMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\query\UserQuery.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\TenantItemServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\PermissionsService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\Oauth2RegisteredClientMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\TenantVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\City.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\ClientRoleDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\op\RolePermissionMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\po\TenantPo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\ClientSevice.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\po\ClientUserRolePo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\MarkerServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\constant\PilotConstant.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\PlatformController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\AreaService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\TenantController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\CityService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\constant\AirportConstant.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\query\CityQuery.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\request\ThirdRequest.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\common\ExceptionInterface.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\constant\FreeWayConstant.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\op\RolesMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\op\PermissionController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\MenusService.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\request\AirportRequest.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\constant\WaterWayConstant.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\http\RestProperties.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\enums\MarkTypeEnum.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\vo\ServiceExampleVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\config\http\HeadClientHttpRequestInterceptor.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\constant\HhzUrlConstant.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\param\CreateClientTenantDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\Impl\RoleMenuServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\CityController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\RolePermission.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\op\RoleController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\AreaMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\op\Impl\RolePermissionServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\MarkerController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\TenantEmployMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\query\RoleClientQuery.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\Permissions.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\CityServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\impl\PlatformServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\MarkerMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\dto\RoleDto.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\mapper\op\MenusMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\service\ClientUserSevice.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\entity\TenantEmploy.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\third\service\impl\ThirdServiceImpl.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\common\ExceptionCatch.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\MenuindexVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\vo\MenuVo.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\controller\ClientController.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_admin\src\main\java\com\tuoheng\model\query\MenuQuery.java