Merge pull request #62 from aliyun/dev

Dev

Author: aleelock

Makefile

@@ -1,5 +1,5 @@
 
-VERSION=1.3.3
+VERSION=1.4.0
 NAME=oss-browser
 CUSTOM=./custom
 
@@ -50,14 +50,13 @@ mac:
 	rm -rf releases/$(VERSION)/$(NAME)-darwin-x64.zip && mkdir -p releases/$(VERSION)
 	cd build && $(ZIP) ../releases/$(VERSION)/$(NAME)-darwin-x64.zip $(NAME)-darwin-x64/
 dmg:
-	rm build/$(NAME)-darwin-x64/LICENSE* build/$(NAME)-darwin-x64/version
-	ln -s /Applications/ build/$(NAME)-darwin-x64/Applications
+	rm build/$(NAME)-darwin-x64/LICENSE* build/$(NAME)-darwin-x64/version || continue
+	ln -s /Applications/ build/$(NAME)-darwin-x64/Applications || continue
 	#cp dist/icons/icon.icns build/$(NAME)-darwin-x64/.VolumeIcon.icns
 	#mkdir -p build/$(NAME)-darwin-x64/.background
 	#cp dist/icons/background.tiff build/$(NAME)-darwin-x64/.background
-	rm -f releases/$(VERSION)/$(NAME).dmg
-	hdiutil create -size 250M -format UDZO -srcfolder build/$(NAME)-darwin-x64 releases/$(VERSION)/$(NAME).dmg
-
+	rm -f releases/$(VERSION)/$(NAME).dmg || continue
+	hdiutil create -size 250M -format UDZO -srcfolder build/$(NAME)-darwin-x64 -o releases/$(VERSION)/$(NAME).dmg
 all:win32 win64 linux32 linux64 mac
 	@echo 'Done'
 

Readme.md

@@ -10,16 +10,22 @@ OSS Browser 提供类似windows资源管理器功能。用户可以很方便的
 
 ## 1. 客户端下载：
 
-最新版本`1.3.3`，下载地址如下，解压即可使用。
+最新版本`1.4.0`，下载地址如下，解压即可使用。
 
-> [<h4>Window x32版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-win32-ia32.zip)
+> [<h4>Window x32版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-win32-ia32.zip)
 
 
-> [<h4>Window x64版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-win32-x64.zip)
+> [<h4>Window x64版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-win32-x64.zip)
 
-> [<h4>Mac 版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser.dmg)
+> [<h4>Mac dmg版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser.dmg)
+
+> [<h4>Mac zip版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-darwin-x64.zip)
+
+
+> [<h4>Ubuntu x64版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-linux-x64.zip)
+
+> [<h4>Ubuntu x32版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-linux-ia32.zip)
 
-> [<h4>Ubuntu x64版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-linux-x64.zip)
 
 其他版本暂不提供，可以自行build。
 

all-releases.md

@@ -1,22 +1,23 @@
 All Releases for [ OSS Browser ]
 
-  ||Windows ia32|Windows x64| Mac |Linux x64|
-  |-----|-----|-----|---------|--------|
-|1.3.3|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-linux-x64.zip) |
-|1.3.2|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-linux-x64.zip) |
-|1.3.1|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-linux-x64.zip) |
-|1.3.0|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-linux-x64.zip) |
-|1.2.5|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-linux-x64.zip) |
-|1.2.4||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.4/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.4/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.4/oss-browser-linux-x64.zip) |
-|1.2.3||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.3/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.3/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.3/oss-browser-linux-x64.zip) |
-|1.2.2||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.2/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.2/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.2/oss-browser-linux-x64.zip) |
-|1.2.1||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.1/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.1/oss-browser-linux-x64.zip) |
-|1.2.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.0/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.0/oss-browser-linux-x64.zip) |
-|1.1.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.1.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.1.0/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.1.0/oss-browser-linux-x64.zip) |
-|1.0.3||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.3/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.3/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.3/oss-browser-linux-x64.zip) |
-|1.0.2||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.2/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.2/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.2/oss-browser-linux-x64.zip) |
-|1.0.1||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.1/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.1/oss-browser-linux-x64.zip) |
-|1.0.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.0/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.0/oss-browser-linux-x64.zip) |
-|0.10.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.10.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.10.0/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.10.0/oss-browser-linux-x64.zip) |
-|0.9.1||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.1/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.1/oss-browser-linux-x64.zip) |
-|0.9.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.0/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.0/oss-browser-linux-x64.zip) |
+  ||Windows ia32|Windows x64| Mac(dmg) | Mac(zip) |Linux ia32|Linux x64|
+  |-----|-----|-----|-----|----|--------|--------|
+|1.4.0|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-darwin-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-linux-ia32.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.0/oss-browser-linux-x64.zip)|
+|1.3.3|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.3/oss-browser-linux-x64.zip) |
+|1.3.2|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-linux-x64.zip) |
+|1.3.1|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-linux-x64.zip) |
+|1.3.0|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-linux-x64.zip) |
+|1.2.5|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-linux-x64.zip) |
+|1.2.4||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.4/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.4/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.4/oss-browser-linux-x64.zip) |
+|1.2.3||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.3/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.3/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.3/oss-browser-linux-x64.zip) |
+|1.2.2||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.2/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.2/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.2/oss-browser-linux-x64.zip) |
+|1.2.1||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.1/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.1/oss-browser-linux-x64.zip) |
+|1.2.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.0/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.0/oss-browser-linux-x64.zip) |
+|1.1.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.1.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.1.0/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.1.0/oss-browser-linux-x64.zip) |
+|1.0.3||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.3/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.3/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.3/oss-browser-linux-x64.zip) |
+|1.0.2||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.2/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.2/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.2/oss-browser-linux-x64.zip) |
+|1.0.1||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.1/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.1/oss-browser-linux-x64.zip) |
+|1.0.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.0/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.0.0/oss-browser-linux-x64.zip) |
+|0.10.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.10.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.10.0/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.10.0/oss-browser-linux-x64.zip) |
+|0.9.1||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.1/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.1/oss-browser-linux-x64.zip) |
+|0.9.0||[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.0/oss-browser.dmg) | | | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/0.9.0/oss-browser-linux-x64.zip) |

app/components/services/oss2.js

@@ -27,6 +27,7 @@ angular.module('web')
         listFiles: listFiles,
         getContent: getContent,
         saveContent: saveContent,
+        getImageBase64Url: getImageBase64Url,
 
         //重命名
         moveFile: moveFile,
@@ -714,6 +715,25 @@ angular.module('web')
         });
       }
 
+      function getImageBase64Url(region, bucket, key) {
+        return new Promise(function (a, b) {
+          var client = getClient({
+            region: region,
+            bucket: bucket
+          });
+          client.getObject({
+            Bucket: bucket,
+            Key: key
+          }, function (err, data) {
+            if (err) {
+              handleError(err);
+              b(err);
+            } else {
+              a(data);
+            }
+          });
+        });
+      }
       function getContent(region, bucket, key) {
         return new Promise(function (a, b) {
           var client = getClient({

app/main/files/files.js

@@ -426,7 +426,8 @@ angular.module('web')
 
         ossSvs2.listFiles(info.region, info.bucket, info.key, marker || '').then(function (result) {
 
-          var arr = settingsSvs.showImageSnapshot.get() == 1 ? signPicURL(info, result.data) : result.data;
+          var arr = result.data;
+          settingsSvs.showImageSnapshot.get() == 1 ? signPicURL(info, arr) : null
 
           $scope.objects = $scope.objects.concat(arr);
           $scope.nextObjectsMarker = result.marker || null;
@@ -457,12 +458,25 @@ angular.module('web')
       }
 
       function signPicURL(info, result) {
-        angular.forEach(result, function (n) {
-          if (!n.isFolder && fileSvs.getFileType(n).type == 'picture') {
-            n.pic_url = ossSvs2.signatureUrl(info.region, info.bucket, n.path, 3600);
-          }
-        });
-        return result;
+        var authInfo = AuthInfo.get();
+        if(authInfo.id.indexOf('STS.')==0){
+          angular.forEach(result, function (n) {
+            ossSvs2.getImageBase64Url(info.region, info.bucket, n.path).then(function(data){
+              if(data.ContentType.indexOf('image/')==0){
+                var base64str = new Buffer(data.Body).toString('base64');
+                n.pic_url = 'data:'+data.ContentType+';base64,'+base64str;
+              }
+            })
+          });
+        }
+        else{
+          angular.forEach(result, function (n) {
+            if (!n.isFolder && fileSvs.getFileType(n).type == 'picture') {
+              n.pic_url = ossSvs2.signatureUrl(info.region, info.bucket, n.path, 3600);
+            }
+          });
+        }
+        //return result;
       }
 
       function listBuckets(fn) {

app/main/files/modals/get-address.html

@@ -29,11 +29,16 @@ <h4 class="modal-title">
         <div class="input-group">
           <input type="text" id="genAddress" ng-model="item.url" rows="4"  class="input-md form-control"/>
           <span class="input-group-btn">
-            <a href="" class="btn btn-default"  clipboard-button target="'#genAddress'">
+            <a href="" class="btn btn-info"  clipboard-button target="'#genAddress'">
               <!-- 点击复制 -->
               {{'click.copy'|translate}}
             </a>
           </span>
+          <span class="input-group-btn">
+            <button type="button" class="btn btn-default" ng-click="info.showSendTo=!info.showSendTo">
+              {{'send.email'|translate}}
+            </button>
+          </span>
         </div>
       </div>