Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7b1edd9d07
@ -29,6 +29,9 @@ public class SearchController {
|
||||
|
||||
@RequestMapping("/searchByInput")
|
||||
public String searchByInput(String searchKey,String userId ) throws IOException {
|
||||
if(searchKey == null ){
|
||||
return setResult(500,"未添加搜索内容");
|
||||
}
|
||||
String placeholder = "***";
|
||||
//非法敏感词汇判断
|
||||
SensitiveFilter filter = SensitiveFilter.getInstance();
|
||||
@ -38,7 +41,7 @@ public class SearchController {
|
||||
//存在非法字符
|
||||
if(n > 0){
|
||||
logger.info("这个人输入了非法字符--> {},不知道他到底要查什么~ userid--> {}",searchKey,1);
|
||||
return setResult(500,"查询失败");
|
||||
return setResult(500,"非法搜索");
|
||||
}
|
||||
|
||||
|
||||
|
@ -35,18 +35,20 @@ public class UrlListController {
|
||||
UrlList urlList = urlListService.selectUrlListByUrlId(Long.valueOf(urlId));
|
||||
String parentString = urlCateListService.selectUrListCateByUrlCateId(urlList.getCateId());
|
||||
String [] parentList = parentString.split(",");
|
||||
//System.out.println(parentString);
|
||||
System.out.println(parentString);
|
||||
for(String parent : parentList)
|
||||
{
|
||||
if(parent.equals("0")){
|
||||
continue;
|
||||
}
|
||||
UrlCateList urlCateList =urlCateListService.selectByPrimaryKey(Integer.valueOf(parent));
|
||||
if(urlCateListService.updateByUrlCateList(urlCateList) == 0)
|
||||
System.out.println(urlCateList);
|
||||
urlCateList.setUrlNumber(urlCateList.getUrlNumber()-1);
|
||||
if(String.valueOf(urlCateListService.updateByUrlCateList(urlCateList)).equals("0"))
|
||||
{
|
||||
flag = 0;
|
||||
}else{
|
||||
flag = 1;
|
||||
flag = urlListService.deleteByPrimaryKey(Long.valueOf(urlId));
|
||||
}
|
||||
}
|
||||
if(flag == 1)
|
||||
@ -79,7 +81,7 @@ public class UrlListController {
|
||||
continue;
|
||||
}
|
||||
UrlCateList urlCateList =urlCateListService.selectByPrimaryKey(Integer.valueOf(parent));
|
||||
if(urlCateListService.updateByUrlCateList(urlCateList) == 0)
|
||||
if(String.valueOf(urlCateListService.updateByUrlCateList(urlCateList)).equals("0") )
|
||||
{
|
||||
flag = 0;
|
||||
}else{
|
||||
|
Loading…
Reference in New Issue
Block a user