---
panlei
2019-11-13 7a4ec397a739bd9d0590c87fed3d7c6371b772b8
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
efb0ddd HEAD@{0}: checkout: moving from changeEs to module
fcbbfa6 HEAD@{1}: commit: linkTagInfo的改动
e376703 HEAD@{2}: checkout: moving from module to changeEs
efb0ddd HEAD@{3}: checkout: moving from changeEs to module
e376703 HEAD@{4}: commit: 推送id
7e71b19 HEAD@{5}: commit: 坐标改为xy
a76d32f HEAD@{6}: checkout: moving from module to changeEs
efb0ddd HEAD@{7}: checkout: moving from changeEs to module
a76d32f HEAD@{8}: checkout: moving from module to changeEs
efb0ddd HEAD@{9}: checkout: moving from changeEs to module
a76d32f HEAD@{10}: commit: ---
466947c HEAD@{11}: commit: targetLocation
77e4132 HEAD@{12}: commit: target
cf33418 HEAD@{13}: commit: 删除islink
10503dd HEAD@{14}: commit: 删除islink
0b54349 HEAD@{15}: commit: 添加cameraName
96085c7 HEAD@{16}: commit: 特征值置空
3b4dcff HEAD@{17}: commit: 改es联动插入
efb0ddd HEAD@{18}: checkout: moving from module to changeEs
efb0ddd HEAD@{19}: reset: moving to efb0ddd9490567bb7f26fc34261ba4ca7961b073
33804d4 HEAD@{20}: commit: --暂存
7cb7884 HEAD@{21}: checkout: moving from master to module
7d57c67 HEAD@{22}: checkout: moving from module to master
7cb7884 HEAD@{23}: commit: 保存一下个体静止算法
573a1e0 HEAD@{24}: checkout: moving from master to module
7d57c67 HEAD@{25}: checkout: moving from module to master
573a1e0 HEAD@{26}: commit: 把一部分判断放进中间件
efb0ddd HEAD@{27}: commit: 打成so的文件必须是main package
dda8d9b HEAD@{28}: commit: fix同一个文件生成的so文件不能被加载
bca5cdb HEAD@{29}: commit: ---
fd059b6 HEAD@{30}: commit: ---
e7d3f49 HEAD@{31}: commit: ---
468bdd4 HEAD@{32}: checkout: moving from master to module
7d57c67 HEAD@{33}: checkout: moving from module to master
468bdd4 HEAD@{34}: checkout: moving from master to module
7d57c67 HEAD@{35}: checkout: moving from module to master
468bdd4 HEAD@{36}: pull origin module: Fast-forward
9929197 HEAD@{37}: pull origin module: Fast-forward
232cb3f HEAD@{38}: commit: ---
dc97565 HEAD@{39}: commit: ---
a079474 HEAD@{40}: commit: fix bug
63dd77c HEAD@{41}: commit: 删掉22上down不下来的http第三方包
b9631b6 HEAD@{42}: checkout: moving from master to module
7d57c67 HEAD@{43}: commit: ---
2e33ad7 HEAD@{44}: commit: ---
52713b8 HEAD@{45}: commit: ---
2b25766 HEAD@{46}: checkout: moving from module to master
b9631b6 HEAD@{47}: commit: ---
6e8ebf7 HEAD@{48}: commit (merge): merge master
5ae97ee HEAD@{49}: commit (merge): merge module
153d80d HEAD@{50}: checkout: moving from master to module
2b25766 HEAD@{51}: commit: ---
09a9fed HEAD@{52}: commit: 单协程
0e441dc HEAD@{53}: commit (merge): merge V1.0
59dcc2b HEAD@{54}: merge v1.0: Fast-forward
2ef24b7 HEAD@{55}: checkout: moving from v1.0 to master
59dcc2b HEAD@{56}: commit: 持续时间第一张画框完成
bf0c61d HEAD@{57}: commit: ---
d7c6faf HEAD@{58}: commit: ---
76430be HEAD@{59}: commit: 给持续时间第一张放后门,给事件推送加过滤
04318a8 HEAD@{60}: commit: ---
faec9e9 HEAD@{61}: commit: ---
23c837b HEAD@{62}: commit: git add .
0bd35e1 HEAD@{63}: commit: 定时器小改以及持续时间第一张画框
f758282 HEAD@{64}: commit: -
5cb53f7 HEAD@{65}: commit: 推送视频地址新方案(不推送)
04ef7bb HEAD@{66}: commit: fix无关目标bug
2c3aa09 HEAD@{67}: commit: 绘图比例float int问题
9eda6d5 HEAD@{68}: commit: ---
2cbca7d HEAD@{69}: commit: 关闭多go程看报警目标问题
a45e6bb HEAD@{70}: commit: 放开事件推送
993dc81 HEAD@{71}: commit: ---
e2c0c83 HEAD@{72}: commit: 存es时存入视频路径
e85732b HEAD@{73}: commit: serverid和server、
103d44a HEAD@{74}: commit: 去掉go程看cpu占用
614eb42 HEAD@{75}: commit: msg.Push初始化
395893f HEAD@{76}: commit: ---
600c898 HEAD@{77}: commit: ---
d697681 HEAD@{78}: commit: ---
665ee61 HEAD@{79}: commit: ---
82b7184 HEAD@{80}: commit: ---
def3181 HEAD@{81}: commit: ---
d89b820 HEAD@{82}: commit: fix
fd210f1 HEAD@{83}: commit: 补全推送信息并给张蒙发送带有视频地址的信号
5a6639b HEAD@{84}: commit: 关闭推送看cpu占用
f661701 HEAD@{85}: commit: send数据用协程
516d949 HEAD@{86}: commit: send数据用协程
d9a447c HEAD@{87}: commit: 存入es先画小图,再画大图
7460be0 HEAD@{88}: commit: ---
e64bf1b HEAD@{89}: commit: ---
78af430 HEAD@{90}: commit: ---
a16a99b HEAD@{91}: commit: ---
d540469 HEAD@{92}: commit: ---
86813e4 HEAD@{93}: commit: ---
da61291 HEAD@{94}: commit: ---
77f8a55 HEAD@{95}: commit: ---
dc4e05c HEAD@{96}: commit: 测事件推送所用时间
11082e2 HEAD@{97}: commit: 测事件推送所用事件
d0c5a63 HEAD@{98}: commit: 多go程不推送
039dc1f HEAD@{99}: commit: 整体起协程
7590528 HEAD@{100}: commit: 事件推送并不另起协程
b8614ca HEAD@{101}: commit: 解决事件推送内存问题
6b12681 HEAD@{102}: commit: ---
57d0e42 HEAD@{103}: commit: ---
ffeb770 HEAD@{104}: commit: ---
e3a4b2b HEAD@{105}: commit: ---
42f1b1d HEAD@{106}: commit: ---
c16cab7 HEAD@{107}: commit: ---
e12ce16 HEAD@{108}: commit: ---
bc12afe HEAD@{109}: commit: ---
e43bff8 HEAD@{110}: commit: ---
db16d63 HEAD@{111}: commit: ---
e41df22 HEAD@{112}: commit: ---
663f867 HEAD@{113}: commit: ---
25e009c HEAD@{114}: commit: ---
0d4a601 HEAD@{115}: commit: ---
1382175 HEAD@{116}: commit: 事件推送加go
74f6cb6 HEAD@{117}: commit: ---
619fed9 HEAD@{118}: commit: ---
f11969d HEAD@{119}: commit: 用结构体标记chan
e698260 HEAD@{120}: commit: 换一个chan
de5c02a HEAD@{121}: commit: ---
0b252e8 HEAD@{122}: commit: ---
5ee5cec HEAD@{123}: commit: ---
b4add78 HEAD@{124}: commit: ---
590ee0a HEAD@{125}: commit: 事件推送不用协程
7ada253 HEAD@{126}: commit: ---
c115b3c HEAD@{127}: commit: ---
a9c4717 HEAD@{128}: commit: ---
5411f87 HEAD@{129}: commit: ---
1453a12 HEAD@{130}: commit: ---
04fd16b HEAD@{131}: commit: ---
d6242c4 HEAD@{132}: commit: 设置推送缓存
2171427 HEAD@{133}: commit: 人体追踪相同的把yolo标签也删掉
355284a HEAD@{134}: commit: 把人体追踪从es最前改为放在规则最后
4262cb8 HEAD@{135}: commit: 事件推送加人体追踪
6d77f4a HEAD@{136}: commit: 只起114一个grountine试试
a47f658 HEAD@{137}: commit: 改chan容量
b795858 HEAD@{138}: commit: 把关闭socket放在外面
d85a66b HEAD@{139}: commit: ---
f98c1de HEAD@{140}: commit: 拼上tcp,愚蠢的错误
4e697bb HEAD@{141}: commit: 一个socket拨一个号
5394127 HEAD@{142}: commit: 一个socket拨一个号
a908d82 HEAD@{143}: commit: ---
5b78a6d HEAD@{144}: commit: ---
88e40c9 HEAD@{145}: commit: 修正事件推送
f29ed4a HEAD@{146}: commit: 修正事件推送
33a8935 HEAD@{147}: commit: 取消推送,看看占内存发生在何处
6ae526a HEAD@{148}: commit: 关事件推送看看内存占用
e3c3368 HEAD@{149}: commit: 修改一下推送成功条件
f3aaa46 HEAD@{150}: commit: 修改一下推送成功条件
a2f3b20 HEAD@{151}: commit: 开启事件推送
c79d961 HEAD@{152}: commit: 绘图比例使用float64而不是int32
5312ebf HEAD@{153}: commit: 用contain方法通过判断并修正绘图比例
b3ef9bc HEAD@{154}: commit: ---
74597a0 HEAD@{155}: commit: ---
58a1be1 HEAD@{156}: commit: ---
90757df HEAD@{157}: commit: ---
f8d0f89 HEAD@{158}: commit: ---
bf455c0 HEAD@{159}: commit: ---
b767829 HEAD@{160}: commit: fix画区域bug
867be31 HEAD@{161}: commit: 关闭事件推送和更新依赖
a905891 HEAD@{162}: commit: 去掉推送中的失败即退出
79c8a58 HEAD@{163}: commit: 给事件推送设置响应超时
3e569f7 HEAD@{164}: commit: ---
13fa092 HEAD@{165}: commit: 把mangos包的容量从5兆扩大为30兆
98a3e64 HEAD@{166}: commit: 时间范围的return改为continue
f36485a HEAD@{167}: commit: 事件推送模块儿加异常处理
5c5433c HEAD@{168}: commit: 地址前拼一个tcp
92addfb HEAD@{169}: commit: 推送地址改为活的
8287d15 HEAD@{170}: commit: 打开事件推送
2ef24b7 HEAD@{171}: checkout: moving from master to v1.0
2ef24b7 HEAD@{172}: reset: moving to 2ef24b7363fb0b79236de9ac2fea43d9edb6a312
6e707d6 HEAD@{173}: commit: 减少日志量外加放开标签过滤器
c165dbb HEAD@{174}: commit: 减少日志量外加放开标签过滤器
a63f2fb HEAD@{175}: commit: 切回单协程测试日志
9fc8aaf HEAD@{176}: commit: 改造日志的输出方式
0307004 HEAD@{177}: commit: fix不画区域的bug
f2035d0 HEAD@{178}: commit: 加一行空格测试goland ctrl+k
cf6237c HEAD@{179}: commit: 对人脸追踪加锁
ece6aac HEAD@{180}: commit: 启动多个groutine处理程序
2ef24b7 HEAD@{181}: commit: ---
0fce9e0 HEAD@{182}: commit: ---
a6fa76d HEAD@{183}: commit: 装配yolo的id
688d42b HEAD@{184}: commit: ---
821c4ff HEAD@{185}: commit: ---
df85614 HEAD@{186}: commit: ---
b9aa64b HEAD@{187}: commit: 人体添加目标信息字段
f33d5c9 HEAD@{188}: commit: ---
f490b28 HEAD@{189}: commit: 人脸加目标信息
ed6ad87 HEAD@{190}: commit: sdkNames逗号改成空格
756e00d HEAD@{191}: commit: 把结构体提出来单独模块儿
65deac4 HEAD@{192}: commit: 把结构体提出来单独模块儿
453c4ec HEAD@{193}: commit: 把结构体提出来单独模块儿
49eaf6f HEAD@{194}: commit: 把结构体提出来单独模块儿
f08948b HEAD@{195}: clone: from https://panlei@192.168.1.14/r/ruleprocess.git