sunyuchao
|
bf6b50967f
|
Merge branches 'dev1.0' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
sunyuchao
|
fcb5b8ba6b
|
陌生人导览获取首页配置sql语句添加排序字段
|
6 years ago |
hosinokamui
|
2296cae1a5
|
菜单增删改查修改
|
6 years ago |
wangchao
|
a2d9ac91b9
|
陌生人访问记录service/dao/mapper删除无用代码
|
6 years ago |
|
wangchao
|
be483a46f4
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
|
6 years ago |
|
wangchao
|
3fa58ddc75
|
网格信息查询增加del_flag校验，陌生人访客记录的分页查询修改，
|
6 years ago |
|
hosinokamui
|
ad88e9692f
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-authlogin
|
6 years ago |
yangshaoping
|
cc3ab53151
|
Merge remote-tracking branch 'origin/dev1.0' into dev1.0
|
6 years ago |
|
yangshaoping
|
eca6f3fe0d
|
添加and a.`STATUS`=1字段
|
6 years ago |
|
sunyuchao
|
74a39bf6dd
|
Merge branches 'dev1.0' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
sunyuchao
|
ce6432bafa
|
sql添加查询字段
|
6 years ago |
|
hosinokamui
|
9f47aa9ca0
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-authlogin
|
6 years ago |
|
hosinokamui
|
49a614cce2
|
用户和角色增删改查修改
|
6 years ago |
|
wangchao
|
ad522ae17f
|
CpAuthGatewayFilterFactory去除无用注释代码
|
6 years ago |
|
wangchao
|
4f65a1b8dc
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
|
6 years ago |
|
wangchao
|
8f79cf0fa7
|
RenException增加构造方法new RenException(int code,String msg)
|
6 years ago |
|
sunyuchao
|
be62daa4c2
|
Merge branches 'dev1.0' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
sunyuchao
|
33e3e67207
|
陌生人导览 修改参数取值问题
|
6 years ago |
|
yangshaoping
|
2dae4480e1
|
返回前段标识c.COMPONENT_FRONT_ID,
|
6 years ago |
|
wangchao
|
4fb2935abf
|
退出登录
|
6 years ago |
|
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 |
