commit

src/main/java/com/budwk/app/sys/controller/SysFileController.java

@@ -2,9 +2,11 @@ package com.budwk.app.sys.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
@@ -66,6 +68,7 @@ public class SysFileController {
     @POST
     @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
     @SaCheckLogin
+	@SaCheckRole("MEMBER")
     public Result uploadDynamicReturnUrl(TempFile file) {
         try {
             if (file == null) {
@@ -123,6 +126,7 @@ public class SysFileController {
     @At
     @Ok("void")
     @SaCheckLogin
+	@SaCheckRole("MEMBER")
     public void download(String id, HttpServletRequest request, HttpServletResponse response) throws IOException {
         sysFileService.download(id, request, response);
     }
@@ -131,6 +135,7 @@ public class SysFileController {
     @Ok("void")
     @SaCheckLogin
     @ApiOperation("文件管理-转换PDF")
+	@SaCheckRole("MEMBER")
     public void convertPDF(String id, HttpServletRequest request, HttpServletResponse response) throws IOException {
         sysFileService.convertPDF(id, request, response);
     }
@@ -139,6 +144,7 @@ public class SysFileController {
     @SaCheckLogin
     @ApiOperation("文件管理-转换HTML")
     @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
+	@SaCheckRole("MEMBER")
     public Result convertHtml(TempFile file) {
         return Result.success().addData(sysFileService.convertHtml(file));
     }
@@ -165,6 +171,7 @@ public class SysFileController {
     @At
     @SaCheckLogin
     @ApiOperation("文件管理-前端预览文件完整数据")
+	@SaCheckRole("MEMBER")
     public Result previewFileData(@Param("ids") String[] ids) {
         List<Sys_file> files = sysFileService.previewFileData(ids);
         return Result.success(files);
@@ -174,6 +181,7 @@ public class SysFileController {
     @SaCheckLogin
     @ApiOperation("文件管理-视频播放")
     @Ok("void")
+	@SaCheckRole("MEMBER")
     public void videoPlay(String id, HttpServletRequest request, HttpServletResponse response) {
         Sys_file sys_file = sysFileService.detail(id);
         byte[] bytes = SysFileMinIoUtil.getFileBytes(sys_file.getBucket(), sys_file.getStoragePath());

src/main/java/com/budwk/app/sys/controller/SysUserController.java

@@ -17,6 +17,7 @@ import com.budwk.app.sys.services.SysUnitService;
 import com.budwk.app.sys.services.SysUserService;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.web.commons.base.Globals;
+import com.fasterxml.jackson.annotation.JsonFilter;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
@@ -381,8 +382,8 @@ public class SysUserController {
      * @return
      */
     @At
-    @Ok("json")
     @SaCheckLogin
+	@Ok("json:{locked:'password|idCard|idCardType|salt'}")
     public Result getLogonUser() {
         Sys_user userAndMenuById = sysUserService.getUserAndMenuById(SecurityUtil.getUserId());
         return Result.success().addData(userAndMenuById);

src/main/resources/views/layouts/platform_h5.html

@@ -70,18 +70,6 @@
     <script src="${base!}/assets/platform/plugins/g2plot/g2plot.min.js"></script>
 
 <!--    <script src="https://cdn.jsdelivr.net/npm/goober@2.1.10/dist/goober.umd.js"></script>-->
-
-    <script>
-        window._AMapSecurityConfig = {
-            securityJsCode: "4fa1e1aeabba7eb9518129cf57ab17c1"
-        }
-    </script>
-    <script
-            type="text/javascript"
-            src="https://webapi.amap.com/maps?v=2.0&key=57f0d098ba1b881ecc436c4cfd23bbbf&plugin=AMap.PolyEditor,AMap.Geolocation"
-    ></script>
-
-    <script src="https://map.qq.com/api/gljs?v=2.exp&key=MLLBZ-GQECI-ASXG7-5GNOZ-XW2OF-H5BVH"></script>
     <script>
         Vue.config.devtools = true
 

src/main/resources/views/layouts/v4/baseLayout.html

@@ -94,19 +94,6 @@
         <script src="${base!}/assets/platform/js/util/autoShowError.js"></script>
         <script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
 
-        <!--<script
-            type="text/javascript"
-            src="https://webapi.amap.com/maps?v=2.0&key=b4fa2e2bc10a725ab007b98a3aa447cc&plugin=AMap.PolyEditor,AMap.Geolocation"
-        ></script>-->
-
-        <script src="https://map.qq.com/api/gljs?v=2.exp&key=MLLBZ-GQECI-ASXG7-5GNOZ-XW2OF-H5BVH"></script>
-
-        <script type="text/javascript">
-            window._AMapSecurityConfig = {
-                securityJsCode: "4fa1e1aeabba7eb9518129cf57ab17c1"
-            }
-        </script>
-
         <script type="text/javascript">
             Vue.config.devtools = false
             ELEMENT.locale(ELEMENT.lang["${lang,escape}"])