Browse Source

Logistics

wfansh 4 months ago
parent
commit
29b38ad5cc

+ 16 - 17
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/logestic/controller/LogisticController.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/logistics/controller/LogisticsController.java

@@ -1,35 +1,34 @@
-package org.jeecg.modules.adweb.logestic.controller;
+package org.jeecg.modules.adweb.logistics.controller;
 
-import org.springframework.beans.factory.annotation.Value;
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
- * @Time 2024/12/2 14:05
- * @Description
+ * @Time 2024/12/2 14:05 @Description
  */
 @RestController
-@RequestMapping("/adweb/logistic")
+@RequestMapping("/adweb/logistics")
 @Slf4j
-public class LogisticController {
-    @Value("${logistic.token}")
-    private String logisticToken;
-    /**
-     * 获取每日出运token
-     */
+public class LogisticsController {
+    @Value("${logistics.meiri56.token}")
+    private String meiri56Token;
+
+    /** 获取每日出运token */
     @AutoLog(value = "获取每日出运token")
-    @GetMapping(value = "/getShippingToken")
-    public Result<?> getShippingToken() {
+    @GetMapping(value = "/getMeiri56Token")
+    public Result<?> getMeiri56Token() {
         // 读取配置文件中的 token
-        if (!logisticToken.isEmpty()) {
-            return Result.OK(logisticToken);
+        if (StringUtils.isNotBlank(meiri56Token)) {
+            return Result.OK(meiri56Token);
         }
+
         return Result.error("获取失败");
     }
 }

+ 4 - 3
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -406,9 +406,10 @@ dataforseo:
   password: 0845d3de83295cca
   api-path: https://api.dataforseo.com
 
-### 跨境物流 - 每日出运
-logistic:
-  token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICAgInVzZXJuYW1lIjogInN1aGFvIiwKICAgICJzdWIiOiAibG9naW4iLAogICAgImlhdCI6IDE3MzIyNDcwOTAsCiAgICAiZXhwIjogMTczMjMzMzQ5MAp9.rI3IsN8qsfKiBqS6YQn45dQiTvPdoY_GcMJOR1FgKDk
+### 跨境物流 - 每日出运等
+logistics:
+  meiri56:
+    token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICAgInVzZXJuYW1lIjogInN1aGFvIiwKICAgICJzdWIiOiAibG9naW4iLAogICAgImlhdCI6IDE3MzIyNDcwOTAsCiAgICAiZXhwIjogMTczMjMzMzQ5MAp9.rI3IsN8qsfKiBqS6YQn45dQiTvPdoY_GcMJOR1FgKDk
 
 ### 询盘列表配置
 enquiry:

+ 4 - 4
jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -405,9 +405,10 @@ dataforseo:
   password: 0845d3de83295cca
   api-path: https://api.dataforseo.com
 
-### 跨境物流 - 每日出运
-logistic:
-  token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICAgInVzZXJuYW1lIjogInN1aGFvIiwKICAgICJzdWIiOiAibG9naW4iLAogICAgImlhdCI6IDE3MzIyNDcwOTAsCiAgICAiZXhwIjogMTczMjMzMzQ5MAp9.rI3IsN8qsfKiBqS6YQn45dQiTvPdoY_GcMJOR1FgKDk
+### 跨境物流 - 每日出运等
+logistics:
+  meiri56:
+    token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICAgInVzZXJuYW1lIjogInN1aGFvIiwKICAgICJzdWIiOiAibG9naW4iLAogICAgImlhdCI6IDE3MzIyNDcwOTAsCiAgICAiZXhwIjogMTczMjMzMzQ5MAp9.rI3IsN8qsfKiBqS6YQn45dQiTvPdoY_GcMJOR1FgKDk
 
 ### 询盘列表配置
 enquiry:
@@ -422,7 +423,6 @@ aws:
     accessKey: AKIAS37NJDKDETZ7PPEN
     secretKey: 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
 
-
 ### 自定义 start, TODO 改位置配置将要再数据库中配置
 ###配置测试文件上传路径
 adcloud:

+ 4 - 3
jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml

@@ -405,9 +405,10 @@ dataforseo:
   password: 0845d3de83295cca
   api-path: https://api.dataforseo.com
 
-### 跨境物流 - 每日出运
-logistic:
-  token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICAgInVzZXJuYW1lIjogInN1aGFvIiwKICAgICJzdWIiOiAibG9naW4iLAogICAgImlhdCI6IDE3MzIyNDcwOTAsCiAgICAiZXhwIjogMTczMjMzMzQ5MAp9.rI3IsN8qsfKiBqS6YQn45dQiTvPdoY_GcMJOR1FgKDk
+### 跨境物流 - 每日出运等
+logistics:
+  meiri56:
+    token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICAgInVzZXJuYW1lIjogInN1aGFvIiwKICAgICJzdWIiOiAibG9naW4iLAogICAgImlhdCI6IDE3MzIyNDcwOTAsCiAgICAiZXhwIjogMTczMjMzMzQ5MAp9.rI3IsN8qsfKiBqS6YQn45dQiTvPdoY_GcMJOR1FgKDk
 
 ### 询盘列表配置
 enquiry: