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

# Conflicts:
#	user-service/src/main/java/com/diagbot/web/UserController.java

diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -92,11 +92,11 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
             }
             return productOrderFacade.updateProductOrderStatus(orderDetails.getOrderNum());
         }
+        orderDetails.setStatus(PaymentMethodEnum.PAY.getKey());
         if(!this.updateById(orderDetails)){
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "审核状态修改失败");
         }
-        orderDetails.setStatus(PaymentMethodEnum.PAY.getKey());
         Long userId =Long.parseLong(UserUtils.getCurrentPrincipleID());
         OpenedProducts openedProducts =new OpenedProducts();
         openedProducts.setGmtCreate(DateUtil.now());

gateway-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -2,9 +2,11 @@ package com.diagbot.client;
 
 import com.diagbot.client.hystrix.UserServiceHystrix;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Token;
 import com.diagbot.entity.User;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
@@ -20,7 +22,7 @@ public interface UserServiceClient {
     RespDTO<User> login(@RequestParam("username") String username, @RequestParam("password") String password);
 
     @PostMapping("/user/verifyToken")
-    RespDTO<Boolean> verifyToken(@RequestParam("token") String token);
+    RespDTO<Boolean> verifyToken(@RequestBody Token token);
 }
 
 

gateway-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -3,6 +3,7 @@ package com.diagbot.client.hystrix;
 
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Token;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -21,7 +22,7 @@ public class UserServiceHystrix implements UserServiceClient {
     }
 
     @Override
-    public RespDTO<Boolean> verifyToken(String token) {
+    public RespDTO<Boolean> verifyToken(Token token) {
         log.error("【hystrix】调用{}异常", "verifyToken");
         return null;
     }

gateway-service/src/main/java/com/diagbot/entity/Token.java

@@ -0,0 +1,24 @@
+package com.diagbot.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: token
+ * @Author: ztg
+ * @Date: 2018/9/19 13:14
+ */
+@Getter
+@Setter
+public class Token implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String token;
+
+    public Token(String token) {
+        this.token = token;
+    }
+}

gateway-service/src/main/java/com/diagbot/filter/GlobalGatewayFilter.java

@@ -4,6 +4,7 @@ import com.diagbot.client.DiagbotmanServiceClient;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceToken;
+import com.diagbot.entity.Token;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -74,7 +75,7 @@ public class GlobalGatewayFilter implements GlobalFilter {
         //验证token有效性
         String token = request.getHeaders().getFirst("Authorization");
         if(StringUtil.isNotEmpty(token)) {
-            RespDTO<Boolean> res = userServiceClient.verifyToken(token);
+            RespDTO<Boolean> res = userServiceClient.verifyToken(new Token(token));
             if (res == null || !RespDTO.TRUE_CODE.equals(res.code)) {
                 return getVoidMono(serverWebExchange, res);
             }

user-service/src/main/java/com/diagbot/entity/Token.java

@@ -0,0 +1,24 @@
+package com.diagbot.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: token
+ * @Author: ztg
+ * @Date: 2018/9/19 13:14
+ */
+@Getter
+@Setter
+public class Token implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String token;
+
+    public Token(String token) {
+        this.token = token;
+    }
+}

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -9,6 +9,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserLoginDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.Permission;
+import com.diagbot.entity.Token;
 import com.diagbot.entity.User;
 import com.diagbot.facade.PermissionFacade;
 import com.diagbot.facade.TokenFacade;
@@ -81,8 +82,8 @@ public class UserController {
     @PostMapping("/verifyToken")
     @SysLogger("verifyToken")
     @ApiIgnore
-    public RespDTO<Boolean> verifyToken(@RequestBody String token) {
-        Boolean data = tokenFacade.verifyToken(token, 1);
+    public RespDTO<Boolean> verifyToken(@RequestBody Token token) {
+        Boolean data = tokenFacade.verifyToken(token.getToken());
         return RespDTO.onSuc(data);
     }