Merge branch 'secondStage' into thirdStage

# Conflicts:
#	public/api_address_config.js
#	src/utils/kkFilePreview.js

src/App.vue

@@ -2,7 +2,7 @@
   <a-config-provider :locale="locale">
     <div id="app">
       <router-view v-if="isRouterAlive" />
-      <div class="watermark" v-if="show" v-watermark="{text: watermark, textColor: 'rgba(180, 180, 180, 0.2)'}"></div>
+      <div class="watermark" v-if="show" v-watermark="{text: watermark, textColor: watermarkConfig.color}"></div>
     </div>
   </a-config-provider>
 </template>
@@ -37,6 +37,9 @@ export default {
         return this.$store.getters.userInfo.username + this.$store.getters.userInfo.realname
       }
       return null
+    },
+    watermarkConfig () {
+      return window._CONFIG.watermarkConfig
     }
   },
   watch: {