gfwleak/enderbyendera-realtime-protection
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. application.yml修改为application-dev.yml和application-prod.yml

Browse Source 
2. 添加更多Exception拦截器
3. 编写状态模式处理task状态的更改
4. 添加StateChangeService，用以处理所有任务状态转换相关的内容
5. 添加StateEnum, ProtocolEnum，TaskTypeEnum用以处理任务和协议相关的所有状态和类型
This commit is contained in:
EnderByEndera
2024-01-11 19:49:07 +08:00
parent 930ba8b5ac
commit 0f712618f2
70 changed files with 1209 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java
View File

@@ -43,11 +43,9 @@ public class DynamicRuleController {
}
//id删除
@RequestMapping("/{dynamicRuleId}/delete")
public ResponseResult deleteDynamicRuleObject(@PathVariable Integer dynamicRuleId ) {
public ResponseResult deleteDynamicRuleObject(@PathVariable Integer dynamicRuleId) {
log.info("删除动态规则: {}", dynamicRuleId);
//调用service删除
dynamicRuleService.deleteDynamicRuleObject(dynamicRuleId);
@@ -62,7 +60,7 @@ public class DynamicRuleController {
//调用service删除
return ResponseResult.ok()
.setData("success",dynamicRuleService.deleteDynamicRuleObjects(dynamicRuleIds));
.setData("success", dynamicRuleService.deleteDynamicRuleObjects(dynamicRuleIds));
}
//修改

1
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleDataListener.java
View File

@@ -4,7 +4,6 @@ import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import com.alibaba.excel.util.ListUtils;
import com.realtime.protection.configuration.entity.rule.dynamicrule.DynamicRuleObject;
import lombok.extern.slf4j.Slf4j;
import java.util.List;

4
src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java
View File

@@ -16,13 +16,13 @@ public interface DynamicRuleMapper {
//新建动态规则与保护对象关联
void newDynamicRulProtectObjectConcat(long dynamicRuleId, Integer protectObjectId);
void deleteDynamicRuleObject( Integer dynamicRuleId);
void deleteDynamicRuleObject(Integer dynamicRuleId);
DynamicRuleObject queryDynamicRuleById(Integer dynamicRuleId);
List<ProtectObject> queryProtectObjectByRuleId(Integer dynamicRuleId);
void updateDynamicRuleObject(@Param("dynamicRuleId") Integer dynamicRuleId,@Param("object") DynamicRuleObject dynamicRuleObject);
void updateDynamicRuleObject(@Param("dynamicRuleId") Integer dynamicRuleId, @Param("object") DynamicRuleObject dynamicRuleObject);
void newDynamicRules(List<DynamicRuleObject> dynamicRuleObjects);

42
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java
View File

@@ -6,8 +6,8 @@ import com.realtime.protection.configuration.entity.rule.staticrule.StaticRuleOb
import com.realtime.protection.configuration.response.ResponseResult;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@@ -22,6 +22,7 @@ import java.util.List;
public class StaticRuleController {
private final StaticRuleService staticRuleService;
public StaticRuleController(StaticRuleService staticRuleService) {
this.staticRuleService = staticRuleService;
}
@@ -30,11 +31,11 @@ public class StaticRuleController {
* 新增静态规则
*/
@PostMapping("/new")
public ResponseResult newStaticRuleObject(@RequestBody @Valid StaticRuleObject object){
log.info("新增静态规则: {}" , object);
public ResponseResult newStaticRuleObject(@RequestBody @Valid StaticRuleObject object) {
log.info("新增静态规则: {}", object);
//调用service新增
staticRuleService.newStaticRuleObject(object);
return ResponseResult.ok().setData("static_rule_name",object.getStaticRuleName());
return ResponseResult.ok().setData("static_rule_name", object.getStaticRuleName());
}
//以Excel方式批量导入静态规则
@@ -44,6 +45,7 @@ public class StaticRuleController {
new StaticRuleDataListener(staticRuleService)).sheet().doRead();
return ResponseResult.ok();
}
//下载模板文件
@GetMapping("/download")
public void downloadTemplate(HttpServletResponse response) throws IOException {
@@ -62,20 +64,20 @@ public class StaticRuleController {
* 删除静态规则（有的删了，有的没删，也返回false）
*/
@DeleteMapping("/{ids}")
public ResponseResult delete(@PathVariable List<Integer> ids){
log.info("根据id删除静态规则:{}",ids);
//
public ResponseResult delete(@PathVariable List<Integer> ids) {
log.info("根据id删除静态规则:{}", ids);
//
return ResponseResult.ok()
.setData("static_rule_id",ids)
.setData("success",staticRuleService.deleteStaticRules(ids));
.setData("static_rule_id", ids)
.setData("success", staticRuleService.deleteStaticRules(ids));
}
/**
* 修改静态规则
*/
@PutMapping("/update")
public ResponseResult updateStaticRule(@RequestBody @Valid StaticRuleObject object){
log.info("修改静态规则: {}" , object);
public ResponseResult updateStaticRule(@RequestBody @Valid StaticRuleObject object) {
log.info("修改静态规则: {}", object);
//调用service修改
staticRuleService.updateStaticRule(object);
return ResponseResult.ok();
@@ -86,11 +88,11 @@ public class StaticRuleController {
* 路径参数：通过请求URL直接传递参数，使用{…}来标识该路径参数，需要使用 @PathVariable 获取路径参数
*/
@RequestMapping("/{id}/query")
public ResponseResult queryStaticRuleById(@PathVariable Integer id){
log.info("根据id查询静态规则:{}",id);
StaticRuleObject object = staticRuleService.queryStaticRuleById(id);
return ResponseResult.ok().setData("static_rule",object);
}
public ResponseResult queryStaticRuleById(@PathVariable Integer id) {
log.info("根据id查询静态规则:{}", id);
StaticRuleObject object = staticRuleService.queryStaticRuleById(id);
return ResponseResult.ok().setData("static_rule", object);
}
/**
* 分页查询静态规则
@@ -99,10 +101,10 @@ public class StaticRuleController {
public ResponseResult queryStaticRule(String static_rule_name, Integer static_rule_id,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer pageSize
){
log.info("多查询静态规则: {},{},{},{}", static_rule_name,static_rule_id,page,pageSize);
) {
log.info("多查询静态规则: {},{},{},{}", static_rule_name, static_rule_id, page, pageSize);
//调用service新增
List<StaticRuleObject> pageResult = staticRuleService.queryStaticRule(static_rule_name,static_rule_id,page,pageSize);
return ResponseResult.ok().setData("static_rule_list",pageResult);
List<StaticRuleObject> pageResult = staticRuleService.queryStaticRule(static_rule_name, static_rule_id, page, pageSize);
return ResponseResult.ok().setData("static_rule_list", pageResult);
}
}

1
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleDataListener.java
View File

@@ -6,7 +6,6 @@ import com.alibaba.excel.util.ListUtils;
import com.realtime.protection.configuration.entity.rule.staticrule.StaticRuleObject;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
@Slf4j

2
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java
View File

@@ -16,8 +16,6 @@ public interface StaticRuleMapper {
//根据主键删除静态规则
@Delete("delete from t_static_rule where static_rule_id = #{id}")
Boolean deleteStaticRuleById(Integer id);
//修改静态规则

5
src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java
View File

@@ -2,9 +2,8 @@ package com.realtime.protection.server.rule.staticrule;
import com.alibaba.excel.util.ListUtils;
import com.realtime.protection.configuration.entity.rule.staticrule.StaticRuleObject;
import org.springframework.stereotype.Service;
import com.realtime.protection.configuration.utils.SqlSessionWrapper;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
@@ -88,7 +87,7 @@ public class StaticRuleService {
*/
public List<StaticRuleObject> queryStaticRule(String static_rule_name, Integer static_rule_id, Integer page, Integer pageSize) {
return staticRuleMapper.queryStaticRule(static_rule_name,static_rule_id,page,pageSize);
return staticRuleMapper.queryStaticRule(static_rule_name, static_rule_id, page, pageSize);
}
public Boolean newStaticRuleObjects(List<StaticRuleObject> staticRuleList) {