wxz
|
b7aa1b4613
|
【gateway内部认证】resi/gov同时支持customerId写入header
|
5 years ago |
sunyuchao
|
ee64fe1f5a
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
|
5 years ago |
|
sunyuchao
|
fe93055760
|
oss库添加客户Id字段
|
5 years ago |
|
wxz
|
fab3ba09a3
|
Merge branch 'dev_jcet' into dev_temp
|
5 years ago |
|
wxz
|
4de7a3a272
|
【sso登录】将配置放到pom中
|
5 years ago |
zxc
|
ad4a86da21
|
resi-group库，不存在customerId的表，添加字段，对应DTO和Entity修改
|
5 years ago |
|
wxz
|
1ba6355acc
|
Merge branch 'dev_jcet' into dev_temp
|
5 years ago |
|
wxz
|
44e1f4e79e
|
【sso登录】根据customerid查询apiService接口，crm服务增加redis缓存
|
5 years ago |
|
sunyuchao
|
c719e8c6fe
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
|
5 years ago |
|
sunyuchao
|
6eef4c0d7a
|
resi_partymember库添加客户Id字段
|
5 years ago |
|
wxz
|
6c9098526b
|
Merge branch 'dev_jcet' into dev_temp
|
5 years ago |
|
wxz
|
3b2f78a0fd
|
修改sso登录，使更灵活...
|
5 years ago |
|
zxc
|
551cc7e6d5
|
resi-group库，不存在customerId的表，添加字段，对应DTO和Entity修改
|
5 years ago |
|
sunyuchao
|
5fdf6126c3
|
陌生人导览库添加字段
|
5 years ago |
|
wxz
|
ee2afc5f86
|
Merge branch 'dev_jcet' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jcet
|
5 years ago |
|
wxz
|
65558cd14f
|
修改sso登录，使更灵活...
|
5 years ago |
|
zxc
|
e132e3c7b9
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
cf4c1d02e7
|
login接口
|
5 years ago |
|
zxc
|
e78a72ec5c
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
9ae6528aaa
|
login接口
|
5 years ago |
|
sunyuchao
|
eae6cd44e2
|
解决冲突 entity添加注解
|
5 years ago |
wangchao
|
21a8a69df7
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
wangchao
|
1cb0bc2ec9
|
/sso 获取用户最近访问的网格请求类型修改
|
5 years ago |
|
wxz
|
edd0c3760d
|
Merge branch 'dev_mq_init_customer' into dev
# Conflicts:
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
# epmet-module/epmet-message/epmet-message-server/pom.xml
|
5 years ago |
|
zxc
|
2b26198125
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
60b3184fea
|
login接口
|
5 years ago |
|
zxc
|
3d1a571cd3
|
login接口
|
5 years ago |
|
wxz
|
b1be2ddb11
|
Merge branch 'dev_mq_init_customer' into dev_temp
|
5 years ago |
|
wxz
|
e8e885c02e
|
删除错误提交的SSOLoginController
|
5 years ago |
|
zxc
|
fcd1df887b
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
0d4c800432
|
login接口
|
5 years ago |
|
wxz
|
4a94e86dbd
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
facda9c629
|
第三方平台：修改查询用户byTicket方法
|
5 years ago |
|
zxc
|
9d7b1cfff2
|
login接口
|
5 years ago |
zhaoqifeng
|
123d9f2ee1
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
90e7ea00fa
|
代码上传
|
5 years ago |
|
zhaoqifeng
|
1d76c7b500
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
e0af1884fa
|
代码上传
|
5 years ago |
|
wxz
|
23efd3a65c
|
新增系统消息表
|
5 years ago |
|
wxz
|
9c6835bb48
|
请求第三方生成签名，用常量代替魔法值
|
5 years ago |
|
wxz
|
c220fdd269
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
37bac23a5f
|
将jcetApiService的实例化，从@Component改为ThirdplatConfig中统一实例化
|
5 years ago |
|
zxc
|
543a6cf536
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
2fbbe4b4e9
|
login接口
|
5 years ago |
|
zxc
|
eb94960987
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
# Conflicts:
# epmet-commons/pom.xml
# epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# 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 |
|
zxc
|
4c43dca2ad
|
login接口
|
5 years ago |
|
wxz
|
4de75be633
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
5596bf1bbf
|
修改部分与第三方平台调用相关代码
|
5 years ago |
|
sunyuchao
|
66c91053f7
|
推送微信消息按客户类型推送
|
5 years ago |
yinzuomei
|
601687cc51
|
添加注释
|
5 years ago |
