Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 b63c28a0c24782753eae26892171dd1a0c8d1fe7

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java

@@ -1156,13 +1156,17 @@
               } catch (UnsupportedEncodingException e) {

                  e.printStackTrace();

               }

               AdminUser adminUser = adminUserService.selectByPrimaryKey(4L);



               long[] targetUids = new long[] { 3L, 4L };

               Config config = configService.getConfig("extract_code_email_from");

               String[] sts = config.getValue().split(",");

               String account = sts[0];

               String pwd = sts[1];

               String msg = "提现审核链接:" + url;

               boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "有新的提现审核", msg);

               for (long adminId : targetUids) {

                  AdminUser adminUser = adminUserService.selectByPrimaryKey(adminId);

                  String msg = "提现审核链接:" + url;

                  boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "有新的提现审核", msg);

               }

            }

         });

         return;