wangchao
|
df29a3685c
|
resiguide的govorgFiegnClient去掉url
|
6 years ago |
|
wangchao
|
8b6cf2fb70
|
Merge remote-tracking branch 'origin/dev1.0' into dev1.0
|
6 years ago |
|
wangchao
|
87c6165df0
|
登录拦截修改
|
6 years ago |
yinzuomei
|
f74d5fee72
|
loginByWxCode接口修改：更新用户微信信息
|
6 years ago |
hosinokamui
|
d667ebe412
|
登录菜单获取修改
|
6 years ago |
|
wangchao
|
8cb5881f12
|
Merge remote-tracking branch 'origin/dev1.0' into dev1.0
|
6 years ago |
|
wangchao
|
68c37c3c2f
|
dev1.0本地变化保存
|
6 years ago |
|
hosinokamui
|
3a2923f16c
|
Merge remote-tracking branch 'origin/dev1.0-authlogin' into dev1.0-authlogin
# Conflicts:
# epmet-gateway/src/main/resources/bootstrap.yml
|
6 years ago |
|
hosinokamui
|
5fa947342e
|
登录菜单获取修改
|
6 years ago |
|
yinzuomei
|
5e797af516
|
Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
|
6 years ago |
|
wangchao
|
6afd6ce422
|
整合resi-guide
|
6 years ago |
|
wangchao
|
800b67de82
|
Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide
# Conflicts:
# epmet-gateway/pom.xml
# epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
# epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
# epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
# epmet-user/epmet-user-server/pom.xml
|
6 years ago |
|
wangchao
|
c7fb5614bd
|
整合dev1.0到resi-guide
|
6 years ago |
|
yinzuomei
|
68e3dc31b2
|
Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
|
6 years ago |
|
yinzuomei
|
2d5f732402
|
loginbywxcode接口修改：encryptedData、iv不必填
|
6 years ago |
sunyuchao
|
d443a0ebd8
|
陌生人导览接口添加token参数 走注册中心测试成功
|
6 years ago |
|
wangchao
|
2fe91fed68
|
查询附近网格信息接口修改
|
6 years ago |
|
sunyuchao
|
dfad20d724
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
|
6 years ago |
yangshaoping
|
5fe87dd33e
|
customize合并到dev1.0，合并冲突解决
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
|
6 years ago |
|
sunyuchao
|
02ea8719d8
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
yinzuomei
|
e3ec61f619
|
拦截token获取token或者Authorization
|
6 years ago |
|
sunyuchao
|
76a5fadeed
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
# epmet-gateway/pom.xml
# epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
# epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
# epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
# epmet-user/epmet-user-server/pom.xml
|
6 years ago |
|
yinzuomei
|
414dd944ed
|
token改为Authorization
|
6 years ago |
|
yinzuomei
|
d21f46fe59
|
dev1.0pull到authlogin解决冲突
|
6 years ago |
|
yinzuomei
|
e307b88ccc
|
Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
Conflicts:
epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
epmet-auth/pom.xml
epmet-module/epmet-demo/epmet-demo-server/pom.xml
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java
epmet-module/oper-crm/oper-crm-server/pom.xml
epmet-user/epmet-user-server/pom.xml
epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
|
6 years ago |
|
yinzuomei
|
c72bf105cf
|
修改mybatis-plus配置
|
6 years ago |
|
yinzuomei
|
087e704efe
|
去除ComponentScan
|
6 years ago |
|
yinzuomei
|
28e2320411
|
token为空返回401
|
6 years ago |
|
yinzuomei
|
b976e35b50
|
@LoginUser V2拦截OK后期要改为从body中获取
|
6 years ago |
|
yinzuomei
|
66af3e36d2
|
@LoginUser初始提交v1
|
6 years ago |
|
yinzuomei
|
f00bb7d157
|
url删除
|
6 years ago |
|
yinzuomei
|
667a7c5a64
|
@LoginUser初始提交
|
6 years ago |
|
wangchao
|
ddb94d3025
|
Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
|
6 years ago |
|
wangchao
|
28ebd0e0dd
|
删除gov下的PdManDbVersion模块，修改strangerAccessRecordController的RequestMapping
|
6 years ago |
|
sunyuchao
|
12f2b08a10
|
Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide
|
6 years ago |
|
sunyuchao
|
b7e9e74cf8
|
陌生人导览模块与王合并代码
|
6 years ago |
|
yinzuomei
|
660ae79970
|
getCustomerGridByGridId方法添加Override
|
6 years ago |
|
wangchao
|
64a6f3b8df
|
resi模块，controller分开，分成stranger和strangerAccessRecord两个RequestMapping
|
6 years ago |
|
yinzuomei
|
708155b7f1
|
删除operaccess-epmetuser测试接口
|
6 years ago |
|
wangchao
|
9dca1322f1
|
合并之后的giude分支，guide模块的gov-orgFiegnClient接口去掉指定本机目标服务器，
|
6 years ago |
|
yinzuomei
|
d1dea07a71
|
operaccess模块feign测试提交
|
6 years ago |
|
wangchao
|
a168126125
|
调整陌生人导览、政府端组织代码规范
|
6 years ago |
|
yinzuomei
|
dfc459269c
|
operaccess模块修改feign
|
6 years ago |
|
yangshaoping
|
b104d1ffd0
|
获取客户首页配置的设计稿--返回3个对象改为3个集合
|
6 years ago |
|
hosinokamui
|
0608964736
|
新增 运营端访问权限控制模块
|
6 years ago |
|
sunyuchao
|
8c12bc1ca4
|
Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide
|
6 years ago |
|
sunyuchao
|
90cddd7bcb
|
陌生人导览接口修改类名
|
6 years ago |
|
yangshaoping
|
9edb5ab238
|
陌生人访问记录表 -添加注释版
|
6 years ago |
|
yinzuomei
|
e8743045fe
|
去除重复引用依赖
|
6 years ago |
|
sunyuchao
|
8efa3ffe6b
|
陌生人导览接口初始提交v1
|
6 years ago |
