From 1c31cebc09103deaa94a7aa0cc7822821685115d Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Thu, 25 Mar 2021 13:19:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beneficiation/src/main/resources/application-prod.yml | 2 +- cloudutil/src/main/resources/application-util-prodsd.yml | 2 +- form/src/main/resources/application-prod.yml | 2 +- health/src/main/resources/application-prod.yml | 2 +- mt/src/main/resources/application-prod.yml | 2 +- ocr/src/main/resources/application-prod.yml | 2 +- pims/src/main/resources/application-prod.yml | 2 +- signin/src/main/resources/application-prod.yml | 2 +- tall/src/main/java/com/ccsens/tall/web/DebugController.java | 2 +- tall/src/main/resources/application-prod.yml | 2 +- tall/src/main/resources/application.yml | 4 ++-- tcm/src/main/resources/application-prod.yml | 2 +- util/src/test/java/com/ccsens/util/FileTest.java | 2 +- wisdomcar/src/main/resources/application-prod.yml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/beneficiation/src/main/resources/application-prod.yml b/beneficiation/src/main/resources/application-prod.yml index fe1f5636..e4e53009 100644 --- a/beneficiation/src/main/resources/application-prod.yml +++ b/beneficiation/src/main/resources/application-prod.yml @@ -29,7 +29,7 @@ swagger: enable: true eureka: instance: - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/cloudutil/src/main/resources/application-util-prodsd.yml b/cloudutil/src/main/resources/application-util-prodsd.yml index 189c4bef..6fd2ea14 100644 --- a/cloudutil/src/main/resources/application-util-prodsd.yml +++ b/cloudutil/src/main/resources/application-util-prodsd.yml @@ -22,7 +22,7 @@ eureka: #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ # defaultZone: http://admin:admin@81.70.54.64:7010/eureka/ - defaultZone: http://admin:admin@192.144.182.42:7010/eureka/ + defaultZone: http://admin:admin@121.36.3.207:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server diff --git a/form/src/main/resources/application-prod.yml b/form/src/main/resources/application-prod.yml index 58ab4196..56e55a6d 100644 --- a/form/src/main/resources/application-prod.yml +++ b/form/src/main/resources/application-prod.yml @@ -29,7 +29,7 @@ swagger: enable: true eureka: instance: - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/health/src/main/resources/application-prod.yml b/health/src/main/resources/application-prod.yml index 7d033160..ae3f50e3 100644 --- a/health/src/main/resources/application-prod.yml +++ b/health/src/main/resources/application-prod.yml @@ -32,7 +32,7 @@ swagger: enable: false eureka: instance: - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 file: path: /home/cloud/health/uploads/ domain: https://sd.tall.com/gateway/health/ diff --git a/mt/src/main/resources/application-prod.yml b/mt/src/main/resources/application-prod.yml index 27606410..f8cc85cb 100644 --- a/mt/src/main/resources/application-prod.yml +++ b/mt/src/main/resources/application-prod.yml @@ -29,7 +29,7 @@ swagger: enable: true eureka: instance: - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/ocr/src/main/resources/application-prod.yml b/ocr/src/main/resources/application-prod.yml index 48426ae3..765cc1f0 100644 --- a/ocr/src/main/resources/application-prod.yml +++ b/ocr/src/main/resources/application-prod.yml @@ -35,7 +35,7 @@ eureka: # www.tall.wiki # ip-address: 140.143.228.3 # ip-address: 81.70.54.64 - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/pims/src/main/resources/application-prod.yml b/pims/src/main/resources/application-prod.yml index 41884d4e..2a72dcb8 100644 --- a/pims/src/main/resources/application-prod.yml +++ b/pims/src/main/resources/application-prod.yml @@ -31,4 +31,4 @@ swagger: enable: false eureka: instance: - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 diff --git a/signin/src/main/resources/application-prod.yml b/signin/src/main/resources/application-prod.yml index bf0a7001..c5ce4fb7 100644 --- a/signin/src/main/resources/application-prod.yml +++ b/signin/src/main/resources/application-prod.yml @@ -35,7 +35,7 @@ eureka: # www.tall.wiki # ip-address: 140.143.228.3 # ip-address: 81.70.54.64 - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/tall/src/main/java/com/ccsens/tall/web/DebugController.java b/tall/src/main/java/com/ccsens/tall/web/DebugController.java index ef1de5d3..8beb2ccd 100644 --- a/tall/src/main/java/com/ccsens/tall/web/DebugController.java +++ b/tall/src/main/java/com/ccsens/tall/web/DebugController.java @@ -41,7 +41,7 @@ public class DebugController { @ApiOperation(value = "/测试",notes = "") @ApiImplicitParams({ }) - @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value="",produces = {"application/json;charset=UTF-8"}) public JsonResponse getSmsCode(HttpServletRequest request) throws Exception { // redisUtil.set("wps_tall_appId","d12722a7d28e430c889309fa4754aaba"); // redisUtil.set("wps_tall_appKey","f273e717247947ba8942a2373b6896c7"); diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml index e31f8289..42358e7d 100644 --- a/tall/src/main/resources/application-prod.yml +++ b/tall/src/main/resources/application-prod.yml @@ -35,7 +35,7 @@ eureka: # www.tall.wiki # ip-address: 140.143.228.3 # ip-address: 81.70.54.64 - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..e75cc2c3 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: prod + include: util-prod,common diff --git a/tcm/src/main/resources/application-prod.yml b/tcm/src/main/resources/application-prod.yml index 8029e69d..c701b723 100644 --- a/tcm/src/main/resources/application-prod.yml +++ b/tcm/src/main/resources/application-prod.yml @@ -29,7 +29,7 @@ swagger: enable: true eureka: instance: - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/util/src/test/java/com/ccsens/util/FileTest.java b/util/src/test/java/com/ccsens/util/FileTest.java index 76aeab73..dfa17327 100644 --- a/util/src/test/java/com/ccsens/util/FileTest.java +++ b/util/src/test/java/com/ccsens/util/FileTest.java @@ -23,7 +23,7 @@ public class FileTest { ByteArrayOutputStream baos = null; BufferedOutputStream bout = null; try { - URL url = new URL("http://192.144.182.42:7030/v1.0/file/download/数钱游戏配置表1.xlsx?path=wps/202012071/f93826c0e81e499f9c749d7a9d0da5d1.xlsx"); + URL url = new URL("http://121.36.3.207:7030/v1.0/file/download/数钱游戏配置表1.xlsx?path=wps/202012071/f93826c0e81e499f9c749d7a9d0da5d1.xlsx"); URLConnection conn = url.openConnection(); in = conn.getInputStream(); System.out.println(in.available()); diff --git a/wisdomcar/src/main/resources/application-prod.yml b/wisdomcar/src/main/resources/application-prod.yml index d63a1a17..9b2069d4 100644 --- a/wisdomcar/src/main/resources/application-prod.yml +++ b/wisdomcar/src/main/resources/application-prod.yml @@ -29,7 +29,7 @@ swagger: enable: true eureka: instance: - ip-address: 192.144.182.42 + ip-address: 121.36.3.207 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ From ebadfd3fd79a33de0e48de5dc206687549bca757 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 26 Mar 2021 14:36:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B3=E8=BD=A6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/wisdomcar/service/RecordService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java index 9498902a..626dd9c5 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java @@ -305,7 +305,7 @@ public class RecordService implements IRecordService{ case Constant.THROMBOLYTIC: type = "剂量";break; } row.add(new PoiUtil.PoiUtilCell(type)); - row.add(new PoiUtil.PoiUtilCell(record.getType() == Constant.CAR_RECORD_WEIGHT ? new BigDecimal(record.getValue()).divide(new BigDecimal(1000), 3).toString() + "Kg" : record.getName())); + row.add(new PoiUtil.PoiUtilCell(record.getType() == Constant.CAR_RECORD_WEIGHT ? new BigDecimal(record.getValue()).divide(new BigDecimal(1000), 3).toString() + "Kg" : record.getType() == Constant.CAR_RECORD_RFID ? record.getName() : record.getValue())); rows.add(row); } log.info("数据：{}", list.size());