瀏覽代碼

fix: 公司邮件展示未发送状态

chenjianhua 7 月之前
父節點
當前提交
5003f3f9a2

+ 1 - 1
service-base/src/main/resources/mapper/CompanyEmailHistoryMapper.xml

@@ -41,7 +41,7 @@
             cec.email,
             maxce.send_time,
             maxce.send_remark,
-            maxce.send_status
+            ifnull(maxce.send_status,-1) as send_status
         FROM
         PPW_EMAIL.company_email_config cec
         JOIN PPW_EMAIL.pvn_company_info c

+ 1 - 2
service-manage/src/main/java/com/simuwang/manage/init/QuartzConfig.java

@@ -71,9 +71,8 @@ public class QuartzConfig implements ApplicationRunner {
                 paramDTO.setAccount(mailboxInfoDO.getEmail());
                 String password = mailboxInfoDO.getPassword();
                 try{
-                    String publicKey = this.properties.getSecurityRsa().getPublicKey();
                     String privateKey = this.properties.getSecurityRsa().getPrivateKey();
-                    password = new RSA(privateKey, publicKey).decryptStr(password, KeyType.PrivateKey);
+                    password = new RSA(privateKey, null).decryptStr(password, KeyType.PrivateKey);
                 }catch (Exception e){
                     logger.error(e.getMessage(),e);
                 }

+ 1 - 2
service-manage/src/main/java/com/simuwang/manage/service/impl/EmailConfigServiceImpl.java

@@ -111,9 +111,8 @@ public class EmailConfigServiceImpl implements EmailConfigService {
 
     private String getPassword(String password){
         try{
-            String publicKey = this.properties.getSecurityRsa().getPublicKey();
             String privateKey = this.properties.getSecurityRsa().getPrivateKey();
-            password = new RSA(privateKey, publicKey).decryptStr(password, KeyType.PrivateKey);
+            password = new RSA(privateKey, null).decryptStr(password, KeyType.PrivateKey);
         }catch (Exception e){
             logger.error(e.getMessage(),e);
         }