github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,748 Commits
3 Branches
68 Tags
146 MiB
Commit Graph

1748 Commits (cdd7f29d4a6b9d9969e90b454caa77220cd5b4e7)

Author SHA1 Message Date
Qiuyi LI c42015520c Update project version 2023-09-15 11:39:10 +02:00
Qiuyi LI 63b61d3f24
Merge pull request #32 from LQYBill/dev 
Hotfixes
 2023-09-15 11:25:42 +02:00
Qiuyi LI 8b32a17a00
Merge pull request #31 from LQYBill/fix/invoiceExcelBug 
fix: Excel display bug in invoices
 2023-09-15 11:21:50 +02:00
Qiuyi LI 8228862f39
Update AbstractInvoice.java 
Cleanup comments
 2023-09-15 11:21:37 +02:00
Qiuyi LI abada459bb
Update AbstractInvoice.java 
Delete system.out.println
 2023-09-15 11:20:28 +02:00
Gauthier LO 0561f8a870 fix: Excel display bug in invoices 2023-09-15 11:02:50 +02:00
Qiuyi LI f64086699d
Merge pull request #30 from LQYBill/archive_order_job_rate_limiter 
Archive order job rate limiter
 2023-09-14 16:16:26 +02:00
Qiuyi LI a0db239994 Use ThrottlingExecutorService in ArchiveOrderJob as MabangAPI has a 300 requests per minute limit 2023-09-14 16:13:48 +02:00
Qiuyi LI bcf57915cc Add thread executor service with throttling 2023-09-14 16:12:40 +02:00
Qiuyi LI c21a8b50fe Update project version 2023-09-13 16:40:40 +02:00
Qiuyi LI 7d85e3becc
Merge pull request #29 from LQYBill/dev 
Hotfix : add tube rule for 30X40 portraits
 2023-09-13 16:39:55 +02:00
Qiuyi LI 18a8448684
Merge pull request #28 from LQYBill/update_tube_adding_job 
Add tube rule for 30X40 portraits
 2023-09-13 16:23:03 +02:00
Qiuyi LI cf2b51c0f7 Add tube rule for 30X40 portraits 2023-09-13 16:21:26 +02:00
Qiuyi LI 76c6d7a853 Merge remote-tracking branch 'origin/release' into release 2023-09-13 15:27:32 +02:00
Gauthier LO cff04fe906 feature : (WIP) Expenses overview + transactions VIEW 2023-09-12 12:26:51 +02:00
zhangdaiscott 581047c569 升级积木报表1.6.2-GA5，解决仪表盘兼容问题 2023-09-12 17:26:23 +08:00
zhangdaiscott 87677df925 升级积木报表1.6.2-GA3，解决严重SQL漏洞 2023-09-12 16:50:33 +08:00
zhangdaiscott 56e81fbf7b 升级积木报表1.6.2-GA，解决严重SQL漏洞 2023-09-11 22:45:22 +08:00
Gauthier LO fd35ea1c3e feature : (WIP) Invoicing page for customer 2023-09-06 14:26:33 +02:00
zhangdaiscott 473875a9d2 --重构表字典逻辑，深度解决SQL注入漏洞问题(修复导致的bug修复)-- 2023-09-05 22:59:08 +08:00
zhangdaiscott 44952c79c2 ---重构表字典逻辑，深度解决SQL注入漏洞问题，新旧版本都可以参考此修改合并--- 
（重点针对表名和字段进行单独check处理，更严格的格式要求，可能会导致一些特殊字典用法出问题，请根据自己业务做灵活调整）
org\jeecg\common\exception\JeecgSqlInjectionException.java(+)
org\jeecg\common\exception\JeecgBootExceptionHandler.java

org\jeecg\common\util\security\AbstractQueryBlackListHandler.java
org\jeecg\common\util\SqlInjectionUtil.java
org\jeecg\modules\system\controller\DuplicateCheckController.java
org\jeecg\modules\system\mapper\xml\SysDictMapper.xml
org\jeecg\modules\system\mapper\SysDictMapper.java
org\jeecg\modules\system\service\impl\SysDictServiceImpl.java
org\jeecg\modules\system\service\ISysDictService.java
 2023-09-03 20:07:58 +08:00
zhangdaiscott 58aebdbba4 调整版本号准备发版 2023-08-31 09:48:20 +08:00
Gauthier LO 061657d9bd fix: digit format in invoices 2023-08-30 15:30:26 +02:00
zhangdaiscott 2411d85af4 Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot 2023-08-30 19:02:34 +08:00
zhangdaiscott 572ea6dd69 Mono示例 2023-08-30 19:02:00 +08:00
JEECG 6e417a22ba
Merge pull request #5328 from EightMonth/master 
issue#5295 issue#5296 issue#5255
 2023-08-30 18:50:35 +08:00
kezhijie 3478e8f7bc issue#5295 issue#5296 issue#5255 2023-08-30 11:38:47 +08:00
zhangdaiscott f9982a9132 【误删接口恢复】用户配置多租户后，登录后点击切换部门按钮，报错 #5298 2023-08-28 17:37:28 +08:00
Gauthier LO 5aed3a9156 Merge branch 'feature/creditPage' of github.com:LQYBill/wia_app into feature/creditPage 2023-08-25 16:30:45 +02:00
Gauthier LO cd9e6e7f45 feature: (WIP) debit + fix breakdownInvoice mail 2023-08-25 16:27:06 +02:00
Gauthier LO 5bade5b89e feature: (WIP) Credit Page 2023-08-25 16:06:40 +02:00
Gauthier LO 87241cc805 feature: (WIP) debit + fix breakdownInvoice mail 2023-08-25 16:06:10 +02:00
Qiuyi LI 97ef71d577
Merge pull request #27 from LQYBill/dev 
Use maven gpg plugin
 2023-08-25 11:36:14 +02:00
Qiuyi LI 708cc5cd73
Merge pull request #26 from LQYBill/fix/mavenGpgPlugin 
Fix/maven gpg plugin
 2023-08-25 11:35:13 +02:00
Qiuyi LI 9d2697affa Use classpath loader for FreeMarker template 2023-08-25 11:33:12 +02:00
Gauthier LO 07ba6510fd added maven gpg plugin 2023-08-25 11:32:46 +02:00
Gauthier LO 14ae44058f feature: (WIP) Credit Page 2023-08-24 16:35:27 +02:00
Qiuyi LI e7857333e3 Update project version 2023-08-24 15:41:46 +02:00
Qiuyi LI 84db512e7c
Merge pull request #25 from LQYBill/dev 
Release note 1.6.0
 2023-08-24 15:40:37 +02:00
Qiuyi LI 8da45dce22 Code optimization 2023-08-24 14:03:32 +02:00
Qiuyi LI 0eb6aadbff
Merge pull request #24 from LQYBill/fix/shippingCalculation 
fix: shipping fee calculation precision
 2023-08-23 11:30:52 +02:00
Gauthier LO dc4d67fcf8 fix: shipping fee calculation precision 2023-08-22 17:34:03 +02:00
Qiuyi LI ba9ba76a7e
Merge pull request #23 from LQYBill/fix/pendingTask 
Fix/pending task
 2023-08-22 16:02:04 +02:00
Gauthier LO f2ff97b1d3 fix: cancelInvoice 2023-08-22 15:57:29 +02:00
Gauthier LO 06d405b7e0 feature : task history 2023-08-22 15:15:24 +02:00
Qiuyi LI ef0ff44d23
Merge pull request #21 from LQYBill/feature/breakdownInvoice 
Feature/breakdown invoice
 2023-08-22 15:12:10 +02:00
Qiuyi LI b3f10e42ea
Merge pull request #22 from LQYBill/fix/cancelInvoice 
Fix/cancel invoice
 2023-08-22 15:11:57 +02:00
Qiuyi LI cebff71e80 Revert "Delete application-dev.yml" 
This reverts commit 828aeacf1a.
 2023-08-22 14:52:37 +02:00
Gauthier LO e57aea61f0 fix : cancel invoice now revert erp status from 4 to 3 2023-08-21 17:54:36 +02:00
Qiuyi LI 828aeacf1a
Delete application-dev.yml 2023-08-21 15:42:22 +02:00