⚡ 统一feign格式

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/feign/INoticeClient.java

@@ -35,7 +35,8 @@ import java.util.List;
 )
 public interface INoticeClient {
 
-	String API_PREFIX = "/dashboard";
+	String API_PREFIX = "/client";
+	String TOP = API_PREFIX + "/top";
 
 	/**
 	 * 获取notice列表
@@ -43,7 +44,7 @@ public interface INoticeClient {
 	 * @param number
 	 * @return
 	 */
-	@GetMapping(API_PREFIX + "/top")
+	@GetMapping(TOP)
 	R<List<Notice>> top(@RequestParam("number") Integer number);
 
 }

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClient.java

@@ -37,7 +37,9 @@ import java.util.List;
 )
 public interface IDictClient {
 
-	String API_PREFIX = "/dict";
+	String API_PREFIX = "/client";
+	String GET_VALUE = API_PREFIX + "/get-value";
+	String GET_LIST = API_PREFIX + "/get-list";
 
 	/**
 	 * 获取字典表对应值
@@ -46,7 +48,7 @@ public interface IDictClient {
 	 * @param dictKey 字典序号
 	 * @return
 	 */
-	@GetMapping(API_PREFIX + "/getValue")
+	@GetMapping(GET_VALUE)
 	R<String> getValue(@RequestParam("code") String code, @RequestParam("dictKey") Integer dictKey);
 
 	/**
@@ -55,7 +57,7 @@ public interface IDictClient {
 	 * @param code 字典编号
 	 * @return
 	 */
-	@GetMapping(API_PREFIX + "/getList")
+	@GetMapping(GET_LIST)
 	R<List<Dict>> getList(@RequestParam("code") String code);
 
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -34,7 +34,21 @@ import org.springframework.web.bind.annotation.RequestParam;
 )
 public interface ISysClient {
 
-	String API_PREFIX = "/sys";
+	String API_PREFIX = "/client";
+	String DEPT = API_PREFIX + "/dept";
+	String DEPT_NAME = API_PREFIX + "/dept-name";
+	String ROLE = API_PREFIX + "/role";
+	String ROLE_NAME = API_PREFIX + "/role-name";
+	String ROLE_ALIAS = API_PREFIX + "/role-alias";
+
+	/**
+	 * 获取部门
+	 *
+	 * @param id 主键
+	 * @return Dept
+	 */
+	@GetMapping(DEPT)
+	Dept getDept(@RequestParam("id") Integer id);
 
 	/**
 	 * 获取部门名
@@ -42,17 +56,17 @@ public interface ISysClient {
 	 * @param id 主键
 	 * @return 部门名
 	 */
-	@GetMapping(API_PREFIX + "/getDeptName")
+	@GetMapping(DEPT_NAME)
 	String getDeptName(@RequestParam("id") Integer id);
 
 	/**
-	 * 获取部门
+	 * 获取角色
 	 *
 	 * @param id 主键
-	 * @return Dept
+	 * @return Role
 	 */
-	@GetMapping(API_PREFIX + "/getDept")
-	Dept getDept(@RequestParam("id") Integer id);
+	@GetMapping(ROLE)
+	Role getRole(@RequestParam("id") Integer id);
 
 	/**
 	 * 获取角色名
@@ -60,7 +74,7 @@ public interface ISysClient {
 	 * @param id 主键
 	 * @return 角色名
 	 */
-	@GetMapping(API_PREFIX + "/getRoleName")
+	@GetMapping(ROLE_NAME)
 	String getRoleName(@RequestParam("id") Integer id);
 
 	/**
@@ -69,16 +83,7 @@ public interface ISysClient {
 	 * @param id 主键
 	 * @return 角色别名
 	 */
-	@GetMapping(API_PREFIX + "/getRoleAlias")
+	@GetMapping(ROLE_ALIAS)
 	String getRoleAlias(@RequestParam("id") Integer id);
 
-	/**
-	 * 获取角色
-	 *
-	 * @param id 主键
-	 * @return Role
-	 */
-	@GetMapping(API_PREFIX + "/getRole")
-	Role getRole(@RequestParam("id") Integer id);
-
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -27,28 +27,29 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ISysClientFallback implements ISysClient {
+
 	@Override
-	public String getDeptName(Integer id) {
+	public Dept getDept(Integer id) {
 		return null;
 	}
 
 	@Override
-	public Dept getDept(Integer id) {
+	public String getDeptName(Integer id) {
 		return null;
 	}
 
 	@Override
-	public String getRoleName(Integer id) {
+	public Role getRole(Integer id) {
 		return null;
 	}
 
 	@Override
-	public String getRoleAlias(Integer id) {
+	public String getRoleName(Integer id) {
 		return null;
 	}
 
 	@Override
-	public Role getRole(Integer id) {
+	public String getRoleAlias(Integer id) {
 		return null;
 	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java

@@ -39,7 +39,7 @@ public class NoticeClient implements INoticeClient {
 	NoticeMapper mapper;
 
 	@Override
-	@GetMapping(API_PREFIX + "/top")
+	@GetMapping(TOP)
 	public R<List<Notice>> top(Integer number) {
 		return R.data(mapper.topList(number));
 	}

blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java

@@ -41,13 +41,13 @@ public class DictClient implements IDictClient {
 	IDictService service;
 
 	@Override
-	@GetMapping(API_PREFIX + "/getValue")
+	@GetMapping(GET_VALUE)
 	public R<String> getValue(String code, Integer dictKey) {
 		return R.data(service.getValue(code, dictKey));
 	}
 
 	@Override
-	@GetMapping(API_PREFIX + "/getList")
+	@GetMapping(GET_LIST)
 	public R<List<Dict>> getList(String code) {
 		return R.data(service.getList(code));
 	}

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -43,33 +43,33 @@ public class SysClient implements ISysClient {
 	IAuthClientService clientService;
 
 	@Override
-	@GetMapping(API_PREFIX + "/getDeptName")
+	@GetMapping(DEPT)
+	public Dept getDept(Integer id) {
+		return deptService.getById(id);
+	}
+
+	@Override
+	@GetMapping(DEPT_NAME)
 	public String getDeptName(Integer id) {
 		return deptService.getById(id).getDeptName();
 	}
 
 	@Override
-	@GetMapping(API_PREFIX + "/getDept")
-	public Dept getDept(Integer id) {
-		return deptService.getById(id);
+	@GetMapping(ROLE)
+	public Role getRole(Integer id) {
+		return roleService.getById(id);
 	}
 
 	@Override
-	@GetMapping(API_PREFIX + "/getRoleName")
+	@GetMapping(ROLE_NAME)
 	public String getRoleName(Integer id) {
 		return roleService.getById(id).getRoleName();
 	}
 
 	@Override
-	@GetMapping(API_PREFIX + "/getRoleAlias")
+	@GetMapping(ROLE_ALIAS)
 	public String getRoleAlias(Integer id) {
 		return roleService.getById(id).getRoleAlias();
 	}
 
-	@Override
-	@GetMapping(API_PREFIX + "/getRole")
-	public Role getRole(Integer id) {
-		return roleService.getById(id);
-	}
-
 }