[add] 添加注销接口

[chg] 拦截器优化以及合同接口优化

src/main/java/vion/controller/ContractController.java

@@ -46,8 +46,8 @@ public class ContractController {
     }
     }
 
 
     @PostMapping("/contract/store")
     @PostMapping("/contract/store")
-    @SaCheckPermission(value = "contract:store", orRole="admin")
-    public String ss(List<RContractStore> contractStoreList) {
+    @SaCheckPermission(value = "contract:store:edit", orRole = "admin")
+    public String saveOrUpdateRContractStore(@RequestBody List<RContractStore> contractStoreList) {
         return contractStoreService.saveBatch(contractStoreList) ? "更新成功" : "更新失败";
         return contractStoreService.saveBatch(contractStoreList) ? "更新成功" : "更新失败";
     }
     }
 
 

src/main/java/vion/controller/ContractPaymentController.java

@@ -23,7 +23,7 @@ public class ContractPaymentController {
 
 
     @PostMapping("/contractPayment")
     @PostMapping("/contractPayment")
     @SaCheckPermission(value = "contractPayment:edit", orRole="admin")
     @SaCheckPermission(value = "contractPayment:edit", orRole="admin")
-    public String updPayment(List<ContractPaymentDTO> dtoList) {
+    public String updPayment(@RequestBody List<ContractPaymentDTO> dtoList) {
         return contractPaymentService.saveBatch(converter.convert(dtoList, ContractPayment.class)) ? "更新成功" : "更新失败";
         return contractPaymentService.saveBatch(converter.convert(dtoList, ContractPayment.class)) ? "更新成功" : "更新失败";
     }
     }
 
 

src/main/java/vion/controller/UserController.java

 package vion.controller;
 package vion.controller;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.lang.Opt;
 import cn.hutool.core.lang.Opt;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -90,6 +91,12 @@ public class UserController {
         return dingMod.dingCallback(target, dto, res);
         return dingMod.dingCallback(target, dto, res);
     }
     }
 
 
+    @GetMapping("/logout/{id}")
+    public String logout(@PathVariable Long id) {
+        StpUtil.logout(id);
+        return "注销成功";
+    }
+
     @GetMapping("/wechat/callback")
     @GetMapping("/wechat/callback")
     public Object wechatCallback(String code, Long taskTempId) {
     public Object wechatCallback(String code, Long taskTempId) {
         Object obj = wechatMod.wechatCallback(code);
         Object obj = wechatMod.wechatCallback(code);

src/main/java/vion/interceptor/StpInterfaceImpl.java

@@ -2,6 +2,8 @@ package vion.interceptor;
 
 
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.lang.Opt;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import vion.vo.RoleVO;
 import vion.vo.RoleVO;
 import vion.vo.UserVO;
 import vion.vo.UserVO;
@@ -26,6 +28,6 @@ public class StpInterfaceImpl implements StpInterface {
     public List<String> getRoleList(Object loginId, String loginType) {
     public List<String> getRoleList(Object loginId, String loginType) {
         UserVO userVO = (UserVO) StpUtil.getTokenSession().get("curLoginUser");
         UserVO userVO = (UserVO) StpUtil.getTokenSession().get("curLoginUser");
         List<RoleVO> roleVOList = userVO.getRoleVOList();
         List<RoleVO> roleVOList = userVO.getRoleVOList();
-        return roleVOList.stream().map(RoleVO::getCode).collect(Collectors.toList());
+        return Opt.ofEmptyAble(roleVOList).map(list -> list.stream().map(RoleVO::getCode).collect(Collectors.toList())).orElse(ListUtil.empty());
     }
     }
 }
 }