5.10.2.3

.gitignore

@@ -11,7 +11,7 @@
 ### Jrebel File ###
 *rebel.xml.bak
 *rebel.xml
-
+*.idx
 ### Common ###
 target
 
@@ -28,4 +28,4 @@ ig**
 application-local.*
 
 .DS_Store
-public/
+public/!/extensions.idx

pom.xml

@@ -4,7 +4,7 @@
     <groupId>io.shulie.takin</groupId>
     <artifactId>takin-web</artifactId>
 
-    <version>takin-web-5.9.0</version>
+    <version>takin-web-5.10.2.2</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/shulieTech/Takin-web.git</url>
@@ -41,7 +41,7 @@
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
         <!-- biz version -->
-        <takin.web.version>takin-web-5.9.0</takin.web.version>
+        <takin.web.version>takin-web-5.10.2.2</takin.web.version>
         <takin.common.version>common-2.0.2-SNAPSHOT</takin.common.version>
         <command.channel>common-2.0.0-SNAPSHOT</command.channel>
         <pardar.log.protocol.version>2.0.6.2</pardar.log.protocol.version>
@@ -50,7 +50,7 @@
         <!-- 3rd libs version -->
         <commons-lang3.version>3.5</commons-lang3.version>
         <spring.boot.version>2.3.0.RELEASE</spring.boot.version>
-        <mysql-jdbc.version>8.0.26</mysql-jdbc.version>
+        <mysql-jdbc.version>8.0.27</mysql-jdbc.version>
         <druid.version>1.1.22</druid.version>
         <common-pools2.version>2.3</common-pools2.version>
         <quartz.version>2.3.0</quartz.version>
@@ -78,6 +78,10 @@
         <openpdf.version>9.1.22</openpdf.version>
         <transmittable-thread-local>2.12.4</transmittable-thread-local>
         <cloud.version>5.4.0.12</cloud.version>
+        <log4j.version>2.16.0</log4j.version>
+        <logback.version>1.2.9</logback.version>
+        <tomcat.version>9.0.67</tomcat.version>
+        <fastjson.version>1.2.83</fastjson.version>
     </properties>
 
     <modules>
@@ -344,7 +348,7 @@
             <dependency>
                 <groupId>io.shulie.amdb</groupId>
                 <artifactId>amdb-common</artifactId>
-                <version>1.0.3-SNAPSHOT</version>
+                <version>1.1.3</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.mapstruct</groupId>
@@ -455,85 +459,85 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
-        <profile>
-            <!--远程仓库-->
-            <id>ossrh</id>
-            <properties></properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>2.5</version>
-                        <configuration>
-                            <encoding>UTF-8</encoding>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-scm-plugin</artifactId>
-                        <version>1.0</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-release-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <additionalparam>-Xdoclint:none</additionalparam>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.7</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <version>2.2</version>
-                        <configuration>
-                            <archive>
-                                <manifestEntries>
-                                    <IsTinyProject>true</IsTinyProject>
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
+<!--        <profile>-->
+<!--            &lt;!&ndash;远程仓库&ndash;&gt;-->
+<!--            <id>ossrh</id>-->
+<!--            <properties></properties>-->
+<!--            <build>-->
+<!--                <plugins>-->
+<!--                    <plugin>-->
+<!--                        <groupId>org.apache.maven.plugins</groupId>-->
+<!--                        <artifactId>maven-resources-plugin</artifactId>-->
+<!--                        <version>2.5</version>-->
+<!--                        <configuration>-->
+<!--                            <encoding>UTF-8</encoding>-->
+<!--                        </configuration>-->
+<!--                    </plugin>-->
+<!--                    <plugin>-->
+<!--                        <groupId>org.apache.maven.plugins</groupId>-->
+<!--                        <artifactId>maven-scm-plugin</artifactId>-->
+<!--                        <version>1.0</version>-->
+<!--                    </plugin>-->
+<!--                    <plugin>-->
+<!--                        <groupId>org.apache.maven.plugins</groupId>-->
+<!--                        <artifactId>maven-release-plugin</artifactId>-->
+<!--                    </plugin>-->
+<!--                    <plugin>-->
+<!--                        <groupId>org.apache.maven.plugins</groupId>-->
+<!--                        <artifactId>maven-javadoc-plugin</artifactId>-->
+<!--                        <version>2.9.1</version>-->
+<!--                        <executions>-->
+<!--                            <execution>-->
+<!--                                <id>attach-javadocs</id>-->
+<!--                                <goals>-->
+<!--                                    <goal>jar</goal>-->
+<!--                                </goals>-->
+<!--                                <configuration>-->
+<!--                                    <additionalparam>-Xdoclint:none</additionalparam>-->
+<!--                                </configuration>-->
+<!--                            </execution>-->
+<!--                        </executions>-->
+<!--                    </plugin>-->
+<!--                    <plugin>-->
+<!--                        <groupId>org.apache.maven.plugins</groupId>-->
+<!--                        <artifactId>maven-gpg-plugin</artifactId>-->
+<!--                        <version>1.5</version>-->
+<!--                        <executions>-->
+<!--                            <execution>-->
+<!--                                <id>sign-artifacts</id>-->
+<!--                                <phase>verify</phase>-->
+<!--                                <goals>-->
+<!--                                    <goal>sign</goal>-->
+<!--                                </goals>-->
+<!--                            </execution>-->
+<!--                        </executions>-->
+<!--                    </plugin>-->
+<!--                    <plugin>-->
+<!--                        <groupId>org.sonatype.plugins</groupId>-->
+<!--                        <artifactId>nexus-staging-maven-plugin</artifactId>-->
+<!--                        <version>1.6.7</version>-->
+<!--                        <extensions>true</extensions>-->
+<!--                        <configuration>-->
+<!--                            <serverId>ossrh</serverId>-->
+<!--                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>-->
+<!--                            <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
+<!--                        </configuration>-->
+<!--                    </plugin>-->
+<!--                    <plugin>-->
+<!--                        <groupId>org.apache.maven.plugins</groupId>-->
+<!--                        <artifactId>maven-jar-plugin</artifactId>-->
+<!--                        <version>2.2</version>-->
+<!--                        <configuration>-->
+<!--                            <archive>-->
+<!--                                <manifestEntries>-->
+<!--                                    <IsTinyProject>true</IsTinyProject>-->
+<!--                                </manifestEntries>-->
+<!--                            </archive>-->
+<!--                        </configuration>-->
+<!--                    </plugin>-->
+<!--                </plugins>-->
+<!--            </build>-->
+<!--        </profile>-->
     </profiles>
     <distributionManagement>
         <repository>

takin-web-amdb-accessor/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>takin-web</artifactId>
         <groupId>io.shulie.takin</groupId>
-        <version>takin-web-5.9.0</version>
+        <version>takin-web-5.10.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -69,10 +69,22 @@
         <dependency>
             <groupId>io.shulie.pradar</groupId>
             <artifactId>log-protocol</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.shulie.takin</groupId>
             <artifactId>takin-common-utils</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
@@ -106,6 +118,10 @@
                     <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
 
             </exclusions>
         </dependency>

takin-web-amdb-accessor/src/main/java/io/shulie/takin/web/amdb/api/ApplicationEntranceClient.java

@@ -18,7 +18,7 @@ public interface ApplicationEntranceClient {
     List<ServiceInfoDTO> getApplicationEntrances(String applicationName, String entranceType, String serviceName, int currentPage, int pageSize);
 
     LinkTopologyDTO getApplicationEntrancesTopology(boolean tempActivity, String applicationName, String linkId, String serviceName,
-                                                    String method, String rpcType, String extend);
+                                                    String method, String rpcType, String extend,boolean extFlag);
 
     String queryMetricsFromAMDB1(TempTopologyQuery1 tempTopologyQuery1);
     JSONObject queryMetricsFromAMDB2(TempTopologyQuery2 tempTopologyQuery2);

takin-web-amdb-accessor/src/main/java/io/shulie/takin/web/amdb/api/impl/ApplicationEntranceClientImpl.java

@@ -78,7 +78,9 @@ public List<ServiceInfoDTO> getApplicationEntrances(String applicationName, Stri
             //查询所有的type
             entranceQueryParam.setRpcType("");
         }
-        entranceQueryParam.setAppName(applicationName);
+        if (StringUtils.isNotBlank(applicationName)) {
+            entranceQueryParam.setAppName(applicationName);
+        }
         entranceQueryParam.setTenantAppKey(WebPluginUtils.traceTenantAppKey());
         entranceQueryParam.setEnvCode(WebPluginUtils.traceEnvCode());
         entranceQueryParam.setCurrentPage(currentPage);
@@ -192,10 +194,21 @@ public List<JSONObject> queryBatchMetrics(QueryMetricsFromAMDB queryMetricsFromA
         }
     }
 
+    /**
+     * @param tempActivity
+     * @param applicationName
+     * @param linkId
+     * @param serviceName
+     * @param method
+     * @param rpcType
+     * @param extend
+     * @param extFlag         是否查询扩展边信息,会返回数据库关联的库信息
+     * @return
+     */
     @Override
     public LinkTopologyDTO getApplicationEntrancesTopology(boolean tempActivity, String applicationName, String linkId,
                                                            String serviceName,
-                                                           String method, String rpcType, String extend) {
+                                                           String method, String rpcType, String extend, boolean extFlag) {
         String url;
         if (tempActivity) {
             url = properties.getUrl().getAmdb() + APPLICATION_ENTRANCES_TOPOLOGY_PATH_TEMP;
@@ -216,6 +229,8 @@ public LinkTopologyDTO getApplicationEntrancesTopology(boolean tempActivity, Str
         if (extend != null) {
             topologyQueryParam.setExtend(extend);
         }
+        // 是否关联查询出数据库的详情信息,默认false
+        topologyQueryParam.setExtFlag(extFlag);
         topologyQueryParam.setTenantAppKey(WebPluginUtils.traceTenantAppKey());
         topologyQueryParam.setEnvCode(WebPluginUtils.traceEnvCode());
         try {

takin-web-amdb-accessor/src/main/java/io/shulie/takin/web/amdb/bean/query/application/ApplicationRemoteCallQueryDTO.java

@@ -16,7 +16,7 @@ public class ApplicationRemoteCallQueryDTO {
     @JsonProperty("currentPage")
     private Integer currentPage;
     @JsonProperty("linkId")
-    private Integer linkId;
+    private String linkId;
     @JsonProperty("methodName")
     private String methodName;
     @JsonProperty("middlewareName")
@@ -37,7 +37,7 @@ public class ApplicationRemoteCallQueryDTO {
     @JsonProperty("userName")
     private String userName;
     @JsonProperty("fieldNames")
-    private String fieldNames = "appName,serviceName,methodName,middlewareName,middlewareDetail,rpcType,extend,upAppName";
+    private String fieldNames = "appName,serviceName,methodName,middlewareName,middlewareDetail,rpcType,extend,upAppName,rpcId,linkId";
     /**
      * 客户端查询
      */

takin-web-amdb-accessor/src/main/java/io/shulie/takin/web/amdb/bean/query/script/QueryLinkDetailDTO.java

@@ -4,6 +4,7 @@
 
 import io.shulie.takin.web.amdb.bean.common.PagingDevice;
 import io.shulie.takin.web.amdb.bean.query.trace.EntranceRuleDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -126,4 +127,13 @@ public class QueryLinkDetailDTO extends PagingDevice {
      */
     private Integer queryType;
 
+    private String appName;
+
+    /**
+     * 类名模糊查询
+     */
+    private String queryMethodName;
+
+    @ApiModelProperty("调用类型")
+    String logType;
 }

takin-web-amdb-accessor/src/main/java/io/shulie/takin/web/amdb/bean/query/trace/TraceInfoQueryDTO.java

@@ -64,6 +64,11 @@ public class TraceInfoQueryDTO implements Serializable {
      */
     private String methodName;
 
+    /**
+     * 方法名模糊查询
+     */
+    private String queryMethodName;
+
     /**
      * 调用参数：request
      */
@@ -85,5 +90,11 @@ public class TraceInfoQueryDTO implements Serializable {
      */
     private Integer queryType;
 
+    private String appName;
+
+    private String rpcType;
+
     private Integer clusterTest;
+
+    String logType;
 }