Commit Graph

  • 12f2b08a10 Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide sunyuchao 2020-03-19 17:47:40 +0800
  • b7e9e74cf8 陌生人导览模块与王合并代码 sunyuchao 2020-03-19 17:47:06 +0800
  • 660ae79970 getCustomerGridByGridId方法添加Override yinzuomei 2020-03-19 17:41:27 +0800
  • 64a6f3b8df resi模块,controller分开,分成stranger和strangerAccessRecord两个RequestMapping wangchao 2020-03-19 17:30:55 +0800
  • 708155b7f1 删除operaccess-epmetuser测试接口 yinzuomei 2020-03-19 17:19:50 +0800
  • 9dca1322f1 合并之后的giude分支,guide模块的gov-orgFiegnClient接口去掉指定本机目标服务器, wangchao 2020-03-19 17:00:43 +0800
  • d1dea07a71 operaccess模块feign测试提交 yinzuomei 2020-03-19 16:37:11 +0800
  • a168126125 调整陌生人导览、政府端组织代码规范 wangchao 2020-03-19 16:17:05 +0800
  • dfc459269c operaccess模块修改feign yinzuomei 2020-03-19 16:15:57 +0800
  • b104d1ffd0 获取客户首页配置的设计稿--返回3个对象改为3个集合 yangshaoping 2020-03-19 15:53:53 +0800
  • 0608964736 新增 运营端访问权限控制模块 hosinokamui 2020-03-19 15:41:43 +0800
  • 8c12bc1ca4 Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide sunyuchao 2020-03-19 15:01:11 +0800
  • 90cddd7bcb 陌生人导览接口修改类名 sunyuchao 2020-03-19 15:00:47 +0800
  • 9edb5ab238 陌生人访问记录表 -添加注释版 yangshaoping 2020-03-19 15:00:34 +0800
  • e8743045fe 去除重复引用依赖 yinzuomei 2020-03-19 14:55:48 +0800
  • 8efa3ffe6b 陌生人导览接口初始提交v1 sunyuchao 2020-03-19 14:18:01 +0800
  • 476f80f564 Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide sunyuchao 2020-03-19 14:17:07 +0800
  • 559618560f Merge branch 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-19 14:16:49 +0800
  • 0370b476be 陌生人访问记录表 --和王朝合并版 yangshaoping 2020-03-19 13:50:09 +0800
  • 622a4de1ff 修改接口:根据位置授权/不授权选定附近网格信息,加注释,加数据校验 wangchao 2020-03-19 12:24:04 +0800
  • 45500e73b9 修改接口:根据位置授权/不授权选定附近网格信息(后期需要加redis提高查询效率) wangchao 2020-03-19 10:09:36 +0800
  • 59011c7616 登录接口修改 yinzuomei 2020-03-18 22:46:03 +0800
  • 65c26f2eed authlogin分支 wangchao 2020-03-18 18:00:46 +0800
  • d03f448d68 feign测试 yinzuomei 2020-03-18 15:48:50 +0800
  • fad2f05668 authlogin分支 wangchao 2020-03-18 13:45:30 +0800
  • ef5c834105 update resi to local repoitory sunyuchao 2020-03-18 12:23:46 +0800
  • 9a9b7de5c3 Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-18 10:29:06 +0800
  • d517ca6a1d 验证码 yinzuomei 2020-03-18 10:06:51 +0800
  • e6b779bc00 修改feign配置 yinzuomei 2020-03-18 09:56:07 +0800
  • 54401f4b41 手机号密码登录接口修改 yinzuomei 2020-03-17 23:32:49 +0800
  • 8dacc3a832 feignbug修改,token规则修改 yinzuomei 2020-03-17 23:19:34 +0800
  • 29dc99bed9 REGION改为varchar注释:所属区域:titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区 yinzuomei 2020-03-17 17:29:31 +0800
  • 62dd732efc 完善根据客户id,所属端获取客户首页配置的设计稿-regin数据类型由int 改为varchar(涉及3个相关表草稿表-模板表-组件表都改了) yangshaoping 2020-03-17 16:51:49 +0800
  • 87e7545970 新增获取验证码接口/auth/login/captcha yinzuomei 2020-03-17 16:10:41 +0800
  • 16496f7b6d 更改居民端小程序appId和appsecret yinzuomei 2020-03-17 15:48:39 +0800
  • 203625ea7f 完善根据客户id,所属端获取客户首页配置的设计稿-添加枚举类引用判断改名称 yangshaoping 2020-03-17 15:45:06 +0800
  • 9953ddcae1 去除feign url yinzuomei 2020-03-17 15:41:29 +0800
  • 16e93abf16 完善根据客户id,所属端获取客户首页配置的设计稿-添加枚举类引用判断 yangshaoping 2020-03-17 15:40:57 +0800
  • 7db67f2594 陌生人导览模块,授权/不授权位置信息时查询网格信息 wangchao 2020-03-17 15:35:33 +0800
  • 970fc187f1 Merge branch 'dev1.0' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin yinzuomei 2020-03-17 15:33:36 +0800
  • 12ca9a252f 登录接口初始提交 yinzuomei 2020-03-17 15:33:14 +0800
  • 66ce1ca839 完善根据客户id,所属端获取客户首页配置的设计稿-sql变更--添加删除条件 yangshaoping 2020-03-17 15:09:15 +0800
  • 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 yangshaoping 2020-03-17 15:00:20 +0800
  • 50a775ac70 完善根据客户id,所属端获取客户首页配置的设计稿-注释信息 yangshaoping 2020-03-17 14:44:19 +0800
  • 3cb94056e3 Merge branch 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide wangchao 2020-03-17 14:18:33 +0800
  • 97744844ed 陌生人导览模块,授权/不授权位置信息时查询网格信息 wangchao 2020-03-17 14:14:39 +0800
  • 11f2122c86 Merge branch 'dev1.0-opercustomize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-17 13:42:28 +0800
  • 298618adb2 服务配置 sunyuchao 2020-03-17 12:36:16 +0800
  • c1ce6f4e59 Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-17 12:35:41 +0800
  • 45eed275dd 主pom文件里删除原gov-org模块依赖 wangchao 2020-03-17 11:47:19 +0800
  • a5b5d2ad65 修改 首页设计稿保存,首页设计稿发版api删除数据改为逻辑删除 hosinokamui 2020-03-17 11:04:17 +0800
  • cd23d6973d Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-17 10:35:20 +0800
  • bc0ad38a33 政府组织模块移到epmet-module模块下,epmet-module的pom文件中删除原epmet-api的引用,修改epmet-gateway中bootstap.yaml中配置的路由order信息,修改gov-org-server的默认端口号为8092 wangchao 2020-03-17 10:34:01 +0800
  • 9fd480acfb 政府组织模块移到epmet-module模块下,epmet-module的pom文件中删除原epmet-api的引用,修改epmet-gateway中bootstap.yaml中配置的路由order信息,修改gov-org-server的默认端口号为8092 wangchao 2020-03-17 10:07:22 +0800
  • 21c58a0fa0 首页设计稿保存,首页设计稿发版api代码重构 hosinokamui 2020-03-17 09:49:57 +0800
  • 7fb7492f94 Merge remote-tracking branch 'origin/dev1.0-opercustomize' into dev1.0-opercustomize yangshaoping 2020-03-17 09:33:06 +0800
  • a60d9c1c7b Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide wangchao 2020-03-17 09:14:10 +0800
  • 5bf4652ecc 政府端 wangchao 2020-03-17 09:08:52 +0800
  • b4d568f96d 新增政府端组织模块,数据库从epmet_oper_business更换为epmet_gov_org,表名不变 wangchao 2020-03-16 19:59:16 +0800
  • 958b1fb8a4 首页设计稿保存,首页设计稿发版api实现 hosinokamui 2020-03-16 18:28:45 +0800
  • 9d8935b19c Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-opercustomize yangshaoping 2020-03-16 16:21:01 +0800
  • 0579101032 数据库表代码生成 sunyuchao 2020-03-16 16:16:53 +0800
  • 4060895be1 获取客户首页配置的设计稿-代码测试版 yangshaoping 2020-03-16 15:57:36 +0800
  • 9a7af6ea3c 获取客户首页配置的设计稿-代码提交2 yangshaoping 2020-03-16 15:49:01 +0800
  • 63b23cc521 数据库变动 删除代码 sunyuchao 2020-03-16 15:07:30 +0800
  • b8b8ce3f9f Merge branch 'dev1.0' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin yinzuomei 2020-03-16 14:52:21 +0800
  • 868715481f 新增RESI_GUIDE_SERVER、EPMET_USER_SERVER常量 yinzuomei 2020-03-16 14:52:03 +0800
  • d372c14732 获取客户首页配置的设计稿-代码提交 yangshaoping 2020-03-16 14:51:29 +0800
  • 103f797b54 Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-16 14:37:58 +0800
  • be72f7a288 Merge branch 'dev1.0' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin yinzuomei 2020-03-16 14:32:01 +0800
  • 7aa38143a8 新增epmet-user模块,修改resi-guide数据库连接 yinzuomei 2020-03-16 14:25:28 +0800
  • dd7be53e28 Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin yinzuomei 2020-03-16 12:01:18 +0800
  • 589ad09343 删除api模块 yinzuomei 2020-03-16 12:00:07 +0800
  • 24d9a40f4b 居民端陌生人导览 sunyuchao 2020-03-16 10:41:47 +0800
  • 201d4994d1 master代码还原 sunyuchao 2020-03-16 10:38:09 +0800
  • 89309768ec 居民端陌生人导览模块 sunyuchao 2020-03-16 10:31:26 +0800
  • 92c6dd80d6 loginbywxcode微信小程序登录接口 yinzuomei 2020-03-15 01:26:44 +0800
  • b6bc4e35b1 数据库连接改为epmet_common_user yinzuomei 2020-03-13 20:15:39 +0800
  • 507301743f commons新增phone,ma,mp yinzuomei 2020-03-13 19:42:55 +0800
  • 248dd9b556 commit项目根目录的 .gitignore文件 yinzuomei 2020-03-12 17:11:27 +0800
  • 070c4ef0f4 coomit .gitignore文件 yinzuomei 2020-03-12 17:08:33 +0800
  • 10ae82b7b3 新增resi-guide模块 yinzuomei 2020-03-12 16:35:27 +0800
  • a5a5284946 修改druid配置 yinzuomei 2020-03-12 15:00:11 +0800
  • 63f1c2927b 初始提交 yinzuomei 2020-03-12 13:00:31 +0800
  • cb2aaf9659 Initial commit 林伟伟 2020-03-12 11:13:22 +0800