Merge remote-tracking branch 'origin/master'

litemall-core/src/main/java/org/linlinjava/litemall/core/config/GlobalExceptionHandler.java

@@ -18,31 +18,37 @@ import java.util.Set;
 @ControllerAdvice
 public class GlobalExceptionHandler {
 
+    @ExceptionHandler(IllegalArgumentException.class)
+    @ResponseBody
+    public Object badArgumentHandler(IllegalArgumentException e){
+        e.printStackTrace();
+        return ResponseUtil.badArgumentValue();
+    }
 
     @ExceptionHandler(MethodArgumentTypeMismatchException.class)
     @ResponseBody
-    public Object argumentHandler(MethodArgumentTypeMismatchException e){
+    public Object badArgumentHandler(MethodArgumentTypeMismatchException e){
         e.printStackTrace();
         return ResponseUtil.badArgumentValue();
     }
 
     @ExceptionHandler(MissingServletRequestParameterException.class)
     @ResponseBody
-    public Object argumentHandler(MissingServletRequestParameterException e){
+    public Object badArgumentHandler(MissingServletRequestParameterException e){
         e.printStackTrace();
         return ResponseUtil.badArgumentValue();
     }
 
     @ExceptionHandler(HttpMessageNotReadableException.class)
     @ResponseBody
-    public Object httpMessageNotReadableHandler(HttpMessageNotReadableException e){
+    public Object badArgumentHandler(HttpMessageNotReadableException e){
         e.printStackTrace();
         return ResponseUtil.badArgumentValue();
     }
 
     @ExceptionHandler(ValidationException.class)
     @ResponseBody
-    public Object handle(ValidationException e) {
+    public Object badArgumentHandler(ValidationException e) {
         e.printStackTrace();
         if(e instanceof ConstraintViolationException){
             ConstraintViolationException exs = (ConstraintViolationException) e;
@@ -57,7 +63,7 @@ public class GlobalExceptionHandler {
 
     @ExceptionHandler(Exception.class)
     @ResponseBody
-    public Object exceptionHandler(Exception e){
+    public Object seriousHandler(Exception e){
         e.printStackTrace();
         return ResponseUtil.serious();
     }

litemall-core/src/main/java/org/linlinjava/litemall/core/storage/QiniuStorage.java

@@ -58,7 +58,7 @@ public class QiniuStorage implements Storage {
     }
 
     /**
-     * 阿里云OSS对象存储简单上传实现
+     * 七牛云OSS对象存储简单上传实现
      */
     @Override
     public void store(InputStream inputStream, long contentLength, String contentType, String keyName) {

litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageAutoConfiguration.java

@@ -21,7 +21,6 @@ public class StorageAutoConfiguration {
     @Bean
     public StorageService storageService() {
         StorageService storageService = new StorageService();
-        Map<String, Storage> supportedStorage = new HashMap<String, Storage>(3);
         String active = this.properties.getActive();
         storageService.setActive(active);
         if(active.equals("local")){
@@ -34,7 +33,7 @@ public class StorageAutoConfiguration {
             storageService.setStorage(tencentStorage());
         }
         else if(active.equals("qiniu")){
-            storageService.setStorage(tencentStorage());
+            storageService.setStorage(qiniuStorage());
         }
         else{
             throw  new RuntimeException("当前存储模式 " + active + " 不支持");

litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java

@@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -140,6 +141,7 @@ public class WxCartController {
             cart.setSpecifications(product.getSpecifications());
             cart.setUserId(userId);
             cart.setChecked(true);
+            cart.setAddTime(LocalDateTime.now());
             cartService.add(cart);
         } else {
             //取得规格的信息,判断规格库存