diff --git a/WebRoot/Excel/785fef9b-530b-482d-81b4-f0ded2e3ae51.xlsx b/WebRoot/Excel/785fef9b-530b-482d-81b4-f0ded2e3ae51.xlsx new file mode 100644 index 00000000..5d9a3f7f Binary files /dev/null and b/WebRoot/Excel/785fef9b-530b-482d-81b4-f0ded2e3ae51.xlsx differ diff --git a/WebRoot/Excel/c887fee0-2c56-4cd1-88e2-7ee78ad3adda.xlsx b/WebRoot/Excel/c887fee0-2c56-4cd1-88e2-7ee78ad3adda.xlsx new file mode 100644 index 00000000..9ea88caa Binary files /dev/null and b/WebRoot/Excel/c887fee0-2c56-4cd1-88e2-7ee78ad3adda.xlsx differ diff --git a/WebRoot/upload/03E8867B-7915-4663-9567-59EF12A01556.doc b/WebRoot/upload/03E8867B-7915-4663-9567-59EF12A01556.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/03E8867B-7915-4663-9567-59EF12A01556.doc and /dev/null differ diff --git a/WebRoot/upload/06066597-5B73-40FE-B49E-A72D2017614A.doc b/WebRoot/upload/06066597-5B73-40FE-B49E-A72D2017614A.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/06066597-5B73-40FE-B49E-A72D2017614A.doc and /dev/null differ diff --git a/WebRoot/upload/0845EB7F-3D65-4A3E-B229-6C18C4BFBB0D.doc b/WebRoot/upload/0845EB7F-3D65-4A3E-B229-6C18C4BFBB0D.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/0845EB7F-3D65-4A3E-B229-6C18C4BFBB0D.doc and /dev/null differ diff --git a/WebRoot/upload/13CAFA9F-C6DF-485B-B5FB-5C2B7BD7EB91.xlsx b/WebRoot/upload/13CAFA9F-C6DF-485B-B5FB-5C2B7BD7EB91.xlsx deleted file mode 100644 index 56699d54..00000000 Binary files a/WebRoot/upload/13CAFA9F-C6DF-485B-B5FB-5C2B7BD7EB91.xlsx and /dev/null differ diff --git a/WebRoot/upload/17CE00C4-2719-4B21-80B1-436B007789F6.docx b/WebRoot/upload/17CE00C4-2719-4B21-80B1-436B007789F6.docx deleted file mode 100644 index 7c09b3e3..00000000 Binary files a/WebRoot/upload/17CE00C4-2719-4B21-80B1-436B007789F6.docx and /dev/null differ diff --git a/WebRoot/upload/1BE372CC-9751-4D55-A932-C2FBEB77403F.docx b/WebRoot/upload/1BE372CC-9751-4D55-A932-C2FBEB77403F.docx deleted file mode 100644 index 3f90b2be..00000000 Binary files a/WebRoot/upload/1BE372CC-9751-4D55-A932-C2FBEB77403F.docx and /dev/null differ diff --git a/WebRoot/upload/1CEA9293-8301-4C95-9CDC-4318AE9330BA.doc b/WebRoot/upload/1CEA9293-8301-4C95-9CDC-4318AE9330BA.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/1CEA9293-8301-4C95-9CDC-4318AE9330BA.doc and /dev/null differ diff --git a/WebRoot/upload/1EB11ABB-4AD2-4994-991D-50AE28F3A4A1.xlsx b/WebRoot/upload/1EB11ABB-4AD2-4994-991D-50AE28F3A4A1.xlsx deleted file mode 100644 index d1889a98..00000000 Binary files a/WebRoot/upload/1EB11ABB-4AD2-4994-991D-50AE28F3A4A1.xlsx and /dev/null differ diff --git a/WebRoot/upload/25186A8E-902D-4F2D-BF6B-23F5275B5AF5.xlsx b/WebRoot/upload/25186A8E-902D-4F2D-BF6B-23F5275B5AF5.xlsx deleted file mode 100644 index 624b5ad3..00000000 Binary files a/WebRoot/upload/25186A8E-902D-4F2D-BF6B-23F5275B5AF5.xlsx and /dev/null differ diff --git a/WebRoot/upload/255E1C19-965F-4DC1-AA29-A876F7CEBE45.xlsx b/WebRoot/upload/255E1C19-965F-4DC1-AA29-A876F7CEBE45.xlsx deleted file mode 100644 index d1889a98..00000000 Binary files a/WebRoot/upload/255E1C19-965F-4DC1-AA29-A876F7CEBE45.xlsx and /dev/null differ diff --git a/WebRoot/upload/257B8D71-4B52-4857-A98A-B8428E130A2A.docx b/WebRoot/upload/257B8D71-4B52-4857-A98A-B8428E130A2A.docx deleted file mode 100644 index 7c09b3e3..00000000 Binary files a/WebRoot/upload/257B8D71-4B52-4857-A98A-B8428E130A2A.docx and /dev/null differ diff --git a/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.pdf b/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.pdf deleted file mode 100644 index cecc9d41..00000000 Binary files a/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.pdf and /dev/null differ diff --git a/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.xlsx b/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.xlsx deleted file mode 100644 index 56699d54..00000000 Binary files a/WebRoot/upload/27C57AB7-6207-4D14-8366-44BEED2CBB02.xlsx and /dev/null differ diff --git a/WebRoot/upload/28FCADA4-98DE-4734-A1F3-633703414202.xlsx b/WebRoot/upload/28FCADA4-98DE-4734-A1F3-633703414202.xlsx deleted file mode 100644 index 56699d54..00000000 Binary files a/WebRoot/upload/28FCADA4-98DE-4734-A1F3-633703414202.xlsx and /dev/null differ diff --git a/WebRoot/upload/2AD8451F-B0D0-4FC4-8BD9-3F23B6077499.docx b/WebRoot/upload/2AD8451F-B0D0-4FC4-8BD9-3F23B6077499.docx deleted file mode 100644 index 7c09b3e3..00000000 Binary files a/WebRoot/upload/2AD8451F-B0D0-4FC4-8BD9-3F23B6077499.docx and /dev/null differ diff --git a/WebRoot/upload/2BD1EB67-1400-4DA1-8383-3D4EC3C9EE26.doc b/WebRoot/upload/2BD1EB67-1400-4DA1-8383-3D4EC3C9EE26.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/2BD1EB67-1400-4DA1-8383-3D4EC3C9EE26.doc and /dev/null differ diff --git a/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.pdf b/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.pdf deleted file mode 100644 index 9b5efe30..00000000 Binary files a/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.pdf and /dev/null differ diff --git a/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.xlsx b/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.xlsx deleted file mode 100644 index 56699d54..00000000 Binary files a/WebRoot/upload/2D8937B7-A51C-4F1D-BDFB-4C4B05066217.xlsx and /dev/null differ diff --git a/WebRoot/upload/31BA93CE-1233-4DE5-952E-236211A2B4DA.doc b/WebRoot/upload/31BA93CE-1233-4DE5-952E-236211A2B4DA.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/31BA93CE-1233-4DE5-952E-236211A2B4DA.doc and /dev/null differ diff --git a/WebRoot/upload/32A96D2C-D534-4E54-AC92-056D108A5680.doc b/WebRoot/upload/32A96D2C-D534-4E54-AC92-056D108A5680.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/32A96D2C-D534-4E54-AC92-056D108A5680.doc and /dev/null differ diff --git a/WebRoot/upload/346E6029-C025-4234-BE6E-2B59C581074A.xlsx b/WebRoot/upload/346E6029-C025-4234-BE6E-2B59C581074A.xlsx deleted file mode 100644 index d86c3367..00000000 Binary files a/WebRoot/upload/346E6029-C025-4234-BE6E-2B59C581074A.xlsx and /dev/null differ diff --git a/WebRoot/upload/35285116-7FE1-4840-9EF3-5A0682BF3F87.xlsx b/WebRoot/upload/35285116-7FE1-4840-9EF3-5A0682BF3F87.xlsx deleted file mode 100644 index a837cb51..00000000 Binary files a/WebRoot/upload/35285116-7FE1-4840-9EF3-5A0682BF3F87.xlsx and /dev/null differ diff --git a/WebRoot/upload/38E60A82-1B3C-457D-B939-4EB2BDB900D0.docx b/WebRoot/upload/38E60A82-1B3C-457D-B939-4EB2BDB900D0.docx deleted file mode 100644 index ddcb60d8..00000000 Binary files a/WebRoot/upload/38E60A82-1B3C-457D-B939-4EB2BDB900D0.docx and /dev/null differ diff --git a/WebRoot/upload/39E11808-F5D0-4819-A77D-7F7BB0989751.doc b/WebRoot/upload/39E11808-F5D0-4819-A77D-7F7BB0989751.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/39E11808-F5D0-4819-A77D-7F7BB0989751.doc and /dev/null differ diff --git a/WebRoot/upload/3E06C2D3-9F8B-4190-852B-A8CA3242330A.xls b/WebRoot/upload/3E06C2D3-9F8B-4190-852B-A8CA3242330A.xls deleted file mode 100644 index 85f72a4a..00000000 Binary files a/WebRoot/upload/3E06C2D3-9F8B-4190-852B-A8CA3242330A.xls and /dev/null differ diff --git a/WebRoot/upload/3E76CCD0-CFFC-4505-8E07-8F7B97C8A80B.docx b/WebRoot/upload/3E76CCD0-CFFC-4505-8E07-8F7B97C8A80B.docx deleted file mode 100644 index 50825919..00000000 Binary files a/WebRoot/upload/3E76CCD0-CFFC-4505-8E07-8F7B97C8A80B.docx and /dev/null differ diff --git a/WebRoot/upload/405CEA72-F373-477A-B53F-D3816BAB0817.docx b/WebRoot/upload/405CEA72-F373-477A-B53F-D3816BAB0817.docx deleted file mode 100644 index 7c09b3e3..00000000 Binary files a/WebRoot/upload/405CEA72-F373-477A-B53F-D3816BAB0817.docx and /dev/null differ diff --git a/WebRoot/upload/40B793B7-F949-40EC-910E-08801D5E7961.xls b/WebRoot/upload/40B793B7-F949-40EC-910E-08801D5E7961.xls deleted file mode 100644 index 85f72a4a..00000000 Binary files a/WebRoot/upload/40B793B7-F949-40EC-910E-08801D5E7961.xls and /dev/null differ diff --git a/WebRoot/upload/469EDC47-2738-4928-88E0-C44ACD6E633F.doc b/WebRoot/upload/469EDC47-2738-4928-88E0-C44ACD6E633F.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/469EDC47-2738-4928-88E0-C44ACD6E633F.doc and /dev/null differ diff --git a/WebRoot/upload/4C816E84-6C6F-4D24-9596-0AC3AEA23CF8.xlsx b/WebRoot/upload/4C816E84-6C6F-4D24-9596-0AC3AEA23CF8.xlsx deleted file mode 100644 index a837cb51..00000000 Binary files a/WebRoot/upload/4C816E84-6C6F-4D24-9596-0AC3AEA23CF8.xlsx and /dev/null differ diff --git a/WebRoot/upload/557C980E-37D5-4B52-A2C4-3F1E01B27809.png b/WebRoot/upload/557C980E-37D5-4B52-A2C4-3F1E01B27809.png deleted file mode 100644 index 4f51ef63..00000000 Binary files a/WebRoot/upload/557C980E-37D5-4B52-A2C4-3F1E01B27809.png and /dev/null differ diff --git a/WebRoot/upload/5A705474-8045-4862-94AB-A1AF2DACF66E.doc b/WebRoot/upload/5A705474-8045-4862-94AB-A1AF2DACF66E.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/5A705474-8045-4862-94AB-A1AF2DACF66E.doc and /dev/null differ diff --git a/WebRoot/upload/5BD6A20E-8034-4567-BB45-0BD0902D374F.doc b/WebRoot/upload/5BD6A20E-8034-4567-BB45-0BD0902D374F.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/5BD6A20E-8034-4567-BB45-0BD0902D374F.doc and /dev/null differ diff --git a/WebRoot/upload/5D405DEE-A894-4599-B47E-42FB97C437E3.xlsx b/WebRoot/upload/5D405DEE-A894-4599-B47E-42FB97C437E3.xlsx deleted file mode 100644 index d86c3367..00000000 Binary files a/WebRoot/upload/5D405DEE-A894-4599-B47E-42FB97C437E3.xlsx and /dev/null differ diff --git a/WebRoot/upload/65040C7D-FDD1-40F3-B85E-B2EFD68C1D14.xlsx b/WebRoot/upload/65040C7D-FDD1-40F3-B85E-B2EFD68C1D14.xlsx deleted file mode 100644 index d1889a98..00000000 Binary files a/WebRoot/upload/65040C7D-FDD1-40F3-B85E-B2EFD68C1D14.xlsx and /dev/null differ diff --git a/WebRoot/upload/6C6C5420-E160-44DE-A211-BD86F30F330F.docx b/WebRoot/upload/6C6C5420-E160-44DE-A211-BD86F30F330F.docx deleted file mode 100644 index 6bcbb804..00000000 Binary files a/WebRoot/upload/6C6C5420-E160-44DE-A211-BD86F30F330F.docx and /dev/null differ diff --git a/WebRoot/upload/72563146-ED1C-4F51-ACC1-E5B5B3225E55.xlsx b/WebRoot/upload/72563146-ED1C-4F51-ACC1-E5B5B3225E55.xlsx deleted file mode 100644 index d86c3367..00000000 Binary files a/WebRoot/upload/72563146-ED1C-4F51-ACC1-E5B5B3225E55.xlsx and /dev/null differ diff --git a/WebRoot/upload/85D26ABD-6FD2-4C4D-95CD-D4A7993A8D41.xlsx b/WebRoot/upload/85D26ABD-6FD2-4C4D-95CD-D4A7993A8D41.xlsx deleted file mode 100644 index 56699d54..00000000 Binary files a/WebRoot/upload/85D26ABD-6FD2-4C4D-95CD-D4A7993A8D41.xlsx and /dev/null differ diff --git a/WebRoot/upload/8621A207-1DAD-4CD2-A53E-7709D26CEAC4.doc b/WebRoot/upload/8621A207-1DAD-4CD2-A53E-7709D26CEAC4.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/8621A207-1DAD-4CD2-A53E-7709D26CEAC4.doc and /dev/null differ diff --git a/WebRoot/upload/86C33C2F-BB08-4D33-AD00-18F80F400B4A.xlsx b/WebRoot/upload/86C33C2F-BB08-4D33-AD00-18F80F400B4A.xlsx deleted file mode 100644 index d86c3367..00000000 Binary files a/WebRoot/upload/86C33C2F-BB08-4D33-AD00-18F80F400B4A.xlsx and /dev/null differ diff --git a/WebRoot/upload/879FB621-7042-4755-B0C1-38E6015C5AD2.xls b/WebRoot/upload/879FB621-7042-4755-B0C1-38E6015C5AD2.xls deleted file mode 100644 index 85f72a4a..00000000 Binary files a/WebRoot/upload/879FB621-7042-4755-B0C1-38E6015C5AD2.xls and /dev/null differ diff --git a/WebRoot/upload/87B7C257-2665-4130-ABD3-92912CB91B61.xlsx b/WebRoot/upload/87B7C257-2665-4130-ABD3-92912CB91B61.xlsx deleted file mode 100644 index b5c1813a..00000000 --- a/WebRoot/upload/87B7C257-2665-4130-ABD3-92912CB91B61.xlsx +++ /dev/null @@ -1,2 +0,0 @@ -教师姓名,性别,登录名,初始密码 -"李局长","男","cxljz","123456" diff --git a/WebRoot/upload/89D8B560-3447-4DDA-8318-F8013B143D4E.png b/WebRoot/upload/89D8B560-3447-4DDA-8318-F8013B143D4E.png deleted file mode 100644 index a7d2822b..00000000 Binary files a/WebRoot/upload/89D8B560-3447-4DDA-8318-F8013B143D4E.png and /dev/null differ diff --git a/WebRoot/upload/8C19A65A-0D62-4E24-A757-F96DD9B8BB8B.docx b/WebRoot/upload/8C19A65A-0D62-4E24-A757-F96DD9B8BB8B.docx deleted file mode 100644 index 3f90b2be..00000000 Binary files a/WebRoot/upload/8C19A65A-0D62-4E24-A757-F96DD9B8BB8B.docx and /dev/null differ diff --git a/WebRoot/upload/900F4FDF-753C-449B-85FC-14124845538A.docx b/WebRoot/upload/900F4FDF-753C-449B-85FC-14124845538A.docx deleted file mode 100644 index 7c09b3e3..00000000 Binary files a/WebRoot/upload/900F4FDF-753C-449B-85FC-14124845538A.docx and /dev/null differ diff --git a/WebRoot/upload/95EAB5DF-A2F1-4C31-AB90-B3918E60A4AB.docx b/WebRoot/upload/95EAB5DF-A2F1-4C31-AB90-B3918E60A4AB.docx deleted file mode 100644 index 0773a828..00000000 Binary files a/WebRoot/upload/95EAB5DF-A2F1-4C31-AB90-B3918E60A4AB.docx and /dev/null differ diff --git a/WebRoot/upload/96F840D8-E7FB-4D58-A735-DE951A103180.xlsx b/WebRoot/upload/96F840D8-E7FB-4D58-A735-DE951A103180.xlsx deleted file mode 100644 index e01cb4f3..00000000 Binary files a/WebRoot/upload/96F840D8-E7FB-4D58-A735-DE951A103180.xlsx and /dev/null differ diff --git a/WebRoot/upload/98528CE7-8AA4-4614-9C65-A4F9BFE535D3.docx b/WebRoot/upload/98528CE7-8AA4-4614-9C65-A4F9BFE535D3.docx deleted file mode 100644 index ddcb60d8..00000000 Binary files a/WebRoot/upload/98528CE7-8AA4-4614-9C65-A4F9BFE535D3.docx and /dev/null differ diff --git a/WebRoot/upload/998F48E6-70C3-42B6-85F6-497989C85E73.xls b/WebRoot/upload/998F48E6-70C3-42B6-85F6-497989C85E73.xls deleted file mode 100644 index 85f72a4a..00000000 Binary files a/WebRoot/upload/998F48E6-70C3-42B6-85F6-497989C85E73.xls and /dev/null differ diff --git a/WebRoot/upload/9A5DBAB3-6EBC-42A6-8C32-A722A5BC6124.xlsx b/WebRoot/upload/9A5DBAB3-6EBC-42A6-8C32-A722A5BC6124.xlsx deleted file mode 100644 index e01cb4f3..00000000 Binary files a/WebRoot/upload/9A5DBAB3-6EBC-42A6-8C32-A722A5BC6124.xlsx and /dev/null differ diff --git a/WebRoot/upload/A4434EFC-2FA8-46F3-B89C-C2AED16F14D7.doc b/WebRoot/upload/A4434EFC-2FA8-46F3-B89C-C2AED16F14D7.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/A4434EFC-2FA8-46F3-B89C-C2AED16F14D7.doc and /dev/null differ diff --git a/WebRoot/upload/B1CED318-4295-43F8-AF34-9722ACB2BAFF.doc b/WebRoot/upload/B1CED318-4295-43F8-AF34-9722ACB2BAFF.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/B1CED318-4295-43F8-AF34-9722ACB2BAFF.doc and /dev/null differ diff --git a/WebRoot/upload/B3A75250-C5E2-4278-8BB3-7C8BD2DD2C73.docx b/WebRoot/upload/B3A75250-C5E2-4278-8BB3-7C8BD2DD2C73.docx deleted file mode 100644 index 7c09b3e3..00000000 Binary files a/WebRoot/upload/B3A75250-C5E2-4278-8BB3-7C8BD2DD2C73.docx and /dev/null differ diff --git a/WebRoot/upload/B6770DB3-F2F6-4B4B-9B6F-B8CA6AD5BFF0.doc b/WebRoot/upload/B6770DB3-F2F6-4B4B-9B6F-B8CA6AD5BFF0.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/B6770DB3-F2F6-4B4B-9B6F-B8CA6AD5BFF0.doc and /dev/null differ diff --git a/WebRoot/upload/B7DCABAD-14C6-43DA-AF6D-134E1D6459FA.xlsx b/WebRoot/upload/B7DCABAD-14C6-43DA-AF6D-134E1D6459FA.xlsx deleted file mode 100644 index d1889a98..00000000 Binary files a/WebRoot/upload/B7DCABAD-14C6-43DA-AF6D-134E1D6459FA.xlsx and /dev/null differ diff --git a/WebRoot/upload/BD877F08-C14D-47EA-AB63-0EB9BDE875C2.doc b/WebRoot/upload/BD877F08-C14D-47EA-AB63-0EB9BDE875C2.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/BD877F08-C14D-47EA-AB63-0EB9BDE875C2.doc and /dev/null differ diff --git a/WebRoot/upload/C081A3E7-7CB1-40D0-8274-C9E835F111DE.doc b/WebRoot/upload/C081A3E7-7CB1-40D0-8274-C9E835F111DE.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/C081A3E7-7CB1-40D0-8274-C9E835F111DE.doc and /dev/null differ diff --git a/WebRoot/upload/C89390A6-FB33-4413-9B86-3E399F4987D4.xlsx b/WebRoot/upload/C89390A6-FB33-4413-9B86-3E399F4987D4.xlsx deleted file mode 100644 index d1889a98..00000000 Binary files a/WebRoot/upload/C89390A6-FB33-4413-9B86-3E399F4987D4.xlsx and /dev/null differ diff --git a/WebRoot/upload/CB56F2C4-8DBB-41F2-AA2D-90959334A336.xlsx b/WebRoot/upload/CB56F2C4-8DBB-41F2-AA2D-90959334A336.xlsx deleted file mode 100644 index 99ddc58f..00000000 Binary files a/WebRoot/upload/CB56F2C4-8DBB-41F2-AA2D-90959334A336.xlsx and /dev/null differ diff --git a/WebRoot/upload/CE5DC3B4-7C85-4D6A-8769-86E2235119C1.docx b/WebRoot/upload/CE5DC3B4-7C85-4D6A-8769-86E2235119C1.docx deleted file mode 100644 index 7c09b3e3..00000000 Binary files a/WebRoot/upload/CE5DC3B4-7C85-4D6A-8769-86E2235119C1.docx and /dev/null differ diff --git a/WebRoot/upload/D03A09D7-B215-4F3C-9628-000DAB8EFF70.doc b/WebRoot/upload/D03A09D7-B215-4F3C-9628-000DAB8EFF70.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/D03A09D7-B215-4F3C-9628-000DAB8EFF70.doc and /dev/null differ diff --git a/WebRoot/upload/D0D958A2-1C08-436D-B446-6D39481B2A16.xlsx b/WebRoot/upload/D0D958A2-1C08-436D-B446-6D39481B2A16.xlsx deleted file mode 100644 index 631885d7..00000000 Binary files a/WebRoot/upload/D0D958A2-1C08-436D-B446-6D39481B2A16.xlsx and /dev/null differ diff --git a/WebRoot/upload/D2F59289-FDCB-4483-85BB-C50E05CEE40A.doc b/WebRoot/upload/D2F59289-FDCB-4483-85BB-C50E05CEE40A.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/D2F59289-FDCB-4483-85BB-C50E05CEE40A.doc and /dev/null differ diff --git a/WebRoot/upload/D6909D7C-974D-4EB1-9CD3-55AB4A394C78.doc b/WebRoot/upload/D6909D7C-974D-4EB1-9CD3-55AB4A394C78.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/D6909D7C-974D-4EB1-9CD3-55AB4A394C78.doc and /dev/null differ diff --git a/WebRoot/upload/D7754B04-F0FF-4519-8BCB-ECDF0858C13B.xlsx b/WebRoot/upload/D7754B04-F0FF-4519-8BCB-ECDF0858C13B.xlsx deleted file mode 100644 index 631885d7..00000000 Binary files a/WebRoot/upload/D7754B04-F0FF-4519-8BCB-ECDF0858C13B.xlsx and /dev/null differ diff --git a/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf b/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf deleted file mode 100644 index c9fc5825..00000000 Binary files a/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf and /dev/null differ diff --git a/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.xlsx b/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.xlsx deleted file mode 100644 index 56699d54..00000000 Binary files a/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.xlsx and /dev/null differ diff --git a/WebRoot/upload/E4F4E145-62DB-4F90-98A5-35FE50780634.doc b/WebRoot/upload/E4F4E145-62DB-4F90-98A5-35FE50780634.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/E4F4E145-62DB-4F90-98A5-35FE50780634.doc and /dev/null differ diff --git a/WebRoot/upload/E77878F9-DB85-4D62-BFBF-1DB6FC963AF6.doc b/WebRoot/upload/E77878F9-DB85-4D62-BFBF-1DB6FC963AF6.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/E77878F9-DB85-4D62-BFBF-1DB6FC963AF6.doc and /dev/null differ diff --git a/WebRoot/upload/E8D51A0A-AFCF-4E57-A9CD-5F2718E62E1D.doc b/WebRoot/upload/E8D51A0A-AFCF-4E57-A9CD-5F2718E62E1D.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/E8D51A0A-AFCF-4E57-A9CD-5F2718E62E1D.doc and /dev/null differ diff --git a/WebRoot/upload/EFFF2261-E27D-4518-8B92-84B3B5C6AABF.png b/WebRoot/upload/EFFF2261-E27D-4518-8B92-84B3B5C6AABF.png deleted file mode 100644 index a7d2822b..00000000 Binary files a/WebRoot/upload/EFFF2261-E27D-4518-8B92-84B3B5C6AABF.png and /dev/null differ diff --git a/WebRoot/upload/F330BFAF-0F2D-4F91-BE97-BD2E8D491CC2.doc b/WebRoot/upload/F330BFAF-0F2D-4F91-BE97-BD2E8D491CC2.doc deleted file mode 100644 index ff44a6b4..00000000 Binary files a/WebRoot/upload/F330BFAF-0F2D-4F91-BE97-BD2E8D491CC2.doc and /dev/null differ diff --git a/WebRoot/upload/F4641A6B-58A4-4B61-A1C9-BF1629AB2087.xlsx b/WebRoot/upload/F4641A6B-58A4-4B61-A1C9-BF1629AB2087.xlsx deleted file mode 100644 index a837cb51..00000000 Binary files a/WebRoot/upload/F4641A6B-58A4-4B61-A1C9-BF1629AB2087.xlsx and /dev/null differ diff --git a/WebRoot/upload/F4C9BE9F-D3FA-483F-BE90-D5B801B4036A.doc b/WebRoot/upload/F4C9BE9F-D3FA-483F-BE90-D5B801B4036A.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/F4C9BE9F-D3FA-483F-BE90-D5B801B4036A.doc and /dev/null differ diff --git a/WebRoot/upload/FC557256-6684-406C-BB63-7C009B739A17.doc b/WebRoot/upload/FC557256-6684-406C-BB63-7C009B739A17.doc deleted file mode 100644 index e4bb558d..00000000 Binary files a/WebRoot/upload/FC557256-6684-406C-BB63-7C009B739A17.doc and /dev/null differ diff --git a/WebRoot/upload/aliyun.xls b/WebRoot/upload/aliyun.xls deleted file mode 100644 index d1889a98..00000000 Binary files a/WebRoot/upload/aliyun.xls and /dev/null differ diff --git a/WebRoot/upload/aliyun1.xls b/WebRoot/upload/aliyun1.xls deleted file mode 100644 index d1889a98..00000000 Binary files a/WebRoot/upload/aliyun1.xls and /dev/null differ diff --git a/WebRoot/upload/aliyun2.xls b/WebRoot/upload/aliyun2.xls deleted file mode 100644 index d1889a98..00000000 Binary files a/WebRoot/upload/aliyun2.xls and /dev/null differ diff --git a/WebRoot/upload/e8f4e7aa-5940-47a9-b739-be667efe42ef.pdf b/WebRoot/upload/e8f4e7aa-5940-47a9-b739-be667efe42ef.pdf deleted file mode 100644 index 871e3028..00000000 Binary files a/WebRoot/upload/e8f4e7aa-5940-47a9-b739-be667efe42ef.pdf and /dev/null differ diff --git a/WebRoot/upload/县区单位账号.xls b/WebRoot/upload/县区单位账号.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号1.xls b/WebRoot/upload/县区单位账号1.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号1.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号10.xls b/WebRoot/upload/县区单位账号10.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号10.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号11.xls b/WebRoot/upload/县区单位账号11.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号11.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号12.xls b/WebRoot/upload/县区单位账号12.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号12.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号13.xls b/WebRoot/upload/县区单位账号13.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号13.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号14.xls b/WebRoot/upload/县区单位账号14.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号14.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号15.xls b/WebRoot/upload/县区单位账号15.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号15.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号16.xls b/WebRoot/upload/县区单位账号16.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号16.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号17.xls b/WebRoot/upload/县区单位账号17.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号17.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号18.xls b/WebRoot/upload/县区单位账号18.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号18.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号19.xls b/WebRoot/upload/县区单位账号19.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号19.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号2.xls b/WebRoot/upload/县区单位账号2.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号2.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号20.xls b/WebRoot/upload/县区单位账号20.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号20.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号21.xls b/WebRoot/upload/县区单位账号21.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号21.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号3.xls b/WebRoot/upload/县区单位账号3.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号3.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号4.xls b/WebRoot/upload/县区单位账号4.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号4.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号5.xls b/WebRoot/upload/县区单位账号5.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号5.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号6.xls b/WebRoot/upload/县区单位账号6.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号6.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号7.xls b/WebRoot/upload/县区单位账号7.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号7.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号8.xls b/WebRoot/upload/县区单位账号8.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号8.xls and /dev/null differ diff --git a/WebRoot/upload/县区单位账号9.xls b/WebRoot/upload/县区单位账号9.xls deleted file mode 100644 index e527b968..00000000 Binary files a/WebRoot/upload/县区单位账号9.xls and /dev/null differ diff --git a/WebRoot/upload/新建文本文档.txt b/WebRoot/upload/新建文本文档.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/WebRoot/upload/机器人走迷宫.jpg b/WebRoot/upload/机器人走迷宫.jpg deleted file mode 100644 index ec24f6c7..00000000 Binary files a/WebRoot/upload/机器人走迷宫.jpg and /dev/null differ diff --git a/WebRoot/upload/项目模板.xlsx b/WebRoot/upload/项目模板.xlsx deleted file mode 100644 index 770357bf..00000000 Binary files a/WebRoot/upload/项目模板.xlsx and /dev/null differ diff --git a/WebRoot/upload/项目模板1.xlsx b/WebRoot/upload/项目模板1.xlsx deleted file mode 100644 index 770357bf..00000000 Binary files a/WebRoot/upload/项目模板1.xlsx and /dev/null differ diff --git a/WebRoot/upload/项目模板2.xlsx b/WebRoot/upload/项目模板2.xlsx deleted file mode 100644 index 24425fda..00000000 Binary files a/WebRoot/upload/项目模板2.xlsx and /dev/null differ diff --git a/WebRoot/upload/项目模板3.xlsx b/WebRoot/upload/项目模板3.xlsx deleted file mode 100644 index 24425fda..00000000 Binary files a/WebRoot/upload/项目模板3.xlsx and /dev/null differ diff --git a/WebRoot/upload/项目模板4.xlsx b/WebRoot/upload/项目模板4.xlsx deleted file mode 100644 index 770357bf..00000000 Binary files a/WebRoot/upload/项目模板4.xlsx and /dev/null differ diff --git a/WebRoot/upload/项目模板5.xlsx b/WebRoot/upload/项目模板5.xlsx deleted file mode 100644 index 770357bf..00000000 Binary files a/WebRoot/upload/项目模板5.xlsx and /dev/null differ diff --git a/WebRoot/upload/项目模板6.xlsx b/WebRoot/upload/项目模板6.xlsx deleted file mode 100644 index 770357bf..00000000 Binary files a/WebRoot/upload/项目模板6.xlsx and /dev/null differ diff --git a/WebRoot/upload/项目模板7.xlsx b/WebRoot/upload/项目模板7.xlsx deleted file mode 100644 index 770357bf..00000000 Binary files a/WebRoot/upload/项目模板7.xlsx and /dev/null differ diff --git a/WebRoot/upload/项目模板8.xlsx b/WebRoot/upload/项目模板8.xlsx deleted file mode 100644 index 770357bf..00000000 Binary files a/WebRoot/upload/项目模板8.xlsx and /dev/null differ diff --git a/null/upload/57587bfe-610a-432d-a69c-5c69af7648a3.xlsx b/null/upload/57587bfe-610a-432d-a69c-5c69af7648a3.xlsx new file mode 100644 index 00000000..af522031 Binary files /dev/null and b/null/upload/57587bfe-610a-432d-a69c-5c69af7648a3.xlsx differ diff --git a/null/upload/822e205e-2fb0-4916-8874-1585dae6b409.xlsx b/null/upload/822e205e-2fb0-4916-8874-1585dae6b409.xlsx new file mode 100644 index 00000000..7909f823 Binary files /dev/null and b/null/upload/822e205e-2fb0-4916-8874-1585dae6b409.xlsx differ diff --git a/null/upload/a4669f59-aa96-4c3b-8333-ad75cfda79ff.xlsx b/null/upload/a4669f59-aa96-4c3b-8333-ad75cfda79ff.xlsx new file mode 100644 index 00000000..d599342b Binary files /dev/null and b/null/upload/a4669f59-aa96-4c3b-8333-ad75cfda79ff.xlsx differ diff --git a/null/upload/c542e83f-35d3-4c17-9140-6e13643571d6.xlsx b/null/upload/c542e83f-35d3-4c17-9140-6e13643571d6.xlsx new file mode 100644 index 00000000..05d485c9 Binary files /dev/null and b/null/upload/c542e83f-35d3-4c17-9140-6e13643571d6.xlsx differ diff --git a/WebRoot/upload/985dbb6c-8b37-4330-a821-589b57475e08.xlsx b/null/upload/cf759d57-32af-4f3b-b1a6-58c717ba3c81.xlsx similarity index 94% rename from WebRoot/upload/985dbb6c-8b37-4330-a821-589b57475e08.xlsx rename to null/upload/cf759d57-32af-4f3b-b1a6-58c717ba3c81.xlsx index d0fea2a2..c943d3e0 100644 Binary files a/WebRoot/upload/985dbb6c-8b37-4330-a821-589b57475e08.xlsx and b/null/upload/cf759d57-32af-4f3b-b1a6-58c717ba3c81.xlsx differ diff --git a/null/upload/f27e8e0a-b82b-43db-bfd1-f8bc35cccda9.xlsx b/null/upload/f27e8e0a-b82b-43db-bfd1-f8bc35cccda9.xlsx new file mode 100644 index 00000000..c9ff3c81 Binary files /dev/null and b/null/upload/f27e8e0a-b82b-43db-bfd1-f8bc35cccda9.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index f5fb9129..9121bb7b 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -42,8 +42,6 @@ import java.util.*; public class CollectController extends Controller { CollectModel cm = new CollectModel(); BaseModel bm = new BaseModel(); - String basePath = CommonUtil.WebRoot + File.separator + "Excel"; - LoginPersonModel personModel = new LoginPersonModel(); /** @@ -97,12 +95,7 @@ public class CollectController extends Controller { return; } String upload_excel_filename = UUID.randomUUID().toString().toLowerCase() + ".xlsx"; - String templateXls = basePath + "/" + upload_excel_filename; - //判断目录是不是存在 - File file = new File(basePath); - if (!file.exists()) { - file.mkdirs();// 创建文件夹 - } + String templateXls =CommonUtil.basePath + "/" + upload_excel_filename; excelFile.getFile().renameTo(new File(templateXls)); //检查这个上传的文件是不是合规，比如是不是每个Sheet都有浅蓝色背景的表头 @@ -363,9 +356,9 @@ public class CollectController extends Controller { String upload_excel_filename = jobRecord.getStr("upload_excel_filename");//原始模板文件 String upload_excel_filename_finish = UUID.randomUUID().toString().toLowerCase() + ".xlsx";//系统中可以提供下载的模板文件 - FileUtil.copy(basePath + File.separator + upload_excel_filename, basePath + File.separator + upload_excel_filename_finish, true); + FileUtil.copy(CommonUtil.basePath + File.separator + upload_excel_filename, CommonUtil.basePath + File.separator + upload_excel_filename_finish, true); - InputStream is = new FileInputStream(basePath + File.separator + upload_excel_filename_finish); + InputStream is = new FileInputStream(CommonUtil.basePath + File.separator + upload_excel_filename_finish); XSSFWorkbook wb = new XSSFWorkbook(is); for (int i = 0; i < listJobSheet.size(); i++) { Record sheetRecord = listJobSheet.get(i); @@ -445,7 +438,7 @@ public class CollectController extends Controller { wb.setActiveSheet(0); //保存 - FileOutputStream fileOut = new FileOutputStream(basePath + File.separator + upload_excel_filename_finish); + FileOutputStream fileOut = new FileOutputStream(CommonUtil.basePath + File.separator + upload_excel_filename_finish); wb.write(fileOut); //关闭Excel wb.close(); @@ -560,19 +553,14 @@ public class CollectController extends Controller { return; } String upload_excel_filename_user = UUID.randomUUID().toString().toLowerCase() + ".xlsx"; - //判断目录是不是存在 - File file = new File(basePath); - if (!file.exists()) { - file.mkdirs();// 创建文件夹 - } - excelFile.getFile().renameTo(new File(basePath + File.separator + upload_excel_filename_user)); + excelFile.getFile().renameTo(new File(CommonUtil.basePath + File.separator + upload_excel_filename_user)); Record jobRecord = cm.getJob(job_id); String upload_excel_filename_finish = jobRecord.getStr("upload_excel_filename_finish");//系统生成的模板文件 //我提供的模板文件 - String f1 = basePath + File.separator + upload_excel_filename_finish; + String f1 = CommonUtil.basePath + File.separator + upload_excel_filename_finish; //用户上传的填充完的EXCEL文件 - String f2 = basePath + File.separator + upload_excel_filename_user; + String f2 = CommonUtil.basePath + File.separator + upload_excel_filename_user; //对比两个EXCEL文件 是不是格式一致，也就是是不是上传了正确的模板文件 int sheetCnt = cm.getSheetCount(upload_excel_filename_finish); @@ -988,7 +976,7 @@ public class CollectController extends Controller { renderJson(kv); return; } - String excelPath = basePath + File.separator + upload_excel_filename_user; + String excelPath = CommonUtil.basePath + File.separator + upload_excel_filename_user; if (!FileUtil.exist(excelPath)) { Kv kv = Kv.by("success", false); @@ -1106,9 +1094,9 @@ public class CollectController extends Controller { renderJson(kv); return; } - if (!FileUtil.exist(basePath)) FileUtil.mkdir(basePath); + String file_id = UUID.randomUUID().toString().toUpperCase(); - String filePath = basePath + File.separator + file_id + "." + suffix; + String filePath = CommonUtil.basePath + File.separator + file_id + "." + suffix; uf.getFile().renameTo(new File(filePath)); //计算文件大小 String file_size = FileSizeUtil.getAutoFileOrFilesSize(filePath); @@ -1420,7 +1408,7 @@ public class CollectController extends Controller { @IsNumericInterface({"job_id"}) public void exportTableStructExcel(int job_id) { String job_name = cm.getJob(job_id).getStr("job_name"); - String excelPath = basePath + File.separator + UUID.randomUUID().toString().toLowerCase() + ".xlsx"; + String excelPath = CommonUtil.basePath + File.separator + UUID.randomUUID().toString().toLowerCase() + ".xlsx"; String url = PropKit.get("jdbcUrl"); String user = PropKit.get("user"); String password = PropKit.get("password"); @@ -1583,7 +1571,7 @@ public class CollectController extends Controller { String fileName = record.getStr("fileName"); String suffix = record.getStr("suffix"); - String filePath = basePath + File.separator + file_id + "." + suffix; + String filePath = CommonUtil.basePath + File.separator + file_id + "." + suffix; if (!FileUtil.exist(filePath)) { Kv kv = Kv.by("success", false); kv.set("message", "文件没有找到，请联系管理员处理异常！"); @@ -1704,7 +1692,7 @@ public class CollectController extends Controller { Record jobRecord = cm.getJob(job_id); String job_name = jobRecord.getStr("job_name"); String tmpFile = UUID.randomUUID().toString().toLowerCase() + ".xlsx"; - String excelPath = basePath + "/" + tmpFile; + String excelPath = CommonUtil.basePath + "/" + tmpFile; //这里需要知道是哪种类型的，因为不同的类型，生成EXCEL汇总表的方法不同 int job_type = jobRecord.getInt("job_type");//任务类型：1：表单，2：EXCEL模板 switch (job_type) { @@ -1731,7 +1719,7 @@ public class CollectController extends Controller { Record jobRecord = cm.getJob(job_id); String job_name = jobRecord.getStr("job_name"); String TemplateFile = jobRecord.getStr("upload_excel_filename"); - String excelPath = basePath + "/" + TemplateFile; + String excelPath = CommonUtil.basePath + "/" + TemplateFile; //先不要着急提供下载，需要根据用户的所在单位，来判断是不是需要删除掉一些信息 //操作人员 String person_id = SessionKit.get(getRequest(), getResponse(), "person_id"); diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java b/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java index 93ece04f..00360f93 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java @@ -113,20 +113,14 @@ public class MaxKbController extends Controller { public void exportExcel(String gather_regionc) { List list = mkm.SchoolClassStudentTeacherList(gather_regionc); ExportExcelUtil exporter = new ExportExcelUtil(); - - //使用guid生成一个临时文件名，然后拼接到tmpDir后面，生成完整的临时文件路径 - if (!new File(CommonUtil.webUploadPath).exists()) { - //创建目录 - new File(CommonUtil.webUploadPath).mkdirs(); - } String fileName = UUID.randomUUID() + ".xlsx"; - String tmpFile = CommonUtil.webUploadPath + fileName; + String tmpFile = CommonUtil.basePath+File.separator + fileName; exporter.exportToExcel(tmpFile, list); //提供文件路径 Kv kv = Kv.create(); kv.set("success", true); kv.set("message", "生成成功！"); - kv.set("url", "/QingLong/upload/" + fileName); + kv.set("url", CommonUtil.getServerUrl(getRequest())+ "/Excel/" + fileName); renderJson(kv); } } diff --git a/src/main/java/com/dsideal/QingLong/Start.java b/src/main/java/com/dsideal/QingLong/Start.java index 498251d6..f17c483f 100644 --- a/src/main/java/com/dsideal/QingLong/Start.java +++ b/src/main/java/com/dsideal/QingLong/Start.java @@ -33,6 +33,7 @@ import com.dsideal.QingLong.YunXiao.Controller.YunXiaoController; import com.dsideal.QingLong.Zbdc.Controller.ZbdcController; import com.dsideal.QingLong.Zjcq.Controller.ZjcqController; import com.jfinal.config.*; +import com.jfinal.kit.PathKit; import com.jfinal.kit.PropKit; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; @@ -42,8 +43,13 @@ import com.jfinal.plugin.hikaricp.HikariCpPlugin; import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.server.undertow.UndertowServer; import com.jfinal.template.Engine; +import lombok.SneakyThrows; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Properties; public class Start extends JFinalConfig { public static void main(String[] args) { @@ -57,10 +63,6 @@ public class Start extends JFinalConfig { @Override public void configConstant(Constants me) { me.setLogFactory(new LogBackLogFactory()); - PropKit.clear(); - PropKit.use("undertow.properties"); - CommonUtil.WebRoot = PropKit.get("undertow.resourcePath").split(",")[0]; - PropKit.clear(); PropKit.use("application.properties"); me.setError404View("/html/common/404/index.html"); } @@ -238,6 +240,7 @@ public class Start extends JFinalConfig { /** * 在jfinal启动完成后马上执行 */ + @SneakyThrows @Override public void onStart() { //打印 启动Logo @@ -257,5 +260,17 @@ public class Start extends JFinalConfig { Thread wt = new Thread(new RefreshTjWorker()); wt.start(); } + + // 从文件加载,读取配置项 + Properties prop = new Properties(); + FileInputStream fis = new FileInputStream(PathKit.getRootClassPath()+File.separator+"undertow.properties"); + prop.load(fis); + String WebRoot = prop.getProperty("undertow.resourcePath").split(",")[0]; + fis.close(); + CommonUtil.basePath = WebRoot + File.separator + "Excel"; + if (!new File(CommonUtil.basePath).exists()) { + //创建目录 + new File(CommonUtil.basePath).mkdirs(); + } } } diff --git a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java index 049b1463..af5ce8fc 100644 --- a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java +++ b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java @@ -17,6 +17,7 @@ import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.HttpServletRequest; import java.io.*; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; @@ -33,11 +34,23 @@ import java.util.regex.Pattern; public class CommonUtil { //在独立的main函数中，使用下面的方式进行声明logback对象 private static Logger log = LoggerFactory.getLogger(CommonUtil.class); - - public static String WebRoot; - - //文件上传路径 - public static String webUploadPath = CommonUtil.WebRoot + File.separator + "upload" + File.separator; + public static String basePath ;//Excel目录 + /** + * 获取当前服务器的URL + * @param request + * @return + */ + public static String getServerUrl(HttpServletRequest request) { + // 获取服务器端口 + int serverPort = request.getLocalPort(); + // 获取完整的访问地址（包含协议、主机名、端口） + String scheme = request.getScheme(); // 获取协议 (http 或 https) + // 获取服务器名称 + String serverName = request.getServerName(); + // 如果需要获取项目上下文路径 + String contextPath = request.getContextPath(); + return scheme + "://" + serverName + ":" + serverPort + contextPath; + } /** * 功能：将jsonObject转换为Record @@ -394,7 +407,7 @@ public class CommonUtil { return flag.toString(); } - public static String generatePassword(int length) { + public static String generatePassword(int length) { String upperCase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; String lowerCase = upperCase.toLowerCase(); String numbers = "0123456789"; @@ -822,9 +835,10 @@ public class CommonUtil { /** * 获取当前时间 + * * @return */ - public static String getCurrentTime(){ + public static String getCurrentTime() { return LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); } } diff --git a/src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java b/src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java index d911c70a..462fefdc 100644 --- a/src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java +++ b/src/main/java/com/dsideal/QingLong/YunXiao/Controller/YunXiaoController.java @@ -16,6 +16,7 @@ import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.util.List; import java.util.UUID; @@ -109,26 +110,23 @@ public class YunXiaoController extends Controller { */ // http://10.10.21.20:9000/QingLong/yx/LessonConstructionExportExcel @Before(GET.class) - public void LessonConstructionExportExcel() throws Exception { + public void LessonConstructionExportExcel() { List list1 = ym.LessonConstructionInfoByStageSubject(); List list2 = ym.LessonConstructionInfoByStageSubjectBook(); List list3 = ym.previewRank(); YunXiaoExportExcelUtil exporter = new YunXiaoExportExcelUtil(); //使用guid生成一个临时文件名，然后拼接到tmpDir后面，生成完整的临时文件路径 - if (!new File(CommonUtil.webUploadPath).exists()) { - //创建目录 - new File(CommonUtil.webUploadPath).mkdirs(); - } + //文件上传路径 String fileName = UUID.randomUUID() + ".xlsx"; - String tmpFile = CommonUtil.webUploadPath + fileName; + String tmpFile = CommonUtil.basePath + File.separator + fileName; exporter.LessonConstructionExportExcel(tmpFile, list1, list2, list3); //提供文件路径 Kv kv = Kv.create(); kv.set("success", true); kv.set("message", "生成成功！"); - kv.set("url", "/QingLong/upload/" + fileName); + kv.set("url", CommonUtil.getServerUrl(getRequest()) + "/Excel/" + fileName); renderJson(kv); } @@ -138,25 +136,20 @@ public class YunXiaoController extends Controller { // http://10.10.21.20:9000/QingLong/yx/LessonConstructionInfoByXzqhSchool // http://10.10.21.20:9000/QingLong/yx/LessonConstructionInfoByXzqhSchool?type_id=1 @Before(GET.class) - public void LessonConstructionInfoByXzqhSchool(int type_id) throws Exception { + public void LessonConstructionInfoByXzqhSchool(int type_id) { List list1 = ym.LessonConstructionInfoByXzqh(); List list2 = ym.LessonConstructionInfoByXzqhStage(); List list3 = ym.LessonConstructionInfoByXzqhSchool(); List list4 = ym.LessonConstructionInfo(); YunXiaoExportExcelUtil exporter = new YunXiaoExportExcelUtil(); - //使用guid生成一个临时文件名，然后拼接到tmpDir后面，生成完整的临时文件路径 - if (!new File(CommonUtil.webUploadPath).exists()) { - //创建目录 - new File(CommonUtil.webUploadPath).mkdirs(); - } String fileName = UUID.randomUUID() + ".xlsx"; - String tmpFile = CommonUtil.webUploadPath + fileName; + String tmpFile = CommonUtil.basePath + File.separator + fileName; exporter.LessonConstructionInfoByXzqhSchool(tmpFile, list1, list2, list3, list4); //提供文件路径 Kv kv = Kv.create(); kv.set("success", true); kv.set("message", "生成成功！"); - kv.set("url", "/QingLong/upload/" + fileName); + kv.set("url", CommonUtil.getServerUrl(getRequest()) + "/Excel/" + fileName); renderJson(kv); }