Commit Graph

1470 Commits (1456e2eb437783e2f3a162b34aa20a0107c238f6)

Author SHA1 Message Date
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
Gauthier LO 1fb0f154ca email is now sent to user and service 2023-08-21 15:16:54 +02:00
Qiuyi LI 997b87a085 Update PlatformOrderContent model 2023-08-21 15:05:20 +02:00
Qiuyi LI 049d48f928 Retrieve specifics aka customization data of PlatformOrderContent 2023-08-21 14:36:35 +02:00
Gauthier LO cd4ad1e5fe feature : Making Shipping invoice in breakdown page + zip files and email 2023-08-21 12:45:04 +02:00
Qiuyi LI d51549c2db Minor code optimization 2023-08-21 11:14:57 +02:00
zhangdaiscott d3238205e1 jeecg存在权限提升漏洞,可直接获得管理员权限 #5270 2023-08-20 18:51:43 +08:00
zhangdaiscott ff083361d4 放开系统权限控制,@RequiresPermissions,解决不安全的问题
jeecg存在权限提升漏洞,可直接获得管理员权限 #5270
2023-08-20 18:01:25 +08:00
zhangdaiscott 9c038a979d 时间盲注SQL注入绕过 #5269 2023-08-20 11:32:17 +08:00
Chenzhexian 5974a2e8a4
Update DynamicRouteLoader.java 2023-08-18 09:54:20 +08:00
Gauthier LO 555e697633 Merge branch 'feature/breakdownInvoice' of github.com:LQYBill/wia_app into feature/breakdownInvoice 2023-08-17 16:26:53 +02:00
Gauthier LO 8eccba5df2 maven jeecg 3.5.1 2023-08-17 16:21:12 +02:00
Gauthier LO a92cd741b1 feature: (WIP) Invoicing in breakdown page 2023-08-17 16:21:12 +02:00
Chenzhexian 30151a2324
Update DynamicRouteLoader.java 2023-08-17 16:06:16 +08:00
Chenzhexian 28293aba7d
Create PredicatesVo.java 2023-08-17 16:01:51 +08:00
Gauthier LO 314a4b7ac4 feature: (WIP) Invoicing in breakdown page 2023-08-17 09:52:00 +02:00
zhangdaiscott d36caf8c69 SQL注入 #5173 2023-08-16 09:40:40 +08:00
zhangdaiscott e6bd2d5009 升级druid 2023-08-15 18:38:53 +08:00
zhangdaiscott baf4b96b3f 【漏洞处理】freemarker模板注入漏洞——升级仪表盘 2023-08-15 18:38:41 +08:00
zhangdaiscott acb48179ab 【漏洞处理】freemarker模板注入问题 禁止解析ObjectConstructor,Execute
(提示:部分依赖尚未上传maven官仓,依赖下载失败请配置jeecg私服)
2023-08-15 17:45:07 +08:00
zhangdaiscott 20889e8724 【issues/4393】解决使用参数tableName=sys_user t&复测,漏洞仍然存在 2023-08-14 15:54:03 +08:00
zhangdaiscott 751b81c7bf 【issues/4393】解决使用参数tableName=sys_user t&复测,漏洞仍然存在 2023-08-14 12:51:31 +08:00
zhangdaiscott 0bc7e0967d 【issues/4393】解决使用参数tableName=sys_user t&复测,漏洞仍然存在 2023-08-14 10:01:49 +08:00
zhangdaiscott 05181754bb 签名失败 2023-08-09 20:45:49 +08:00
Qiuyi LI 00914ac93e
Merge pull request #20 from LQYBill/dev
Release 1.5.0
2023-08-09 14:08:55 +02:00
Qiuyi LI 8d5a26bb62 Release note: Add SKU prices in RMB, add SAV refunds to invoice detail and minors improvements 2023-08-09 11:43:33 +02:00
Qiuyi LI 2223f19eab
Merge pull request #19 from LQYBill/sav_refunds_in_invoice_detail
Sav refunds in invoice detail and RMB SKU prices
2023-08-09 11:40:36 +02:00
Qiuyi LI f6dfaffa12 Feature: Add Luxembourg Post tracking number pattern 2023-08-09 11:30:51 +02:00
Qiuyi LI bc05f0db5a Feature: Add SKU prices in RMB, to be used in priority if present 2023-08-09 11:30:27 +02:00