Commit Graph
100 Commits
Author SHA1 Message Date
wenjianzhang 221ee539cd Merge branch 'master' into v1.0.0 2020-05-12 23:59:13 +08:00
wenjianzhang 4343cbefba Merge pull request #76 from wenjianzhang/v1.0.0_fixbug
V1.0.0 fixbug
2020-05-12 23:54:46 +08:00
zhangwenjian f6adb48837 Fix jwt key 2020-05-12 23:53:51 +08:00
zhangwenjian 63184fcd0a Code generation import list add imported data table 2020-05-09 14:51:54 +08:00
zhangwenjian 429bc5fb18 Code generation changed to physical deletion 2020-05-09 14:50:39 +08:00
zhangwenjian 99e038cb35 Fix bulk import data table 2020-05-09 14:50:03 +08:00
zhangwenjian a252264868 Remove configuration that is no longer in use 2020-05-09 01:00:56 +08:00
wenjianzhang 75a9ad79cc Merge pull request #72 from wenjianzhang/v1.0.0_fixbug
V1.0.0 fixbug
2020-05-05 12:26:50 +08:00
zhangwenjian 982af439f2 Unified return structure 2020-05-05 12:25:17 +08:00
zhangwenjian 77a4f183d5 added BatchDelete action 2020-05-05 12:25:17 +08:00
zhangwenjian 38eed4a8fe update vue template 2020-05-05 12:25:17 +08:00
zhangwenjian 570afbbe12 update model template 2020-05-05 12:25:17 +08:00
zhangwenjian 8260581be1 update api template 2020-05-05 12:25:17 +08:00
zhangwenjian 9ea3ccc064 remove demo middleware 2020-05-05 12:25:17 +08:00
wenjianzhang de41e30aa1 Modify unauthorized code 2020-05-05 12:25:17 +08:00
zhangwenjian fa2d88870e fix role control btn isshow 2020-05-05 12:25:17 +08:00
wenjianzhang 7fda92a1b1 Merge pull request #71 from wenjianzhang/v1.0.0_fixbug
Fix init DB error
2020-05-05 12:19:43 +08:00
wenjianzhang 5da8487ea1 Merge pull request #69 from wenjianzhang/master_fixbug
Master fixbug
2020-05-05 03:05:22 +08:00
wenjianzhang f48a955d13 Merge pull request #70 from wenjianzhang/v1.0.0_fixbug
V1.0.0 fixbug
2020-05-05 02:58:01 +08:00
zhangwenjian b2883e9bce fix dept deletion is invalid 2020-05-05 02:52:38 +08:00
zhangwenjian ef26a2b864 added batch delete action 2020-05-05 02:33:35 +08:00
zhangwenjian 41ae5e8282 Unified return structure 2020-05-05 02:15:25 +08:00
zhangwenjian 8d844b00dd added BatchDelete action 2020-05-05 02:02:58 +08:00
wenjianzhang a88ecb5793 Merge pull request #68 from wenjianzhang/master_fixbug
Modify unauthorized code
update api template
update js template
update model template
update vue template
2020-05-04 23:18:14 +08:00
zhangwenjian 9e2726cbbb update vue template 2020-05-04 23:15:40 +08:00
zhangwenjian c4daa50819 update model template 2020-05-04 23:15:32 +08:00
zhangwenjian 5479b95e84 update js template 2020-05-04 23:15:23 +08:00
zhangwenjian 0caf51331f update api template 2020-05-04 23:15:15 +08:00
zhangwenjian a3ac2845ac Modify unauthorized code 2020-05-04 23:15:01 +08:00
wenjianzhang af7af51f07 Merge pull request #67 from wenjianzhang/v1.0.0_fixbug
V1.0.0 fixbug
Modify unauthorized code
remove demo middleware
update api template
update model template
update vue template
2020-05-04 23:01:00 +08:00
zhangwenjian f116859711 update vue template 2020-05-04 22:55:30 +08:00
zhangwenjian 0f82545ddf update model template 2020-05-04 22:55:30 +08:00
zhangwenjian 2720f4f46d update api template 2020-05-04 22:55:30 +08:00
zhangwenjian 037066c81a remove demo middleware 2020-05-04 22:55:30 +08:00
wenjianzhang 8d0f2fe5df Modify unauthorized code 2020-05-04 22:11:40 +08:00
wenjianzhang b792ae7107 Merge pull request #62 from wenjianzhang/master_fixbug
Master fixbug
2020-05-04 16:18:45 +08:00
zhangwenjian 300d64c54d control btn is show 2020-05-04 00:27:52 +08:00
zhangwenjian fdc4c52d68 fix data scope 2020-05-04 00:27:30 +08:00
zhangwenjian 0906d49d09 update base data sql 2020-05-04 00:26:49 +08:00
wenjianzhang 35558f7b06 Merge pull request #61 from wenjianzhang/v1.0.0_fixbug
fix role control btn isshow
2020-05-03 23:37:59 +08:00
zhangwenjian 0b7458b602 fix role control btn isshow 2020-05-03 23:34:50 +08:00
wenjianzhang 10b3e286b7 Merge pull request #60 from wenjianzhang/v1.0.0_fixbug
sql column data change sort
2020-05-03 22:21:52 +08:00
zhangwenjian 0b9976d6b4 sql column data change sort 2020-05-03 22:20:55 +08:00
wenjianzhang 4cb0a69ecd Merge pull request #59 from wenjianzhang/v1.0.0_fixbug
base data sql update
2020-05-03 22:14:01 +08:00
zhangwenjian ce5a969bb2 base data sql update 2020-05-03 22:13:24 +08:00
zhangwenjian 5999a0a158 role added column datascope 2020-05-03 22:10:01 +08:00
zhangwenjian 6b2a59f542 remove log data 2020-05-03 22:08:32 +08:00
zhangwenjian d34d7ec0a8 update mark 2020-05-03 21:57:23 +08:00
zhangwenjian 13b01a09d3 升级sql 2020-05-03 21:56:55 +08:00
wenjianzhang f1084627e6 Merge pull request #58 from wenjianzhang/dev
更新migrate 更名为init
2020-05-01 20:16:18 +08:00
zhangwenjian 130a5feb72 更新migrate 更名为init 2020-05-01 20:13:46 +08:00
wenjianzhang 0ba8e937b9 Merge pull request #57 from wenjianzhang/dev
更新使用说明
2020-05-01 15:23:37 +08:00
zhangwenjian e35efac419 更新使用说明 2020-05-01 15:22:52 +08:00
wenjianzhang 95de5a51cc Merge pull request #56 from wenjianzhang/dev
1. 添加js代码模板
2. 添加vue代码模板
1. 使用cmd进行程序配置
1. 调整代码结构
1. 添加token过期时间配置项
1. 修复bug,含搜索条件等
2020-05-01 15:01:08 +08:00
zhangwenjian 07068656a2 修改拼写错误,删除注释代码 2020-05-01 14:46:20 +08:00
zhangwenjian 8faff5384f 添加js模板,页面模板,去掉数据库数据初始化,去掉sql文件中没用语句 2020-05-01 14:25:14 +08:00
zhangwenjian ba1c7f6193 修复数据权限bug 2020-04-26 22:13:06 +08:00
zhangwenjian 2d697ec80b 添加搜索条件 2020-04-22 23:17:05 +08:00
zhangwenjian 8630a8c784 添加6401 token 过期状态 2020-04-22 23:16:50 +08:00
zhangwenjian bf494c2131 权限检查修改返回结构名称,修复前端无限循环getinfo接口bug 2020-04-22 23:16:20 +08:00
zhangwenjian 02f46de17c 菜单添加状态和名称查询条件 2020-04-22 23:15:21 +08:00
zhangwenjian 81dd53b3fd 用户搜索 手机号,状态 查询条件的添加 2020-04-22 22:28:44 +08:00
zhangwenjian e1cf38adf9 添加生成 表描述查询 2020-04-22 22:22:57 +08:00
zhangwenjian 0cec342fac 修改生成数据库模型,添加批量删除 2020-04-22 22:16:02 +08:00
zhangwenjian 02255240fe 添加数据库数据初始化 2020-04-21 13:44:36 +08:00
zhangwenjian 6bb6c69700 update 2020-04-21 13:39:40 +08:00
wenjianzhang a8cf9806aa Merge pull request #26 from bestgopher/jwt_bug
Jwt bug
2020-04-21 11:33:17 +08:00
zhangwenjian e174f1e740 fix merge err 2020-04-18 10:53:24 +08:00
wenjianzhang 9a70ea3d09 Merge pull request #37 from lwnmengjing/master
引入条件编译,选择性使用sqlite3
2020-04-18 10:41:34 +08:00
wenjianzhang d61a9f6bc0 Merge branch 'dev' into master 2020-04-18 10:41:25 +08:00
zhangwenjian f5037f50a7 合并代码 2020-04-18 10:33:29 +08:00
zhangwenjian a2f4c00246 结构调整添加cmd 2020-04-18 10:06:44 +08:00
wenjianzhang f2829bfd98 Merge pull request #34 from lwnmengjing/master
开发模式下,log打印出行号,方便错误定位
2020-04-17 01:09:24 +08:00
wenjianzhang e371a9a196 Merge pull request #33 from wenjianzhang/dev
Dev
2020-04-16 16:21:37 +08:00
wenjianzhang 490c9770f3 Merge pull request #31 from kikiyou/dev
update sqlite db file
2020-04-14 19:07:10 +08:00
wenjianzhang 1f1255ca4c Update README.md 2020-04-14 10:07:37 +08:00
wenjianzhang 37b4ed6f37 Update README.md 2020-04-14 09:54:57 +08:00
wenjianzhang e36e42c67d Merge pull request #30 from wenjianzhang/dev
update
2020-04-14 00:51:35 +08:00
zhangwenjian 2532f121ad update 2020-04-14 00:50:44 +08:00
wenjianzhang d008a725a4 Update README.md 2020-04-14 00:45:02 +08:00
wenjianzhang dd1927a633 Merge pull request #29 from wenjianzhang/dev
update
2020-04-14 00:41:41 +08:00
zhangwenjian 52a77636fb update 2020-04-14 00:40:27 +08:00
wenjianzhang 4f2e019c74 Merge pull request #28 from wenjianzhang/dev
Dev
2020-04-14 00:34:25 +08:00
wenjianzhang 45fc174cc2 Merge branch 'master' into dev 2020-04-14 00:33:39 +08:00
zhangwenjian 4893009526 added monitor 2020-04-13 22:07:07 +08:00
zhangwenjian 1df55e75e5 update 2020-04-13 00:30:58 +08:00
zhangwenjian f25da5f1ee 调整中间件结构 2020-04-13 00:13:35 +08:00
zhangwenjian 4106f023d0 修改中间件结构 2020-04-13 00:11:47 +08:00
zhangwenjian 531cc6926d 添加jwt配置 2020-04-13 00:11:29 +08:00
zhangwenjian 958c2d332f 删除 demo 2020-04-13 00:07:23 +08:00
wenjianzhang bd20f6be36 Merge pull request #25 from bestgopher/graceful_shutdown
graceful shutdown
2020-04-12 09:29:57 +08:00
zhangwenjian a57eec423e update 2020-04-10 14:09:16 +08:00
zhangwenjian 5e70d90cd5 字段更新 2020-04-08 17:09:48 +08:00
zhangwenjian 6da0829b92 登录bug修复 2020-04-08 15:32:56 +08:00
zhangwenjian ef5a1681ed 修复配置文件问题 2020-04-08 15:23:43 +08:00
wenjianzhang 84edce374f Merge pull request #23 from wenjianzhang/dev
Dev
2020-04-08 15:17:30 +08:00
zhangwenjian 93790ea13a 字段格式调整更新 2020-04-08 15:15:30 +08:00
zhangwenjian 7ae2630d3d update 2020-04-08 14:24:54 +08:00
wenjianzhang 5678132a47 Merge pull request #22 from wenjianzhang/dev
update
2020-04-08 14:21:27 +08:00
zhangwenjian ef1f23b2d5 update 2020-04-08 14:19:31 +08:00