Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-admin/pom.xml

@@ -74,6 +74,12 @@
             <artifactId>jodd-http</artifactId>
             <version>6.2.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
+        </dependency>
     </dependencies>
 
     <build>

zkqy-admin/src/main/java/com/zkqy/web/controller/system/LoginPageConfigurationController.java

@@ -41,7 +41,7 @@ public class LoginPageConfigurationController extends BaseController {
     /**
      * 查询登录页面配置信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:configuration:list')")
+    //@PreAuthorize("@ss.hasPermi('system:configuration:list')")
     @GetMapping("/list")
     @ApiOperation(value = "查询登录页面配置信息列表")
     public TableDataInfo list(LoginPageConfiguration loginPageConfiguration) {
@@ -53,7 +53,7 @@ public class LoginPageConfigurationController extends BaseController {
     /**
      * 导出登录页面配置信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:configuration:export')")
+    //@PreAuthorize("@ss.hasPermi('system:configuration:export')")
     @Log(title = "登录页面配置信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出登录页面配置信息列表")
@@ -66,7 +66,7 @@ public class LoginPageConfigurationController extends BaseController {
     /**
      * 获取登录页面配置信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:configuration:query')")
+    //@PreAuthorize("@ss.hasPermi('system:configuration:query')")
     @GetMapping(value = "getInfoByTenantId")
     @ApiOperation(value = "获取登录页面配置信息详细信息")
     public AjaxResult getInfo(Long tenantId, String loginType) {
@@ -85,7 +85,7 @@ public class LoginPageConfigurationController extends BaseController {
     /**
      * 新增登录页面配置信息
      */
-    @PreAuthorize("@ss.hasPermi('system:configuration:add')")
+    //@PreAuthorize("@ss.hasPermi('system:configuration:add')")
     @Log(title = "登录页面配置信息", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增登录页面配置信息")
@@ -96,7 +96,7 @@ public class LoginPageConfigurationController extends BaseController {
     /**
      * 修改登录页面配置信息
      */
-    @PreAuthorize("@ss.hasPermi('system:configuration:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:configuration:edit')")
     @Log(title = "登录页面配置信息", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改登录页面配置信息")
@@ -107,7 +107,7 @@ public class LoginPageConfigurationController extends BaseController {
     /**
      * 删除登录页面配置信息
      */
-    @PreAuthorize("@ss.hasPermi('system:configuration:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:configuration:remove')")
     @Log(title = "登录页面配置信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除登录页面配置信息")

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysBpmNodeScriptController.java

@@ -40,7 +40,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 查询流程节点脚本列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:list')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:list')")
     @GetMapping("/list")
     @ApiOperation(value = "查询流程节点脚本列表")
     public TableDataInfo list(SysBpmNodeScript sysBpmNodeScript)
@@ -53,7 +53,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 导出流程节点脚本列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:export')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:export')")
     @Log(title = "流程节点脚本", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出流程节点脚本列表")
@@ -67,7 +67,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 获取流程节点脚本详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:query')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取流程节点脚本详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -78,7 +78,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 新增流程节点脚本
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:add')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:add')")
     @Log(title = "流程节点脚本", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增流程节点脚本")
@@ -90,7 +90,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 修改流程节点脚本
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:edit')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:edit')")
     @Log(title = "流程节点脚本", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改流程节点脚本")
@@ -102,7 +102,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 删除流程节点脚本
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:remove')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:remove')")
     @Log(title = "流程节点脚本", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除流程节点脚本")

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysConfigController.java

@@ -37,7 +37,7 @@ public class SysConfigController extends BaseController
     /**
      * 获取参数配置列表
      */
-    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    //@PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysConfig config)
     {
@@ -47,7 +47,7 @@ public class SysConfigController extends BaseController
     }
 
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    //@PreAuthorize("@ss.hasPermi('system:config:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysConfig config)
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDeptController.java

@@ -37,7 +37,7 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门列表
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {
@@ -51,7 +51,7 @@ public class SysDeptController extends BaseController
     /**
      * 查询部门列表（排除节点）
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
@@ -63,7 +63,7 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {
@@ -74,7 +74,7 @@ public class SysDeptController extends BaseController
     /**
      * 新增部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDept dept)
@@ -90,7 +90,7 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
@@ -116,7 +116,7 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId)

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictDataController.java

@@ -42,7 +42,7 @@ public class SysDictDataController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysDictData dictData)
     {
@@ -52,7 +52,7 @@ public class SysDictDataController extends BaseController
     }
 
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictData dictData)
     {
@@ -64,7 +64,7 @@ public class SysDictDataController extends BaseController
     /**
      * 查询字典数据详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
     public AjaxResult getInfo(@PathVariable Long dictCode)
     {
@@ -89,7 +89,7 @@ public class SysDictDataController extends BaseController
     /**
      * 新增字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictData dict)

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictTypeController.java

@@ -34,7 +34,7 @@ public class SysDictTypeController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysDictType dictType)
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDragTableStyleController.java

@@ -37,7 +37,7 @@ public class SysDragTableStyleController extends BaseController
     /**
      * 查询动态格样式模板列表
      */
-    @PreAuthorize("@ss.hasPermi('system:style:list')")
+    //@PreAuthorize("@ss.hasPermi('system:style:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysDragTableStyle sysDragTableStyle)
     {
@@ -49,7 +49,7 @@ public class SysDragTableStyleController extends BaseController
     /**
      * 导出动态格样式模板列表
      */
-    @PreAuthorize("@ss.hasPermi('system:style:export')")
+    //@PreAuthorize("@ss.hasPermi('system:style:export')")
     @Log(title = "动态格样式模板", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDragTableStyle sysDragTableStyle)
@@ -62,7 +62,7 @@ public class SysDragTableStyleController extends BaseController
     /**
      * 获取动态格样式模板详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:style:query')")
+    //@PreAuthorize("@ss.hasPermi('system:style:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +72,7 @@ public class SysDragTableStyleController extends BaseController
     /**
      * 新增动态格样式模板
      */
-    @PreAuthorize("@ss.hasPermi('system:style:add')")
+    //@PreAuthorize("@ss.hasPermi('system:style:add')")
     @Log(title = "动态格样式模板", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysDragTableStyle sysDragTableStyle)
@@ -83,7 +83,7 @@ public class SysDragTableStyleController extends BaseController
     /**
      * 修改动态格样式模板
      */
-    @PreAuthorize("@ss.hasPermi('system:style:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:style:edit')")
     @Log(title = "动态格样式模板", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysDragTableStyle sysDragTableStyle)
@@ -94,7 +94,7 @@ public class SysDragTableStyleController extends BaseController
     /**
      * 删除动态格样式模板
      */
-    @PreAuthorize("@ss.hasPermi('system:style:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:style:remove')")
     @Log(title = "动态格样式模板", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysEngineeringController.java

@@ -55,7 +55,7 @@ public class SysEngineeringController extends BaseController {
     /**
      * 查询工程部署列表
      */
-    @PreAuthorize("@ss.hasPermi('system:engineering:list')")
+    //@PreAuthorize("@ss.hasPermi('system:engineering:list')")
     @GetMapping("/list")
     @ApiOperation(value = "查询工程部署列表")
     public TableDataInfo list(SysEngineering sysEngineering) {
@@ -67,7 +67,7 @@ public class SysEngineeringController extends BaseController {
     /**
      * 导出工程部署列表
      */
-    @PreAuthorize("@ss.hasPermi('system:engineering:export')")
+    //@PreAuthorize("@ss.hasPermi('system:engineering:export')")
     @Log(title = "工程部署", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出工程部署列表")
@@ -80,7 +80,7 @@ public class SysEngineeringController extends BaseController {
     /**
      * 获取工程部署详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:engineering:query')")
+    //@PreAuthorize("@ss.hasPermi('system:engineering:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取工程部署详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -90,7 +90,7 @@ public class SysEngineeringController extends BaseController {
     /**
      * 新增工程部署
      */
-    @PreAuthorize("@ss.hasPermi('system:engineering:add')")
+    //@PreAuthorize("@ss.hasPermi('system:engineering:add')")
     @Log(title = "工程部署", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增工程部署")
@@ -101,7 +101,7 @@ public class SysEngineeringController extends BaseController {
     /**
      * 修改工程部署
      */
-    @PreAuthorize("@ss.hasPermi('system:engineering:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:engineering:edit')")
     @Log(title = "工程部署", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改工程部署")
@@ -112,7 +112,7 @@ public class SysEngineeringController extends BaseController {
     /**
      * 删除工程部署
      */
-    @PreAuthorize("@ss.hasPermi('system:engineering:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:engineering:remove')")
     @Log(title = "工程部署", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除工程部署")

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysLoginController.java

@@ -1,9 +1,7 @@
 package com.zkqy.web.controller.system;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import com.zkqy.common.core.domain.entity.DataSource;
 import com.zkqy.common.core.domain.entity.SysTenant;
@@ -240,4 +238,6 @@ public class SysLoginController {
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
+
+
 }

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysMenuController.java

@@ -29,7 +29,7 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单列表
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
@@ -39,7 +39,7 @@ public class SysMenuController extends BaseController {
     /**
      * 根据菜单编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
     public AjaxResult getInfo(@PathVariable Long menuId) {
         return success(menuService.selectMenuById(menuId));
@@ -69,7 +69,7 @@ public class SysMenuController extends BaseController {
     /**
      * 新增菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysMenu menu) {
@@ -90,7 +90,7 @@ public class SysMenuController extends BaseController {
     /**
      * 批量新增菜单按钮权限
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping("/tbnHasPerms")
     public AjaxResult add(@Validated @RequestBody List<SysMenu> menus) {
@@ -101,7 +101,7 @@ public class SysMenuController extends BaseController {
     /**
      * 修改菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
@@ -119,7 +119,7 @@ public class SysMenuController extends BaseController {
     /**
      * 删除菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId) {
@@ -135,7 +135,7 @@ public class SysMenuController extends BaseController {
     /**
      * 批量删除菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/removeBatch/{menuIds}")
     public AjaxResult removeBatch(@PathVariable List<Long> menuIds) {
@@ -152,7 +152,7 @@ public class SysMenuController extends BaseController {
     /**
      * 动态表格获取菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/getMenuList")
     public AjaxResult getMenuList() {
         List<SysMenu> menus = menuService.getMenuList(getTenantId());

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRoleController.java

@@ -58,7 +58,7 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    //@PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysRole role)
     {
@@ -71,7 +71,7 @@ public class SysRoleController extends BaseController
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    //@PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysRole role)
     {
@@ -83,7 +83,7 @@ public class SysRoleController extends BaseController
     /**
      * 根据角色编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    //@PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
     public AjaxResult getInfo(@PathVariable Long roleId)
     {
@@ -94,7 +94,7 @@ public class SysRoleController extends BaseController
     /**
      * 新增角色
      */
-    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    //@PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysRole role)
@@ -116,7 +116,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存角色
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysRole role)
@@ -151,7 +151,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存数据权限
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role)

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysTenantController.java

@@ -38,7 +38,7 @@ public class SysTenantController extends BaseController {
     /**
      * 查询租户信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysTenant sysTenant) {
         startPage();
@@ -49,7 +49,7 @@ public class SysTenantController extends BaseController {
     /**
      * 查询所有租户信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/getTenantAllList")
     public TableDataInfo getTenantAllList(SysTenant sysTenant) {
         List<SysTenant> list = sysTenantService.selectSysTenantAllList(sysTenant);
@@ -59,7 +59,7 @@ public class SysTenantController extends BaseController {
     /**
      * 导出租户信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:export')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:export')")
     @Log(title = "租户信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysTenant sysTenant) {
@@ -71,7 +71,7 @@ public class SysTenantController extends BaseController {
     /**
      * 获取租户信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:query')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:query')")
     @GetMapping(value = "/{tenantId}")
     public AjaxResult getInfo(@PathVariable("tenantId") Long tenantId) {
         return success(sysTenantService.selectSysTenantByTenantId(tenantId));
@@ -83,7 +83,7 @@ public class SysTenantController extends BaseController {
      * @param tenantId
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:query')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:query')")
     @GetMapping(value = "/getTenantChildrenInfo/{tenantId}")
     public AjaxResult getTenantChildrenInfo(@PathVariable("tenantId") Long tenantId) {
         return success(sysTenantService.selectSysTenantChildrenInfoByTenantId(tenantId));
@@ -92,7 +92,7 @@ public class SysTenantController extends BaseController {
     /**
      * 新增租户信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:add')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:add')")
     @Log(title = "租户信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysTenant sysTenant) {
@@ -106,7 +106,7 @@ public class SysTenantController extends BaseController {
     /**
      * 修改租户信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:edit')")
     @Log(title = "租户信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysTenant sysTenant) {
@@ -121,7 +121,7 @@ public class SysTenantController extends BaseController {
     /**
      * 删除租户信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:remove')")
     @Log(title = "租户信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tenantIds}")
     public AjaxResult remove(@PathVariable Long[] tenantIds) {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysUserController.java

@@ -54,7 +54,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    //@PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
         startPage();
@@ -78,7 +78,7 @@ public class SysUserController extends BaseController {
 
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    //@PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user) {
         List<SysUser> list = userService.selectUserList(user);
@@ -87,7 +87,7 @@ public class SysUserController extends BaseController {
     }
 
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    //@PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -106,7 +106,7 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    //@PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = {"/", "/{userId}"})
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
@@ -138,7 +138,7 @@ public class SysUserController extends BaseController {
     /**
      * 新增用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    //@PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user) {
@@ -161,7 +161,7 @@ public class SysUserController extends BaseController {
     /**
      * 修改用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
@@ -181,7 +181,7 @@ public class SysUserController extends BaseController {
     /**
      * 删除用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds) {
@@ -194,7 +194,7 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    //@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
@@ -208,7 +208,7 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
@@ -221,7 +221,7 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取授权角色
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    //@PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
     public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
@@ -247,7 +247,7 @@ public class SysUserController extends BaseController {
     /**
      * 用户授权角色
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
@@ -259,7 +259,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    //@PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept) {
         if (getLoginUser().isTenantAdmin()) {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/ThirdPartLoginController.java

@@ -2,19 +2,22 @@ package com.zkqy.web.controller.system;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.R;
 import com.zkqy.common.utils.http.HttpUtilsOauth2;
 
+import okhttp3.MultipartBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import org.apache.http.HttpResponse;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.HashMap;
@@ -54,40 +57,44 @@ public class ThirdPartLoginController {
             // 转换编码凭证
             byte[] encodedBytes = Base64.getEncoder().encode(BASIC.getBytes(StandardCharsets.UTF_8));
             String encodedCredentials = new String(encodedBytes, StandardCharsets.UTF_8);
-            headers.put("Authorization", " Basic " + encodedCredentials);
-            headers.put("Content-Type", "application/json");
+            headers.put("Authorization", "Basic " + encodedCredentials);
+            headers.put("Content-Type", "multipart/form-data");
             HttpResponse response = HttpUtilsOauth2.doPost(URL, "/oauth2/token", "post", headers, map, new HashMap<>());
             //2、处理
             if (response.getStatusLine().getStatusCode() == 200) {
                 // 得到code换取token结果
                 String tokenJSON = EntityUtils.toString(response.getEntity());
+                System.out.println("获取token" + tokenJSON);
                 Map<String, Object> tokenMap = JSONObject.parse(tokenJSON);
                 // 封装请求用户信息请求头
                 Map<String, String> getUserHeaders = new HashMap<>();
-                getUserHeaders.put("Authorization", " Bearer " + tokenMap.get("access_token"));
-//                getUserHeaders.put("Content-Type", "application/json");
+                getUserHeaders.put("Authorization", "Bearer " + tokenMap.get("access_token"));
+                getUserHeaders.put("Content-Type", "application/json");
                 HttpResponse userResponse = HttpUtilsOauth2.doGet(URL, "/user/login", "get", getUserHeaders, new HashMap<>());
                 if (userResponse.getStatusLine().getStatusCode() == 200) {
                     // 得到当前登录用户信息
                     String userJson = EntityUtils.toString(userResponse.getEntity());
                     Map<String, Object> retUserMap = JSONObject.parse(userJson);
-                    String usernmae = "kjjt01";
+                    System.out.println("用户json：" + userJson);
                     Map<String, Object> data = (Map<String, Object>) retUserMap.get("data");
-                    data.get("username");
-                    if (null == data.get("companyTenant")) {
-                        // ((Map) data.get("companyTenant")).get("tenantcode").toString();
-                        String tenantCode = "kjjt01";
+                    String usernmae = data.get("username").toString();
+                    if (null != data.get("companyTenant")) {
+                        String tenantCode = ((Map) data.get("companyTenant")).get("tenantCode").toString();
+                        System.out.println("用户名：" + (tenantCode + "^_^" + usernmae + "^_^" + System.currentTimeMillis() / 1000));
                         byte[] userInfo = Base64.getEncoder().encode((tenantCode + "^_^" + usernmae + "^_^" + System.currentTimeMillis() / 1000).getBytes(StandardCharsets.UTF_8));
                         String retUserInfo = new String(userInfo, StandardCharsets.UTF_8);
+                        System.out.println("正常跳转");
                         return "redirect:" + REDIRECT_URL + "/redirectAuth?bWVz=" + retUserInfo;
                     }
                 }
             }
         } catch (Exception e) {
             System.out.println(e);
+            System.out.println("最外层跳转1");
             // 异常处理
             return "redirect:" + REDIRECT_URL + "/401";
         }
+        System.out.println("最外层跳转2");
         // 授权失败处理
         return "redirect:" + REDIRECT_URL + "/401";
     }
@@ -97,5 +104,36 @@ public class ThirdPartLoginController {
     public AjaxResult authorize() {
         return AjaxResult.success("认证中心", URL + "/oauth2/authorize?" + "response_type=code" + "&client_id=toolmes" + "&scope=openid" + "&redirect_uri=" + CALLBACK);
     }
+
+
+//    @GetMapping("oauth/callback")
+//    public Object getToken(@RequestParam String code) {
+//        byte[] encodedBytes = Base64.getEncoder().encode(BASIC.getBytes(StandardCharsets.UTF_8));
+//        String encode = new String(encodedBytes, StandardCharsets.UTF_8);
+//        // 构建form-data请求体
+//        MultipartBody requestBody = new MultipartBody.Builder()
+//                .setType(MultipartBody.FORM)
+//                .addFormDataPart("grant_type", "authorization_code")
+//                .addFormDataPart("code", code)
+//                .addFormDataPart("redirect_uri", CALLBACK)
+//                .build();
+//        // 构建请求
+//        Request request = new Request.Builder()
+//                .url(URL + "/oauth2/token")
+//                .post(requestBody)
+//                .header("Authorization", "Basic " + encode)
+//                .build();
+//        // 发送请求并获取响应
+//        OkHttpClient client = new OkHttpClient();
+//        try (Response response = client.newCall(request).execute()) {
+//            String responseBody = response.body().string();
+//            System.out.println(responseBody);
+//            // 处理响应
+//            return responseBody;
+//        } catch (IOException e) {
+//            System.out.println("code换token异常");
+//        }
+//        return R.fail("获取错误");
+//    }
 }
 

zkqy-admin/src/main/resources/application.yml

@@ -79,7 +79,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.110.15
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -156,10 +156,10 @@ OpenAuthorization2:
   # 工联院单点登录信息
   GLY:
     # 单点获取code、token、userinfo主机地址
-    URL: http://dljp.dev.feysh.com:30159
+    URL: http://sso.dljp.pre.feysh.com
     # 本系统标识 Base64
     BASIC: toolmes:123456
     # 重定向本系统主机地址
-    REDIRECT_URL: http://192.168.110.52:1024
+    REDIRECT_URL: https://db399361fp97.vicp.fun
     # 回调地址
-    CALLBACK: https://db399361fp97.vicp.fun/oauth/callback
+    CALLBACK: http://124.126.77.28:8080/oauth/callback

zkqy-framework/src/main/java/com/zkqy/framework/manager/factory/AsyncFactory.java

@@ -65,7 +65,7 @@ public class AsyncFactory
                 logininfor.setBrowser(browser);
                 logininfor.setOs(os);
                 logininfor.setMsg(message);
-                logininfor.setWhichApplication("1");
+                logininfor.setWhichApplication("2");
                 // 日志状态
                 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
                 {
@@ -116,7 +116,7 @@ public class AsyncFactory
                 // 增加租户标识
                 logininfor.setTenantId(tenantId);
                 // 增加登录端标识
-                logininfor.setWhichApplication("1");
+                logininfor.setWhichApplication("2");
                 // 日志状态
                 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
                 {

zkqy-generator/src/main/java/com/zkqy/generator/controller/GenController.java

@@ -46,7 +46,7 @@ public class GenController extends BaseController
     /**
      * 查询代码生成列表
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
     @GetMapping("/list")
     public TableDataInfo genList(GenTable genTable)
     {
@@ -58,7 +58,7 @@ public class GenController extends BaseController
     /**
      * 修改代码生成业务
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:query')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:query')")
     @GetMapping(value = "/{tableId}")
     public AjaxResult getInfo(@PathVariable Long tableId)
     {
@@ -75,7 +75,7 @@ public class GenController extends BaseController
     /**
      * 查询数据库列表
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
     @GetMapping("/db/list")
     public TableDataInfo dataList(GenTable genTable)
     {
@@ -87,7 +87,7 @@ public class GenController extends BaseController
     /**
      * 查询数据表字段列表
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:list')")
     @GetMapping(value = "/column/{tableId}")
     public TableDataInfo columnList(Long tableId)
     {
@@ -101,7 +101,7 @@ public class GenController extends BaseController
     /**
      * 导入表结构（保存）
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:import')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:import')")
     @Log(title = "代码生成", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
     public AjaxResult importTableSave(String tables)
@@ -116,7 +116,7 @@ public class GenController extends BaseController
     /**
      * 修改保存代码生成业务
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
@@ -129,7 +129,7 @@ public class GenController extends BaseController
     /**
      * 删除代码生成
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:remove')")
     @Log(title = "代码生成", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tableIds}")
     public AjaxResult remove(@PathVariable Long[] tableIds)
@@ -141,7 +141,7 @@ public class GenController extends BaseController
     /**
      * 预览代码
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:preview')")
     @GetMapping("/preview/{tableId}")
     public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
     {
@@ -152,7 +152,7 @@ public class GenController extends BaseController
     /**
      * 生成代码（下载方式）
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/download/{tableName}")
     public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
@@ -164,7 +164,7 @@ public class GenController extends BaseController
     /**
      * 生成代码（自定义路径）
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/genCode/{tableName}")
     public AjaxResult genCode(@PathVariable("tableName") String tableName)
@@ -176,7 +176,7 @@ public class GenController extends BaseController
     /**
      * 同步数据库
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:edit')")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @GetMapping("/synchDb/{tableName}")
     public AjaxResult synchDb(@PathVariable("tableName") String tableName)
@@ -188,7 +188,7 @@ public class GenController extends BaseController
     /**
      * 批量生成代码
      */
-    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+    //@PreAuthorize("@ss.hasPermi('tool:gen:code')")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/batchGenCode")
     public void batchGenCode(HttpServletResponse response, String tables) throws IOException

zkqy-generator/src/main/resources/vm/java/controller.java.vm

@@ -43,7 +43,7 @@ public class ${ClassName}Controller extends BaseController
 /**
  * 查询${functionName}列表
  */
-@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+//@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
 @GetMapping("/list")
 @ApiOperation(value = "查询${functionName}列表")
     #if($table.crud || $table.sub)

zkqy-quartz/src/main/java/com/zkqy/quartz/controller/SysJobController.java

@@ -42,7 +42,7 @@ public class SysJobController extends BaseController
     /**
      * 查询定时任务列表
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysJob sysJob)
     {
@@ -54,7 +54,7 @@ public class SysJobController extends BaseController
     /**
      * 导出定时任务列表
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:export')")
     @Log(title = "定时任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysJob sysJob)
@@ -67,7 +67,7 @@ public class SysJobController extends BaseController
     /**
      * 获取定时任务详细信息
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:query')")
     @GetMapping(value = "/{jobId}")
     public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
     {
@@ -77,7 +77,7 @@ public class SysJobController extends BaseController
     /**
      * 新增定时任务
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:add')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:add')")
     @Log(title = "定时任务", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
@@ -113,7 +113,7 @@ public class SysJobController extends BaseController
     /**
      * 修改定时任务
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
@@ -149,7 +149,7 @@ public class SysJobController extends BaseController
     /**
      * 定时任务状态修改
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
@@ -162,7 +162,7 @@ public class SysJobController extends BaseController
     /**
      * 定时任务立即执行一次
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping("/run")
     public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
@@ -174,7 +174,7 @@ public class SysJobController extends BaseController
     /**
      * 删除定时任务
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @Log(title = "定时任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobIds}")
     public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException

zkqy-quartz/src/main/java/com/zkqy/quartz/controller/SysJobLogController.java

@@ -34,7 +34,7 @@ public class SysJobLogController extends BaseController
     /**
      * 查询定时任务调度日志列表
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysJobLog sysJobLog)
     {
@@ -46,7 +46,7 @@ public class SysJobLogController extends BaseController
     /**
      * 导出定时任务调度日志列表
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:export')")
     @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysJobLog sysJobLog)
@@ -59,7 +59,7 @@ public class SysJobLogController extends BaseController
     /**
      * 根据调度编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:query')")
     @GetMapping(value = "/{jobLogId}")
     public AjaxResult getInfo(@PathVariable Long jobLogId)
     {
@@ -70,7 +70,7 @@ public class SysJobLogController extends BaseController
     /**
      * 删除定时任务调度日志
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobLogIds}")
     public AjaxResult remove(@PathVariable Long[] jobLogIds)
@@ -81,7 +81,7 @@ public class SysJobLogController extends BaseController
     /**
      * 清空定时任务调度日志
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+    //@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @Log(title = "调度日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
     public AjaxResult clean()