remove trace

Author: allwefantasy

pom.xml

@@ -5,7 +5,7 @@
     <groupId>net.csdn</groupId>
     <artifactId>ServiceFramework_2.11</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <name>ServiceFramework</name>
     <description>Java MVC framework, agile, fast, rich domain model, made especially for server side of mobile
         application

release.sh

@@ -1,3 +1,3 @@
-mvn clean deploy -DskipTests -Prelease-sign-artifacts
+mvn clean deploy -DskipTests -Prelease-sign-artifacts -Pscala-2.12
 #https://oss.sonatype.org/#stagingRepositories
 #mvn versions:set -DnewVersion={version}

serviceframework-common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>ServiceFramework_2.11</artifactId>
         <groupId>net.csdn</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <artifactId>serviceframework-common_2.11</artifactId>
 

serviceframework-dispatcher/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ServiceFramework_2.11</artifactId>
         <groupId>net.csdn</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

serviceframework-jetty-9-server/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>ServiceFramework_2.11</artifactId>
         <groupId>net.csdn</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>serviceframework-jetty-9-server</artifactId>
+    <artifactId>serviceframework-jetty-9-server_2.11</artifactId>
 
     <dependencies>
         <dependency>

serviceframework-mongo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ServiceFramework_2.11</artifactId>
         <groupId>net.csdn</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

serviceframework-orm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ServiceFramework_2.11</artifactId>
         <groupId>net.csdn</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

serviceframework-orm/src/main/java/net/csdn/jpa/model/Model.java

@@ -1,6 +1,7 @@
 package net.csdn.jpa.model;
 
 import net.csdn.common.exception.AutoGeneration;
+import net.csdn.jpa.JPA;
 import net.csdn.jpa.exception.JPAQueryException;
 import net.csdn.modules.persist.mysql.MysqlClient;
 
@@ -175,6 +176,10 @@ public static int delete(String query, Object... params) {
         throw new AutoGeneration();
     }
 
+    public static void commit() {
+        JPA.getJPAConfig().getJPAContext().closeTx(false);
+    }
+
     /**
      * Delete all entities
      *

serviceframework-web/pom.xml

@@ -5,15 +5,15 @@
     <parent>
         <artifactId>ServiceFramework_2.11</artifactId>
         <groupId>net.csdn</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>serviceframework-web_2.11</artifactId>
     <dependencies>
         <dependency>
             <groupId>net.csdn</groupId>
-            <artifactId>serviceframework-jetty-9-server</artifactId>
+            <artifactId>serviceframework-jetty-9-server_2.11</artifactId>
             <version>${parent.version}</version>
         </dependency>
 

serviceframework-web/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestClientProxy.java

@@ -8,11 +8,6 @@
 import net.csdn.common.path.Url;
 import net.csdn.modules.http.RestRequest;
 import net.csdn.modules.transport.HttpTransportService;
-import net.csdn.trace.RemoteTraceElementKey;
-import net.csdn.trace.Trace;
-import net.csdn.trace.TraceContext;
-import net.csdn.trace.VisitType;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import scala.collection.JavaConversions;
 
 import java.io.UnsupportedEncodingException;
@@ -113,10 +108,6 @@ public Object invoke(Object o, Method method, Object[] objects) throws Throwable
         if (!methodSupport) throw new RuntimeException(reqMethod + "not support in invoke " + url);
 
 
-
-
-
-
         //支持rest接口
         List<String> replaceKeys = new ArrayList<String>();
         String remenberPath = path;
@@ -132,15 +123,8 @@ public Object invoke(Object o, Method method, Object[] objects) throws Throwable
         }
         Url finalUrl = new Url(url + "/" + remenberPath);
 
-        TraceContext traceContext = Trace.get();
-        if (traceContext != null) {
-            traceContext.start(finalUrl.toString(), VisitType.HTTP_SERVICE());
-            finalUrl.addParam(RemoteTraceElementKey.TRACEID(), traceContext.traceId());
-            finalUrl.addParam(RemoteTraceElementKey.RPCID(), traceContext.currentRpcId());
-        }
 
         HttpTransportService.SResponse response = null;
-        String message = null;
         try {
             if (reqMethod.equals(RestRequest.Method.GET)) {
                 response = httpTransportService.get(finalUrl, params);
@@ -154,15 +138,7 @@ public Object invoke(Object o, Method method, Object[] objects) throws Throwable
 
             }
         } catch (Exception e) {
-            message = ExceptionUtils.getStackTrace(e).replaceAll("\n", "\\n");
-        } finally {
-            int responseStatus = -1;
-            long responseLength = -1;
-            if (response != null) responseStatus = response.getStatus();
-            if (response != null) responseLength = response.getContent().length();
-            if (traceContext != null) {
-                traceContext.finish(responseStatus, responseLength, message, logger);
-            }
+            logger.info("call remote fail", e);
         }
 
         if (response == null)