Commit Graph

3994 Commits

Author SHA1 Message Date
Ming Deng 093f976365
Merge pull request #4355 from flycash/develop
rename key world 'governor' to 'admin'
2020-12-13 19:36:23 +08:00
Ming Deng 198b9cce5f rename key world 'governor' to 'admin' 2020-12-13 19:11:07 +08:00
Ming Deng 1452a75de4
Merge pull request #4354 from flycash/develop
update flow request image
2020-12-13 18:27:50 +08:00
Ming Deng 728296a7ae update flow request image 2020-12-13 18:26:53 +08:00
Ming Deng e2fc8b93f2
Merge pull request #4353 from flycash/develop
update architecture and flow .png
2020-12-13 17:22:19 +08:00
Ming Deng 86620210f8 update architecture and flow .png 2020-12-13 17:01:08 +08:00
Ming Deng 64d7d36794
Merge pull request #4352 from flycash/develop
update read me: add architecture ssection
2020-12-13 15:45:45 +08:00
Ming Deng 88bd9f594a update read me: add architecture ssection 2020-12-13 15:43:21 +08:00
Ming Deng 2e1c50253c
Merge pull request #4351 from flycash/develop
update readme
2020-12-13 15:35:10 +08:00
Ming Deng a5842e9de2 update readme 2020-12-13 15:30:07 +08:00
Ming Deng 40f7a56bf5
Merge pull request #4348 from flycash/develop-bk
update doc
2020-12-12 23:47:48 +08:00
Ming Deng aec5f4b3a5 remove flag of XSRF cookie 2020-12-12 23:26:03 +08:00
Ming Deng 9eda707297 update doc 2020-12-12 22:30:44 +08:00
Ming Deng b92edb6587
Merge pull request #4347 from flycash/develop-bk
Resolve conflict between master and develop
2020-12-12 22:00:31 +08:00
Ming Deng 53688ce32f Merge branch 'develop' of https://github.com/astaxie/beego into develop-bk 2020-12-12 21:29:53 +08:00
Ming Deng debd68cbe4 Revert "Merge pull request #4325 from flycash/revert1"
This reverts commit fad897346f, reversing
changes made to e284b0ddae.
2020-12-12 21:28:58 +08:00
Ming Deng b6d6571e99
Merge pull request #4332 from AllenX2018/fix-issue-4331
fix issue #4331
2020-12-04 09:22:39 +08:00
AllenX2018 db785479ab fix issue #4331
1. Modify Incr&Decr for file cache
2. Add different type of integer testcases for Incr&Decr
2020-12-01 17:18:30 +08:00
jianzhiyao 54ab211f00
Merge pull request #4329 from jianzhiyao/fix-3865
fix dot parse in route & delete useless testing file
2020-12-01 11:52:53 +08:00
jianzhiyao c034d3767a rollback 2020-11-30 20:22:52 +08:00
jianzhiyao 99a47e7644 fix reg_express 2020-11-30 19:27:59 +08:00
Anker Jam 59ca0d063f fix dot parsing result in route & delete useless testing file 2020-11-29 23:39:58 +08:00
Ming Deng aa05b66ca1
Merge pull request #4328 from flycash/develop
expose more error code in web module
2020-11-29 23:05:20 +08:00
Ming Deng 8d7f48ea75 expose more error code in web module 2020-11-29 22:33:03 +08:00
jianzhiyao fd48c62873
Merge pull request #4316 from AllenX2018/fix-issue-4311
fix issue #4311
2020-11-29 22:01:25 +08:00
Ming Deng 7ee5c8e553
Merge pull request #4327 from flycash/develop
Update readme
2020-11-27 00:02:56 +08:00
Ming Deng 4afa9d2d25 Update readme 2020-11-26 23:49:37 +08:00
Ming Deng fad897346f
Merge pull request #4325 from flycash/revert1
Revert "Merge pull request #4254 from astaxie/develop-2.0"
2020-11-26 20:18:35 +08:00
Ming Deng 650fde66aa Revert "Merge pull request #4254 from astaxie/develop-2.0"
This reverts commit e284b0ddae, reversing
changes made to 8ef8fd2606.
2020-11-26 17:48:29 +08:00
Ming Deng 359ad7a889
Merge pull request #4323 from flycash/fix4298
Update doc & update default conf path
2020-11-25 20:48:53 +08:00
Ming Deng 00ed1c3733 change the globalInstance to read conf/app.conf 2020-11-25 20:16:41 +08:00
Ming Deng 0958174bc8 update doc 2020-11-25 20:14:18 +08:00
AllenX2018 c6282e7b27 remove ineffectual assignment to err 2020-11-18 09:56:56 +08:00
AllenX2018 6225f0c1e9 fix issue 4311 2020-11-17 20:53:33 +08:00
Ming Deng 05d8e293f7
Merge pull request #4313 from AllenX2018/fix-issue-4312
fix issue #4312
2020-11-14 16:04:29 +08:00
AllenX2018 663e5d728c fix issue #4312 2020-11-13 16:47:22 +08:00
Ming Deng 26bc9e7264
Merge pull request #4310 from gswcodeshow/develop
添加Condition单元测试 #4298
2020-11-13 09:31:18 +08:00
cruis 0a852912b4 调整CI警告 2020-11-13 07:25:21 +08:00
cruis 647e21b0c4 添加Condition单元测试 2020-11-13 00:13:35 +08:00
Ming Deng a00b54d8f6
Merge pull request #4304 from gswcodeshow/develop
Fix 4298
2020-11-12 21:41:10 +08:00
Ming Deng 8f16098508
Merge pull request #4306 from AllenX2018/fix-issue-4305
fix issue #4305: add write lock for map adminTaskList iteration and modify
2020-11-11 20:52:29 +08:00
AllenX2018 aad80ba4fa fix issue#4305: add write lock for map adminTaskList iteration and modify 2020-11-11 17:14:05 +08:00
cruis 8f3fd317da Fix 4298
Condition的clone方法,params存在共享内存,导致isCond死循环。
2020-11-11 16:12:57 +08:00
Ming Deng c5c03815f3
Merge pull request #4301 from flycash/fix4298
Fix 4298
2020-11-11 08:55:08 +08:00
Ming Deng 0b3bcbd3ec Fix 4298 2020-11-10 23:30:24 +08:00
Ming Deng 49d763dc6c
Merge pull request #4296 from flycash/fix4138
Fix 4138
2020-11-10 21:58:28 +08:00
Ming Deng aa2c0ca108
Merge pull request #4299 from AllenX2018/fix-4282
fix issue 4282
2020-11-10 21:57:52 +08:00
AllenX2018 b3474b20b9 fix issue 4282 2020-11-10 15:45:34 +08:00
Ming Deng 2a6fadb9ae Fix 4138 2020-11-09 22:46:26 +08:00
Ming Deng fb12e1f743
Merge pull request #4292 from flycash/develop-2.0
Develop 2.0
2020-11-07 22:23:55 +08:00