update

.gitignore

@@ -0,0 +1,37 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+.git
+/log
+/src/main/webapp/upload/
+/src/main/webapp/temp/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+log/
+.idea/
+
+### VS Code ###
+.vscode/

pom.xml

@@ -215,6 +215,19 @@
 			<version>3.9</version>
 		</dependency>
 
+<!--
+		<dependency>
+			<groupId>fop</groupId>
+			<artifactId>fop</artifactId>
+			<version>0.20.5</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>xalan</artifactId>
+					<groupId>xalan</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+-->
 
 
 	</dependencies>

src/main/java/com/jfinal/club/_admin/downloadrecord/AdminDownloadRecordController.java

@@ -3,19 +3,16 @@ package com.jfinal.club._admin.downloadrecord;
 import com.jfinal.aop.Inject;
 import com.jfinal.club.common.controller.BaseController;
 import com.jfinal.club.common.model.DownloadRecord;
-import com.jfinal.club.common.model.DownloadRecord;
 import com.jfinal.club.util.Cons;
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.Ret;
 import com.jfinal.plugin.activerecord.Page;
-import lombok.extern.log4j.Log4j;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

src/main/java/com/jfinal/club/_front/IndexController.java

@@ -238,8 +238,8 @@ public class IndexController extends BaseController {
 
         try {
             String str = "您有样品申请已提交,请注意查收";
-            AliyunMail.sendMail("hms@shjieguan.com", "Jieguan501", AliyunMail.ALIDM_SMTP_HOST, AliyunMail.ALIDM_SMTP_PORT, "样品申请提交",
-                    str, "wechat_pc@elementis.com", null, null);
+            AliyunMail.sendMail(PropKit.get("fromEmail"), PropKit.get("emailPass"), AliyunMail.ALIDM_SMTP_HOST, AliyunMail.ALIDM_SMTP_PORT, "样品申请提交",
+                    str, PropKit.get("fixEmail"), null, null);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -498,4 +498,5 @@ public class IndexController extends BaseController {
         renderJson(Ret.ok().set("msg","success"));
     }
 
+
 }

src/main/java/com/jfinal/club/util/Cons.java

@@ -24,9 +24,9 @@ public class Cons {
 
     public static final String RETURNURL = "returnUrl";
 
-    public static final String EXPORT_SAMPLE = "/files/样品申请表.xlsx";
-    public static final String EXPORT_USERS = "/files/会员信息表.xlsx";
-    public static final String EXPORT_DOWNLOADRECORD = "/files/下载统计.xlsx";
+    public static final String EXPORT_SAMPLE = "/files/样品申请表.xls";
+    public static final String EXPORT_USERS = "/files/会员信息表.xls";
+    public static final String EXPORT_DOWNLOADRECORD = "/files/下载统计.xls";
 
 
     /**