sunyuchao
|
b3eb5fc271
|
居民端-居民注册、热心申请模块insert语句修改 使用系统insert方法
|
6 years ago |
wxz
|
ccab39a11d
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wxz
|
98e7b6aa2f
|
修改：短信验证码接口，改为url传参。提供短信验证码接口的feign client
|
6 years ago |
hosinokamui
|
cb5aae62ae
|
修改 认证成功后添加角色
|
6 years ago |
|
wxz
|
f285ae6fc5
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wxz
|
91948ce28c
|
修改：将message-server模块的feign client挪到了message-client模块
|
6 years ago |
wangchao
|
f18e1be322
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wangchao
|
a059aa4ed7
|
话题、评论接口修改
|
6 years ago |
|
hosinokamui
|
3e89fb4b56
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
hosinokamui
|
a5c5026085
|
修改 党员认证提交
|
6 years ago |
|
sunyuchao
|
0470ded8c6
|
居民端-居民注册信息提交入参修改
|
6 years ago |
|
wxz
|
bb35320ee0
|
新增：短信验证码接口
修改：/message/sms/send接口，由表单形式修改为json形式
|
6 years ago |
|
wxz
|
bb22079bec
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wxz
|
f41fc9b0a0
|
修复：新增EpmetBaseEntity update时机的自动填充
修改：去掉AuthFilter的@Configuration
|
6 years ago |
|
wangchao
|
0afa1ecd00
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wangchao
|
414eb97509
|
话题、评论接口修改，进入网格增加用户关系表的存在性校验
|
6 years ago |
|
wxz
|
ace875171d
|
修复：界面短信发送不能用的问题
|
6 years ago |
|
hosinokamui
|
a115b59638
|
api修改
|
6 years ago |
|
hosinokamui
|
9d066215e7
|
修改 认证成功后添加角色
|
6 years ago |
|
hosinokamui
|
5c6a50958a
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
# Conflicts:
# epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
|
6 years ago |
|
hosinokamui
|
7d87467f47
|
修改 认证成功后添加角色
|
6 years ago |
yinzuomei
|
6bf8ed658b
|
partymember编译bug修改
|
6 years ago |
|
sunyuchao
|
86f301314b
|
居民端-角色添加合并代码
|
6 years ago |
|
sunyuchao
|
aba13685f3
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java
|
6 years ago |
|
wangchao
|
fe4394a204
|
话题、评论相关接口
|
6 years ago |
|
sunyuchao
|
7a629c8000
|
居民端-居民注册添加角色信息
|
6 years ago |
|
wangchao
|
cac04f939f
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wangchao
|
3159b68152
|
话题、评论相关接口
|
6 years ago |
|
yinzuomei
|
7435c29f19
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
0c1b47f4ae
|
发送短信临时insertsql
|
6 years ago |
|
hosinokamui
|
8fce3b0a30
|
认证成功后添加角色
|
6 years ago |
|
yinzuomei
|
1c4628601a
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
9396b33186
|
oss模块修改
|
6 years ago |
|
sunyuchao
|
ad32d03765
|
居民端-热心居民申请模块接口逻辑调整
|
6 years ago |
|
hosinokamui
|
21e36c8aa3
|
新增 党员认证信息提交和党员认证信息补充功能
|
6 years ago |
|
yinzuomei
|
4f93a09803
|
去除@LogOperation,去除epmet-monitor-server
|
6 years ago |
|
yinzuomei
|
1c6092f289
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
503f1454b9
|
message修改db连接epmet_message
|
6 years ago |
|
sunyuchao
|
649e06d16a
|
居民端-居民注册根据手机号获取验证码
|
6 years ago |
|
hosinokamui
|
21769db26d
|
partyMemberInfoDao.xml修正
|
6 years ago |
|
wangchao
|
95bb02bb23
|
话题相关代码2
|
6 years ago |
|
sunyuchao
|
f60c49c010
|
居民端-居民注册信息提交接口-部分逻辑代码提交
|
6 years ago |
|
wangchao
|
3b406709a5
|
话题相关代码
|
6 years ago |
|
wangchao
|
b52b1e5305
|
话题相关代码
|
6 years ago |
|
yinzuomei
|
0a96568035
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
560310c00a
|
修改配置文件
|
6 years ago |
|
yinzuomei
|
d72d4242dd
|
新增接口：生成群链接、同意进群、根据邀请连接查询群基本信息v1
|
6 years ago |
|
yinzuomei
|
623676ee70
|
新增接口：生成群链接、同意进群、根据邀请连接查询群基本信息
|
6 years ago |
|
yinzuomei
|
45eb157324
|
selectOperUserInfoById入参改为user.id
|
6 years ago |
|
yinzuomei
|
eaf00d671c
|
申请入群增加校验避免重复申请
|
6 years ago |
