1·新建分支
右下角显示分支名称
添加代码
/**
* 列表查询(非分页)new功能添加
*
* @return
*/
@RequestMapping("/list")
@SentinelResource(value = "articleList",
blockHandlerClass = ApArticleBlockHandler.class,
blockHandler = "blockHandler",
fallbackClass = ApArticleFallback.class,
fallback = "fallback")
public R listNew() throws InterruptedException {
ApArticle model = new ApArticle();
//SentinelResourceAspect
//SentinelResourceAspect
List<ApArticle> list = iApArticleService.list();
// TimeUnit.MILLISECONDS.sleep(1500);
//int i=1/0;
// todo 再包装一层
//int i = 1/0;
return R.ok(list);
}
2·提交到远程
首先提交到本地
3·主分支拉取dev分支的内容
右下角显示master
合并到主分支