clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、当36壁纸爬虫正在执行时，不可修改配置 

2、36壁纸新增接口权限验证
This commit is contained in:
xjs 2022-02-21 20:34:52 +08:00
parent add64ea618
commit 856166612a
5 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-ui/src/views/business/warning/apiwarning/index.vue
View File

@ -7,6 +7,7 @@
placeholder="请输入"
clearable
size="small"
@change="handleQuery"
style="width: 180px">
<el-option
v-for="index in apiName"

1
ruoyi-ui/src/views/business/warning/apiwarninginfo/index.vue
View File

@ -7,6 +7,7 @@
placeholder="请输入"
clearable
size="small"
@change="handleQuery"
style="width: 180px">
<el-option
v-for="index in apiName"

2
xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiRecordMapper.xml
View File

@ -26,7 +26,7 @@
<include refid="selectApiRecordVo"/>
<where>
<if test="apiName != null and apiName != ''"> and api_name like concat('%', #{apiName}, '%')</if>
<if test="status != null">status = #{status}</if>
<if test="status != null">and status = #{status}</if>
</where>
order by create_time desc
</select>

18
xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java
View File

@ -75,10 +75,7 @@ public class _36wallpaperServiceImpl extends ServiceImpl<_36wallpaperMapper, _36
@Override
public boolean updateSettings(String json) {
//判断爬虫是否正在执行，正在执行不可修改！
if(redisService.hasKey(REPTILE_COUNT)){
throw new BusinessException("爬虫正在执行中！暂时无法修改，请稍后再试");
}
this.checkRunning();
//校验json格式是否正确
try {
@ -116,6 +113,8 @@ public class _36wallpaperServiceImpl extends ServiceImpl<_36wallpaperMapper, _36
@Override
public boolean resetSettings() {
this.checkRunning();
//构建json
JSONObject jsonObject = new JSONObject();
jsonObject.put("path",PATH);
@ -128,4 +127,15 @@ public class _36wallpaperServiceImpl extends ServiceImpl<_36wallpaperMapper, _36
}
return false;
}
/**
* 检测是否正在运行
*/
private void checkRunning() {
//判断爬虫是否正在执行，正在执行不可修改！
if(redisService.hasKey(REPTILE_COUNT)){
throw new BusinessException("爬虫正在执行中！暂时无法修改，请稍后再试");
}
}
}

24
xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java
View File

@ -40,7 +40,7 @@ public class CopyWritingNetworkServiceImpl extends ServiceImpl<CopyWritingNetwor
@Override
public List<CopyWritingNetwork> selectCopyWritingNetworkList(CopyWritingNetwork copyWritingNetwork) {
List<CopyWritingNetwork> list = copyWritingNetworkMapper.selectCopyWritingNetworkList(copyWritingNetwork);
list.forEach(data ->{
list.forEach(data -> {
data.setContent(this.filterContent(data.getContent()));
});
return list;
@ -67,23 +67,33 @@ public class CopyWritingNetworkServiceImpl extends ServiceImpl<CopyWritingNetwor
char index0 = oldStr.charAt(0);
char index1 = oldStr.charAt(1);
char index2 = oldStr.charAt(2);
char index3 = oldStr.charAt(3);
boolean matches0 = pattern.matcher(String.valueOf(index0)).matches();
boolean matches1 = pattern.matcher(String.valueOf(index1)).matches();
boolean matches2 = pattern.matcher(String.valueOf(index2)).matches();
// 1、
if (matches0 && index1=='、') {
return oldStr.substring(2,oldStr.length()-2);
if (matches0 && index1 == '、') {
return oldStr.substring(2);
}
// 15、
if (matches0 && matches1 && index2 == '、') {
return oldStr.substring(3,oldStr.length()-3);
return oldStr.substring(3);
}
//100、
if (matches0 && matches1 && matches2 && index3 == '、') {
return oldStr.substring(4);
}
//1.
if (matches0 && index1=='.') {
return oldStr.substring(2,oldStr.length()-2);
if (matches0 && index1 == '.') {
return oldStr.substring(2);
}
//13.
if (matches0 && matches1 && index2 == '.') {
return oldStr.substring(3,oldStr.length()-3);
return oldStr.substring(3);
}
//100.
if (matches0 && matches1 && matches2 && index3 == '.') {
return oldStr.substring(4);
}
} catch (Exception e) {
log.error(e.getMessage());