Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -33,7 +33,7 @@ import java.util.List;
 @EnableDiscoveryClient
 @EnableCircuitBreaker
 @SpringBootApplication
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.universal.feign"})
+@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.universal.feign", "com.github.wxiaoqi.security.admin"})
 @EnableScheduling
 @EnableAceAuthClient
 @EnableAceCache

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

+package com.github.wxiaoqi.security.admin.feign;
+
+
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author wanghaobin
+ * @create 2017-06-21 8:11
+ */
+@FeignClient(value = "ace-admin")
+public interface UserFeign {
+    @RequestMapping(value = "/public/app/userinfo-by-token")
+    public ObjectRestResponse<AppUserDTO> userDetailByToken(@RequestParam("token") String token);
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

+package com.github.wxiaoqi.security.admin.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-tour/xx-tour-api/pom.xml

@@ -10,5 +10,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xxfc.platform</groupId>
     <artifactId>xx-tour-api</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.github.wxiaoqi</groupId>
+            <artifactId>ace-admin</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 </project>
\ No newline at end of file

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java

+package com.xxfc.platform.tour.common;
+
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+
+@Slf4j
+public class TourBaseController<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-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourSpePriceDto.java

+package com.xxfc.platform.tour.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 计算价格
+ */
+@Data
+public class TourSpePriceDto {
+
+	//用户id
+	@ApiModelProperty(value = "用户id")
+	private Integer userId;
+
+	//用户等级
+	@ApiModelProperty(value = "用户等级")
+	private Integer level;
+
+	//规格i
+	@ApiModelProperty(value = "规格id")
+	private Integer speId;
+
+	//儿童人数
+	@ApiModelProperty(value = "儿童人数")
+	private String childNumber;
+
+	//"成人人数
+	@ApiModelProperty(value = "成人人数")
+	private String endTime;
+
+
+}

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/TourApplication.java

@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign"})
+@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.github.wxiaoqi.security.admin.feign"})
 @EnableAceCache
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.tour.mapper")
 public class TourApplication {

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodDetailBiz.java

@@ -99,4 +99,5 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
     }
 
 
+
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodDetailController.java

 package com.xxfc.platform.tour.rest;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.tour.biz.TourGoodDetailBiz;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("good")
+@IgnoreClientToken
 public class TourGoodDetailController{
 
 
@@ -18,7 +21,8 @@ public class TourGoodDetailController{
 
 
      //获取商品详情
-    @RequestMapping(value = "/app/unauth/details", method = RequestMethod.GET) //匹配的是href中的download请求
+    @RequestMapping(value = "/app/unauth/details", method = RequestMethod.GET)
+    @IgnoreUserToken
     public ObjectRestResponse details(@RequestParam(value = "goodId",defaultValue = "0") Integer goodId) {
         return detailBiz.getGoodDetaileById(goodId);
     }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodSpeController.java

 package com.xxfc.platform.tour.rest;
 
-import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.tour.biz.TourGoodSpeBiz;
-import com.xxfc.platform.tour.entity.TourGoodSpe;
+import com.xxfc.platform.tour.common.TourBaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("tourGoodSpe")
-public class TourGoodSpeController extends BaseController<TourGoodSpeBiz,TourGoodSpe> {
+@RequestMapping("spe")
+@IgnoreClientToken
+public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
+
+
+
+    //获取商品详情
+    @RequestMapping(value = "/user/prices", method = RequestMethod.GET)
+    public ObjectRestResponse user() {
+        AppUserDTO userDTO=getUserInfo();
+        return ObjectRestResponse.succ(userDTO);
+    }
 
 }
\ No newline at end of file