diff --git a/application/admin/view/default/site/attachment/index.html b/application/admin/view/default/site/attachment/index.html
index 79b1f356e..c9cb225b0 100644
--- a/application/admin/view/default/site/attachment/index.html
+++ b/application/admin/view/default/site/attachment/index.html
@@ -36,6 +36,20 @@
                   </span>
                 </div>
             </div>
+
+            <div class="am-form-group">
+                <label>{{$data.is_upload_images_redraw.name}}<span class="am-form-group-label-tips">{{$data.is_upload_images_redraw.describe}}</span></label>
+                <select name="{{$data.is_upload_images_redraw.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.is_upload_images_redraw.error_tips}}" required>
+                    {{foreach $common_is_text_list as $v}}
+                        <option value="{{$v.id}}" {{if isset($data['is_upload_images_redraw']['value']) and $data['is_upload_images_redraw']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+                    {{/foreach}}
+                </select>
+                <div class="am-alert am-alert-warning" data-am-alert>
+                    <button type="button" class="am-close">&times;</button>
+                    <p>1. 默认否、建议开启上传图片重新绘制、防止木马病毒图片上传</p>
+                    <p>2. 开启后gif动态图片将失效、由于重新绘制图片大小也会改变</p>
+                </div>
+            </div>
             
             <div class="am-form-group am-form-group-refreshing am-margin-top-lg am-padding-left-0">
                 <input type="hidden" name="nav_type" value="{{$nav_type}}" />
diff --git a/application/index/view/default/config.json b/application/index/view/default/config.json
index 6d63bd62f..7519b5fad 100755
--- a/application/index/view/default/config.json
+++ b/application/index/view/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.0.0",
+	"ver":"2.0.1",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php
index 92feac909..6ce76de4b 100755
--- a/application/lang/zh-cn.php
+++ b/application/lang/zh-cn.php
@@ -33,6 +33,7 @@ return [
             '1.9.2' => ['value' => '1.9.2', 'name' => 'v1.9.2'],
             '1.9.3' => ['value' => '1.9.3', 'name' => 'v1.9.3'],
             '2.0.0' => ['value' => '2.0.0', 'name' => 'v2.0.0'],
+            '2.0.1' => ['value' => '2.0.1', 'name' => 'v2.0.1'],
         ],
 
     // 用户注册类型列表
diff --git a/application/tags.php b/application/tags.php
index 975bac18d..2b1d0a97d 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -32,5 +32,77 @@ return array (
   'log_write' => 
   array (
   ),
+  'plugins_css' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_navigation_header_handle' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_goods_handle_end' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_goods_spec_base' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_buy_group_goods_handle' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_user_login_success_record' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_goods_spec_extends_handle' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_view_admin_user_save' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_user_save_handle' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_goods_save_handle' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_view_goods_detail_panel_price_top' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_view_home_goods_inside_bottom' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_view_search_goods_inside_bottom' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_goods_spec_type' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_users_center_left_menu_handle' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_service_header_navigation_top_right_handle' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_module_form_admin_user_index' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_module_form_admin_user_detail' => 
+  array (
+    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
 );
 ?>
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index f6558f428..330fe897d 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,23 @@
++=========================================================+
+   ShopXO 2.0.1 Release --- http://shopxo.net
++=========================================================+
+全局
+	1. 公共图片上传重绘加开关
+	2. 搜索模块多个关键字[或|并且]关系的控制
+
+web端
+	1. 修复编辑器粘贴数据图片重复存储
+	2. 修复web端用户注册图片验证码过期问题
+	3. 修复微信小程序用户授权基础信息丢失问题
+	4. 新增多商户插件、支持用户入驻开店销售产品、商品/订单/结算/数据统计管理
+
+小程序
+	1. 
+
+插件
+	1. 多商户
+
+
 +=========================================================+
    ShopXO 2.0.0 Release 20210316 http://shopxo.net
 +=========================================================+
diff --git a/public/core.php b/public/core.php
index 8c486ecd0..96b8e02f7 100755
--- a/public/core.php
+++ b/public/core.php
@@ -13,7 +13,7 @@
 if(version_compare(PHP_VERSION,'5.6.0','<'))  die('PHP版本最低 5.6.0');
 
 // 系统版本
-define('APPLICATION_VERSION', 'v2.0.0');
+define('APPLICATION_VERSION', 'v2.0.1');
 
 // 定义系统目录分隔符
 define('DS', '/');
diff --git a/sourcecode/alipay/default/config.json b/sourcecode/alipay/default/config.json
index 6d63bd62f..7519b5fad 100755
--- a/sourcecode/alipay/default/config.json
+++ b/sourcecode/alipay/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.0.0",
+	"ver":"2.0.1",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/sourcecode/baidu/default/config.json b/sourcecode/baidu/default/config.json
index 6d63bd62f..7519b5fad 100644
--- a/sourcecode/baidu/default/config.json
+++ b/sourcecode/baidu/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.0.0",
+	"ver":"2.0.1",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/sourcecode/qq/default/config.json b/sourcecode/qq/default/config.json
index 6d63bd62f..7519b5fad 100644
--- a/sourcecode/qq/default/config.json
+++ b/sourcecode/qq/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.0.0",
+	"ver":"2.0.1",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/sourcecode/toutiao/default/config.json b/sourcecode/toutiao/default/config.json
index 6d63bd62f..7519b5fad 100644
--- a/sourcecode/toutiao/default/config.json
+++ b/sourcecode/toutiao/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.0.0",
+	"ver":"2.0.1",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/sourcecode/weixin/default/config.json b/sourcecode/weixin/default/config.json
index 6d63bd62f..7519b5fad 100755
--- a/sourcecode/weixin/default/config.json
+++ b/sourcecode/weixin/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.0.0",
+	"ver":"2.0.1",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file