Commit Graph
333 Commits
Author SHA1 Message Date
鲁飞 2f4ad5c556 * Format code and fix return value. 2022-12-06 06:05:18 +00:00
dingguodong 5fc4eeb5dd * Adjust extension loading priority for saas. 2022-12-05 10:00:37 +08:00
wangyidong e460772fc4 * code for task #77129. 2022-11-29 10:52:01 +08:00
liugang 08748eb7d4 Merge branch 'guanxiying/zentaopms-master' 2022-11-23 10:09:31 +08:00
王怡栋 66b9e6b116 Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
#   framework/base/router.class.php
2022-11-11 02:49:32 +00:00
wangyidong 8a178c72fe * adjust for project release link story and bug. 2022-11-11 10:47:01 +08:00
wangyidong a5b9f374d1 * merge git stash. 2022-11-10 15:50:17 +08:00
wangyidong 6eae8345f7 * merge ztSessionHandler. 2022-11-10 15:47:05 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
Lufei 35ef023439 * Fix die error for xuanxuan. 2022-11-04 17:17:49 +08:00
朱金勇 8fff18a3ea Merge branch 'sprint/fix-api' into 'master'
* Fix call api error.

See merge request easycorp/zentaopms!6025
2022-11-04 02:51:21 +00:00
鲁飞 95d10ea6d3 * Fix call api error. 2022-11-04 02:51:20 +00:00
tianshujie 787ba2ad2d * Fix bug #29247. 2022-11-04 10:17:00 +08:00
wangyidong 59f0cc09d9 * adjust for account. 2022-11-03 15:58:08 +08:00
zhujinyong e5aa646144 * Fix session for api. 2022-11-03 10:03:19 +08:00
鲁飞 e0cd779954 * Remove use exit for api. 2022-11-03 00:32:42 +00:00
wangyidong fd56b11e41 * code for task #74779. 2022-11-02 10:18:26 +08:00
Lufei 3970bc226d * Fix install and upgrade locate error. 2022-11-01 19:22:40 +08:00
Lufei ac363b3df7 * Fix install error. 2022-11-01 15:44:49 +08:00
wangyidong 4f824f9410 * code for task #73994. 2022-11-01 15:02:20 +08:00
Yagami 68665d5ed0 * Finish task #74207. 2022-11-01 14:57:52 +08:00
liugang 540cd0e3c5 * Rename model to target. 2022-11-01 09:59:32 +08:00
liugang 8220ce7025 * Load tao class in the model class and its subclasses. 2022-11-01 09:47:09 +08:00
liugang 9b6e282725 * Load zen class in the control class and its subclasses. 2022-11-01 09:45:25 +08:00
Lufei 031838a6ce * Fix loadModel for entry. 2022-10-31 16:36:52 +08:00
鲁飞 b1cb5a798e * Fix bug of unauthorized users. 2022-10-28 08:16:50 +00:00
wangyidong 11e0ad5c0b * adjust for ztsession. 2022-10-28 09:38:40 +08:00
Guan Xiying c2e9f3dab2 * Add function to load target file. 2022-10-27 15:48:48 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
Guan Xiying 3848e7312d * Use $this->moduleName instead of $moduleName for it might be empty
sometimes.
2022-10-26 14:00:12 +08:00
Guan Xiying 3c46850e0e * Return false when the target object is empty to avoid assigning
property to a null object.
2022-10-26 13:58:18 +08:00
Guan Xiying a3da6393be * Don't need load config and lang when load the zen object. 2022-10-26 13:57:38 +08:00
Guan Xiying 9b7ccef034 * Optimize the comment. 2022-10-26 13:56:11 +08:00
Guan Xiying 59ff8af5e6 * Add the loadTao function to load the tao object of a module. 2022-10-26 11:05:37 +08:00
Guan Xiying 08ce854f41 * Call the loadTarget function to load the model object of a module. 2022-10-26 11:00:49 +08:00
Guan Xiying 8c185e925c * Add function to load the zen object of a module. 2022-10-26 11:00:27 +08:00
Guan Xiying b47999a32e * Call the loadTarget function to load the model object of a module. 2022-10-26 10:59:44 +08:00
Guan Xiying 23f17a3812 * Add function to load the object of a class. 2022-10-26 10:57:27 +08:00
caoyanyi 1a68e5ac28 * Modify session error. 2022-10-26 09:56:45 +08:00
Guan Xiying dc874101da * Remove blank. 2022-10-19 17:16:51 +08:00
Guan Xiying c43f14c7b0 * Refactor to support load extensions of tao. 2022-10-19 16:48:04 +08:00
Guan Xiying d9883bd382 * Refactor to avoid errors when class names contain ext or model. 2022-10-19 16:45:18 +08:00
Guan Xiying 7d305bd7f7 * Refactor the loadModel function to support loading tao files and return tao object. 2022-10-19 16:43:49 +08:00
Guan Xiying 0ec0e38a29 * Refactor the loadModel function to support loading zen files and return zen object. 2022-10-19 16:40:58 +08:00
Guan Xiying b0be2cd295 * Remove useless variable. 2022-10-19 10:10:15 +08:00
Guan Xiying 8d961926a4 * Adjust the comments. 2022-10-18 16:45:52 +08:00
Guan Xiying 8dce21799f * Optimize the codes of loadModel function. 2022-10-18 16:28:10 +08:00
Guan Xiying ca19766cbc * Refactor functions to support loading the zen files and the tao files. 2022-10-18 16:14:48 +08:00
wangyidong 460c3d9fb1 * adjust for ztSessionHandler. 2022-10-09 10:41:14 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00