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 |
yangshaoping
|
5fe87dd33e
|
customize合并到dev1.0,合并冲突解决
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
|
6 years ago |
yinzuomei
|
e3ec61f619
|
拦截token获取token或者Authorization
|
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 |
yinzuomei
|
708155b7f1
|
删除operaccess-epmetuser测试接口
|
6 years ago |
yinzuomei
|
d1dea07a71
|
operaccess模块feign测试提交
|
6 years ago |
yinzuomei
|
dfc459269c
|
operaccess模块修改feign
|
6 years ago |
yangshaoping
|
b104d1ffd0
|
获取客户首页配置的设计稿--返回3个对象改为3个集合
|
6 years ago |
hosinokamui
|
0608964736
|
新增 运营端访问权限控制模块
|
6 years ago |
yinzuomei
|
59011c7616
|
登录接口修改
|
6 years ago |
yinzuomei
|
d03f448d68
|
feign测试
|
6 years ago |
wangchao
|
fad2f05668
|
authlogin分支
|
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 |
yinzuomei
|
970fc187f1
|
Merge branch 'dev1.0' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
|
6 years ago |
yinzuomei
|
12ca9a252f
|
登录接口初始提交
|
6 years ago |
yangshaoping
|
66ce1ca839
|
完善根据客户id,所属端获取客户首页配置的设计稿-sql变更--添加删除条件
|
6 years ago |
yangshaoping
|
58e49a105e
|
Merge branches 'dev1.0-authlogin', 'dev1.0-opercustomize' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-opercustomize
|
6 years ago |
yangshaoping
|
50a775ac70
|
完善根据客户id,所属端获取客户首页配置的设计稿-注释信息
|
6 years ago |
sunyuchao
|
298618adb2
|
服务配置
|
6 years ago |
sunyuchao
|
c1ce6f4e59
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
wangchao
|
45eed275dd
|
主pom文件里删除原gov-org模块依赖
|
6 years ago |
hosinokamui
|
a5b5d2ad65
|
修改 首页设计稿保存,首页设计稿发版api删除数据改为逻辑删除
|
6 years ago |
sunyuchao
|
cd23d6973d
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
wangchao
|
bc0ad38a33
|
政府组织模块移到epmet-module模块下,epmet-module的pom文件中删除原epmet-api的引用,修改epmet-gateway中bootstap.yaml中配置的路由order信息,修改gov-org-server的默认端口号为8092
|
6 years ago |
hosinokamui
|
21c58a0fa0
|
首页设计稿保存,首页设计稿发版api代码重构
|
6 years ago |
yangshaoping
|
7fb7492f94
|
Merge remote-tracking branch 'origin/dev1.0-opercustomize' into dev1.0-opercustomize
|
6 years ago |
wangchao
|
b4d568f96d
|
新增政府端组织模块,数据库从epmet_oper_business更换为epmet_gov_org,表名不变
|
6 years ago |
hosinokamui
|
958b1fb8a4
|
首页设计稿保存,首页设计稿发版api实现
|
6 years ago |
yangshaoping
|
9d8935b19c
|
Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-opercustomize
|
6 years ago |
sunyuchao
|
0579101032
|
数据库表代码生成
|
6 years ago |