配置文件修改

PCS/src/main/java/cn/cslg/permission/service/LoginService.java

@@ -30,6 +30,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.ServletRequest;
 import java.util.*;
@@ -53,7 +56,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
     private final PerDpService perDpService;
     private final SystemService systemService;
     private final LoginRecordService loginRecordService;
-    private final HttpServletRequest request;
+//    private final HttpServletRequest request;
 
     /**
      * @param loginVO 登录参数类
@@ -61,6 +64,10 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
      * @author 沈永艺
      */
     public String login(LoginVO loginVO) {
+        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
+        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
+        HttpServletRequest httpRequest = sra.getRequest();
+
         LoginRecordVO loginRecordVO = new LoginRecordVO();
         loginRecordVO.setLoginSystem(loginVO.getLoginSystem());
         //获取已经存放进Redis的验证码 格式: verify-code:uuid(参数)
@@ -83,8 +90,18 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
         //登录日志记录租户id
         loginRecordVO.setTenantId(personnel.getTenantId());
         //登录日志记录ip地址
-        loginRecordVO.setLoginIp(request.getRemoteAddr());
-        String ua = request.getHeader("User-Agent");
+        String ipAddress = httpRequest.getHeader("X-Forwarded-For");
+        System.out.println(ipAddress);
+        if (ipAddress == null || ipAddress.isEmpty() || "unknown".equalsIgnoreCase(ipAddress)) {
+            ipAddress = httpRequest.getHeader("X-Real-IP");
+            System.out.println("未获得1"+ipAddress);
+        }
+        if (ipAddress == null || ipAddress.isEmpty() || "unknown".equalsIgnoreCase(ipAddress)) {
+            ipAddress = httpRequest.getRemoteAddr();
+            System.out.println("未获得2"+ipAddress);
+        }
+        loginRecordVO.setLoginIp(ipAddress);
+        String ua = httpRequest.getHeader("User-Agent");
         UserAgent userAgent = UserAgent.parseUserAgentString(ua);
         //获取客户端操作系统
         String os = userAgent.getOperatingSystem().getName();

PCS/src/main/java/cn/cslg/permission/service/PersonnelService.java

@@ -5,18 +5,22 @@ import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.model.vo.RoleVO;
 import cn.cslg.permission.common.utils.*;
 import cn.cslg.permission.common.utils.SecurityUtils.SecurityUtils;
+import cn.cslg.permission.common.utils.message.MessageUtils;
 import cn.cslg.permission.domain.Personnel;
 import cn.cslg.permission.domain.Tenant;
 import cn.cslg.permission.domain.associate.AssoDepartPos;
 import cn.cslg.permission.domain.associate.AssoPerDp;
 import cn.cslg.permission.domain.associate.AssoPersonRole;
+import cn.cslg.permission.domain.sys.SysDictItem;
 import cn.cslg.permission.mapper.PersonnelMapper;
+import cn.cslg.permission.mapper.SysDictItemMapper;
 import cn.cslg.permission.service.associate.DepartPosiService;
 import cn.cslg.permission.service.associate.PerDpService;
 import cn.cslg.permission.service.associate.PersonGroupService;
 import cn.cslg.permission.service.associate.PersonRoleService;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.crypto.SecureUtil;
+import cn.hutool.extra.mail.MailUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,10 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -50,7 +51,8 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
     private final TenantService tenantService;
     private final CacheUtils cacheUtils;
     private final RedisUtil redisUtil;
-
+    private final SysDictItemMapper sysDictItemMapper;
+    private final MessageUtils messageUtils;
     @Transactional(rollbackFor = Exception.class)
     public Personnel addPersonnel(PersonnelVO personnelVO) {
         log.info("开始处理【新增人员】的业务，参数为：{}", personnelVO);
@@ -148,6 +150,9 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
                     personRoleService.addAssociatePerRole(personnelVO.getRole(), personnel.getId());
                 }
             }
+
+           this.sendAddPersonEmail(personnelVO);
+
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             e.printStackTrace();
@@ -513,4 +518,28 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
         }
         return personnel;
     }
+
+    public void sendAddPersonEmail(PersonnelVO personnel){
+        //从字典表里获得配置联系人数
+        LambdaQueryWrapper<SysDictItem> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(SysDictItem::getDictParentKey, "ADD_CC_PERSON");
+        List<SysDictItem> sysDictItems = sysDictItemMapper.selectList(wrapper1);
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("title", "人员添加通知");
+        map.put("template", "mail/addPersonEmail.html");
+
+        map.put("img", "/logo.png");
+        map.put("value0",personnel.getName());
+        map.put("value1",personnel.getUsername());
+        map.put("value2",personnel.getPassword());
+        map.put("email", personnel.getEmail());
+        if(sysDictItems!=null&&sysDictItems.size()>0){
+            String[]cc =new String[sysDictItems.size()];
+            for (int i=0;i<sysDictItems.size();i++){
+                cc[i]=sysDictItems.get(i).getDictChildValue();
+            }
+        map.put("cc",cc);
+        }
+        messageUtils.sendEmailMessage(map);
+    }
 }

PCS/src/main/resources/application-dev.yml

@@ -1,23 +1,23 @@
 spring:
   #    # 使用 smtp 协议
-  #  mail.protocol: smtps
-  #  mail.host: smtp.exmail.qq.com
-  #  mail.port: 465
-  #  mail.username: shenyongyi@china-wispro.com
-  #    # 授权码
-  #  mail.password: c3hY5cgAexhhr9HL
-  #  mail.test-connection: false
-  #  mail.properties.mail.smtp.auth: true
-  #  mail.properties.mail.debug: false
-  #  mail.properties.mail.mime.splitlongparameters: false
-  #  mail.default-encoding: UTF-8
-  # rabbitmq
-  rabbitmq.host: 192.168.1.24
+  #  #  mail.protocol: smtps
+  #  #  mail.host: smtp.exmail.qq.com
+  #  #  mail.port: 465
+  #  #  mail.username: shenyongyi@china-wispro.com
+  #  #    # 授权码
+  #  #  mail.password: c3hY5cgAexhhr9HL
+  #  #  mail.test-connection: false
+  #  #  mail.properties.mail.smtp.auth: true
+  #  #  mail.properties.mail.debug: false
+  #  #  mail.properties.mail.mime.splitlongparameters: false
+  #  #  mail.default-encoding: UTF-8
+  #  # rabbitmq
+  rabbitmq.host: 192.168.2.24
   rabbitmq.port: 5672
   rabbitmq.username: admin
   rabbitmq.password: 123456
   redis:
-    host: 192.168.1.24
+    host: 192.168.2.24
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
@@ -29,7 +29,7 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://192.168.1.24:3306/PCS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.2.24:3306/PCS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: rrzTwWAYX8Gxh5JH
     driver-class-name: com.mysql.cj.jdbc.Driver