fix: 修改服务连接配置，修复 common 包更新依赖问题。 20210603160638

polestar-statement-services.iml

@@ -84,12 +84,16 @@
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: com.yutu.comm:yutu_common:1.0.37" level="project" />
+    <orderEntry type="library" name="Maven: com.yutu.comm:yutu_common:1.0.50" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastJson:1.2.7" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.6" level="project" />
     <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
     <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.6.Final" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
   </component>

pom.xml

@@ -132,7 +132,7 @@
         <dependency>
             <groupId>com.yutu.comm</groupId>
             <artifactId>yutu_common</artifactId>
-            <version>1.0.37</version>
+            <version>1.0.50</version>
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>

src/main/java/com/yutu/base/controller/DownLoadController.java

 package com.yutu.base.controller;
 
 import com.yutu.base.entity.Response;
-import com.yutu.base.entity.SaleDetail;
 import com.yutu.base.service.DownLoadService;
 import com.yutu.base.service.OrderService;
 import com.yutu.base.service.PrivateFreightService;

src/main/java/com/yutu/base/controller/StatementController.java

 package com.yutu.base.controller;
 
 
-import com.yutu.base.entity.Response;
 import com.yutu.base.service.SaleDetailService;
 import com.yutu.base.service.SalesSummaryService;
-import com.yutu.comm.entity.exception.NoteResult;
+import com.yutu.comm.response.NoteResult;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/yutu/base/controller/TestController.java

-package com.yutu.base.controller;
-
-import io.swagger.annotations.ApiOperation;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@RestController
-public class TestController {
-    Logger logger = Logger.getLogger("test");
-
-    @RequestMapping(value="/test",method = RequestMethod.GET)
-    @ApiOperation("测试")
-    public String test(){
-        try {
-            System.out.println("Test测试接口响应,时间 = "+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            return "hello";
-        }catch (Exception e){
-
-        }
-        return "";
-    }
-
-
-
-}

src/main/java/com/yutu/base/entity/SaleRules.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.Objects;
 

src/main/java/com/yutu/base/service/BaseService.java

@@ -2,7 +2,6 @@ package com.yutu.base.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.yutu.base.entity.SaleDetail;
 import com.yutu.base.entity.Store;
 import com.yutu.base.entity.User;
 import com.yutu.base.utils.httpClient.HttpUtil;
@@ -10,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/com/yutu/base/service/OrderService.java

@@ -4,17 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yutu.base.entity.NoteResult;
 import com.yutu.base.entity.Response;
-import com.yutu.base.entity.Store;
-import com.yutu.base.entity.User;
 import com.yutu.base.utils.HttpsSendData;
-import com.yutu.base.utils.MyComparator;
-import jxl.CellView;
-import jxl.Workbook;
-import jxl.format.Alignment;
-import jxl.format.Colour;
-import jxl.format.UnderlineStyle;
-import jxl.write.*;
-import jxl.write.Number;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@@ -24,15 +14,14 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.text.DecimalFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 订单相关业务层
@@ -241,7 +230,7 @@ public class OrderService extends BaseService{
 
                 JSONArray passengers = orderInfos.getJSONObject(i).getJSONArray("orderPassengers");
                 JSONArray flights = orderInfos.getJSONObject(i).getJSONArray("orderFlightInfos");
-                
+
                 String passengerInfo = "";
                 for (int j = 0; j < passengers.size(); j++) {
                     JSONObject pass = passengers.getJSONObject(j);

src/main/java/com/yutu/base/service/SaleDetailReportService.java

@@ -2,7 +2,6 @@ package com.yutu.base.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.yutu.base.entity.Response;
 import com.yutu.base.entity.Store;
 import com.yutu.base.entity.User;
 import com.yutu.base.utils.MyComparator;
@@ -11,11 +10,9 @@ import jxl.Workbook;
 import jxl.format.Alignment;
 import jxl.format.Colour;
 import jxl.format.UnderlineStyle;
-import jxl.write.*;
 import jxl.write.Number;
-import org.apache.commons.lang3.StringUtils;
+import jxl.write.*;
 import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.File;

src/main/java/com/yutu/base/service/SaleDetailService.java

@@ -2,12 +2,10 @@ package com.yutu.base.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-
-import com.github.pagehelper.PageInfo;
 import com.yutu.base.entity.Response;
 import com.yutu.base.entity.SaleDetail;
 import com.yutu.base.utils.HttpsSendData;
-import com.yutu.comm.entity.exception.NoteResult;
+import com.yutu.comm.response.NoteResult;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/yutu/base/service/SalesSummaryService.java

@@ -2,7 +2,7 @@ package com.yutu.base.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yutu.base.utils.HttpsSendData;
-import com.yutu.comm.entity.exception.NoteResult;
+import com.yutu.comm.response.NoteResult;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/yutu/base/utils/HttpsSendData.java

 package com.yutu.base.utils;
 
 import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.collections4.Get;
-import org.apache.commons.httpclient.*;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
@@ -10,11 +11,8 @@ import org.apache.commons.httpclient.params.HttpClientParams;
 import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.log4j.Logger;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 

src/main/resources/application-prod.yml

@@ -7,7 +7,8 @@ spring:
     polestarLogsServicesUrl: 'http://127.0.0.1:8089/'
     dataApiUrl: 'http://14.18.207.91:38071/iffs-data-api/'
     # 订单服务 ordercenter
-    statementApiUrl: 'http://121.36.16.56:32480/ordercenterApi/'
+#    statementApiUrl: 'http://121.36.16.56:32480/ordercenterApi/'
+    statementApiUrl: 'http://121.36.31.103:32480/ordercenterApi/'
   pathConfig:
     saleDetailReportExcelPath: 'D:\\polestar_ExcelFile/'  # 销售明细报表导出保存的本地路径
     saleReportExcelPath: 'D:/polestar_ExcelFile/'       #

src/main/resources/application-test.yml

 spring:
   urlConfig:
     overseasCheetahUrl: 'http://127.0.0.1:18092/polestar/'
-#    overseasAirTicketUrl: 'http://127.0.0.1:18071/OverseasAirTicket/'
+    #    overseasAirTicketUrl: 'http://127.0.0.1:18071/OverseasAirTicket/'
     overseasAirTicketUrl: 'http://192.168.11.158:8080/ordercenterApi/'
     productServiceUrl: 'http://127.0.0.1:28071/20160907_InterfaceConnected/'
     polestarLogsServicesUrl: 'http://127.0.0.1:8089/'
     dataApiUrl: 'http://14.18.207.91:38071/iffs-data-api/'
-
-    statementApiUrl: 'http://192.168.11.158:8080/ordercenterApi/'
+    # 订单服务 ordercenter
+    #    statementApiUrl: 'http://121.36.16.56:32480/ordercenterApi/'
+    statementApiUrl: 'http://121.36.31.103:32480/ordercenterApi/'
   pathConfig:
     saleDetailReportExcelPath: 'D:\\polestar_ExcelFile/'  # 销售明细报表导出保存的本地路径
     saleReportExcelPath: 'D:/polestar_ExcelFile/'       #
 server:
-  port: 8080
+  port: 8086
   compression:
     enabled: true
     mime-types: application/json,application/xml,application/octet-stream,textml,text/xml,text/plain
@@ -20,3 +21,4 @@ server:
   tomcat:
     max-connections: 2000
     max-threads: 2000
+