Browse Source

修改回调日志信息

syh 5 years ago
parent
commit
be0d0f6a94

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -82,7 +82,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ctop/material/top/cost", "anon");
 
         filterChainDefinitionMap.put("/v1/**", "anon");
-        filterChainDefinitionMap.put("/ctop/wpsFile/**", "anon");
 
         filterChainDefinitionMap.put("/generic/**", "anon");
         filterChainDefinitionMap.put("/", "anon");

+ 0 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/UserImplController.java

@@ -105,14 +105,4 @@ public class UserImplController{
         }
     }
 
-    /**
-     * 通过wps官方模版新建文件
-     * template值 {"word", "excel", "ppt"}
-     */
-    @GetMapping("createTemplateFile")
-    public ResponseEntity<Object> createTemplateFile(String template){
-        String newUrl = wpsFileService.createTemplateFile(template);
-        return Response.success(newUrl);
-    }
-
 }

+ 16 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileController.java

@@ -6,12 +6,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.wps.base.Response;
 import org.jeecg.modules.wps.entity.WpsFile;
 import org.jeecg.modules.wps.service.IWpsFileService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -53,6 +57,8 @@ public class WpsFileController {
 												HttpServletRequest req) {
 		Result<IPage<WpsFile>> result = new Result<>();
 		QueryWrapper<WpsFile> queryWrapper = QueryGenerator.initQueryWrapper(wpsFile, req.getParameterMap());
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		queryWrapper.eq("creator",sysUser.getId());
 		Page<WpsFile> page = new Page<>(pageNo, pageSize);
 		IPage<WpsFile> pageList = wpsFileService.page(page, queryWrapper);
 		result.setSuccess(true);
@@ -159,4 +165,14 @@ public class WpsFileController {
 		}
 		return result;
 	}
+
+	/**
+	 * 通过wps官方模版新建文件
+	 * template值 {"word", "excel", "ppt"}
+	 */
+	@GetMapping("createTemplateFile")
+	public ResponseEntity<Object> createTemplateFile(String template){
+		String newUrl = wpsFileService.createTemplateFile(template);
+		return Response.success(newUrl);
+	}
 }

+ 4 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.Project;
 import org.jeecg.modules.ctop.service.IProjectService;
 import org.jeecg.modules.wps.config.Context;
@@ -371,9 +373,10 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
 
     @Override
     public String createTemplateFile(String template){
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         boolean typeTrue = FileUtil.checkCode(template);
         if (typeTrue){
-            return wpsUtil.getTemplateWpsUrl(template,"913039605");
+            return wpsUtil.getTemplateWpsUrl(template,sysUser.getId());
         }
         return "";
     }