Merge remote-tracking branch 'origin/master'

zzjs-admin/src/main/java/com/miaxis/app/controller/fulu/FuluController.java

@@ -0,0 +1,85 @@
+package com.miaxis.app.controller.fulu;
+
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.sms.MD5Utils;
+import com.miaxis.feign.dto.FilmDTO;
+import com.miaxis.feign.dto.fulu.FuluCommonApiDTO;
+import com.miaxis.feign.dto.fulu.FuluDTO;
+import com.miaxis.feign.service.IFuluService;
+import com.miaxis.wx.service.IWxOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+
+import static com.miaxis.common.constant.Constants.FILM_BLACK_LIST;
+
+/**
+ * 【小程序-客户信息】Controller
+ *
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.STUDENT_PREFIX+"/fulu")
+@Api(tags = {"【小程序-福禄】"})
+@Slf4j
+public class FuluController extends BaseController {
+
+
+    @Autowired
+    private IFuluService fuluService;
+
+    @Value("${fulu.appKey}")
+    private String appKey;
+    @Value("${fulu.appSecret}")
+    private String appSecret;
+
+    @PostMapping(value = "/fuluCommonApi")
+    @ApiOperation("福禄通用接口")
+    public  Response<JSONObject>  httpPostWithForm(@RequestBody FuluCommonApiDTO fuluCommonApiDTO) {
+
+
+        FuluDTO fuluDTO = new FuluDTO();
+        init(fuluDTO,fuluCommonApiDTO);
+
+        // 用于接收返回的结果
+        String resultData = fuluService.fuluCommonApi(fuluDTO);
+        return Response.success(JSONObject.parseObject(resultData));
+    }
+
+    private void init(FuluDTO fuluDTO, FuluCommonApiDTO fuluCommonApiDTO) {
+        fuluDTO.setApp_key(appKey);
+        fuluDTO.setMethod(fuluCommonApiDTO.getMethod());
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        fuluDTO.setTimestamp(simpleDateFormat.format(new Date()));
+        fuluDTO.setVersion("2.0");
+        fuluDTO.setFormat("json");
+        fuluDTO.setCharset("utf-8");
+        fuluDTO.setSign_type("md5");
+        fuluDTO.setApp_auth_token("");
+        fuluDTO.setBiz_content(fuluCommonApiDTO.getBiz_content());
+        String str = JSONObject.toJSONString(fuluDTO);
+        char[] s = str.toCharArray();
+        Arrays.sort(s);
+        String outputSignOriginalStr = new String(s) + appSecret;
+        String sign = MD5Utils.MD5Encode(outputSignOriginalStr);
+        fuluDTO.setSign(sign);
+    }
+
+
+}

zzjs-admin/src/main/resources/application-dev.yml

@@ -139,3 +139,10 @@ mei:
 wai:
     appid: "7629"
     secret: "cce08fcab10ff96a863892bb6e396a9e"
+
+
+# 福禄平台
+fulu:
+    appKey: "i4esv1l+76l/7NQCL3QudG90Fq+YgVfFGJAWgT+7qO1Bm9o/adG/1iwO2qXsAXNB"
+    appSecret: "0a091b3aa4324435aab703142518a8f7"
+    url: "http://pre.openapi.fulu.com"

zzjs-admin/src/main/resources/application-prod.yml

@@ -139,3 +139,10 @@ mei:
 wai:
     appid: "7629"
     secret: "cce08fcab10ff96a863892bb6e396a9e"
+
+
+# 福禄平台
+fulu:
+    appKey: "qxTK3W/RNleYH5tygePOu52hoFHpaqCi0eR5yKhHVgYQanIcua5edOG2rgrldHnL"
+    appSecret: "a1be19d04c724c05971942305ea97489"
+    url: "http://openapi.fulu.com"

zzjs-admin/src/test/java/com/miaxis/test/FuluTest.java

@@ -0,0 +1,58 @@
+package com.miaxis.test;
+
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.ZzjsApplication;
+import com.miaxis.common.sms.MD5Utils;
+import com.miaxis.feign.dto.fulu.FuluDTO;
+import com.miaxis.feign.service.IFuluService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+
+@SpringBootTest(classes = ZzjsApplication.class)
+@RunWith(SpringRunner.class)
+public class FuluTest {
+    @Autowired
+    private IFuluService fuluService;
+
+    String AppSecret = "0a091b3aa4324435aab703142518a8f7";
+
+
+    @Test
+    public void test1()  {
+        FuluDTO fuluDTO = new FuluDTO();
+        fuluDTO.setApp_key("i4esv1l+76l/7NQCL3QudG90Fq+YgVfFGJAWgT+7qO1Bm9o/adG/1iwO2qXsAXNB");
+        fuluDTO.setMethod("fulu.goods.list.get");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        fuluDTO.setTimestamp(simpleDateFormat.format(new Date()));
+        fuluDTO.setVersion("2.0");
+        fuluDTO.setFormat("json");
+        fuluDTO.setCharset("utf-8");
+        fuluDTO.setSign_type("md5");
+        fuluDTO.setApp_auth_token("");
+        fuluDTO.setBiz_content("{}");
+        String str = JSONObject.toJSONString(fuluDTO);
+        System.out.println("json字符串"+str);
+        char[] s = str.toCharArray();
+        Arrays.sort(s);
+        String outputSignOriginalStr = new String(s) + AppSecret;
+        String sign = MD5Utils.MD5Encode(outputSignOriginalStr);
+        fuluDTO.setSign(sign);
+        String s1 = fuluService.fuluCommonApi(fuluDTO);
+        System.out.println(s1);
+    }
+
+
+
+
+
+
+
+
+}

zzjs-service/src/main/java/com/miaxis/feign/dto/fulu/FuluCommonApiDTO.java

@@ -0,0 +1,18 @@
+package com.miaxis.feign.dto.fulu;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 福禄传输对象
+ */
+@Data
+public class FuluCommonApiDTO {
+    @ApiModelProperty(value = "接口方法名称",required = true)
+    String method;
+    @ApiModelProperty(value= "请求参数集合,该参数是以json字符串的形式传输",required = true)
+    String biz_content;
+}

zzjs-service/src/main/java/com/miaxis/feign/dto/fulu/FuluDTO.java

@@ -0,0 +1,25 @@
+package com.miaxis.feign.dto.fulu;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 福禄传输对象
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FuluDTO {
+    String app_key;
+    String method;
+    String timestamp;
+    String version;
+    String format;
+    String charset;
+    String sign_type;
+    String sign;
+    String app_auth_token;
+    String biz_content;
+}

zzjs-service/src/main/java/com/miaxis/feign/dto/fulu/FuluResult.java

@@ -0,0 +1,19 @@
+package com.miaxis.feign.dto.fulu;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 福禄传输对象
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FuluResult {
+    Integer code;
+    String message;
+    String result;
+
+}

zzjs-service/src/main/java/com/miaxis/feign/service/IFuluService.java

@@ -0,0 +1,25 @@
+package com.miaxis.feign.service;
+
+
+import com.miaxis.common.config.FeignConfig;
+import com.miaxis.feign.dto.fulu.FuluDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ *
+ * 福禄开放接口
+ */
+@FeignClient(name="fuluService",
+        url = "${fulu.url}",configuration = FeignConfig.class)
+@Component
+public interface IFuluService {
+    /**
+     *  通用接口
+     * @return
+     */
+    @GetMapping(value = "/api/getway",consumes = MediaType.APPLICATION_JSON_VALUE)
+    String fuluCommonApi(FuluDTO fuluDTO);
+}