同步地址参数全部改为配置

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/config/ThirdPartySystemConfig.java

@@ -0,0 +1,34 @@
+package com.xunmei.sync.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "app.thirdpartysystem")
+public class ThirdPartySystemConfig {
+
+    private String fjnxSystemCode;
+    private String fjnxSyncOrgTopOrgCode;
+
+    /**
+     * fjnx 统一运营门户地址，用于同步机构、用户
+     */
+    private String fjnxPortalIp;
+
+    private String fjnxSyncOrgFileInfoUrl;
+
+    private String fjnxSyncUserFileInfoUrl;
+
+    private String fjnxSyncOrgFileDownloadUrl;
+
+    private String fjnxSyncUserFileDownloadUrl;
+
+
+    /**
+     * fjnx 密管系统地址，用于加密登录用户信息
+     */
+    private String fjnxPasswordIp;
+
+}

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/config/ThirdPartyUrl.java

@@ -1,15 +0,0 @@
-package com.xunmei.sync.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "app.device")
-public class ThirdPartyUrl {
-
-    private String fjnxPortalIp;
-
-    private String fjnxPasswordIp;
-}

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/api/FjnxApi.java

@@ -5,7 +5,7 @@ import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.http.service.CustomHttpClient;
 import com.xunmei.common.core.http.service.params.HttpParams;
 import com.xunmei.common.core.http.service.result.ResultExecute;
-import com.xunmei.sync.config.ThirdPartyUrl;
+import com.xunmei.sync.config.ThirdPartySystemConfig;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Response;
 import org.apache.commons.lang3.StringUtils;
@@ -13,8 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StopWatch;
 
-import javax.annotation.Resource;
-
 @Slf4j
 @Component
 public class FjnxApi implements ResultExecute {
@@ -22,10 +20,10 @@ public class FjnxApi implements ResultExecute {
     private CustomHttpClient httpClient;
 
     @Autowired
-    private ThirdPartyUrl thirdPartyUrl;
+    private ThirdPartySystemConfig thirdPartySystemConfig;
 
     public <T> T get(final HttpParams httpParams) {
-        httpParams.setUrl(this.thirdPartyUrl.getFjnxPortalIp() + httpParams.getUrl());
+        httpParams.setUrl(this.thirdPartySystemConfig.getFjnxPortalIp() + httpParams.getUrl());
         return this.httpClient.execute(httpParams, this);
     }
 

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/api/FjnxXmlApi.java

@@ -4,7 +4,7 @@ import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.http.service.CustomHttpClient;
 import com.xunmei.common.core.http.service.params.HttpParams;
 import com.xunmei.common.core.http.service.result.ResultExecute;
-import com.xunmei.sync.config.ThirdPartyUrl;
+import com.xunmei.sync.config.ThirdPartySystemConfig;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Response;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,10 +31,10 @@ public class FjnxXmlApi implements ResultExecute {
     private CustomHttpClient httpClient;
 
     @Autowired
-    private ThirdPartyUrl thirdPartyUrl;
+    private ThirdPartySystemConfig thirdPartySystemConfig;
 
     public <T> T get(final HttpParams httpParams) {
-        httpParams.setUrl(this.thirdPartyUrl.getFjnxPortalIp() + httpParams.getUrl());
+        httpParams.setUrl(this.thirdPartySystemConfig.getFjnxPortalIp() + httpParams.getUrl());
         return this.httpClient.execute(httpParams, this);
     }
 

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/impl/FJNXOrgSyncServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.sync.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xunmei.common.core.http.service.params.HttpParamsGet;
+import com.xunmei.sync.config.ThirdPartySystemConfig;
 import com.xunmei.sync.dto.fjnxsync.FJNXXmlOrgDto;
 import com.xunmei.sync.dto.fjnxsync.SyncResponseDto;
 import com.xunmei.sync.service.IFJNXOrgSyncService;
@@ -31,14 +32,17 @@ public class FJNXOrgSyncServiceImpl implements IFJNXOrgSyncService {
     @Autowired
     FjnxXmlApi fjnxXmlApi;
 
+    @Autowired
+    private ThirdPartySystemConfig thirdPartySystemConfig;
+
     @Override
     public SyncResponseDto getOrgSyncFileInfo() {
         final Map<String, Object> params = new HashMap<>();
         // TODO 后期将参数和地址 放在数据库中，放在配置文件中如果不是多套需要修改多个配置文件，可以放在数据库中 获取一次后放入Redis缓存
-        params.put("systemCode", 61303);
-        params.put("orgCode", "900000000");
+        params.put("systemCode", thirdPartySystemConfig.getFjnxSystemCode());
+        params.put("orgCode", thirdPartySystemConfig.getFjnxSyncOrgTopOrgCode());
 //        final JSONObject data = this.fjnxApi.get(HttpParamsGet.get("/sp-app-batch/api/syncout/orgdirect", params));
-        final JSONObject data = this.fjnxApi.get(HttpParamsGet.get("/fjnx/mock/orgfileInfo", params));
+        final JSONObject data = this.fjnxApi.get(HttpParamsGet.get(thirdPartySystemConfig.getFjnxSyncOrgFileInfoUrl(), params));
         if (data == null) {
             return null;
         }
@@ -52,12 +56,12 @@ public class FJNXOrgSyncServiceImpl implements IFJNXOrgSyncService {
 
         // TODO 后期将参数和地址 放在数据库中，放在配置文件中如果不是多套需要修改多个配置文件，可以放在数据库中 获取一次后放入Redis缓存
         final Map<String, Object> params = new HashMap<>();
-        params.put("systemCode", "61303");
+        params.put("systemCode",  thirdPartySystemConfig.getFjnxSystemCode());//"61303"
         params.put("fileName", syncResponseDto.getData().getFileName());
         params.put("fileId", syncResponseDto.getData().getFileId());
         params.put("storageType", "localdisk");
 //        final String data= fjnxXmlApi.get(HttpParamsGet.get("/yusp-file/api/file/download", params));
-        final String data= fjnxXmlApi.get(HttpParamsGet.get("/fjnx/mock/orgxmldata", params));
+        final String data= fjnxXmlApi.get(HttpParamsGet.get(thirdPartySystemConfig.getFjnxSyncOrgFileDownloadUrl(), params)); //"/fjnx/mock/orgxmldata"
 
         try {
             return FjnxXmlApi.convertXmlToJavaBean(data, FJNXXmlOrgDto.class);

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/impl/FJNXUserSyncServiceImpl.java

@@ -2,6 +2,7 @@ package com.xunmei.sync.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.xunmei.common.core.http.service.params.HttpParamsGet;
+import com.xunmei.sync.config.ThirdPartySystemConfig;
 import com.xunmei.sync.dto.fjnxsync.FJNXXmlUserDto;
 import com.xunmei.sync.dto.fjnxsync.SyncResponseDto;
 import com.xunmei.sync.service.IFJNXUserSyncService;
@@ -25,13 +26,16 @@ public class FJNXUserSyncServiceImpl implements IFJNXUserSyncService {
     FjnxApi fjnxApi;
     @Autowired
     FjnxXmlApi fjnxXmlApi;
+
+    @Autowired
+    private ThirdPartySystemConfig thirdPartySystemConfig;
     @Override
     public SyncResponseDto getUserSyncFileInfo() {
         final Map<String, Object> params = new HashMap<>();
         // TODO 放在数据库中，放在配置文件中如果不是多套需要修改多个配置文件，可以放在数据库中 获取一次后放入Redis缓存
-        params.put("systemCode", 61303);
-//        final JSONObject data = this.fjnxApi.get(HttpParamsGet.get("/sp-app-batch/api/syncout/userdirect", params));
-        final JSONObject data = this.fjnxApi.get(HttpParamsGet.get("/fjnx/mock/orgfileInfo", params));
+        params.put("systemCode", thirdPartySystemConfig.getFjnxSystemCode());
+//        final JSONObject data = this.fjnxApi.get(HttpParamsGet.get(thirdPartySystemConfig.getFjnxSyncUserFileInfoUrl(), params));
+        final JSONObject data = this.fjnxApi.get(HttpParamsGet.get(thirdPartySystemConfig.getFjnxSyncUserFileInfoUrl(), params));//"/fjnx/mock/orgfileInfo"
         if (data == null) {
             return null;
         }
@@ -45,13 +49,13 @@ public class FJNXUserSyncServiceImpl implements IFJNXUserSyncService {
 
         // TODO 后期将参数和地址 放在数据库中，放在配置文件中如果不是多套需要修改多个配置文件，可以放在数据库中 获取一次后放入Redis缓存
         final Map<String, Object> params = new HashMap<>();
-        params.put("systemCode", "61303");
+        params.put("systemCode", thirdPartySystemConfig.getFjnxSystemCode());
         params.put("fileName", syncResponseDto.getData().getFileName());
         params.put("fileId", syncResponseDto.getData().getFileId());
         params.put("storageType", "localdisk");
-//        final String data= fjnxXmlApi.get(HttpParamsGet.get("/yusp-file/api/file/download", params));
+//        final String data= fjnxXmlApi.get(HttpParamsGet.get(thirdPartySystemConfig.getFjnxSyncUserFileDownloadUrl(), params));
 
-        final String data= fjnxXmlApi.get(HttpParamsGet.get("/fjnx/mock/userxmldata", params));
+        final String data= fjnxXmlApi.get(HttpParamsGet.get(thirdPartySystemConfig.getFjnxSyncUserFileDownloadUrl(), params));//"/fjnx/mock/userxmldata"
 
         try {
             return FjnxXmlApi.convertXmlToJavaBean(data, FJNXXmlUserDto.class);