github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
907 Commits
4 Branches
69 Tags
148 MiB
Commit Graph

907 Commits (a914ee383ed866cf7069066ab06914a3800f5890)

Author SHA1 Message Date
Qiuyi LI a914ee383e Update project version 2023-07-07 10:41:33 +02:00
Qiuyi LI 1e8993b24e
Merge pull request #11 from LQYBill/dev 
Merge hotfix
 2023-07-07 10:39:24 +02:00
Qiuyi LI de1005f64d
Merge pull request #10 from LQYBill/hotfix_longer_timeout 
Hotfix: prolong HTTP requests timeout from 3s to 10s
 2023-07-07 10:37:52 +02:00
Qiuyi LI 1f4848afd4 Hotfix: prolong HTTP requests timeout from 3s to 10s since now we can receive up to 1000 orders from one single request to MabangAPI 2023-07-07 10:30:44 +02:00
Qiuyi LI 5c715848f8
Merge pull request #9 from LQYBill/dev 
Hotfix : retrieve 1000 orders per request to MabangAPI
 2023-07-06 17:12:40 +02:00
Qiuyi LI 2d29f28fad
Merge pull request #8 from LQYBill/fix/newMabangJobMaxRows 
fix: maxRows set to 1000
 2023-07-06 17:09:33 +02:00
Gauthier LO 2e59bc53d6 fix: maxRows set to 1000 2023-07-06 17:08:11 +02:00
Gauthier LO 52cfeac6f4 Merge branch 'dev' of github.com:LQYBill/wia_app into fix/newMabangJobMaxRows 2023-07-06 17:06:55 +02:00
Gauthier LO 7896883f11 fix: maxRows set to 1000 2023-07-06 17:04:32 +02:00
Qiuyi LI 7d1d288401 Release note 1.1.0: Use new MabangAPI and add order archiving job 2023-07-06 16:44:39 +02:00
Qiuyi LI ef2f387112
Merge pull request #7 from LQYBill/dev 
New MabangAPI & order archive job
 2023-07-06 16:42:05 +02:00
Qiuyi LI 43f9e84cc8
Merge pull request #6 from LQYBill/feature/newMabangApi 
Feature/new mabang api
 2023-07-06 16:39:24 +02:00
Gauthier LO cfce37e758 fix: revert some changes 2023-07-06 16:34:35 +02:00
Gauthier LO f1acfa3a3d feature : new Mabang Job to retrieve orders. 2023-07-06 16:15:48 +02:00
Gauthier LO 5b108d9ec6 fix : archiving job now works as intended, by archiving by default all orders and parcel infos before today 1 year ago 2023-07-06 16:13:27 +02:00
Gauthier LO f1473e1d94 feature : - changed list loading logic to include filter 2023-07-06 16:11:18 +02:00
Gauthier LO c094ec3577
Merge pull request #4 from LQYBill/dev 
fix: issue in previous merge
 2023-07-04 14:18:08 +02:00
Gauthier LO a4a96e4a8a fix: issue in previous merge 2023-07-04 14:15:37 +02:00
Gauthier LO 4071a5edc3
Merge pull request #3 from LQYBill/dev 
Dev
 2023-07-04 12:19:34 +02:00
Gauthier LO 03cef62343
Merge pull request #2 from LQYBill/dev-g-3 
Dev g 3
 2023-07-04 12:15:47 +02:00
Gauthier LO 8004443d2a merge with dev 2023-07-04 12:14:07 +02:00
Gauthier LO 3f327a22c3 feature : Job that archives po, poc, parcel, parcel_traces 
fix : orders with empty logistic_channel_name were not displayed in invoicing page with manual selection
 2023-07-04 11:58:53 +02:00
Qiuyi LI 9c5c7432b6 Update project version 2023-07-04 11:42:42 +02:00
Qiuyi LI ccd36caf72 Restore app port and file paths now that old version is no longer running 2023-07-04 11:41:41 +02:00
Qiuyi LI 76bf080344 Feature: makes excluded tracking numbers regex a parameter in ArchiveOrderJob 2023-07-04 11:10:56 +02:00
Qiuyi LI 43bc7339b8 Update project version 2023-06-30 11:01:08 +02:00
Qiuyi LI 7f9b143971 Fix: convert order time in the database from GMT+8 to GMT+2 to avoid searching mismatch 2023-06-30 10:40:54 +02:00
Qiuyi LI c61b5e373c Add missing CMK job 2023-06-30 10:34:26 +02:00
Qiuyi LI a23a94f3ef Update project version 2023-06-28 16:39:47 +02:00
Qiuyi LI 4c6457cf29 Fix: When checking SQL injections, make sure that the tested string's length also matches keyword's length, otherwise a perfectly normal table name "country" will be considered as SQL injection suspect because it starts with "count" 2023-06-28 16:38:44 +02:00
Qiuyi LI 1f95e88c3a Exclude WIA API calls from JWT filter 2023-06-20 16:28:05 +02:00
Gauthier LO 7953e9df2c feature: (WIP) archiving job for po, poc, parcel and parcel_trace 2023-06-19 16:14:21 +02:00
Gauthier LO 1c0eec21fa feat : new pages (sav_refund, shipping_calculation, billable_orders_breakdown), warehouses implementation 2023-06-14 11:37:39 +02:00
Gauthier LO fafd549d61 prod config file updated 2023-05-26 12:41:28 +02:00
Gauthier LO f501c314b6 Feat : upgrade from jeecg boot version 3.5 2023-05-26 11:59:13 +02:00
zhangdaiscott d81fa1f908 新增用户的时候设置租户无效 2023-03-15 11:34:26 +08:00
zhangdaiscott 217fe0dce4 租户邀请人改成采用手机号，租户敏感接口加权限 2023-03-15 11:34:20 +08:00
zhangdaiscott fffa7f327b 简化职位录入，职位编码自动生成 2023-03-15 11:34:11 +08:00
zhangdaiscott 5417f1285a 多租户实现逻辑功能不完善问题 #4676 2023-03-13 16:12:18 +08:00
zhangdaiscott b75cbcc911 积木报表数据库表字段缺失 #4675 2023-03-13 10:36:32 +08:00
zhangdaiscott a68f304307 补充逻辑，登录加载权限，加上租户套餐权限配置 2023-03-09 12:06:55 +08:00
zhangdaiscott 0a00bd8a7c 解决bug，租户是否有效判断有误 2023-03-09 12:06:30 +08:00
zhangdaiscott e90efbb52f 解决bug，导入部门是否叶子值不对 2023-03-09 12:06:04 +08:00
JEECG 3c320a5769
Merge pull request #4295 from wang1223440313/patch-1 
#FIX 修复枚举常量命名错误
 2023-03-08 20:20:04 +08:00
JEECG 98472b5c35
Merge pull request #4654 from xuxiaowei-com-cn/master-token 
✨ 储存在Redis中的Token增加文件夹前缀
 2023-03-08 20:16:06 +08:00
zhangdaiscott 3f2354a8ac 开源协议补充 2023-03-08 13:38:51 +08:00
徐晓伟 8a94c40e0e ✨ 储存在Redis中的Token增加文件夹前缀 
https://github.com/jeecgboot/jeecg-boot/issues/4650
 2023-03-07 16:24:30 +08:00
zhangdaiscott 42eedcd3b3 系统接口加了权限注解@RequiresPermissions未授权会提示无权限，暂时注释掉 
(无奈的修改，因为太多人问没权限的问题，请注重安全的项目，自行打开注解)
 2023-03-07 13:37:02 +08:00
zhangdaiscott 3c2038ac0e 系统接口加了权限注解@RequiresPermissions未授权会提示无权限，暂时注释掉 
(无奈的修改，因为太多人问没权限的问题，请注重安全的项目，自行打开注解)
 2023-03-07 13:36:02 +08:00
zhangdaiscott c8323540cc 启动报错：java.lang.ArrayIndexOutOfBoundsException: -1 #3653 2023-03-07 11:56:20 +08:00