archive-gh-me/thinkjs
1
0
Fork 0
mirror of https://github.com/thinkjs/thinkjs.git synced 2026-01-18 14:26:56 +00:00
Code Issues Projects Releases Wiki Activity
2,793 Commits 13 Branches 87 Tags
Commit Graph

1086 Commits

Author SHA1 Message Date
blue0125
8970d9efdd [feature] cookie support the samesite option 2023-04-19 13:59:55 +08:00
blue0125
65e6863cf9 support prefix for session as cache adapter 2020-03-31 19:14:06 +08:00
blue0125
4332493529 redis adapter socket add ioredis package 2020-03-31 19:11:20 +08:00
lichengyin
70ed07d2d8 fix addMany data order by array first keys. 2019-02-24 19:34:31 +08:00
lizheming
2eeccb20eb value should filter by fields if val is object 2019-02-23 17:33:10 +08:00
lizheming
c1bd803fc0 filter data with first data key order 2019-02-23 17:01:48 +08:00
lizheming
64690e6562 filter data with first data key order 2019-02-23 16:55:07 +08:00
welefen
518cf50e21 fix inject 2017-09-14 10:01:20 +08:00
welefen
2242f6d1d6 update 2017-09-13 11:32:17 +08:00
welefen
7a7ea12dac fix comparison 2017-09-12 18:45:59 +08:00
welefen
6ce75e1657 update pg socket adapter 2017-09-12 18:28:43 +08:00
welefen
b7fa8a72f1 escape comparison 2017-09-12 18:26:49 +08:00
snadn
2f254be403 处理export为箭头函数时的异常 
箭头函数没有prototype
 2017-08-23 12:54:05 +08:00
welefen
2dd35c19b7 Remove some default db configs 2017-07-24 14:51:22 +08:00
welefen
10dbdcf7a6 Fix log sql config 2017-07-24 14:34:53 +08:00
welefen
67ad97ce1b Fix log_sql config 2017-07-24 14:30:27 +08:00
welefen
8742599f32 Upgrade pg version to 7.0.1 2017-07-19 14:03:04 +08:00
welefen
d5c55fe2d2 Fix download file with Chinese chars in filename, fix #668 2017-07-13 09:27:52 +08:00
welefen
cd54fa6f26 Fix #644 2017-07-12 10:35:08 +08:00
welefen
e7c8b7813f Fix ObjectId error 2017-07-12 10:34:13 +08:00
welefen
c12f8bb7e0 Merge branch 'master' of github.com:thinkjs/thinkjs 2017-07-12 10:05:17 +08:00
welefen
9193b5f046 Fix filename has chinese chars in download method 2017-07-12 10:04:55 +08:00
leejim
e7a27cf1a8 优化mongodb的where方法 
当value是objectId类型的时候，也同样将value转换成objectId
 2017-07-10 11:57:12 +08:00
Welefen Lee
ab2149f9e7 Merge pull request #688 from macurial/master 
updateMany 会丢失where条件
 2017-07-06 21:21:35 +08:00
17040389
6ca1c63117 updateMany 会丢失where条件 2017-07-04 22:43:30 +08:00
welefen
dc98292a2a Change default db config, fix #682 2017-07-04 18:06:28 +08:00
welefen
d84c5f7525 Retry when socket is closed in postgresql, fix #687 2017-07-04 09:56:51 +08:00
welefen
3dd9c7df6c Support get/set multi name, fix #665 2017-06-05 17:13:40 +08:00
welefen
fc117b335e Allow 0 when set validate type to int 2017-06-05 17:07:47 +08:00
Welefen Lee
3399f00f01 Merge pull request #621 from thinkjs/songguangyu-websocket-bugfix 
websocket
 2017-06-02 21:50:57 +08:00
sgy
40ff4b9eb1 新增request判断 2017-06-02 14:24:06 +08:00
songguangyu
c2e2d1312a Update socket.io.js 2017-06-02 11:26:38 +08:00
Welefen Lee
b87631ffa2 Merge pull request #656 from Juwan-Xu/master 
Update _parse_mongo.js
 2017-06-02 11:20:58 +08:00
Juwan-Xu
c2128456fb 调整格式 
调整格式，加空格
 2017-06-01 17:21:07 +08:00
Juwan-Xu
2586203ad7 Update _parse_mongo.js 
解决 #655 问题
 2017-05-26 10:42:46 +08:00
songguangyu
ce06f9bed1 fixed 
不小心把下面的东西去掉了 加回来
 2017-04-26 13:06:49 +08:00
songguangyu
b159f76e3b websocket 
在websocket open的时候 会在URL上附带参数 以便于 对socket 进行鉴权和管理，但是之前 url把config配上的直接输出了到request.url上， 没有附加search的内容。 以至于在controller里 用this.get 获取不到本应该附属在链接上的参数。
 2017-04-26 13:04:58 +08:00
JerryQu
5c69cec2a6 fixed #616 2017-04-20 20:23:59 +08:00
zero0-1one
ec2107902c 1. 解决 think.parallel_limit 与文档意图不一致的行为 
https://thinkjs.org/zh-cn/doc/2.2/api_think.html#toc-0a1
并不能达到同时执行数量限制的作用.  'clip_image' 没用当成 key
2. 解决只有一个参数 callback 的情况下没有起到任何限制作用的bug
 2017-04-04 12:29:17 +08:00
zero0-1one
96376a8ec5 解决 当使用相同 key 多次调用 think.parallelLimit, 总是执行第一次传递的 callback, 而导致不能得到预期结果 2017-04-04 11:14:02 +08:00
welefen
f5a2bbafaf Fix PREVENT_NEXT_PROCESS error, remove event in pm2 2017-03-30 16:08:23 +08:00
Welefen Lee
c07a668049 Merge pull request #584 from jerrybendy/resource_header 
输出静态文件增加设置 header 的功能
 2017-03-10 21:13:04 +08:00
Jerry Bendy
672141bc13 输出静态文件增加设置 header 的功能 2017-03-10 06:22:14 +00:00
welefen
f529f89719 Support decimal field type for parseType method. fix #576 2017-03-08 10:03:12 +08:00
welefen
b819b83a46 Remove preload log 2017-03-08 09:59:36 +08:00
welefen
b902e701cf Upgrade typescript version to 2.1.6 2017-02-20 17:48:34 +08:00
ZHANGJIANGUANG
1ae2ff3d82 x-forwarded-for数组中ip有空格问题 2017-02-15 20:55:14 +08:00
ZHANGJIANGUANG
75f12421a6 x-forwarded-for数组中ip有空格问题 2017-02-15 15:34:22 +08:00
Shijie Lu
7b7be492f1 update parseSql 
/\s__([A-Z_-]+)__\s/g  改成  /\s__([A-Z_-]+)__\s?/g

this.parseSql("SELECT * FROM __TEST__");
否则这种情况没法解析
 2017-02-13 12:01:17 +08:00
welefen
4974aa0096 change es2015-loose to es2015 2017-02-07 16:35:55 +08:00