sunyuchao
|
eb06ce39a0
|
邀请入组的接口添加返参，标识是否存在审核中申请
|
5 years ago |
yinzuomei
|
927f2d159a
|
查看入群待审核列表SQL修改
|
5 years ago |
|
sunyuchao
|
63cafbb86b
|
邀请入组程序调整兼容旧程序
|
5 years ago |
|
sunyuchao
|
4356b96e07
|
区分不同进组方式
|
5 years ago |
wxz
|
c9e729b7ab
|
测试获取请求域名端口
|
5 years ago |
|
wxz
|
8bb2df597a
|
修复：HttpContextutils.getRequestServerNameAndPort()支持从nginx获取X-Forwarded-Scheme头
|
5 years ago |
|
wxz
|
692aede971
|
修改：测试请求信息的方法
|
5 years ago |
|
wxz
|
461e1dc7d2
|
小组二维码查询接口，url增加域名信息
|
5 years ago |
|
wxz
|
02dce016f5
|
测试获取请求域名
|
5 years ago |
|
sunyuchao
|
cad2d16ff1
|
小组海报Bug修改
|
5 years ago |
|
sunyuchao
|
b444117e4a
|
二维码下载路径问题
|
5 years ago |
jianjun
|
dfeabf616c
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_group_code
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/pom.xml
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
|
wxz
|
d95d31f073
|
恢复x文件
|
5 years ago |
|
wxz
|
1a162a1623
|
删除x文件
|
5 years ago |
|
wxz
|
2c7e78572d
|
加个空格
|
5 years ago |
|
wxz
|
ee233c81e9
|
Merge branch 'dev_group_edit' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
|
5 years ago |
|
sunyuchao
|
896c9fd3f3
|
Merge branch 'dev_wx_msg' into dev
|
5 years ago |
liushaowen
|
873faa606f
|
下调发送订阅的错误日志级别
|
5 years ago |
|
yinzuomei
|
ee58f84e7b
|
申请加入小组日志级别修改
|
5 years ago |
|
yinzuomei
|
fa98880154
|
修改/resi/group/member/getapplyingmember接口，新增返参enterGroupType
|
5 years ago |
|
wxz
|
7b27044013
|
Merge branch 'dev_govaccess_async' into dev
|
5 years ago |
|
wxz
|
858e1b58c9
|
修改：调整权限批量添加，api和方法名称调整
|
5 years ago |
|
sunyuchao
|
31bf195e38
|
DB key值修改
|
5 years ago |
|
wxz
|
99ea55660c
|
新增：将默认权限同步到所有客户的指定角色的接口
|
5 years ago |
|
wxz
|
84d3e7c025
|
去掉flyway版本
|
5 years ago |
|
wxz
|
34eb0a3bea
|
调整flyway版本
|
5 years ago |
|
sunyuchao
|
bec8b47d4f
|
sql脚本调整
|
5 years ago |
|
sunyuchao
|
a4a83fdb3f
|
自测代码调整
|
5 years ago |
|
liushaowen
|
27b0311fb7
|
group_code表添加invitationId
|
5 years ago |
|
jianjun
|
3dd2d2899a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
jianjun
|
016ed7793c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
|
wxz
|
be43fe97aa
|
Merge branch 'dev_common' into dev
|
5 years ago |
|
yinzuomei
|
796cc157c7
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
yinzuomei
|
6dab1ffef0
|
修改user服务/userresiinfo/getuserresiinfo接口
|
5 years ago |
wangchao
|
af4c0091ed
|
难点赌点 修正时间
|
5 years ago |
|
jianjun
|
122c8cebcc
|
job feign接口日志配置
|
5 years ago |
|
jianjun
|
e0c3492869
|
Merge branch 'dev_group_code' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_code
|
5 years ago |
|
jianjun
|
f8de85bb21
|
小组组长信息获取失败 日志
|
5 years ago |
|
wangchao
|
7f44a2d45c
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
wangchao
|
f709bedaf5
|
难点赌点 全删全增
|
5 years ago |
|
jianjun
|
bffe8dc539
|
暂时废弃 初始化多appId的方式代码
|
5 years ago |
|
sunyuchao
|
4ef8e25b87
|
扫码进群添加是否开启审核机制
|
5 years ago |
|
wxz
|
cac28f16de
|
Merge branch 'dev_gateway_whitelist' into dev
|
5 years ago |
|
jianjun
|
52b0eaea1b
|
服务统一添加 错误告警
|
5 years ago |
|
wxz
|
44074e9973
|
Merge branch 'dev_oss_fix' into dev_group_code
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
|
5 years ago |
|
liushaowen
|
9533d51708
|
Merge branch 'dev_group_code' of http://121.42.41.42:7070/r/epmet-cloud into dev_group_code
|
5 years ago |
|
wxz
|
4997d80e9a
|
修改，解决oss-client影响服务调用的问题
|
5 years ago |
|
yinzuomei
|
af95b5311a
|
组长开启/关闭入群审核
|
5 years ago |
|
jianjun
|
97f4d46372
|
调用feign接口失败 返回错误，创建议题失败
|
5 years ago |
|
liushaowen
|
bfa25c3bb7
|
群二维码变为invitationId
|
5 years ago |
