Merge pull request #4 from alibaba/develop

Develop
alibaba · Feb 27, 2019 · 9641ea8 · 9641ea8
2 parents dca6261 + 931a0f4
commit 9641ea8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 265 deletions.
diff --git a/console/pom.xml b/console/pom.xml
@@ -114,5 +114,13 @@
                 </executions>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>static/console-fe/.vscode/**</exclude>
+                </excludes>
+            </resource>
+        </resources>
     </build>
 </project>
diff --git a/console/src/main/resources/diamond-server-logback.xml b/console/src/main/resources/diamond-server-logback.xml