wangchao
|
ed1e049b93
|
USERopenFeign
|
5 years ago |
|
wangchao
|
fd7eab4a7b
|
Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins
# Conflicts:
# epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java
|
5 years ago |
|
wangchao
|
6d3d1f4e6a
|
ext-plugin
|
5 years ago |
sunyuchao
|
fffc5599ef
|
服务器升级
|
5 years ago |
|
sunyuchao
|
af3db1f56b
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
sunyuchao
|
038aa40441
|
运营端客户定制化接口
|
5 years ago |
zxc
|
db5ffbe163
|
添加外部应用鉴签
|
5 years ago |
|
zxc
|
b6cff2739e
|
添加外部应用鉴签
|
5 years ago |
|
zxc
|
339da4bd4b
|
Merge branches 'dev_externalappauth' and 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
|
5 years ago |
|
wangchao
|
037ea035c1
|
Merge branches 'dev_externalappauth' and 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
|
5 years ago |
zhaoqifeng
|
2d62693687
|
客户列表，修改
|
5 years ago |
wxz
|
c392477af4
|
版本升级
|
5 years ago |
|
wxz
|
59febdb95c
|
Merge branch 'dev_externalappauth' into dev_temp
|
5 years ago |
|
wxz
|
cc67d269d4
|
临时去掉时间戳校验，便于调试。上线之前打开
|
5 years ago |
|
wxz
|
8e482f820f
|
Merge branches 'dev_externalappauth' and 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
9f7e267b46
|
外部应用认证修改请求头的key为驼峰
|
5 years ago |
|
wxz
|
33e1c53468
|
增加url登录认证白名单
|
5 years ago |
|
wxz
|
404cf83589
|
Merge branches 'dev_externalappauth' and 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
43ba212539
|
增加url登录认证白名单
|
5 years ago |
|
wxz
|
f6dfb8a4f8
|
版本升级
|
5 years ago |
|
wxz
|
1d193b063d
|
Merge branches 'dev_externalappauth' and 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
66aa7bfba5
|
外部应用鉴权增加时间戳判断，允许5分钟之内的请求
|
5 years ago |
jianjun
|
098605dae6
|
测试
|
5 years ago |
|
jianjun
|
3633df39b4
|
升级ext
|
5 years ago |
|
wxz
|
f700d97cc2
|
Merge branch 'dev_externalappauth' into dev_temp
# Conflicts:
# epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-common-service/common-service-server/pom.xml
|
5 years ago |
|
wxz
|
4376693053
|
版本升级
|
5 years ago |
|
wxz
|
0f47a87aef
|
修改错误的提交-FeignClient#url
|
5 years ago |
|
wxz
|
9b80e654e9
|
测试提交
|
5 years ago |
|
wxz
|
5e33e983d9
|
Merge branch 'dev_externalappauth' into dev_temp
# Conflicts:
# epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
wxz
|
43e7e3f406
|
版本升级
|
5 years ago |
|
wxz
|
792f6a1e34
|
Merge branches 'dev_temp' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
5 years ago |
|
wxz
|
b905d4765e
|
增加外部应用请求鉴权模块
|
5 years ago |
|
sunyuchao
|
082250cb7d
|
接口返参调整
|
5 years ago |
|
sunyuchao
|
7c1453e1a4
|
Merge branch 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
|
5 years ago |
|
wangchao
|
5769962dac
|
Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
|
5 years ago |
|
wangchao
|
183e22182b
|
对外接口 工作人员的数据权限，既所在组织以及下级
ResiTopicOperationFormDTO去掉不必要的@NotBlank
|
5 years ago |
|
sunyuchao
|
25e7f6ff77
|
Merge branch 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
Conflicts:
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
epmet-module/epmet-third/epmet-third-server/pom.xml
epmet-module/resi-group/resi-group-server/pom.xml
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
jianjun
|
ec2e1c7cd0
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_plugins
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
# epmet-module/resi-group/resi-group-server/pom.xml
# epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
jianjun
|
6bbca75f39
|
部署user，group
|
5 years ago |
|
jianjun
|
7039ba00fc
|
Merge remote-tracking branch 'remotes/origin/release'
|
5 years ago |
|
zhaoqifeng
|
bbf5b9188e
|
版本升级
|
5 years ago |
|
zhaoqifeng
|
1138f961d3
|
Merge branch 'dev_plugins' into dev_temp
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
|
5 years ago |
|
zhaoqifeng
|
d9cb1ba8d0
|
关闭话题添加已解决未解决
|
5 years ago |
|
sunyuchao
|
069e0fda29
|
Merge branches 'dev' and 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
Conflicts:
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
epmet-module/epmet-third/epmet-third-server/pom.xml
epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
epmet-module/resi-group/resi-group-server/pom.xml
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
wangchao
|
2cccd03131
|
user 升级 同步130 版本号到 118 [test.yml]
group升级 同步130 版本号到 66 [test.yml]
|
5 years ago |
|
wangchao
|
08ed155bf9
|
Merge remote-tracking branch 'origin/dev' into release
|
5 years ago |
|
wangchao
|
4f9d8639c4
|
user +1 118
|
5 years ago |
|
wangchao
|
7a31fc276c
|
查找用户的身份信息 修改
|
5 years ago |
|
wangchao
|
40669bca49
|
resi-group 版本号+1
|
5 years ago |
|
wangchao
|
4182141e1a
|
plugin staffINfo
|
5 years ago |
