dingxin
|
b34418490c
|
暂存
|
6 年之前 |
傅行帆
|
db03639cb1
|
pdm
|
6 年之前 |
dingxin
|
8416bf006d
|
暂存
|
6 年之前 |
dingxin
|
3c9c42a25d
|
暂存
|
6 年之前 |
傅行帆
|
bab62d988e
|
change
|
6 年之前 |
傅行帆
|
6c7561ab67
|
提交
|
6 年之前 |
傅行帆
|
5189750d67
|
API
|
6 年之前 |
傅行帆
|
5a59a7f185
|
Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop
# Conflicts:
# CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java
# CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java
|
6 年之前 |
傅行帆
|
a49da4f81a
|
接口對接
|
6 年之前 |
dingxin
|
b1a3b75e97
|
暂存
|
6 年之前 |
dingxin
|
e385c01485
|
暂存
|
6 年之前 |
weiximei
|
ebf799b42a
|
海康API
|
6 年之前 |
dingxin
|
8dfab8d2d8
|
暂存
|
6 年之前 |
傅行帆
|
0b8dfa9087
|
hk
|
6 年之前 |
weiximei
|
1e58ed32c4
|
合并本地分支
|
6 年之前 |
weiximei
|
0efe6e48ed
|
修改 接口
|
6 年之前 |
傅行帆
|
26fdf8e036
|
Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop
# Conflicts:
# CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java
# CODE/smart-community/community-common/target/classes/com/community/commom/ailiyun/AESDecode.class
# CODE/smart-community/community-common/target/classes/com/community/commom/mode/ResponseBean.class
# CODE/smart-community/community-common/target/classes/com/community/commom/redis/FastJsonSerializer.class
# CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisConfiguration.class
# CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisJsonSerializer.class
# CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisObjectSerializer.class
# CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisSerializer.class
# CODE/smart-community/community-common/target/classes/com/community/commom/redis/RedisTemplate.class
# CODE/smart-community/community-common/target/classes/com/community/commom/redis/SerializationFailedException.class
# CODE/smart-community/community-common/target/classes/com/community/commom/redis/SingleRedisTemplate.class
# CODE/smart-community/community-common/target/classes/com/community/commom/session/UserElement.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/AccountValidatorUtil.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/BeanTools.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/CommonUtils.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/CookieUtil.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/DESUtils.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/DateUtils.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/EnumUtils.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/HttpClientUtils.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/MD5Utils.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/OssUtil.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/QRCodeGeneratorUtils.class
# CODE/smart-community/community-common/target/classes/com/community/commom/utils/StringConverter.class
|
6 年之前 |
傅行帆
|
ce7152cb41
|
page
|
6 年之前 |
dingxin
|
5e926f9a20
|
暂存
|
6 年之前 |
weiximei
|
a2ad49f58c
|
修改 海康数据接口
|
6 年之前 |
weiximei
|
d79d638e3f
|
合并本地分支
|
6 年之前 |
weiximei
|
a815a50b7b
|
修改 海康数据接口
|
6 年之前 |
傅行帆
|
a6a858cb30
|
Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop
|
6 年之前 |
傅行帆
|
533fd22936
|
忽略
|
6 年之前 |
weiximei
|
bd248dd680
|
获取监控列表
|
6 年之前 |
dingxin
|
a8fab42623
|
暂存
|
6 年之前 |
weiximei
|
3b72d92835
|
提交
|
6 年之前 |
dingxin
|
a9ec9fee81
|
暂存·
|
6 年之前 |
weiximei
|
cae92fd7c2
|
提交
|
6 年之前 |
weiximei
|
4afb635bda
|
引入海康一些测试类
|
6 年之前 |
weiximei
|
185199cab0
|
导入海康jar
|
6 年之前 |
weiximei
|
1807d7b583
|
导入海康jar
|
6 年之前 |
傅行帆
|
8d5a2aee07
|
编译
|
6 年之前 |
傅行帆
|
b3857e8e0a
|
pom
|
6 年之前 |
傅行帆
|
f0a0363edd
|
Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop
|
6 年之前 |
傅行帆
|
51f8c3704c
|
调整
|
6 年之前 |
dingxin
|
0274e20713
|
提交
|
6 年之前 |
dingxin
|
e7185e3af3
|
人脸修改
|
6 年之前 |
傅行帆
|
f7d50d4529
|
Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop
|
6 年之前 |
傅行帆
|
eb173389bd
|
pdm
|
6 年之前 |
魏超
|
72677315a7
|
提交分支
|
6 年之前 |
傅行帆
|
fc21bc6a19
|
index
|
6 年之前 |
weiximei
|
19b138554d
|
合并本地分支
|
6 年之前 |
weiximei
|
80062f6df1
|
修改登录
|
6 年之前 |
dingxin
|
4beacf2323
|
冲突
|
6 年之前 |
dingxin
|
354ff0f7be
|
存
|
6 年之前 |
魏超
|
2f26676163
|
Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop
|
6 年之前 |
魏超
|
7d2ec87dd0
|
提交分支
|
6 年之前 |
魏超
|
0172cebb9f
|
提交分支
|
6 年之前 |
傅行帆
|
77d733549a
|
menu
|
6 年之前 |