Merge remote-tracking branch 'origin/master'

zj

2024-08-02 815342ea90c689561adeecca3230b5b5f8ddc2b7

 src/main/resources/spring/applicationContext-email.xml

@@ -45,6 +45,7 @@
            <prop key="mail.smtp.auth">true</prop>
            <prop key="mail.smtp.port">465</prop>
            <prop key="mail.smtp.ssl.enable">true</prop>
            <prop key="mail.smtp.starttls.enable">true</prop>
            <prop key="mail.debug">true</prop>
            <prop key="mail.smtp.host">smtp.gmail.com</prop>
            <prop key="mail.smtp.socketFactory.class">javax.net.ssl.SSLSocketFactory</prop>