修改路径

4dkankan-center-manage/src/main/java/com/fdkankan/manage/aop/VisitLogInterceptor.java

@@ -74,12 +74,10 @@ public class VisitLogInterceptor {
 
 		//获取浏览器信息
 		String browser = this.getBrowser(request);
-
-		//获取参数
-		String params = this.getParams(pjp, request);
-
 		//获取操作路径
 		String requestPath = this.getRequestPath(uri);
+		//获取参数
+		String params = this.getParams(pjp, request);
 
         //放行
 		Object result = pjp.proceed();
@@ -120,6 +118,7 @@ public class VisitLogInterceptor {
 		operLog.setBrowser(browser);
 		operLog.setCreateTime(Calendar.getInstance().getTime());
 		operLog.setResult(msg);
+		operLog.setOperationType("manage");
 		mongoTemplate.insert(operLog);
 
 		return result;

4dkankan-center-manage/src/main/java/com/fdkankan/manage/config/SaTokenConfigure.java

@@ -39,7 +39,7 @@ public class SaTokenConfigure {
                 .setAuth(obj -> {
                     System.out.println("---------- 进入Sa-Token全局认证 -----------");
                     // 登录认证 -- 拦截所有路由，并排除/user/doLogin 用于开放登录
-                    SaRouter.match("/**", "/service/manager/login", r ->checkLogin() );
+                    SaRouter.match("/**", "/service/manage/login", r ->checkLogin() );
                     String menu = redisUtil.get(RedisKey.MANAGE_MENU);
                     if(StringUtils.isBlank(menu)){
                         SaRouter.match("/**", r -> StpUtil.checkRole("super-admin"));

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/DataController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/service/manager/data")
+@RequestMapping("/service/manage/data")
 public class DataController {
 
     @Autowired

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/ExcelController.java

@@ -19,7 +19,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
 @RestController
-@RequestMapping("/service/manager/excel")
+@RequestMapping("/service/manage/excel")
 public class ExcelController {
 
     @Autowired
@@ -61,11 +61,15 @@ public class ExcelController {
      * 导入excel
      * type 0 入库模板， 1出库模板 ，2 客户关联模板
      */
-    @PostMapping("uploadExcel")
-    public ResultData uploadExcel(@RequestParam(required = false) MultipartFile file,
+    @PostMapping("cameraUploadExcel")
+    public ResultData cameraUploadExcel(@RequestParam(required = false) MultipartFile file,
                                   @RequestParam(required = false,defaultValue = "0") Integer type) throws IOException {
         return ResultData.ok(excelService.uploadExcel(file,type));
     }
+    @PostMapping("companyUploadExcel")
+    public ResultData companyUploadExcel(@RequestParam(required = false) MultipartFile file) throws IOException {
+        return ResultData.ok(excelService.uploadExcel(file,2));
+    }
 
 
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/FollowHeartController.java

@@ -0,0 +1,29 @@
+package com.fdkankan.manage.controller;
+
+
+import com.fdkankan.common.response.ResultData;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/service/manage/followHeart")
+public class FollowHeartController {
+
+
+    @PostMapping("/list")
+    public ResultData list(){
+        return ResultData.ok();
+    }
+
+    @PostMapping("/sameScreen")
+    public ResultData sameScreen(){
+        return ResultData.ok();
+    }
+    @PostMapping("/delete")
+    public ResultData delete(){
+        return ResultData.ok();
+    }
+
+}
+

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/LoginController.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/service/manager/")
+@RequestMapping("/service/manage/")
 public class LoginController {
 
 

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/TestController.java

@@ -1,57 +0,0 @@
-package com.fdkankan.manage.controller;
-
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.manage.entity.Agent;
-import com.fdkankan.manage.service.IAgentService;
-import com.fdkankan.redis.util.RedisUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/27
- **/
-@RestController
-@RequestMapping("/service/manage")
-public class TestController {
-
-    @Autowired
-    RedisUtil redisUtil;
-
-    @Autowired
-    private IAgentService agentService;
-
-    @GetMapping("/test")
-    public ResultData test(String num){
-
-        List<Agent> list = agentService.list();
-
-        return ResultData.ok(list.toArray());
-    }
-
-    @PostMapping("/test3")
-    public ResultData test3(String num, @RequestParam("file") MultipartFile file){
-
-        List<Agent> list = agentService.list();
-
-        return ResultData.ok(list.toArray());
-    }
-
-    @PostMapping("/test1")
-    public ResultData test(@RequestBody Map<String, String> params){
-
-        List<Agent> list = agentService.list();
-
-        return ResultData.ok(list.toArray());
-    }
-
-
-}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/TestlyhController.java

@@ -1,26 +0,0 @@
-package com.fdkankan.manage.controller;
-
-import com.fdkankan.common.response.ResultData;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/service/manage/test")
-public class TestlyhController {
-
-
-    @GetMapping("/list")
-    public ResultData test(){
-
-        return ResultData.ok("list");
-    }
-    @GetMapping("/save")
-    public ResultData test2(){
-
-        return ResultData.ok("save");
-    }
-
-
-
-}

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/UserController.java

@@ -51,7 +51,7 @@ public class UserController {
      *  id      权益id
      *  year    延期年限
      */
-    @PostMapping("/IncrementDelay")
+    @PostMapping("/incrementDelay")
     public ResultData IncrementDelay(@RequestBody UserIncrementParam param){
         if(param.getId() == null){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);