From bfc88976a7101604de447cd3c07482e9b00ec14b Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 26 Mar 2020 15:52:22 +0800 Subject: [PATCH] build: ui docker --- .../manage/dev/web/TestController.java | 29 +++++-------------- uidocker/conf.d/default.conf | 24 +++++++-------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 25a77c46a..973d2b870 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -18,9 +18,10 @@ import au.com.royalpay.payment.manage.appclient.core.RetailAppService; import au.com.royalpay.payment.manage.dev.bean.AliExcel; import au.com.royalpay.payment.manage.dev.bean.Message; import au.com.royalpay.payment.manage.dev.bean.SendWechatMessage; -import au.com.royalpay.payment.manage.dev.core.*; -import au.com.royalpay.payment.manage.mappers.customers.CustomerEncourageMoneyUseLogMapper; -import au.com.royalpay.payment.manage.mappers.log.NotifyErrorLogMapper; +import au.com.royalpay.payment.manage.dev.core.AliforexcelService; +import au.com.royalpay.payment.manage.dev.core.HfClearAmountService; +import au.com.royalpay.payment.manage.dev.core.HfUpdateService; +import au.com.royalpay.payment.manage.dev.core.WechatMessageService; import au.com.royalpay.payment.manage.mappers.payment.OrderMapper; import au.com.royalpay.payment.manage.mappers.payment.RefundMapper; import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper; @@ -57,8 +58,6 @@ import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.util.Assert; import org.springframework.util.MimeTypeUtils; import org.springframework.validation.Errors; @@ -86,7 +85,7 @@ import java.util.List; */ @RestController @RequestMapping("/dev") -public class TestController implements ApplicationEventPublisherAware { +public class TestController { private Logger logger = LoggerFactory.getLogger(getClass()); @Resource private OrderMapper orderMapper; @@ -96,8 +95,6 @@ public class TestController implements ApplicationEventPublisherAware { private ClientMapper clientMapper; @Resource private ATOReportService atoReportService; - @Resource - private NotifyErrorLogMapper notifyErrorLogMapper; @Value("${app.agreetemplate.classic.path}") private String pdfPath; @Value("${app.agreetemplate.aggregate.path}") @@ -107,8 +104,6 @@ public class TestController implements ApplicationEventPublisherAware { @Resource private PlatformClearService platformClearService; @Resource - private CustomerEncourageMoneyUseLogMapper customerEncourageMoneyUseLogMapper; - @Resource private ClientBankAccountMapper clientBankAccountMapper; @Resource private PaymentApi paymentApi; @@ -128,12 +123,9 @@ public class TestController implements ApplicationEventPublisherAware { private TradeLogService tradeLogService; @Resource private RetailAppService retailAppService; - private ApplicationEventPublisher publisher; @Resource private WechatMessageService wechatMessageService; @Resource - private NewpartnerService newpartnerService; - @Resource private AliforexcelService aliforexcelService; @Resource private HfClearAmountService hfClearAmountService; @@ -423,12 +415,6 @@ public class TestController implements ApplicationEventPublisherAware { tradeLogService.generateAustracData(datefrom, dateto); } - - @Override - public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { - this.publisher = applicationEventPublisher; - } - @PutMapping("/send_message") public void sendMassageByCode(@RequestBody @Valid Message message, Errors errors) { HttpUtils.handleValidErrors(errors); @@ -578,13 +564,14 @@ public class TestController implements ApplicationEventPublisherAware { /** * 重新生成执行商户下某日消费者数据 + * * @param date * @param clientId */ @GetMapping("/task/analysisCustomerDashboard") - public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,@RequestParam("clientId")String clientId){ + public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date, @RequestParam("clientId") String clientId) { try { - dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientId); + dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1), clientId); } catch (ParseException e) { e.printStackTrace(); } diff --git a/uidocker/conf.d/default.conf b/uidocker/conf.d/default.conf index e8dd7dba8..b8ac6c383 100644 --- a/uidocker/conf.d/default.conf +++ b/uidocker/conf.d/default.conf @@ -29,7 +29,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -45,7 +45,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -60,7 +60,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -76,7 +76,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -92,7 +92,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -107,7 +107,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -123,7 +123,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -139,7 +139,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -155,7 +155,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -171,7 +171,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -186,7 +186,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr; @@ -201,7 +201,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; proxy_set_header Real-IP $remote_addr;