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 |
|
sunyuchao
|
476f80f564
|
Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide
|
6 years ago |
|
sunyuchao
|
559618560f
|
Merge branch 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
# epmet-module/resi-guide/resi-guide-server/pom.xml
|
6 years ago |
|
yangshaoping
|
0370b476be
|
陌生人访问记录表 --和王朝合并版
|
6 years ago |
|
wangchao
|
622a4de1ff
|
修改接口：根据位置授权/不授权选定附近网格信息,加注释,加数据校验
|
6 years ago |
|
wangchao
|
45500e73b9
|
修改接口：根据位置授权/不授权选定附近网格信息（后期需要加redis提高查询效率）
|
6 years ago |
|
yinzuomei
|
59011c7616
|
登录接口修改
|
6 years ago |
|
wangchao
|
65c26f2eed
|
authlogin分支
|
6 years ago |
|
yinzuomei
|
d03f448d68
|
feign测试
|
6 years ago |
|
wangchao
|
fad2f05668
|
authlogin分支
|
6 years ago |
|
sunyuchao
|
ef5c834105
|
update resi to local repoitory
|
6 years ago |
|
sunyuchao
|
9a9b7de5c3
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
yinzuomei
|
d517ca6a1d
|
验证码
|
6 years ago |
|
yinzuomei
|
e6b779bc00
|
修改feign配置
|
6 years ago |
|
yinzuomei
|
54401f4b41
|
手机号密码登录接口修改
|
6 years ago |
|
yinzuomei
|
8dacc3a832
|
feignbug修改，token规则修改
|
6 years ago |
|
yinzuomei
|
29dc99bed9
|
REGION改为varchar注释：所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
|
6 years ago |
|
yangshaoping
|
62dd732efc
|
完善根据客户id,所属端获取客户首页配置的设计稿-regin数据类型由int 改为varchar(涉及3个相关表草稿表-模板表-组件表都改了)
|
6 years ago |
|
yinzuomei
|
87e7545970
|
新增获取验证码接口/auth/login/captcha
|
6 years ago |
|
yinzuomei
|
16496f7b6d
|
更改居民端小程序appId和appsecret
|
6 years ago |
|
yangshaoping
|
203625ea7f
|
完善根据客户id,所属端获取客户首页配置的设计稿-添加枚举类引用判断改名称
|
6 years ago |
|
yinzuomei
|
9953ddcae1
|
去除feign url
|
6 years ago |
|
yangshaoping
|
16e93abf16
|
完善根据客户id,所属端获取客户首页配置的设计稿-添加枚举类引用判断
|
6 years ago |
|
wangchao
|
7db67f2594
|
陌生人导览模块，授权/不授权位置信息时查询网格信息
|
6 years ago |
