Merge pull request #11 from u014427391/1.0.0

1.0.0

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("/user")
+@RequestMapping("/admin/user")
 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="@{/user/toUserCenter}">
+                            <a th:href="@{/admin/user/toUserCenter}">
                                 <i class="iconfont">&#xe60d;</i>
                                 <span class="pf-opt-name">账户信息</span>
                             </a>

src/taoshop-portal/src/main/java/com/muses/taoshop/base/ConfigConsts.java

+package com.muses.taoshop.base;
+
+/**
+ * <pre>
+ *  配置相关常量类
+ * </pre>
+ *
+ * @author nicky
+ * @version 1.00.00
+ * <pre>
+ * 修改记录
+ *    修改后版本:     修改人：  修改日期: 2018.09.23 16:30    修改内容:
+ * </pre>
+ */
+public class ConfigConsts {
+}

src/taoshop-portal/src/main/java/com/muses/taoshop/util/CategoryTreeUtil.java → src/taoshop-portal/src/main/java/com/muses/taoshop/util/CategoryTreeUtils.java

@@ -18,7 +18,7 @@ import java.util.List;
  *    修改后版本:     修改人：  修改日期: 2018.06.24 17:12    修改内容:
  * </pre>
  */
-public class CategoryTreeUtil {
+public class CategoryTreeUtils {
 
 
     public List<ItemCategory> commonCategorys;

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

@@ -7,7 +7,7 @@ import com.muses.taoshop.item.entity.ItemPortal;
 import com.muses.taoshop.item.service.IItemBrankService;
 import com.muses.taoshop.item.service.IItemCategoryService;
 import com.muses.taoshop.item.service.IItemService;
-import com.muses.taoshop.util.CategoryTreeUtil;
+import com.muses.taoshop.util.CategoryTreeUtils;
 import com.muses.taoshop.web.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -52,7 +52,7 @@ public class IndexController extends BaseController{
         ModelAndView mv = this.getModelAndView();
         mv.setViewName("index");
         List<ItemPortal> items = iItemService.listItemPortal();
-        CategoryTreeUtil treeUtil = new CategoryTreeUtil();
+        CategoryTreeUtils treeUtil = new CategoryTreeUtils();
         List<ItemCategory> list = iItemCategoryService.listCategory();
         List<ItemCategory> categories = treeUtil.buildCategoryTree(list);
         mv.addObject("items" , items);
@@ -75,7 +75,7 @@ public class IndexController extends BaseController{
     @GetMapping(value = "/listCategory" , produces = "application/json;charset=UTF-8")
     @ResponseBody
     public String listCategory(){
-        CategoryTreeUtil treeUtil = new CategoryTreeUtil();
+        CategoryTreeUtils treeUtil = new CategoryTreeUtils();
         List<ItemCategory> list = iItemCategoryService.listCategory();
         List<ItemCategory> categories = treeUtil.buildCategoryTree(list);
         for(ItemCategory itemCategory : categories){

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

@@ -17,7 +17,7 @@ import org.springframework.web.servlet.ModelAndView;
  *    修改后版本:     修改人：  修改日期: 2018.08.11 11:08    修改内容:
  * </pre>
  */
-@RequestMapping("/user")
+@RequestMapping("/portal/user")
 @Controller
 public class UserController extends BaseController{
 
@@ -28,7 +28,7 @@ public class UserController extends BaseController{
     @RequestMapping("/toUserCenter")
     public ModelAndView toUserCenter(){
         ModelAndView mv = this.getModelAndView();
-        mv.setViewName("user/user_center");
+        mv.setViewName("user/portal_user_center");
         return mv;
     }
 }

src/taoshop-portal/src/main/resources/templates/top_bar.html

@@ -11,7 +11,7 @@
                   <span class="user-cs" style="display:none;">
                     <span class="user-cs-con">
                       <s class="icon-arr"></s>
-                      <p><a th:href="@{/templates/admin/user/toUserCenter.do}">个人中心</a></p>
+                      <p><a th:href="@{/portal/user/toUserCenter.do}">个人中心</a></p>
                       <p><a href="#">退出登录</a></p>
                     </span>
                   </span>