Merge remote-tracking branch 'origin/dev' into dev

ace-common/pom.xml

@@ -38,10 +38,6 @@
             <artifactId>spring-cloud-sleuth-zipkin</artifactId>
             <version>2.1.0.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>

ace-common/src/main/java/com/github/wxiaoqi/security/common/filter/AcceptFilter.java

@@ -12,16 +12,7 @@ public class AcceptFilter extends Filter<ILoggingEvent> {
 //	MailServiceImpl mailService;
 	@Override
 	public FilterReply decide(ILoggingEvent event) {
-		if(event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi") || event.getLoggerName().contains("Exception")) {
-			if(event.getLoggerName().contains("Exception") || event.getLoggerName().contains("ERROR")) {
-				//邮件日志
-//				try {
-//					log.info("发送异常邮件，邮件内容：【服务器异常】： {}", event.getLoggerName() + ":" +event.getMessage());
-//					mailService.sendSimpleMail("jiaoruizhen@126.com", "服务器异常", event.getLoggerName() + ":" +event.getMessage());
-//				}catch (Exception e) {
-//					log.error("发送异常邮件失败，异常信息： {}", e);
-//				}
-			}
+		if(event.getLoggerName().contains("Exception") || event.getLoggerName().contains("ERROR") || event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi") || event.getLoggerName().contains("Exception")) {
 			return FilterReply.ACCEPT;
 		} else {
 			return FilterReply.DENY;

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java

@@ -8,21 +8,37 @@ import com.github.wxiaoqi.security.common.exception.auth.UserTokenException;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 import javax.servlet.http.HttpServletResponse;
 
+import static org.springframework.http.HttpStatus.NOT_EXTENDED;
+
 /**
  * Created by ace on 2017/9/8.
  */
-@ControllerAdvice("com.github.wxiaoqi.security")
+@ControllerAdvice
 @ResponseBody
-public class GlobalExceptionHandler {
+public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
     private Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
-//    @Autowired
-//    MailServiceImpl mailService;
+
+    /**
+     * 在controller里面内容执行之前，校验一些参数不匹配啊，Get post方法不对啊之类的
+     */
+    @Override
+    protected ResponseEntity<Object> handleExceptionInternal(Exception ex, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        logger.error(ex.getMessage(),ex);
+        return new ResponseEntity<>("出错了", NOT_EXTENDED);
+    }
+
+
     @ExceptionHandler(ClientTokenException.class)
     public BaseResponse clientTokenExceptionHandler(HttpServletResponse response, ClientTokenException ex) {
         response.setStatus(403);
@@ -50,7 +66,6 @@ public class GlobalExceptionHandler {
         if(0 == ex.getStatus()) {
             response.setStatus(500);
         }
-//        sendEmail(ex);
         return new BaseResponse(ex.getStatus(), ex.getMessage());
     }
 
@@ -58,16 +73,6 @@ public class GlobalExceptionHandler {
     public BaseResponse otherExceptionHandler(HttpServletResponse response, Exception ex) {
         response.setStatus(500);
         logger.error(ex.getMessage(),ex);
-//        sendEmail(ex);
         return new BaseResponse(CommonConstants.EX_OTHER_CODE, ex.getMessage());
     }
-
-//    public void sendEmail(Exception ex) {
-//        try {
-//            logger.info("发送异常邮件，邮件内容：【服务器异常】： {}", ex.getMessage() + ":" + ex);
-//            mailService.sendSimpleMail("jiaoruizhen@126.com", "服务器异常", ex.getMessage() + ":" + ex);
-//        }catch (Exception e) {
-//            logger.error("发送异常邮件失败，异常信息： {}", e);
-//        }
-//    }
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/log/Impl/MailServiceImpl.java

-package com.github.wxiaoqi.security.common.log.Impl;
-
-import com.github.wxiaoqi.security.common.util.process.SystemConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-
-@Slf4j
-public class MailServiceImpl {
-
-	@Autowired
-	private JavaMailSender mailSender;
-
-	public void sendSimpleMail(String to, String subject, String content) {
-		SimpleMailMessage message = new SimpleMailMessage();
-		message.setFrom(SystemConfig.EMAILADDRESS);
-		message.setTo(to);
-		message.setSubject(subject);
-		message.setText(content);
-
-		try {
-			mailSender.send(message);
-			log.info("简单邮件已经发送。");
-		}catch (Exception e) {
-			log.error("发送简单邮件时发生异常！", e);
-		}
-
-	}
-}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -232,16 +232,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
         Vehicle vehicle = null;
         RestResponse<Vehicle> vehicleRestResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
-        log.info("获取车辆信息返回消息：{}", vehicleRestResponse.getMessage());
         if (vehicleRestResponse.getData() != null) {
             vehicle = vehicleRestResponse.getData();
         }
         if (vehicle == null) {
             return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
         }
-//        if (vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
-//            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc());
-//        }
         if (baseOrder.getStatus() != -1) {
             if (vehicle.getMileageLastUpdate() != null) {
                 //判断车辆公里数
@@ -249,7 +245,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc());
                 }
             }
-
         }
         //添加验车人信息
         JSONArray list = new JSONArray();
@@ -361,7 +356,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
             orderVehicleCrosstownDto.setDeductionCost(amount);
-            //扣除费用
+            //剩余押金 = 总押金 - 扣除费用
             orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
             if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
                 return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
@@ -401,6 +396,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     OrderVehicleCrosstownDto orderVehicleCrosstownDto = list.get(0);
                     OrderVehicleCrosstown orderVehicleCrosstown1 = new OrderVehicleCrosstown();
                     BeanUtil.copyProperties(orderVehicleCrosstownDto, orderVehicleCrosstown1, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                    //添加押金记录
                     DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
                     depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
                     depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown1.getDeductionCost()));

xx-universal/xx-universal-server/pom.xml

@@ -36,6 +36,10 @@
             </exclusions>
             <version>4.4.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-dysmsapi</artifactId>

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/MailServiceBiz.java

+package com.xxfc.platform.universal.biz;
+
+import com.github.wxiaoqi.security.common.util.process.SystemConfig;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Slf4j
+@Service
+public class MailServiceBiz {
+
+	@Autowired
+	 JavaMailSender mailSender;
+
+	public void sendSimpleMail(String to, String subject, String content) {
+		SimpleMailMessage message = new SimpleMailMessage();
+		message.setFrom(SystemConfig.EMAILADDRESS);
+		message.setTo(to);
+		message.setSubject(subject);
+		message.setText(content);
+
+		try {
+			mailSender.send(message);
+			log.info("简单邮件已经发送。{}", message);
+		}catch (Exception e) {
+			log.error("发送简单邮件时发生异常！", e);
+		}
+
+	}
+
+	public void run(String to, String subject, String content) {
+		ExecutorService executorService = Executors.newCachedThreadPool();
+		executorService.submit(new Task(to, subject, content));
+	}
+
+	@Data
+	class Task implements Runnable{
+		private String toUser;
+		private String subject;
+		private String content;
+
+		public Task(String toUser, String subject, String content) {
+			this.toUser = toUser;
+			this.subject = subject;
+			this.content = content;
+		}
+
+		@Override
+		public void run() {
+			sendSimpleMail(toUser, subject, content);
+		}
+	}
+}
\ No newline at end of file

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/EmailSendController.java

+package com.xxfc.platform.universal.controller;
+
+import com.xxfc.platform.universal.biz.MailServiceBiz;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("mail")
+public class EmailSendController {
+
+	@Autowired
+	MailServiceBiz mailServiceBiz;
+
+	@GetMapping(value = "/app/unauth/send")
+	public void senEmail(String toUser, String subject, String content) {
+		mailServiceBiz.run(toUser, subject, content);
+	}
+
+}