Bladeren bron

优化代码

bihuisong 1 jaar geleden
bovenliggende
commit
32f5dc320f

+ 1 - 2
src/main/java/com/sooka/sponest/dataexchange/exchange/conf/FeignConfig.java

@@ -1,6 +1,5 @@
-package com.sooka.sponest.dataexchange.exchange.conf;
+package com.sooka.sponest.dataexchange.conf;
 
-import com.sooka.sponest.dataexchange.exchange.domian.LoginBody;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import org.springframework.context.annotation.Configuration;

+ 7 - 7
src/main/java/com/sooka/sponest/dataexchange/exchange/controller/ExchangeController.java

@@ -7,13 +7,11 @@ import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.RemoteFileService;
 import com.ruoyi.system.api.domain.SysFile;
 import com.sooka.sponest.dataexchange.util.spring.SpringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.dataexchange.exchange.domian.DataExchangeEntity;
 import com.sooka.sponest.dataexchange.exchange.domian.LoginBody;
-import com.sooka.sponest.dataexchange.exchange.utils.RestUtil;
+import com.sooka.sponest.dataexchange.util.RestUtil;
 import com.sooka.sponest.dataexchange.remoteapi.service.center.auth.RemoteAuthBaseService;
 import com.sooka.sponest.dataexchange.remoteapi.service.center.event.RemoteEventBaseService;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +38,7 @@ public class ExchangeController {
     @Resource
     private RemoteConfigService remoteConfigService;
 
-    @Value("${}")
+//    @Value("${}")
     private String url;
 
     /**
@@ -53,7 +51,7 @@ public class ExchangeController {
         if (result.getCode() == 200) {
             return R.ok(result.getData().toString(), "操作成功");
         } else {
-            return R.fail("操作失败");
+            return R.fail("获取失败");
         }
     }
 
@@ -74,7 +72,8 @@ public class ExchangeController {
 
     @PostMapping("/straightPushData")
     @ResponseBody
-    public R<?> dataCheck(@RequestBody DataExchangeEntity dataExchangeEntity) {
+    public R<?> straightPushData(@RequestBody DataExchangeEntity dataExchangeEntity) {
+        log.info("dataExchangeEntity:{}",dataExchangeEntity);
         List<String> pictureList = new ArrayList<>();
         if (StringUtils.isNotEmpty(SecurityUtils.getToken()) && !CollectionUtils.isEmpty(dataExchangeEntity.getEventPicture())) {
             for (String picture : dataExchangeEntity.getEventPicture()) {
@@ -102,7 +101,8 @@ public class ExchangeController {
 
     @PostMapping("/receiveEventData")
     @ResponseBody
-    public R<?> pushData(@RequestBody DataExchangeEntity dataExchangeEntity) {
+    public R<?> receiveEventData(@RequestBody DataExchangeEntity dataExchangeEntity) {
+        System.out.println(dataExchangeEntity);
         R<String> appUrl = remoteConfigService.remotegetConfigKey("appUrl");
         List<String> pictureList = new ArrayList<>();
         for (String picture : dataExchangeEntity.getEventPicture()) {

+ 1 - 3
src/main/java/com/sooka/sponest/dataexchange/remoteapi/service/ModulesServiceNameContants.java

@@ -42,10 +42,8 @@ public class ModulesServiceNameContants extends ServiceNameConstants {
      * 系统模块的serviceid
      */
     public static final String SYSTEM_SERVICE = "sooka-sponest-system";
-
     //认证中心
     public static final String CENTER_AUTH = "sooka-sponest-auth";
-    //
-    public static final String CENTER_DATAEXCHANGE = "sooka-sponest-dataexchange";
+
 
 }

+ 1 - 1
src/main/java/com/sooka/sponest/dataexchange/exchange/utils/RestUtil.java

@@ -1,4 +1,4 @@
-package com.sooka.sponest.dataexchange.exchange.utils;
+package com.sooka.sponest.dataexchange.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sooka.sponest.dataexchange.util.StringUtils;