Merge branch 'master' of https://github.com/metersphere/server

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "backend/src/main/java/io/metersphere/xpack"]
+	path = backend/src/main/java/io/metersphere/xpack
+	url = https://github.com/metersphere/xpack-backend.git
+[submodule "frontend/src/business/components/xpack"]
+	path = frontend/src/business/components/xpack
+	url = https://github.com/metersphere/xpack-frontend.git

backend/pom.xml

@@ -365,6 +365,54 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-and-filter-allatori-config</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/allatori</directory>
+                                    <includes>
+                                        <include>allatori.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>run-allatori</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>java</executable>
+                    <arguments>
+                        <argument>-Xms128m</argument>
+                        <argument>-Xmx512m</argument>
+                        <argument>-jar</argument>
+                        <argument>${basedir}/target/classes/allatori/allatori.jar</argument>
+                        <argument>${basedir}/target/classes/allatori/allatori.xml</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit 914f2e189af22904cf6ee5394cc9bfa69fe6144d
+Subproject commit 85f7879c49d2d3b2444d8dc250fa007da4fc8181

backend/src/main/resources/allatori/allatori.xml

@@ -0,0 +1,14 @@
+<config>
+    <input>
+        <jar in="../../*.jar" out="../../*.jar"/>
+    </input>
+
+    <keep-names>
+        <class access="private+">
+            <field access="protected+"/>
+            <method access="protected+"/>
+        </class>
+    </keep-names>
+
+    <property name="log-file" value="log.xml"/>
+</config>

frontend/src/business/components/common/router/router.js

@@ -34,6 +34,8 @@ import ApiReportList from "../../api/report/ApiReportList";
 import axios from "axios";
 import ApiKeys from "../../settings/personal/ApiKeys";
 
+const requireContext = require.context('@/business/components/xpack/', true, /router\.js$/)
+
 Vue.use(VueRouter);
 
 const router = new VueRouter({
@@ -45,6 +47,7 @@ const router = new VueRouter({
         sidebar: RouterSidebar
       }
     },
+    ...requireContext.keys().map(key => requireContext(key).default),
     {
       path: "/setting",
       components: {

frontend/src/business/components/xpack

@@ -0,0 +1 @@
+Subproject commit 52adadce7eb781fcab20c5e1ab7e83bd03b24b4e