内网迁移环境代码调整

@@ -11,7 +11,7 @@
     <groupId>com.erry.iclear</groupId>
     <groupId>com.erry.iclear</groupId>
     <artifactId>iclear-api</artifactId>
     <artifactId>iclear-api</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <name>iClear-api</name>
     <name>iClear-api</name>
     <description>iClear-api</description>
     <description>iClear-api</description>
     <properties>
     <properties>
@@ -116,6 +116,10 @@
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
@@ -125,7 +129,6 @@
             <optional>true</optional>
             <optional>true</optional>
             <scope>true</scope>
             <scope>true</scope>
         </dependency>
         </dependency>
-
     </dependencies>
     </dependencies>
 
 
     <profiles>
     <profiles>

+
+
+CREATE TABLE [dbo].[T_ICLEAR_API_CHECK_LOG](
+	[ID] [bigint] IDENTITY(1,1) NOT NULL,
+	[request_appid] [varchar](200) NULL,
+	[request_appkey] [varchar](200) NULL,
+	[request_token] [varchar](200) NULL,
+	[consignment_code] [varchar](200) NULL,
+	[request_text] [text] NULL,
+	[response_text] [text] NULL,
+	[request_ip] [varchar](200) NULL,
+	[create_time] [datetime] NULL,
+	[success] [int] NULL,
+	[code] [varchar](200) NULL,
+PRIMARY KEY CLUSTERED
+(
+	[ID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+

@@ -108,7 +108,11 @@ public class FedexDataInterface {
         sw.start("checkFedexMawb");
         sw.start("checkFedexMawb");
         String msg = result.getMsg();
         String msg = result.getMsg();
         String iclearCheckMsg = fedexService.checkFedexMawb(saveMawbFedexResult).getMsg();
         String iclearCheckMsg = fedexService.checkFedexMawb(saveMawbFedexResult).getMsg();
-        result.setMsg(msg+";"+iclearCheckMsg);
+        if(StringUtil.isEmpty(msg) && StringUtil.isEmpty(iclearCheckMsg)){
+            result.setSuccess(Boolean.TRUE);
+        }else{
+            result.setMsg(msg+";"+iclearCheckMsg);
+        }
         sw.stop();
         sw.stop();
 
 
         log.info(sw.prettyPrint());
         log.info(sw.prettyPrint());

@@ -74,4 +74,4 @@ public class HsCodeInterface {
             iClearApiHsCodeLogService.saveIClearApiHsCodeLog(iclearApiHsCodeLog);
             iClearApiHsCodeLogService.saveIClearApiHsCodeLog(iclearApiHsCodeLog);
         }
         }
     }
     }
-}
\ No newline at end of file
+}

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
  * @author Administrator
  * @author Administrator
+ *
  */
  */
 @RestController
 @RestController
 @RequestMapping("/system")
 @RequestMapping("/system")
@@ -46,7 +47,7 @@ public class IClearExportInterface {
     @GetMapping("/refreshSendMawbe")
     @GetMapping("/refreshSendMawbe")
     public String refreshSendMawbe() {
     public String refreshSendMawbe() {
         try{
         try{
-            
+
 
 
             return "Success";
             return "Success";
         }catch (Exception e){
         }catch (Exception e){