Commit Graph

824 Commits

Author SHA1 Message Date
An Tao ff79a2ddb5
Merge pull request #96 from an-tao/dev
Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR
2019-03-27 20:50:50 +08:00
antao 8ae07ce195 Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR in CMakeLists.txt files 2019-03-27 19:32:09 +08:00
An Tao 92d7867ee4
Merge pull request #95 from an-tao/dev
Fix an issue that occur on incorrect SQL
2019-03-27 16:10:13 +08:00
an-tao 5b55a8f9bf Fix an issue that occur on incorrect SQL 2019-03-27 15:32:23 +08:00
An Tao ef3ec63be8
Merge pull request #94 from an-tao/dev
Modify the method of setting the CMAKE_MODULE_PATH
2019-03-27 13:38:06 +08:00
antao f1a14e4441 Modify the method of setting the CMAKE_MODULE_PATH 2019-03-27 13:14:30 +08:00
antao ff3d87da13 Modify config.example.json 2019-03-27 13:11:02 +08:00
An Tao 8d251f8158
Merge pull request #92 from an-tao/travis_test
Make Travis CI work
2019-03-26 15:49:21 +08:00
antao 1f8be1ce8c Add some Travis CI tests 2019-03-26 15:25:22 +08:00
An Tao 9132b08c87
Merge pull request #91 from an-tao/dev
Add the getLoop() method to the HttpAppFramework class
2019-03-26 11:09:16 +08:00
antao 65c101bee0 Add the getLoop() method to the HttpAppFramework class 2019-03-26 10:45:39 +08:00
an-tao 798861a1cc Use IPV4 in the webapp example 2019-03-25 23:28:22 +08:00
An Tao 9b6259837d
Merge pull request #90 from an-tao/dev
Remove the loop() interface
2019-03-25 20:54:01 +08:00
antao d12b49cab0 Remove the loop() interface 2019-03-25 20:32:35 +08:00
An Tao b2ff2f2af2
Merge pull request #89 from an-tao/dev
1.  Add the getCustomConfig() method.
2. Rename the registerHttpMethod() to registerHandler().
3. Add some comments.
2019-03-25 18:13:44 +08:00
antao 66456eae1a 1. Add the getCustomCOnfig() method.
2. Add some comments.
2019-03-25 17:44:22 +08:00
antao 56eaca1998 Update README.md and the banner image 2019-03-24 23:17:12 +08:00
An Tao 40464da6b2
Merge pull request #88 from an-tao/dev
Optimize the app.run() method and the DbClientLockFree class
2019-03-23 17:56:56 +08:00
antao 353790f90b Use shared_ptr to store sql query in cache in the DbClientLockFree class 2019-03-23 17:32:03 +08:00
antao 6adff3469c Modify mysql client 2019-03-23 15:32:34 +08:00
antao 894b634b22 Adjust the execution order inside the run() method
Modify the configuration of fast database clients
Modify the ConfigLoader class
2019-03-23 11:26:21 +08:00
antao 93848ceff2 1. Update the Dockerfile
2. Update the submodule trantor
2019-03-23 10:53:07 +08:00
An Tao f02c5d38b1
Merge pull request #85 from an-tao/dev
Move utility functions to the utils namespace
2019-03-21 18:28:18 +08:00
antao db72840fc2 Move utility functions to the utils namespace 2019-03-21 17:47:45 +08:00
an-tao e341488338 Restore .github folder 2019-03-20 23:26:58 +08:00
An Tao 11d3f46edb
Merge pull request #82 from zhjunjun/master
Add some query tests in db_test.cc for orm_lib
2019-03-20 23:09:42 +08:00
zhangjunjun a580f89c8b Add query test in db_test.cc for orm_lib 2019-03-20 21:56:56 +08:00
An Tao 15075a2227
Merge pull request #81 from an-tao/dev
Remove an unnecessary null pointer check
2019-03-20 13:00:15 +08:00
antao fecec81975 1.Remove an unnecessary null pointer check
2.Fix a compilation error for older g++
    3.Update README.md
2019-03-20 11:46:27 +08:00
An Tao 9eb7025d74
Update README.md 2019-03-19 23:21:14 +08:00
An Tao 34ebd7ef58
Update README.md 2019-03-19 23:01:19 +08:00
An Tao 06da245cd6
Update README.md 2019-03-19 20:47:18 +08:00
An Tao 3e4a650d9c
Update README.md 2019-03-19 18:50:58 +08:00
antao 1a5845d06c Update README 2019-03-19 18:26:09 +08:00
antao f8c5a73c6b Update the README 2019-03-19 18:22:15 +08:00
An Tao 96f9862ba4
Merge pull request #78 from an-tao/dev
Add matchedPathPattern() interface in the HttpRequest class
2019-03-18 11:57:23 +08:00
antao 7ae533671c Add matchedPathPattern() interface in the HttpRequest class
Change version to 0.9.31
2019-03-18 10:44:38 +08:00
antao 58835e0b1b Update submodule trantor 2019-03-18 00:19:04 +08:00
An Tao 5a9ecd4327
Merge pull request #77 from an-tao/dev
Fix a compilation warning
2019-03-17 21:32:10 +08:00
antao afdb7d26da Fix a compilation warning 2019-03-17 21:09:05 +08:00
An Tao c9743400f1
Merge pull request #76 from an-tao/dev
Modify HttpRequestParser to handle invalid requests
2019-03-15 18:03:33 +08:00
antao 3ba18b2102 Add a Dockerfile 2019-03-15 17:39:18 +08:00
antao db266d9aad Modify HttpRequestParser to handle invalid requests 2019-03-15 16:55:36 +08:00
antao 62f152b945 Add a docker badge 2019-03-14 17:51:42 +08:00
antao 053c760d27 Rename the InnerIpFilter class 2019-03-14 11:25:12 +08:00
An Tao 8d6a1ed643
Merge pull request #75 from an-tao/dev
Adapt ipv6
2019-03-14 09:11:38 +08:00
an-tao 0e447a1f9e Adapt ipv6 2019-03-13 23:44:53 +08:00
an-tao 93bd3b11d7 Update trantor for ipv6 2019-03-13 23:29:58 +08:00
antao 056a55ab27 Update the submodule trantor 2019-03-13 10:29:48 +08:00
An Tao 322e7672d2
Merge pull request #74 from an-tao/dev
Add configuration options that limit the number of keep-alive requests
2019-03-12 18:47:30 +08:00