集成yapi接口文档管理

app.pid

@@ -1 +1 @@
-17916
+4056

sp-core/sp-base/pom.xml

@@ -150,6 +150,13 @@
         	<artifactId>spring-boot-configuration-processor</artifactId>
         	<!-- <optional>true</optional> -->
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.github.nobugboy/ydoc-spring-boot-starter -->
+        <dependency>
+            <groupId>com.github.nobugboy</groupId>
+            <artifactId>ydoc-spring-boot-starter</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+
         
         
     </dependencies>

sp-core/sp-base/src/main/java/com/pj/current/satoken/StpUserUtil.java

@@ -3,6 +3,7 @@ package com.pj.current.satoken;
 import java.util.Collections;
 import java.util.List;
 
+import cn.dev33.satoken.strategy.SaStrategy;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.pj.utils.cache.RedisUtil;
@@ -552,35 +553,16 @@ public class StpUserUtil {
     }
 
     /**
-     * 获取：指定账号的权限码集合
-     *
-     * @param loginId 指定账号id
-     * @return /
-     */
-    public static List<String> getPermissionList(Object loginId) {
-        return stpLogic.getPermissionList(loginId);
-    }
-
-    /**
      * 判断：当前账号是否含有指定权限, 返回true或false
      *
      * @param permission 权限码
      * @return 是否含有指定权限
      */
     public static boolean hasPermission(String permission) {
-        return stpLogic.hasPermission(permission);
+       return SaStrategy.me.hasElement.apply(getPermissionList(), permission);
     }
 
-    /**
-     * 判断：指定账号id是否含有指定权限, 返回true或false
-     *
-     * @param loginId    账号id
-     * @param permission 权限码
-     * @return 是否含有指定权限
-     */
-    public static boolean hasPermission(Object loginId, String permission) {
-        return stpLogic.hasPermission(loginId, permission);
-    }
+
 
     /**
      * 判断：当前账号是否含有指定权限, [指定多个，必须全部具有]

sp-service/sp-admin/src/main/java/com/pj/project4sp/admin4login/SpAccAdminController.java

@@ -2,6 +2,8 @@ package com.pj.project4sp.admin4login;
 
 import javax.servlet.http.HttpServletRequest;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pj.current.satoken.AuthConst;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -55,6 +57,7 @@ public class SpAccAdminController {
 	/** 管理员登录后台时需要返回的信息 */
 	@RequestMapping("fristOpenAdmin")
 	AjaxJson fristOpenAdmin(HttpServletRequest request) {
+		StpUtil.checkLogin();
 		// 当前admin
 		SpAdmin admin = SpAdminUtil.getCurrAdmin();
 		

sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverController.java

@@ -1,6 +1,7 @@
 package com.pj.project.tb_driver;
 
 import java.util.List;
+
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,74 +16,82 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 
 /**
  * Controller: tb_driver -- 司机
- * @author qzy 
+ *
+ * @author qzy
  */
-@RestController
+@RestController(value = "司机管理接口")
 @RequestMapping("/TbDriver/")
 public class TbDriverController {
 
-	/** 底层 Service 对象 */
-	@Autowired
-	TbDriverService tbDriverService;
+    /**
+     * 底层 Service 对象
+     */
+    @Autowired
+    TbDriverService tbDriverService;
+
+    /**
+     * 增
+     */
+    @RequestMapping(value="add",name = "添加司机")
+    @SaCheckPermission(TbDriver.PERMISSION_CODE_ADD)
+    public AjaxJson add(TbDriver t) {
+        tbDriverService.add(t);
+        t = tbDriverService.getById(SP.publicMapper.getPrimarykey());
+        return AjaxJson.getSuccessData(t);
+    }
+
+    /**
+     * 删
+     */
+    @RequestMapping("delete")
+    @SaCheckPermission(TbDriver.PERMISSION_CODE_DEL)
+    public AjaxJson delete(Long id) {
+        tbDriverService.delete(id);
+        return AjaxJson.getSuccess();
+    }
 
-	/** 增 */  
-	@RequestMapping("add")
-	@SaCheckPermission(TbDriver.PERMISSION_CODE_ADD)
-	public AjaxJson add(TbDriver t){
-		tbDriverService.add(t);
-		t = tbDriverService.getById(SP.publicMapper.getPrimarykey());
-		return AjaxJson.getSuccessData(t);
-	}
+    /**
+     * 删 - 根据id列表
+     */
+    @RequestMapping("deleteByIds")
+    @SaCheckPermission(TbDriver.PERMISSION_CODE_DEL)
+    public AjaxJson deleteByIds() {
+        List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+        int line = SP.publicMapper.deleteByIds(TbDriver.TABLE_NAME, ids);
+        return AjaxJson.getByLine(line);
+    }
 
-	/** 删 */  
-	@RequestMapping("delete")
-	@SaCheckPermission(TbDriver.PERMISSION_CODE_DEL)
-	public AjaxJson delete(Long id){
-		 tbDriverService.delete(id);
-		return AjaxJson.getSuccess();
-	}
-	
-	/** 删 - 根据id列表 */  
-	@RequestMapping("deleteByIds")
-	@SaCheckPermission(TbDriver.PERMISSION_CODE_DEL)
-	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
-		int line = SP.publicMapper.deleteByIds(TbDriver.TABLE_NAME, ids);
-		return AjaxJson.getByLine(line);
-	}
-	
-	/** 改 */  
-	@RequestMapping("update")
-	@SaCheckPermission(TbDriver.PERMISSION_CODE_EDIT)
-	public AjaxJson update(TbDriver t){
-		tbDriverService.update(t);
-		return AjaxJson.getSuccess();
-	}
+    /**
+     * 改
+     */
+    @RequestMapping("update")
+    @SaCheckPermission(TbDriver.PERMISSION_CODE_EDIT)
+    public AjaxJson update(TbDriver t) {
+        tbDriverService.update(t);
+        return AjaxJson.getSuccess();
+    }
 
-	/** 查 - 根据id */  
-	@RequestMapping("getById")
-		@SaCheckPermission(TbDriver.PERMISSION_CODE)
-	public AjaxJson getById(Long id){
-		TbDriver t = tbDriverService.getById(id);
-		return AjaxJson.getSuccessData(t);
-	}
+    /**
+     * 查 - 根据id
+     */
+    @RequestMapping("getById")
+    @SaCheckPermission(TbDriver.PERMISSION_CODE)
+    public AjaxJson getById(Long id) {
+        TbDriver t = tbDriverService.getById(id);
+        return AjaxJson.getSuccessData(t);
+    }
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
-	@RequestMapping("getList")
-		@SaCheckPermission(TbDriver.PERMISSION_CODE)
-	public AjaxJson getList() { 
-		SoMap so = SoMap.getRequestSoMap();
-		so.set("deleteStatus", 1);
-		List<TbDriver> list = tbDriverService.getList(so.startPage());
-		return AjaxJson.getPageData(so.getDataCount(), list);
-	}
-	
-	
-	
-	
+    /**
+     * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+     */
+    @RequestMapping("getList")
+    @SaCheckPermission(TbDriver.PERMISSION_CODE)
+    public AjaxJson getList() {
+        SoMap so = SoMap.getRequestSoMap();
+        so.set("deleteStatus", 1);
+        List<TbDriver> list = tbDriverService.getList(so.startPage());
+        return AjaxJson.getPageData(so.getDataCount(), list);
+    }
 
-	
-	
-	
 
 }

sp-service/transport-server/src/main/resources/bootstrap.yml

@@ -2,4 +2,4 @@ spring:
   # ????
   application.name: transport-server
   # ????
-  profiles.active: dev
+  profiles.active: dev