8.9 KiB
8.9 KiB
22b55e9 (HEAD -> master) HEAD@{0}: merge origin/master: Merge made by the 'ort' strategy.
0ed5593 HEAD@{1}: rebase (finish): returning to refs/heads/master
0ed5593 HEAD@{2}: rebase (pick): 在application.yml中添加MySQL连接时区设置，解决时间错误问题
228eabc HEAD@{3}: rebase (pick): 1、更新策略模板增删改查和alertmessage的模板处理，增加is_full_flow和description字段
6b22a0d HEAD@{4}: rebase (pick): 1、前端版本0229，更新至gitlab
9e41231 HEAD@{5}: rebase (pick): 1、前端版本0229，更新至gitlab
98c1c5b (origin/haskafka, haskafka) HEAD@{6}: rebase (start): checkout haskafka
22ada45 (origin/master, origin/HEAD) HEAD@{7}: merge origin/master: Merge made by the 'ort' strategy.
1aa587f HEAD@{8}: cherry-pick: 1、更新策略模板增删改查和alertmessage的模板处理，增加is_full_flow和description字段
3d717a8 HEAD@{9}: checkout: moving from tmp_branch to master
cec0c74 HEAD@{10}: commit: 1、更新策略模板增删改查和alertmessage的模板处理，增加is_full_flow和description字段
98c1c5b (origin/haskafka, haskafka) HEAD@{11}: checkout: moving from haskafka to tmp_branch
98c1c5b (origin/haskafka, haskafka) HEAD@{12}: checkout: moving from master to haskafka
3d717a8 HEAD@{13}: commit: 1、前端版本0229，更新至gitlab
bdafcf4 HEAD@{14}: commit: 1、前端版本0229，更新至gitlab
8c64d04 HEAD@{15}: checkout: moving from haskafka to master
98c1c5b (origin/haskafka, haskafka) HEAD@{16}: merge origin/master: Merge made by the 'ort' strategy.
282e598 HEAD@{17}: checkout: moving from master to haskafka
8c64d04 HEAD@{18}: commit: 1、alertmssage入库增加alertmssage的uuid
e7c797e HEAD@{19}: commit: 1、bug修复
b0ba80a HEAD@{20}: checkout: moving from haskafka to master
282e598 HEAD@{21}: checkout: moving from master to haskafka
b0ba80a HEAD@{22}: checkout: moving from haskafka to master
282e598 HEAD@{23}: merge origin/master: Merge made by the 'ort' strategy.
621c7d1 HEAD@{24}: checkout: moving from master to haskafka
b0ba80a HEAD@{25}: commit: 1、前端更新，有些文件缺失
28d671a HEAD@{26}: checkout: moving from haskafka to master
621c7d1 HEAD@{27}: checkout: moving from master to haskafka
28d671a HEAD@{28}: checkout: moving from haskafka to master
621c7d1 HEAD@{29}: commit: 1、生产者测试
ef302a2 HEAD@{30}: merge origin/master: Merge made by the 'ort' strategy.
248119d HEAD@{31}: checkout: moving from master to haskafka
28d671a HEAD@{32}: commit: 1、前端更新
5a44af9 HEAD@{33}: checkout: moving from haskafka to master
248119d HEAD@{34}: commit (merge): Merge remote-tracking branch 'origin/master' into haskafka
5af9295 HEAD@{35}: checkout: moving from master to haskafka
5a44af9 HEAD@{36}: merge origin/master: Merge made by the 'ort' strategy.
802f434 HEAD@{37}: commit: 1、修改queryDynamicRuleTotalNum缺少left join的bug
384c48a HEAD@{38}: checkout: moving from haskafka to master
5af9295 HEAD@{39}: commit: 1、修改@KafkaListener id topic为固定值
6cab8d2 HEAD@{40}: checkout: moving from master to haskafka
384c48a HEAD@{41}: checkout: moving from haskafka to master
6cab8d2 HEAD@{42}: checkout: moving from master to haskafka
384c48a HEAD@{43}: checkout: moving from haskafka to master
6cab8d2 HEAD@{44}: commit: 1、修改dockerfile网络配置
ef637d1 HEAD@{45}: merge master: Merge made by the 'ort' strategy.
b89fd6c HEAD@{46}: checkout: moving from master to haskafka
384c48a HEAD@{47}: commit: 1、静态规则文件上传bug解决，文件上传增加ip、掩码不匹配判断
11fb439 HEAD@{48}: checkout: moving from haskafka to master
b89fd6c HEAD@{49}: checkout: moving from master to haskafka
11fb439 HEAD@{50}: checkout: moving from haskafka to master
b89fd6c HEAD@{51}: commit: 1、kafka消费者@KafkaListener增加errorHandler属性记录consumer错误，增加properties解决数据获取子系统的消费者发来json数据无法解序列化；
85410b9 HEAD@{52}: checkout: moving from master to haskafka
11fb439 HEAD@{53}: checkout: moving from haskafka to master
85410b9 HEAD@{54}: commit: 1、Kafka consumer和producer的配置类注释掉不需要了
11fb439 HEAD@{55}: checkout: moving from master to haskafka
11fb439 HEAD@{56}: checkout: moving from haskafka to master
11fb439 HEAD@{57}: checkout: moving from master to haskafka
11fb439 HEAD@{58}: merge origin/master: Merge made by the 'ort' strategy.
1be5269 HEAD@{59}: commit: 1、AlertMessage实体类增加content字段，并同步mapper中新增、查询方法增加content字段
e48f837 HEAD@{60}: merge origin/master: Fast-forward
e9313f2 HEAD@{61}: commit: 1、AlertMessage类移动位置
0864644 HEAD@{62}: commit: 1、添加kafka依赖、
d5deffa HEAD@{63}: merge origin/master: Fast-forward
6f54afc HEAD@{64}: merge origin/master: Merge made by the 'ort' strategy.
f368c31 HEAD@{65}: commit: 1、whitelist增加whiteListCommandsCheck、whiteListStaticRulesCheck。支持前端发送staticRuleIds列表，查询静态规则是否存在白名单。记录白名单check指令的问题
02dd207 HEAD@{66}: commit: 1、whitelist查询返回审核状态字段，task查询返回动作字段
7cb8666 HEAD@{67}: merge origin/master: Merge made by the 'ort' strategy.
31277b7 HEAD@{68}: commit: 1、解决指令按条件查询总数bug
3894839 HEAD@{69}: merge origin/master: Merge made by the 'ort' strategy.
b6e046c HEAD@{70}: commit: 1、动态、静态规则、任务、白名单、防护对象、策略模板的查询总数增加了条件
121fff1 HEAD@{71}: commit: AlertMessage:
095eb88 HEAD@{72}: merge origin/master: Fast-forward
d6cf33f HEAD@{73}: merge origin/master: Fast-forward
193862f HEAD@{74}: commit: 1、AlertMessage删除is_distribute属性
63e7270 HEAD@{75}: commit: 1、修改swagger，scheme中增加显示对象属性
44abfe0 HEAD@{76}: commit: AlertMessage：
073dfc9 HEAD@{77}: merge origin/master: Fast-forward
449c320 HEAD@{78}: merge origin/master: Fast-forward
1d317eb HEAD@{79}: merge origin/master: Fast-forward
cb6ca74 HEAD@{80}: commit: 1、添加AlertMessage http接口，接收告警信息。
914b0f0 HEAD@{81}: commit: 1、增加AlertMessage http接口，接收告警信息，生成指令入库
51e7dbc HEAD@{82}: commit: 1、增加白名单、静态、动态规则的创建时间和修改时间
3a77019 HEAD@{83}: commit (merge): Merge remote-tracking branch 'origin/master'
07d253e HEAD@{84}: commit (merge): Merge remote-tracking branch 'origin/master'
8315e6e HEAD@{85}: commit: 1、DynamicRule的新增、更新添加对id、protectObjectId的判断；分页查询添加creator、sourceSystem查询条件；按id查询新增template_id为null的判断
135a1ae HEAD@{86}: commit: 1、动态规则、静态规则、白名单修改完善接口设计，添加API文档
bf99b41 HEAD@{87}: merge origin/master: Fast-forward
c1a5d24 HEAD@{88}: merge origin/master: Fast-forward
8f54511 HEAD@{89}: merge origin/master: Fast-forward
6a24e4a HEAD@{90}: commit: 1、WhiteList新增testWhiteListCommandJudge方法，判断指令是否命中白名单
930ba8b HEAD@{91}: commit: 1、DynamicRule实现新增、删除、修改、id查询、分页查询功能。并在crud时与ProtectObject关联。
a04b83e HEAD@{92}: merge origin/master: Fast-forward
1e9fe37 HEAD@{93}: commit: 1.完成的excel批量新增、按id删除、批量删除、按id查询、分页查询、按id新增、修改审核状态
db02907 HEAD@{94}: merge origin/master: Fast-forward
776c7c0 HEAD@{95}: merge origin/master: Fast-forward
b4db26c HEAD@{96}: merge origin/master: Merge made by the 'ort' strategy.
dba3c9e HEAD@{97}: pull --no-stat -v --progress origin master: updating HEAD
dba3c9e HEAD@{98}: commit: 1.完成静态规则的修改、id查询、分页查询、删除（目前直接在数据库delete）
b0c1700 HEAD@{99}: merge origin/master: Fast-forward
e6ca420 HEAD@{100}: checkout: moving from master to master
e6ca420 HEAD@{101}: branch: Reset to origin/master
e6ca420 HEAD@{102}: commit: new staticrule
66c710c HEAD@{103}: clone: from https://git.mesalab.cn/EnderByEndera/realtime_protection
0ed5593 HEAD@{1}: rebase (finish): returning to refs/heads/master
0ed5593 HEAD@{2}: rebase (pick): 在application.yml中添加MySQL连接时区设置，解决时间错误问题
228eabc HEAD@{3}: rebase (pick): 1、更新策略模板增删改查和alertmessage的模板处理，增加is_full_flow和description字段
6b22a0d HEAD@{4}: rebase (pick): 1、前端版本0229，更新至gitlab
9e41231 HEAD@{5}: rebase (pick): 1、前端版本0229，更新至gitlab
98c1c5b (origin/haskafka, haskafka) HEAD@{6}: rebase (start): checkout haskafka
22ada45 (origin/master, origin/HEAD) HEAD@{7}: merge origin/master: Merge made by the 'ort' strategy.
1aa587f HEAD@{8}: cherry-pick: 1、更新策略模板增删改查和alertmessage的模板处理，增加is_full_flow和description字段
3d717a8 HEAD@{9}: checkout: moving from tmp_branch to master
cec0c74 HEAD@{10}: commit: 1、更新策略模板增删改查和alertmessage的模板处理，增加is_full_flow和description字段
98c1c5b (origin/haskafka, haskafka) HEAD@{11}: checkout: moving from haskafka to tmp_branch
98c1c5b (origin/haskafka, haskafka) HEAD@{12}: checkout: moving from master to haskafka
3d717a8 HEAD@{13}: commit: 1、前端版本0229，更新至gitlab
bdafcf4 HEAD@{14}: commit: 1、前端版本0229，更新至gitlab
8c64d04 HEAD@{15}: checkout: moving from haskafka to master
98c1c5b (origin/haskafka, haskafka) HEAD@{16}: merge origin/master: Merge made by the 'ort' strategy.
282e598 HEAD@{17}: checkout: moving from master to haskafka
8c64d04 HEAD@{18}: commit: 1、alertmssage入库增加alertmssage的uuid
e7c797e HEAD@{19}: commit: 1、bug修复
b0ba80a HEAD@{20}: checkout: moving from haskafka to master
282e598 HEAD@{21}: checkout: moving from master to haskafka
b0ba80a HEAD@{22}: checkout: moving from haskafka to master
282e598 HEAD@{23}: merge origin/master: Merge made by the 'ort' strategy.
621c7d1 HEAD@{24}: checkout: moving from master to haskafka
b0ba80a HEAD@{25}: commit: 1、前端更新，有些文件缺失
28d671a HEAD@{26}: checkout: moving from haskafka to master
621c7d1 HEAD@{27}: checkout: moving from master to haskafka
28d671a HEAD@{28}: checkout: moving from haskafka to master
621c7d1 HEAD@{29}: commit: 1、生产者测试
ef302a2 HEAD@{30}: merge origin/master: Merge made by the 'ort' strategy.
248119d HEAD@{31}: checkout: moving from master to haskafka
28d671a HEAD@{32}: commit: 1、前端更新
5a44af9 HEAD@{33}: checkout: moving from haskafka to master
248119d HEAD@{34}: commit (merge): Merge remote-tracking branch 'origin/master' into haskafka
5af9295 HEAD@{35}: checkout: moving from master to haskafka
5a44af9 HEAD@{36}: merge origin/master: Merge made by the 'ort' strategy.
802f434 HEAD@{37}: commit: 1、修改queryDynamicRuleTotalNum缺少left join的bug
384c48a HEAD@{38}: checkout: moving from haskafka to master
5af9295 HEAD@{39}: commit: 1、修改@KafkaListener id topic为固定值
6cab8d2 HEAD@{40}: checkout: moving from master to haskafka
384c48a HEAD@{41}: checkout: moving from haskafka to master
6cab8d2 HEAD@{42}: checkout: moving from master to haskafka
384c48a HEAD@{43}: checkout: moving from haskafka to master
6cab8d2 HEAD@{44}: commit: 1、修改dockerfile网络配置
ef637d1 HEAD@{45}: merge master: Merge made by the 'ort' strategy.
b89fd6c HEAD@{46}: checkout: moving from master to haskafka
384c48a HEAD@{47}: commit: 1、静态规则文件上传bug解决，文件上传增加ip、掩码不匹配判断
11fb439 HEAD@{48}: checkout: moving from haskafka to master
b89fd6c HEAD@{49}: checkout: moving from master to haskafka
11fb439 HEAD@{50}: checkout: moving from haskafka to master
b89fd6c HEAD@{51}: commit: 1、kafka消费者@KafkaListener增加errorHandler属性记录consumer错误，增加properties解决数据获取子系统的消费者发来json数据无法解序列化；
85410b9 HEAD@{52}: checkout: moving from master to haskafka
11fb439 HEAD@{53}: checkout: moving from haskafka to master
85410b9 HEAD@{54}: commit: 1、Kafka consumer和producer的配置类注释掉不需要了
11fb439 HEAD@{55}: checkout: moving from master to haskafka
11fb439 HEAD@{56}: checkout: moving from haskafka to master
11fb439 HEAD@{57}: checkout: moving from master to haskafka
11fb439 HEAD@{58}: merge origin/master: Merge made by the 'ort' strategy.
1be5269 HEAD@{59}: commit: 1、AlertMessage实体类增加content字段，并同步mapper中新增、查询方法增加content字段
e48f837 HEAD@{60}: merge origin/master: Fast-forward
e9313f2 HEAD@{61}: commit: 1、AlertMessage类移动位置
0864644 HEAD@{62}: commit: 1、添加kafka依赖、
d5deffa HEAD@{63}: merge origin/master: Fast-forward
6f54afc HEAD@{64}: merge origin/master: Merge made by the 'ort' strategy.
f368c31 HEAD@{65}: commit: 1、whitelist增加whiteListCommandsCheck、whiteListStaticRulesCheck。支持前端发送staticRuleIds列表，查询静态规则是否存在白名单。记录白名单check指令的问题
02dd207 HEAD@{66}: commit: 1、whitelist查询返回审核状态字段，task查询返回动作字段
7cb8666 HEAD@{67}: merge origin/master: Merge made by the 'ort' strategy.
31277b7 HEAD@{68}: commit: 1、解决指令按条件查询总数bug
3894839 HEAD@{69}: merge origin/master: Merge made by the 'ort' strategy.
b6e046c HEAD@{70}: commit: 1、动态、静态规则、任务、白名单、防护对象、策略模板的查询总数增加了条件
121fff1 HEAD@{71}: commit: AlertMessage:
095eb88 HEAD@{72}: merge origin/master: Fast-forward
d6cf33f HEAD@{73}: merge origin/master: Fast-forward
193862f HEAD@{74}: commit: 1、AlertMessage删除is_distribute属性
63e7270 HEAD@{75}: commit: 1、修改swagger，scheme中增加显示对象属性
44abfe0 HEAD@{76}: commit: AlertMessage：
073dfc9 HEAD@{77}: merge origin/master: Fast-forward
449c320 HEAD@{78}: merge origin/master: Fast-forward
1d317eb HEAD@{79}: merge origin/master: Fast-forward
cb6ca74 HEAD@{80}: commit: 1、添加AlertMessage http接口，接收告警信息。
914b0f0 HEAD@{81}: commit: 1、增加AlertMessage http接口，接收告警信息，生成指令入库
51e7dbc HEAD@{82}: commit: 1、增加白名单、静态、动态规则的创建时间和修改时间
3a77019 HEAD@{83}: commit (merge): Merge remote-tracking branch 'origin/master'
07d253e HEAD@{84}: commit (merge): Merge remote-tracking branch 'origin/master'
8315e6e HEAD@{85}: commit: 1、DynamicRule的新增、更新添加对id、protectObjectId的判断；分页查询添加creator、sourceSystem查询条件；按id查询新增template_id为null的判断
135a1ae HEAD@{86}: commit: 1、动态规则、静态规则、白名单修改完善接口设计，添加API文档
bf99b41 HEAD@{87}: merge origin/master: Fast-forward
c1a5d24 HEAD@{88}: merge origin/master: Fast-forward
8f54511 HEAD@{89}: merge origin/master: Fast-forward
6a24e4a HEAD@{90}: commit: 1、WhiteList新增testWhiteListCommandJudge方法，判断指令是否命中白名单
930ba8b HEAD@{91}: commit: 1、DynamicRule实现新增、删除、修改、id查询、分页查询功能。并在crud时与ProtectObject关联。
a04b83e HEAD@{92}: merge origin/master: Fast-forward
1e9fe37 HEAD@{93}: commit: 1.完成的excel批量新增、按id删除、批量删除、按id查询、分页查询、按id新增、修改审核状态
db02907 HEAD@{94}: merge origin/master: Fast-forward
776c7c0 HEAD@{95}: merge origin/master: Fast-forward
b4db26c HEAD@{96}: merge origin/master: Merge made by the 'ort' strategy.
dba3c9e HEAD@{97}: pull --no-stat -v --progress origin master: updating HEAD
dba3c9e HEAD@{98}: commit: 1.完成静态规则的修改、id查询、分页查询、删除（目前直接在数据库delete）
b0c1700 HEAD@{99}: merge origin/master: Fast-forward
e6ca420 HEAD@{100}: checkout: moving from master to master
e6ca420 HEAD@{101}: branch: Reset to origin/master
e6ca420 HEAD@{102}: commit: new staticrule
66c710c HEAD@{103}: clone: from https://git.mesalab.cn/EnderByEndera/realtime_protection