Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

4 years ago · fbc0c9e647
15 changed files with 16 additions and 16 deletions
--- 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/
--- 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
--- 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/
--- 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/
--- 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/
--- 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/
--- 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
--- 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/
--- 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");
--- 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/
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@ -1,5 +1,5 @@
 spring:
  profiles:
-    active: test
+    active: prod
-    include: util-test,common
+    include: util-prod,common
--- 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/
--- 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());
--- 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());
--- 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/