Merge branch 'master' into feature/201801041612

pom.xml

@@ -312,6 +312,11 @@
             <artifactId>quantgroup-sms-sdk</artifactId>
             <version>3.0</version>
         </dependency>
+        <dependency>
+            <groupId>io.sentry</groupId>
+            <artifactId>sentry-spring</artifactId>
+            <version>1.6.3</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/cn/quantgroup/xyqb/Bootstrap.java

@@ -4,6 +4,7 @@ import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
 import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
 import com.weibo.api.motan.common.MotanConstants;
 import com.weibo.api.motan.util.MotanSwitcherUtil;
+import io.sentry.Sentry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -45,5 +46,7 @@ public class Bootstrap {
         springApplication.setRegisterShutdownHook(true);
         springApplication.run(args);
         log.info("server start...");
+
+        Sentry.init("http://13ef5642903a414c910f8d0e0a2c56ee:8b351ad1abf44de3b4c25f39105fb927@172.16.4.89:9000/6");
     }
 }

src/main/java/cn/quantgroup/xyqb/config/sentry/SentryConfig.java

+package cn.quantgroup.xyqb.config.sentry;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletContextInitializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+
+/**
+ * @author xufei on 2017/12/27.
+ */
+@Controller
+@EnableAutoConfiguration
+@SpringBootApplication
+public class SentryConfig {
+    @Bean
+    public HandlerExceptionResolver sentryExceptionResolver() {
+        return new io.sentry.spring.SentryExceptionResolver();
+    }
+
+    @Bean
+    public ServletContextInitializer sentryServletContextInitializer() {
+        return new io.sentry.spring.SentryServletContextInitializer();
+    }
+}

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -31,10 +31,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.sql.Timestamp;