微调

src/main/java/com/system/api/CommonHttpApi.java

@@ -40,6 +40,8 @@ public class CommonHttpApi {
 
     public String mallAddress;
 
+    public Map<String, Object> header;
+
     public boolean flag = false;
 
     @Autowired
@@ -61,6 +63,10 @@ public class CommonHttpApi {
         return initConnectParam;
     }
 
+    public void setHeader(Map<String, Object> header) {
+        this.header = header;
+    }
+
     public void setFlag(boolean flag) {
         this.flag = flag;
     }
@@ -97,7 +103,11 @@ public class CommonHttpApi {
 
     public String commonHttpSync(List<Integer> idList) {
         try {
-            return HttpUtil.httpPost(mallAddress + "api/dataSyn/getSyn", JsonUtil.toString(idList)).getBody();
+            if (flag) {
+                return HttpUtil.httpPost(mallAddress + "api/dataSyn/getSyn", header, JsonUtil.toString(idList)).getBody();
+            } else {
+                throw new MallCommonException(LOGIN_MESSAGE);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             throw new MallCommonException(LOGIN_MESSAGE);
@@ -106,7 +116,11 @@ public class CommonHttpApi {
 
     public String commonHttpPostByUpdate(String data) {
         try {
-            return HttpUtil.httpPost(mallAddress + "api/dataSyn/success", data).getBody();
+            if (flag) {
+                return HttpUtil.httpPost(mallAddress + "api/dataSyn/success", header, data).getBody();
+            } else {
+                throw new MallCommonException(LOGIN_MESSAGE);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             throw new MallCommonException(LOGIN_MESSAGE);
@@ -114,22 +128,26 @@ public class CommonHttpApi {
     }
 
     public String commonHttpSyncData(Map<String, String> config, String queueId, String name, List<String> keyList, Map<String, Object> where) {
-        Map<String, Object> request = new HashMap<>(3);
-        request.put("form", config.get("sFormId"));
-        request.put("fields", String.join(",", keyList));
-        request.putAll(where);
-
         try {
-            long start = System.currentTimeMillis();
-            String response = HttpUtil.httpPost(mallAddress + "api/dataSyn/synData", JsonUtil.toString(request)).getBody();
-            long costTime = System.currentTimeMillis() - start;
-
-            Map<String, Object> map = ThreadLocalConfig.get();
-            map.put("costTime", costTime);
-            ThreadLocalConfig.set(map);
-
-            productLogUtil.productSyncLogCreate(Integer.valueOf(config.get("productId")), queueId, name, config.get("docType"), config.get("direction"), JsonUtil.toString(request), response);
-            return response;
+            if (flag) {
+                Map<String, Object> request = new HashMap<>(3);
+                request.put("form", config.get("sFormId"));
+                request.put("fields", String.join(",", keyList));
+                request.putAll(where);
+
+                long start = System.currentTimeMillis();
+                String response = HttpUtil.httpPost(mallAddress + "api/dataSyn/synData", header, JsonUtil.toString(request)).getBody();
+                long costTime = System.currentTimeMillis() - start;
+
+                Map<String, Object> map = ThreadLocalConfig.get();
+                map.put("costTime", costTime);
+                ThreadLocalConfig.set(map);
+
+                productLogUtil.productSyncLogCreate(Integer.valueOf(config.get("productId")), queueId, name, config.get("docType"), config.get("direction"), JsonUtil.toString(request), response);
+                return response;
+            } else {
+                throw new MallCommonException(LOGIN_MESSAGE);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             throw new MallCommonException(LOGIN_MESSAGE);

src/main/java/com/system/controller/MallCommonSyncConfigController.java

 package com.system.controller;
 
-import com.system.transfer.configure.InitConnectParamCreateInVo;
+import com.system.transfer.configure.InitConnectParamCheckInVo;
+import com.system.transfer.configure.InitConnectParamRefreshInVo;
 import com.system.transfer.response.RestResponse;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,8 +18,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/api")
 public class MallCommonSyncConfigController {
 
-    @PostMapping("/init/connect/param/create")
-    public RestResponse initConnectParamCreate(@RequestBody InitConnectParamCreateInVo inVo) {
+    @ApiOperation("商城配置刷新")
+    @PostMapping("/init/connect/param/refresh")
+    public RestResponse initConnectParamRefresh(@RequestBody InitConnectParamRefreshInVo inVo) {
+        return RestResponse.success();
+    }
+
+    @PostMapping("/init/connect/param/check")
+    public RestResponse initConnectParamCheck(@RequestBody InitConnectParamCheckInVo inVo) {
         return RestResponse.success();
     }
 

src/main/java/com/system/scheduler/MallLoginScheduler.java

 package com.system.scheduler;
 
 import com.system.api.CommonHttpApi;
+import com.system.constants.Constants;
 import com.system.model.InitConnectParam;
+import com.system.utils.HttpUtil;
+import com.system.utils.JsonUtil;
 import com.system.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Inori
@@ -28,24 +36,34 @@ public class MallLoginScheduler {
         InitConnectParam initConnectParam = commonHttpApi.getInitConnectParam();
 
         if (StringUtil.isNotNull(initConnectParam)) {
-            boolean flag;
             try {
                 //TODO 商城登陆
-                flag = true;
-            } catch (Exception e) {
-                flag = false;
-                log.info("商城登录失败！");
-            }
+                Map<String, Object> request = new HashMap<>(2);
+                request.put("mobile", initConnectParam.getAccount());
+                request.put("password", initConnectParam.getPassword());
+                String response = HttpUtil.httpPost(initConnectParam.getMallAddress() + "auth/login_by_mobile", JsonUtil.toString(request)).getBody();
 
-            if (flag) {
-                log.info("商城登录成功！");
-            } else {
+                Map<String, Object> map = JsonUtil.toMap(response, String.class, Object.class);
+                if (!CollectionUtils.isEmpty(map)) {
+                    if (map.containsKey(Constants.CODE_NAME) && HttpStatus.OK.value() == Integer.parseInt(String.valueOf(map.get(Constants.CODE_NAME)))) {
+                        Map<String, Object> data = JsonUtil.toMap(JsonUtil.toString(map.get(Constants.DATE_NAME)), String.class, Object.class);
+                        Map<String, Object> header = new HashMap<>(1);
+                        header.put("Authorization", data.get("token"));
+                        commonHttpApi.setHeader(header);
+                        commonHttpApi.setFlag(true);
+                        log.info("商城登录成功！");
+                    }
+                } else {
+                    commonHttpApi.setFlag(false);
+                    log.info("商城登录失败！");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
                 log.info("商城登录失败！");
             }
-
-            commonHttpApi.setFlag(flag);
         } else {
             commonHttpApi.setFlag(false);
+            log.info("商城登录失败！");
         }
     }
 

src/main/java/com/system/serivce/impl/SynchronizationServiceImpl.java

@@ -6,7 +6,6 @@ import com.system.mall.MallCommonApi;
 import com.system.serivce.ISynchronizationService;
 import com.system.transfer.mall.MallTriggerSynchronizationInVo;
 import com.system.transfer.mall.SynchronizationRecordsListOutVoRecords;
-import com.system.utils.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,7 +60,6 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
 
     @Transactional(rollbackFor = Exception.class)
     public void synchronization(List<Integer> request) {
-        System.out.println("----->" + JsonUtil.toString(request));
         List<Map<String, Object>> tempList = mallCommonApi.getSynchronizationRecords(request);
 
         if (!CollectionUtils.isEmpty(tempList)) {

src/main/java/com/system/transfer/configure/InitConnectParamCreateInVo.java → src/main/java/com/system/transfer/configure/InitConnectParamCheckInVo.java

@@ -2,34 +2,33 @@ package com.system.transfer.configure;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @author Inori
  */
 @Data
-public class InitConnectParamCreateInVo {
+public class InitConnectParamCheckInVo {
 
     /**
      * 商城地址
      */
+    @NotBlank(message = "参数mallAddress缺失")
     private String mallAddress;
 
 
     /**
      * 用户名
      */
+    @NotBlank(message = "参数account缺失")
     private String account;
 
 
     /**
      * 密码
      */
+    @NotBlank(message = "参数password缺失")
     private String password;
 
 
-    /**
-     * 任务时长/分钟
-     */
-    private Integer duration;
-
-
 }

src/main/java/com/system/transfer/configure/InitConnectParamRefreshInVo.java

+package com.system.transfer.configure;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author Inori
+ */
+@Data
+public class InitConnectParamRefreshInVo {
+
+    /**
+     * 商城地址
+     */
+    @NotBlank(message = "参数mallAddress缺失")
+    private String mallAddress;
+
+
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "参数account缺失")
+    private String account;
+
+
+    /**
+     * 密码
+     */
+    @NotBlank(message = "参数password缺失")
+    private String password;
+
+
+    /**
+     * 任务时长/分钟
+     */
+    @NotNull(message = "参数duration缺失")
+    private Integer duration;
+
+
+    /**
+     * 接收地址
+     */
+    private String receiveAddress;
+
+
+}