更新版本号等信息以及一些修改

fecshop · Apr 23, 2017 · a43adb6 · a43adb6
1 parent 85c89e6
commit a43adb6
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 19 deletions.
diff --git a/appadmin/uploads/product/product_1492501121_product.xlsx b/appadmin/uploads/product/product_1492501121_product.xlsx
diff --git a/appadmin/uploads/product/product_1492501160_product.xlsx b/appadmin/uploads/product/product_1492501160_product.xlsx
diff --git a/appfront/components/.gitignore b/appfront/components/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/appfront/config/fecshop_local_services/Cache.php b/appfront/config/fecshop_local_services/Cache.php
@@ -53,4 +53,4 @@
 			],
 		],
 	],
-];
+];
diff --git a/appfront/config/fecshop_local_services/Store.php b/appfront/config/fecshop_local_services/Store.php
@@ -10,7 +10,11 @@
 				'localThemeDir'	=> '@appfront/theme/terry/theme01', # 设置当前store对应的模板路径。关于多模板的方面的知识，您可以参看fecshop多模板的知识。
 				'thirdThemeDir'	=> [],  # 第三方模板路径，数组，可以多个路径
 				'currency' 		=> 'USD', # 当前store的默认货币,这个货币简码，必须在货币配置中配置
-				'mobile'		=> [ # 当设备满足什么条件的时候，进行跳转。
+				/**
+				 * 当设备满足什么条件的时候，进行跳转。
+				 * 这种方式不怎么高效，最好的方式是在nginx中配置。
+				 */
+				'mobile'		=> [ 
 					'enable'		=> false,
 					'condition'		=> ['phone','tablet'], # phone 代表手机，tablet代表平板
 					'redirectDomain' 	=> 'fecshop.apphtml5.fancyecommerce.com',	# 如果是移动设备访问进行域名跳转，这里填写的值为store key
@@ -28,6 +32,8 @@
 						'CLIENT_SECRET'  => 'ei8RaoCDoAlIeh1nHYm0rrwO',
 					],
 				],
+				# 用于sitemap生成中域名。
+				'https'			=> true,
 				# sitemap的路径。
 				'sitemapDir' => '@appfront/web/sitemap.xml',
 			],

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*",
 		"yiisoft/yii2-apidoc": "~2.0.0",
-        "fancyecommerce/fecshop": ">=1.1.2.6"
+        "fancyecommerce/fecshop": ">=1.1.2.7"
 
     },
     "require-dev": {

diff --git a/console/config/fecshop_local_services/Sitemap.php b/console/config/fecshop_local_services/Sitemap.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * FecShop file.
+ * 
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+return [
+	'sitemap' => [
+		'class' => 'fecshop\services\Sitemap',
+		'sitemapConfig' => [
+			/**
+			 * 对于下面的设置，您可能感觉很啰嗦，域名作为store的key，在store service中已经设置，
+			 * 为什么需要在这里重新搞一套呢？  这样做是为了更加的灵活
+			 *
+			 */
+			# appfront入口
+			'appfront' => [
+				# store的key(域名)，
+				'fecshop.appfront.fancyecommerce.com' => [
+					'https'			=> true,  # false代表使用http，true代表使用https			
+					'sitemapDir' 	=> '@appfront/web/sitemap.xml', # sitemap存放的地址
+					'showScriptName'=> false,	# 是否显示index.php ，譬如http://www.fecshop.com/index.php/xxxxxx,当nginx没有设置重写，这里需要设置为true,这样url中会存在index.php，否则会404
+												# 这个设置对seo来说，设置为false最合适，也就是隐藏 url中index.php ，这种设置需要开启nginx的url重写
+				],
+				# store的key(域名)
+				'fecshop.appfront.fancyecommerce.com/fr' => [
+					'https'			=> true,  # false代表使用http，true代表使用https			
+					'sitemapDir' 	=> '@appfront/web/fr/sitemap.xml', # sitemap存放的地址
+					'showScriptName'=> false,
+				],
+
+				'fecshop.appfront.es.fancyecommerce.com' => [
+					'https'			=> true,  # false代表使用http，true代表使用https			
+					'sitemapDir' 	=> '@appfront/web/sitemap_es.xml',
+					'showScriptName'=> false,
+				],
+				'fecshop.appfront.fancyecommerce.com/cn' => [
+					'https'			=> true,  # false代表使用http，true代表使用https			
+					'sitemapDir' 	=> '@appfront/web/cn/sitemap.xml',
+					'showScriptName'=> false,
+				],
+			]
+		],
+	],
+];
diff --git a/environments/dev/appapi/web/index.php b/environments/dev/appapi/web/index.php
@@ -33,7 +33,7 @@
 		# fecshop services config
 		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/config/fecshop.php'),
 		# fecshop module config
-		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appfront/config/appfront.php'),
+		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appapi/config/appapi.php'),
 
 		# thrid part confing
 

diff --git a/environments/dev/apphtml5/web/index-merge-config.php b/environments/dev/apphtml5/web/index-merge-config.php
@@ -20,7 +20,7 @@
 	# fecshop services config
 	require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/config/fecshop.php'),
 	# fecshop module config
-	require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appfront/config/appfront.php'),
+	require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/apphtml5/config/apphtml5.php'),
 
 	# thrid part confing
 

diff --git a/environments/dev/apphtml5/web/index.php b/environments/dev/apphtml5/web/index.php
@@ -33,7 +33,7 @@
 		# fecshop services config
 		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/config/fecshop.php'),
 		# fecshop module config
-		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appfront/config/appfront.php'),
+		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/apphtml5/config/apphtml5.php'),
 
 		# thrid part confing
 

diff --git a/environments/dev/appserver/web/index.php b/environments/dev/appserver/web/index.php
@@ -33,7 +33,7 @@
 		# fecshop services config
 		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/config/fecshop.php'),
 		# fecshop module config
-		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appfront/config/appfront.php'),
+		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appserver/config/appserver.php'),
 
 		# thrid part confing
 

diff --git a/environments/index.php b/environments/index.php
@@ -48,10 +48,10 @@
             'appserver/web/assets',
 			'appimage/common/media/catalog/product',
 
-			'appapi/merge_config.php',
-			'appfront/merge_config.php',
-			'apphtml5/merge_config.php',
-			'appserver/merge_config.php',
+			//'appapi/merge_config.php',
+			//'appfront/merge_config.php',
+			//'apphtml5/merge_config.php',
+			//'appserver/merge_config.php',
         ],
         'setExecutable' => [
             'yii',
@@ -81,10 +81,10 @@
 			'appserver/runtime',
             'appserver/web/assets',
 			'appimage/common/media/catalog/product',
-			'appapi/merge_config.php',
-			'appfront/merge_config.php',
-			'apphtml5/merge_config.php',
-			'appserver/merge_config.php',
+			//'appapi/merge_config.php',
+			//'appfront/merge_config.php',
+			//'apphtml5/merge_config.php',
+			//'appserver/merge_config.php',
         ],
         'setExecutable' => [
             'yii',

diff --git a/environments/prod/appapi/web/index.php b/environments/prod/appapi/web/index.php
@@ -33,7 +33,7 @@
 		# fecshop services config
 		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/config/fecshop.php'),
 		# fecshop module config
-		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appfront/config/appfront.php'),
+		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appapi/config/appapi.php'),
 
 		# thrid part confing
 

diff --git a/environments/prod/apphtml5/web/index-merge-config.php b/environments/prod/apphtml5/web/index-merge-config.php
@@ -20,7 +20,7 @@
 	# fecshop services config
 	require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/config/fecshop.php'),
 	# fecshop module config
-	require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appfront/config/appfront.php'),
+	require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/apphtml5/config/apphtml5.php'),
 
 	# thrid part confing
 

diff --git a/environments/prod/apphtml5/web/index.php b/environments/prod/apphtml5/web/index.php
@@ -33,7 +33,7 @@
 		# fecshop services config
 		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/config/fecshop.php'),
 		# fecshop module config
-		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appfront/config/appfront.php'),
+		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/apphtml5/config/apphtml5.php'),
 
 		# thrid part confing
 

diff --git a/environments/prod/appserver/web/index.php b/environments/prod/appserver/web/index.php
@@ -33,7 +33,7 @@
 		# fecshop services config
 		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/config/fecshop.php'),
 		# fecshop module config
-		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appfront/config/appfront.php'),
+		require(__DIR__ . '/../../vendor/fancyecommerce/fecshop/app/appserver/config/appserver.php'),
 
 		# thrid part confing
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,4 +53,4 @@ @@
     			],
     		],
     	],
-    ];
+    ];