Merge branch 'master' into master-links123

assets/example.html

   </div>
   
   <script src="http://gosspublic.alicdn.com/aliyun-oss-sdk.min.js"></script>
-  <script type="text/javascript" src="./static/js/main.b165c3be.js"></script>
+  <script type="text/javascript" src="./static/js/main.6d72baad.js"></script>
   <script type="text/javascript" src="example.js"></script>
 </body>
 </html>