Merge remote-tracking branch 'origin/1.0.0' into dev

src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/item/OrderController.java

@@ -19,7 +19,7 @@ import org.springframework.web.servlet.ModelAndView;
  * </pre>
  */
 @Controller
-@RequestMapping("/order")
+@RequestMapping("/admin/order/api")
 public class OrderController extends BaseController{
 
 

src/taoshop-manager/taoshop-manager-web/src/main/java/com/muses/taoshop/manager/web/controller/userCenter/UserController.java

@@ -19,7 +19,7 @@ import org.springframework.web.servlet.ModelAndView;
  * </pre>
  */
 @Controller
-@RequestMapping("/admin/user")
+@RequestMapping("/admin/user/api")
 public class UserController extends BaseController {
 
     /**

src/taoshop-manager/taoshop-manager-web/src/main/resources/templates/admin/frame/nav.html

@@ -31,7 +31,7 @@
                 <div class="user-opt-panel">
                     <ul class="user-opt">
                         <li>
-                            <a th:href="@{/admin/user/toUserCenter}">
+                            <a th:href="@{/admin/user/api/toUserCenter}">
                                 <i class="iconfont">&#xe60d;</i>
                                 <span class="pf-opt-name">账户信息</span>
                             </a>

src/taoshop-manager/taoshop-manager-web/src/main/resources/templates/admin/frame/sider_bar_bk.html

@@ -14,7 +14,7 @@
                 </a>
             </h3>
             <ul class="sider-nav-s">
-                <li class="current"><a th:href="@{/order/toOrder}">订单管理</a></li>
+                <li class="current"><a th:href="@{/admin/order/api/toOrder}">订单管理</a></li>
                 <li><a href="order-detail.html">订单详情</a></li>
                 <li><a href="order-handle.html">订单处理</a></li>
             </ul>

src/taoshop-portal/src/main/java/com/muses/taoshop/Application.java

@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.*;
 @EnableTransactionManagement//开启对事务管理配置的支持
 @EnableCaching
 @EnableAsync//开启对异步方法的支持
-@EnableAutoConfiguration //TODO 修改该注解可以实现自动部署
+@EnableAutoConfiguration
 @SpringBootApplication(exclude={DataSourceAutoConfiguration.class,
         MybatisAutoConfiguration.class,
         DataSourceTransactionManagerAutoConfiguration.class})

src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/cart/ShopCartController.java

 package com.muses.taoshop.web.controller.cart;
 
+import com.muses.taoshop.web.controller.BaseController;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
 
 /**
  * <pre>
@@ -15,8 +19,18 @@ import org.springframework.stereotype.Controller;
  * </pre>
  */
 @Controller
-public class ShopCartController {
-
+@RequestMapping("/portal/shopcart")
+public class ShopCartController extends BaseController{
 
+    /**
+     * 添加购物车成功
+     * @return
+     */
+    @GetMapping(value = "/toAddSuccess")
+    public ModelAndView toAddSuccess() {
+        ModelAndView mv = this.getModelAndView();
+        mv.setViewName("/shopcart/add_shopcart_success");
+        return mv;
+    }
 
 }

src/taoshop-portal/src/main/java/com/muses/taoshop/web/controller/portal/ItemDetailController.java

@@ -29,7 +29,7 @@ import java.util.List;
  * </pre>
  */
 @Controller
-@RequestMapping("/portal")
+@RequestMapping("/portal/item")
 public class ItemDetailController extends BaseController{
 
     @Autowired
@@ -37,7 +37,7 @@ public class ItemDetailController extends BaseController{
     @Autowired
     IItemSpecService iItemSpecService;
 
-    @GetMapping("/item/toDetail/{spuId}/{skuId}")
+    @GetMapping("/toDetail/{spuId}/{skuId}")
     public ModelAndView toDetail(@PathVariable int spuId, @PathVariable int skuId){
         ModelAndView mv = this.getModelAndView();
         ItemDetail itemDetail = iItemService.getItemDetailInfo(spuId);

src/taoshop-portal/src/main/resources/templates/item/item_detail.html

@@ -200,7 +200,7 @@
                 <!--已选择-->
                 <div class="phone_choosed">
                     <span>此商品由　<a href="#" class="f-big f-orange1" th:text="${itemDetail.shopName}"></a>　负责销售及发货</span>
-                    <div class="add_btn"><a href="#" class="btn btn-red">立即购买</a><a href="#" class="btn btn-coffee">加入购物车</a>请移步购物车选择合约套餐</div>
+                    <div class="add_btn"><a href="#" class="btn btn-red">立即购买</a><a th:href="@{/portal/shopcart/toAddSuccess}" class="btn btn-coffee">加入购物车</a>请移步购物车选择合约套餐</div>
                 </div>
                 <!--已选择-->
             </div>

src/taoshop-portal/src/main/resources/templates/shortcart/add_shopcart_success.html → src/taoshop-portal/src/main/resources/templates/shopcart/add_shopcart_success.html

@@ -4,10 +4,10 @@
 <head>
 <meta charset="utf-8" />
 <title>成功加入购物车</title>
-<link href="style/public.css" rel="stylesheet" type="text/css">
-<link href="style/cart.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="script/jquery-1.3.2.min.js"></script>
-<script type="text/javascript" src="script/html5.js"></script>
+    <link th:href="@{/static/css/public.css}" rel="stylesheet" type="text/css" />
+    <link th:href="@{/static/css/cart.css}" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" th:src="@{/static/js/jquery-1.3.2.min.js}"></script>
+    <script type="text/javascript" th:src="@{/static/js/html5.js}"></script>
 </head>
 <body>
 <!--header-->
@@ -40,36 +40,35 @@
     <div class="hot-goods-bd">
         <div class="clearfix hot-goods-list">
             <div class="goods">
-                <p class="goods-img"><img src="picture/hot-goods_180x180.jpg"></p>
+                <p class="goods-img"><img th:src="@{/static/picture/hot-goods_180x180.jpg}" /></p>
                 <p class="goods-name">学院风帆布双肩包 卡其色</p>
                 <p class="goods-des">使用500g纯棉帆布，材质上乘</p>
                 <p class="goods-price"><span class="val">79元</span></p>
                 <p class="goods-buy"><a class="add-cart" href="#"><span>加入购物车</span></a></p>
             </div>
             <div class="goods">
-                <p class="goods-img"><img src="picture/hot-goods_180x180.jpg"></p>
+                <p class="goods-img"><img th:src="@{/static/picture/hot-goods_180x180.jpg}" /></p>
                 <p class="goods-name">学院风帆布双肩包 卡其色</p>
                 <p class="goods-des">使用500g纯棉帆布，材质上乘</p>
                 <p class="goods-price"><span class="val">79元</span></p>
                 <p class="goods-buy"><a class="add-cart" href="#"><span>加入购物车</span></a></p>
             </div>
             <div class="goods">
-                <p class="goods-img"><img src="picture/hot-goods_180x180.jpg"></p>
+                <p class="goods-img"><img th:src="@{/static/picture/hot-goods_180x180.jpg}" /></p>
                 <p class="goods-name">学院风帆布双肩包 卡其色</p>
                 <p class="goods-des">使用500g纯棉帆布，材质上乘</p>
-
                 <p class="goods-price"><span class="val">79元</span></p>
                 <p class="goods-buy"><a class="add-cart" href="#"><span>加入购物车</span></a></p>
             </div>
             <div class="goods">
-                <p class="goods-img"><img src="picture/hot-goods_180x180.jpg"></p>
+                <p class="goods-img"><img th:src="@{/static/picture/hot-goods_180x180.jpg}" /></p>
                 <p class="goods-name">学院风帆布双肩包 卡其色</p>
                 <p class="goods-des">使用500g纯棉帆布，材质上乘</p>
                 <p class="goods-price"><span class="val">79元</span></p>
                 <p class="goods-buy"><a class="add-cart" href="#"><span>加入购物车</span></a></p>
             </div>
             <div class="goods">
-                <p class="goods-img"><img src="picture/hot-goods_180x180.jpg"></p>
+                <p class="goods-img"><img th:src="@{/static/picture/hot-goods_180x180.jpg}" /></p>
                 <p class="goods-name">学院风帆布双肩包 卡其色</p>
                 <p class="goods-des">使用500g纯棉帆布，材质上乘</p>
                 <p class="goods-price"><span class="val">79元</span></p>