恢复产品URL

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -266,8 +266,7 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
             if (!isset($additional['_escape'])) {
                 $additional['_escape'] = true;
             }
-            return $product->getUrlKey();
-            //return $product->getUrlModel()->getUrl($product, $additional);
+            return $product->getUrlModel()->getUrl($product, $additional);
         }
 
         return '#';

app/code/Magento/Catalog/Model/Product/Url.php

@@ -182,13 +182,12 @@ class Url extends \Magento\Framework\DataObject
         if (!empty($requestPath)) {
             $routeParams['_direct'] = $requestPath;
         } else {
-            $routeParams['_direct'] = "products/".$product->getUrlKey();
-//            $routePath = 'catalog/product/view';
-//            $routeParams['id'] = $product->getId();
-//            $routeParams['s'] = $product->getUrlKey();
-//            if ($categoryId) {
-//                $routeParams['category'] = $categoryId;
-//            }
+            $routePath = 'catalog/product/view';
+            $routeParams['id'] = $product->getId();
+            $routeParams['s'] = $product->getUrlKey();
+            if ($categoryId) {
+                $routeParams['category'] = $categoryId;
+            }
         }
 
         // reset cached URL instance GET query params