修改分类和获取appid

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/AccessGatewayFilter.java

@@ -72,6 +72,7 @@ public class AccessGatewayFilter implements GlobalFilter {
 //    private String zuulPrefix;
 
     private static final String GATE_WAY_PREFIX = "/api";
+    private static final String GATE_WAY_UNAUTH = "/app/unauth";
     @Autowired
     private UserAuthUtil userAuthUtil;
 
@@ -248,7 +249,7 @@ public class AccessGatewayFilter implements GlobalFilter {
     private boolean isStartWith(String requestUri) {
         boolean flag = false;
         for (String s : startWith.split(",")) {
-            if (requestUri.startsWith(s)) {
+            if (requestUri.startsWith(s)||requestUri.contains(GATE_WAY_UNAUTH)) {
                 return true;
             }
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

 package com.github.wxiaoqi.security.admin.rest;
 
+import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
 import com.github.wxiaoqi.security.admin.biz.MenuBiz;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.entity.Menu;
 import com.github.wxiaoqi.security.admin.entity.User;
@@ -31,6 +33,8 @@ public class PublicController {
 
     @Autowired
     private UserBiz userBiz;
+    @Autowired
+    private AppUserDetailBiz detailBiz;
 
     @Autowired
     private UserAuthUtil userAuthUtil;
@@ -48,4 +52,19 @@ public class PublicController {
         }
         return new ObjectRestResponse<User>().rel(true).data(user);
     }
+
+    @RequestMapping(value = "/app/userinfo-by-token", method = RequestMethod.GET)
+    public @ResponseBody
+    ObjectRestResponse userDetailByToken(String token) throws Exception {
+        String username = userAuthUtil.getInfoFromToken(token).getId();
+        if (username == null) {
+            throw new Exception();
+        }
+        Integer userid=Integer.parseInt(username);
+        AppUserDetail user = detailBiz.getUserByUserid(userid);
+        if (user == null) {
+            throw new Exception();
+        }
+        return new ObjectRestResponse<AppUserDetail>().rel(true).data(user);
+    }
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehiclePlatCata.java

 package com.xxfc.platform.vehicle.entity;
 
 import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.math.BigDecimal;
-import java.util.Date;
+import javax.persistence.*;
 
 @Table(name = "vehicle_plat_cata")
 @Data
-public class VehiclePlatCata {
+public class VehiclePlatCata{
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "JDBC")
     private Integer id;
 
     //父类id
@@ -25,7 +21,7 @@ public class VehiclePlatCata {
     private String icon;
 
    //描述
-    private String desc;
+    private String depict;
 
     //排序
     private Integer rank;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/UserFeign.java

 package com.xxfc.platform.vehicle.feign;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,4 +16,7 @@ public interface UserFeign {
     @RequestMapping(value = "/public/userinfo-by-token")
     public ObjectRestResponse<UserDTO> userinfoByToken(@RequestParam("token") String token);
 
+    @RequestMapping(value = "/public/app/userinfo-by-token")
+    public ObjectRestResponse<AppUserDTO> userDetailByToken(@RequestParam("token") String token);
+
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/dto/AppUserDTO.java

+package com.xxfc.platform.vehicle.feign.dto;
+
+import lombok.Data;
+/**
+ * 用户详情信息表
+ */
+@Data
+public class AppUserDTO {
+
+	private Integer id;
+	private Integer userid;
+	private Integer isMember;
+	private String nickname;
+	private String realname;
+	private String headimgurl;
+	private String email;
+	private Integer sex;
+	private String birthday;
+	private String personSign;
+	private String remark;
+	private Long createtime;
+	private Long updatetime;
+	private Integer isdel;
+
+}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CataDto.java

+package com.xxfc.platform.vehicle.vo;
+
+
+import java.util.List;
+
+public class CataDto {
+        Integer id;
+        Integer parentId;
+        List<CataDto> chirdren;
+        String name;
+        Integer level;
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CataVo.java

@@ -8,13 +8,13 @@ public class CataVo {
 
     private Integer id;
    //父类id
-    private Integer parent_id;
+    private Integer parentId;
     //名称
     private String name;
     //图标
     private String icon;
     //描述
-    private String desc;
+    private String depict;
     //级别
     private Integer level;
     //排序

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java

 package com.xxfc.platform.vehicle.biz;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
@@ -10,6 +11,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+import java.util.ArrayList;
+import java.util.List;
 
 
 @Service
@@ -17,6 +21,8 @@ import org.springframework.transaction.annotation.Transactional;
 public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePlatCata> {
 
 
+
+
     //更新
     @Transactional
     public RestResponse update(CataVo cataVo){
@@ -31,6 +37,52 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
           return RestResponse.suc();
     }
 
+    /**
+     * 获取无限级的类别资源
+     */
+   @Transactional
+    public JSONObject findTypeTree() throws Exception {
+        //默认查询出所有的一级类别
+        JSONObject obj = new JSONObject();
+        List<VehiclePlatCata> typeList = getAll(0);
+        List<Object> list = new ArrayList<>();
+        for (VehiclePlatCata cata : typeList) {
+            JSONObject treeObject = new JSONObject();
+            treeObject.put("id", cata.getId());
+            treeObject.put("parentId", cata.getParentId());
+            treeObject.put("name", cata.getName());
+            treeObject.put("level", cata.getLevel());
+            treeObject.put("icon", cata.getIcon());
+            treeObject.put("children", getChildren(cata.getId()));
+            list.add(treeObject);
+        }
+        obj.put("cata",list);
+        return obj;
+    }
+    public List<Object> getChildren(Integer parentId){
+        List<Object> list = new ArrayList<>();
+        List<VehiclePlatCata> children = getAll(parentId);
+     if(children.size()>0){
+        for (VehiclePlatCata cata : children) {
+            JSONObject obj = new JSONObject();
+            obj.put("id", cata.getId());
+            obj.put("parentId", cata.getParentId());
+            obj.put("name", cata.getName());
+            obj.put("level", cata.getLevel());
+            obj.put("icon", cata.getIcon());
+            obj.put("children", getChildren(cata.getId()));
+            list.add(obj);
+        }
+      }
+        return list;
+    }
+
+    public  List<VehiclePlatCata> getAll(Integer parentId){
+        Example example = new Example(VehiclePlatCata.class);
+        example.createCriteria().andEqualTo("parentId", parentId).andEqualTo("state",0);
+        return mapper.selectByExample(example);
+    }
+
 
 
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/common/VehicleBaseController.java

+package com.xxfc.platform.vehicle.common;
+
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.vehicle.feign.UserFeign;
+import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+
+@Slf4j
+public class VehicleBaseController<Biz extends BaseBiz> {
+    @Autowired
+    protected HttpServletRequest request;
+    @Autowired
+    protected Biz baseBiz;
+    @Autowired
+    protected UserFeign userFeign;
+    @Autowired
+    protected UserAuthConfig userAuthConfig;
+
+  public AppUserDTO getUserInfo(){
+      return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
+  }
+
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCataController.java

@@ -10,16 +10,16 @@ import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleBookRecordBiz;
 import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
-import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.common.VehicleBaseController;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.feign.UserFeign;
+import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
 import com.xxfc.platform.vehicle.vo.*;
 import lombok.extern.slf4j.Slf4j;
-
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,27 +30,33 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 @RestController
-@RequestMapping("/vehiclecata")
+@RequestMapping("/cata")
 @Slf4j
 @IgnoreClientToken
-public class VehicleCataController extends BaseController<VehiclePlatCataBiz> {
-
-    @Autowired
-    private VehicleBookRecordBiz vehicleBookRecordBiz;
-
-    @Autowired
-    VehicleBiz vehicleBiz;
 
-    @Autowired
-    UserFeign userFeign;
+public class VehicleCataController extends VehicleBaseController<VehiclePlatCataBiz> {
 
-    @Autowired
-    private UserAuthConfig userAuthConfig;
 
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public RestResponse update(@RequestBody CataVo cataVo) throws Exception {
         return baseBiz.update(cataVo);
     }
+    @RequestMapping(value = "/app/all", method = RequestMethod.POST)
+    public RestResponse test() throws Exception {
+        AppUserDTO userDTO =getUserInfo();
+
+        return RestResponse.data(userDTO);
+    }
+
+    @RequestMapping(value = "/app/unauth/all", method = RequestMethod.POST)
+    @IgnoreUserToken
+    public RestResponse all() throws Exception {
+        return RestResponse.data(baseBiz.findTypeTree());
+    }
+
+
+
+
 
    /* @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public RestResponse<Vehicle> get(@PathVariable String id) {