Merge remote-tracking branch 'origin/release-bihe-hyy' into release-bihe-hyy

# Conflicts:
#	sso-server/src/main/java/com/uas/sso/bihe/service/BiHeService.java
#	sso-server/src/main/java/com/uas/sso/foreign/bihe/controller/BiHeController.java
#	sso-server/src/main/java/com/uas/sso/foreign/bihe/service/impl/BiHeServiceImpl.java

sso-server/src/main/java/com/uas/sso/bihe/entity/BiHeOrder.java

@@ -0,0 +1,196 @@
+package com.uas.sso.bihe.entity;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangmh
+ * @create 2018-07-25 17:36
+ * @desc 碧合订单
+ **/
+public class BiHeOrder implements Serializable {
+
+    private static final long serialVersionUID = -6210001684674793480L;
+
+
+    /**
+     * accessToken : 559e128640f54319860026937a796a04
+     * details : {"key1":"订单id"}
+     * imageUrl : string
+     * isUrl : YES
+     * listOrderFunctionEntity : [{"orderId":"cs123456","functionName":"支付","functionUrl":"支付跳转地址","functionColour":"","createTime":"2018-04-21 10:50:36","updateTime":"2018-04-21 10:50:36"}]
+     * openId : a31f4d5ff20546aab7eb82a2ef490c13
+     * orderId : 123456
+     * orderModelId : a1000001
+     * orderStatus : a100000101
+     * payStatus : UNPAID
+     * url : string
+     */
+
+    private String accessToken;
+    private Map<String, Object> details;
+    private String imageUrl;
+    private String isUrl;
+    private String openId;
+    private String orderId;
+    private String orderModelId;
+    private String orderStatus;
+    private String payStatus;
+    private String url;
+    private List<BiHeOrderItem> listOrderFunctionEntity;
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public String getIsUrl() {
+        return isUrl;
+    }
+
+    public void setIsUrl(String isUrl) {
+        this.isUrl = isUrl;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderModelId() {
+        return orderModelId;
+    }
+
+    public void setOrderModelId(String orderModelId) {
+        this.orderModelId = orderModelId;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public List<BiHeOrderItem> getListOrderFunctionEntity() {
+        return listOrderFunctionEntity;
+    }
+
+    public void setListOrderFunctionEntity(List<BiHeOrderItem> listOrderFunctionEntity) {
+        this.listOrderFunctionEntity = listOrderFunctionEntity;
+    }
+
+    public Map<String, Object> getDetails() {
+        return details;
+    }
+
+    public void setDetails(Map<String, Object> details) {
+        this.details = details;
+    }
+
+    public static class BiHeOrderItem {
+        /**
+         * orderId : cs123456
+         * functionName : 支付
+         * functionUrl : 支付跳转地址
+         * functionColour :
+         * createTime : 2018-04-21 10:50:36
+         * updateTime : 2018-04-21 10:50:36
+         */
+
+        private String orderId;
+        private String functionName;
+        private String functionUrl;
+        private String functionColour;
+        private String createTime;
+        private String updateTime;
+
+        public String getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(String orderId) {
+            this.orderId = orderId;
+        }
+
+        public String getFunctionName() {
+            return functionName;
+        }
+
+        public void setFunctionName(String functionName) {
+            this.functionName = functionName;
+        }
+
+        public String getFunctionUrl() {
+            return functionUrl;
+        }
+
+        public void setFunctionUrl(String functionUrl) {
+            this.functionUrl = functionUrl;
+        }
+
+        public String getFunctionColour() {
+            return functionColour;
+        }
+
+        public void setFunctionColour(String functionColour) {
+            this.functionColour = functionColour;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getUpdateTime() {
+            return updateTime;
+        }
+
+        public void setUpdateTime(String updateTime) {
+            this.updateTime = updateTime;
+        }
+    }
+}

sso-server/src/main/java/com/uas/sso/foreign/bihe/controller/BiHeController.java

@@ -3,6 +3,7 @@ package com.uas.sso.foreign.bihe.controller;
 import com.uas.sso.foreign.bihe.entity.BiHeInfo;
 import com.uas.sso.foreign.bihe.entity.BiHeUserInfo;
 import com.uas.sso.foreign.bihe.service.BiHeService;
+import com.uas.sso.bihe.entity.BiHeOrder;
 import com.uas.sso.controller.BaseController;
 import com.uas.sso.entity.Token;
 import com.uas.sso.entity.User;
@@ -82,4 +83,20 @@ public class BiHeController extends BaseController {
         BiHeUserInfo userRoot = biHeService.findUserByUnionid(biHeInfo.get());
         return success(userRoot);
     }
+
+    @GetMapping("/order/save")
+    public ModelMap saveOrders(String accessToken) {
+        BiHeOrder order = new BiHeOrder();
+        order.setAccessToken(accessToken);
+        biHeService.saveOrder(order);
+        return success();
+    }
+
+    @GetMapping("/order/change")
+    public ModelMap changeOrders(String accessToken) {
+        BiHeOrder order = new BiHeOrder();
+        order.setAccessToken(accessToken);
+        biHeService.updateOrder(order);
+        return success();
+    }
 }

sso-server/src/main/java/com/uas/sso/foreign/bihe/service/impl/BiHeServiceImpl.java

@@ -6,10 +6,12 @@ import com.uas.sso.foreign.bihe.entity.BiHeInfo;
 import com.uas.sso.foreign.bihe.entity.BiHeResult;
 import com.uas.sso.foreign.bihe.entity.BiHeUserInfo;
 import com.uas.sso.foreign.bihe.service.BiHeService;
+import com.uas.sso.bihe.entity.BiHeOrder;
 import com.uas.sso.core.BHParam;
 import com.uas.sso.exception.VisibleError;
 import com.uas.sso.util.HttpUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
 import java.util.*;
 
@@ -70,5 +72,71 @@ public class BiHeServiceImpl implements BiHeService {
         return userRoot.getData();
     }
 
+    @Override
+    public String getAccessTokenByRefreshToken(String refreshToken) {
+        String url = "https://opengwtest.bgycc.com/open/oauth/token/refresh";
+        Map<String, String>map = new HashMap<>(3);
+        map.put("refreshToken", refreshToken);
+        map.put("appSecret", BHParam.DEFAULT_APPSECRET);
+        map.put("appId", BHParam.DEFAULT_APPID);
+        String content;
+        try{
+            content = HttpUtil.doPut(url, JSON.toJSONString(map));
+        }catch (Exception e){
+            throw new VisibleError(e.getMessage());
+        }
+        BiHeResult<String> userRoot = JSON.parseObject(content, BiHeResult.class);
+        if (!BiHeResult.Code.OK.getCode().equals(userRoot.getCode())) {
+            throw new VisibleError(userRoot.getMsg());
+        }
+        return userRoot.getData();
+    }
 
+    @Override
+    public void saveOrder(BiHeOrder order) {
+        order.setOpenId("be4a123f30894bf1bfba0c8962c0eed2");
+        order.setDetails(new ModelMap().addAttribute("key1", "orderId")
+                .addAttribute("key2", "hehehehe")
+                .addAttribute("key3", "xixixixi"));
+        order.setImageUrl("https://dfs.ubtob.com/group1/M00/B8/16/CgpkyFtazM6AJzGJAABMYEueKOQ200.jpg");
+        order.setIsUrl("YES");
+        order.setOrderId("orderId");
+        order.setOrderModelId("b2000001");
+        order.setOrderStatus("b200000101");
+        order.setPayStatus("UNPAID");
+        order.setUrl("https://www.usoftmall.com/");
+        String url = "https://opengwtest.bgycc.com/open/order/save";
+        String content;
+        try{
+            content = HttpUtil.doPost(url, JSON.toJSONString(order));
+        }catch (Exception e){
+            throw new VisibleError(e.getMessage());
+        }
+        BiHeResult<String> userRoot = JSON.parseObject(content, BiHeResult.class);
+        if (!BiHeResult.Code.OK.getCode().equals(userRoot.getCode())) {
+            throw new VisibleError(userRoot.getMsg());
+        }
+    }
+
+    @Override
+    public void updateOrder(BiHeOrder order) {
+        order.setOpenId("be4a123f30894bf1bfba0c8962c0eed2");
+        order.setDetails(new ModelMap().addAttribute("key1", "orderId")
+                .addAttribute("key2", "lalalala")
+                .addAttribute("key3", "bababababa"));
+        order.setOrderId("orderId2");
+        order.setOrderStatus("b200000102");
+        order.setPayStatus("PAID");
+        String url = "https://opengw.bgycc.com/open/order/changeStatus";
+        String content;
+        try{
+            content = HttpUtil.doPost(url, JSON.toJSONString(order));
+        }catch (Exception e){
+            throw new VisibleError(e.getMessage());
+        }
+        BiHeResult<String> userRoot = JSON.parseObject(content, BiHeResult.class);
+        if (!BiHeResult.Code.OK.getCode().equals(userRoot.getCode())) {
+            throw new VisibleError(userRoot.getMsg());
+        }
+    }
 }

sso-server/src/main/java/com/uas/sso/util/HttpUtil.java

@@ -3,6 +3,7 @@ package com.uas.sso.util;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
@@ -25,4 +26,15 @@ public class HttpUtil {
         String content = EntityUtils.toString(response.getEntity());
         return content;
     }
+
+    public static String doPut(String putUrl, String formData) throws Exception {
+        HttpClient httpClient = new DefaultHttpClient();
+        HttpPut post = new HttpPut(putUrl);
+        StringEntity postingString = new StringEntity(formData, "UTF-8");
+        post.setEntity(postingString);
+        post.setHeader("Content-type", MediaType.APPLICATION_JSON.toString());
+        HttpResponse response = httpClient.execute(post);
+        String content = EntityUtils.toString(response.getEntity());
+        return content;
+    }
 }