Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

新增支持内嵌套打开网页

Browse Source
This commit is contained in:
WangHao
2020-10-08 14:18:42 +08:00
parent f79ef13ddf
commit d6692f242b
12 changed files with 786 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java
View File

@ -9,7 +9,7 @@ import com.ruoyi.bookmark.service.ISqMenuService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.BookmarkHtml.ImportHtml;
import com.ruoyi.common.utils.bookmarkhtml.ImportHtml;
import com.ruoyi.common.utils.StringUtils;
import org.jsoup.HttpStatusException;
import org.slf4j.Logger;
@ -22,17 +22,14 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.net.ssl.SSLHandshakeException;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
/**
* @Auther: Wang
* @auther: Wang
* @Date:
* 功能描述: 导入书签 导出书签
*/

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java
View File

@ -8,7 +8,7 @@ import java.util.List;
import com.ruoyi.bookmark.domain.SqBookmark;
import com.ruoyi.bookmark.service.ISqBookmarkService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.BookmarkHtml.ImportHtml;
import com.ruoyi.common.utils.bookmarkhtml.ImportHtml;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize;

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java
View File

@ -186,10 +186,10 @@ public class SqMenuController extends BaseController
}
}
// /**
// * 批量更新书签的数量
// */
//
/**
* 批量更新书签的数量
*/
@RequestMapping("/bookmarkcount/{menuId}")
public AjaxResult bookmarkcount(@PathVariable Long menuId)
{

2
ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/BaseSpringBootTest.java
View File

@ -13,7 +13,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
/**
* @Auther: Wang
* @auther: Wang
* @Date: 2020/08/08 19:10
* 功能描述:
*/