20210705

game/src/main/resources/application-prod.yml

@@ -32,7 +32,8 @@ swagger:
   enable: true
 eureka:
   instance:
-    ip-address: 119.3.214.36
+#    ip-address: 119.3.214.36
+    ip-address: 121.36.106.168
 
 gatewayUrl: https://www.tall.wiki/gateway/
 notGatewayUrl: https://www.tall.wiki/

game/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: prod
-    include: common, util-dev
+    include: common, util-prod

mt/src/main/resources/application-prod.yml

@@ -8,7 +8,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: 127.0.0.1
+    host: 121.36.3.207
     password: 111111
     port: 5672
     username: admin
@@ -21,16 +21,16 @@ spring:
         max-idle: 10
         max-wait: -1ms
         min-idle: 0
-#    password: ''
+    password: ''
-    password: 'areowqr!@43ef'
+#    password: 'areowqr!@43ef'
     port: 6379
     timeout: 1000ms
 swagger:
   enable: true
 eureka:
   instance:
-    ip-address: 127.0.0.1
+#    ip-address: 127.0.0.1
-#    ip-address: 119.3.214.36
+    ip-address: 121.36.106.168
 
 gatewayUrl: https://www.tall.wiki/gateway/
 notGatewayUrl: https://www.tall.wiki/

mt/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
-    include: common, util-dev
+    include: common, util-prod
 
 

mt/src/main/resources/druid-prod.yml

@@ -15,8 +15,8 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-      password:
+#      password:
-#      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -28,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://121.36.3.207/mt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

pom.xml

@@ -164,6 +164,7 @@
             <version>0.7.0</version>
         </dependency>
 
+
         <!--Jackson Xml-->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

util/src/main/java/com/ccsens/util/PoiUtil.java

@@ -640,8 +640,8 @@ public class PoiUtil {
 
         PoiUtilCell poiUtilCell = new PoiUtilCell();
         poiUtilCell.setValue("111222333");
-        poiUtilCell.setColspan(2);
+        /*poiUtilCell.setColspan(2);
-        poiUtilCell.setRowspan(1);
+        poiUtilCell.setRowspan(1);*/
         PoiUtilCell poiUtilCell1 = new PoiUtilCell();
         poiUtilCell1.setValue("1112222");
         PoiUtilCell poiUtilCell3 = new PoiUtilCell();
@@ -649,7 +649,7 @@ public class PoiUtil {
 
         PoiUtilCell poiUtilCell2 = new PoiUtilCell();
         poiUtilCell2.setValue("");
-        poiUtilCell2.setFunction("SUM(A1:C1)");
+        //poiUtilCell2.setFunction("SUM(A1:C1)");
 
 
         List<PoiUtilCell> cells = new ArrayList<>();

util/src/test/java/com/ccsens/util/VideoTest.java

@@ -98,14 +98,16 @@ public class VideoTest {
 
         //指定资源地址，下载文件测试
 //        downloadFile("http://1258473962.vod2.myqcloud.com/1e124671vodcq1258473962/76557f735285890810478037694/VCj25SXUgFsA.mp4", "D:/temp/");
-        List<Object[]> objects = PoiUtil.readExce(new File("C:\\Users\\逗\\Desktop\\跳绳比赛选手证件照.xlsx"), 0, null, 0, false);
+        List<Object[]> objects = PoiUtil.readExce(new File("C:\\Users\\10626\\Desktop\\跳绳比赛选手证件照.xlsx"), 0, null, 0, false);
+
         for (int i = 0; i < objects.size(); i++) {
             Object[] obj = objects.get(i);
             if (obj == null || obj.length < 4) {
                 continue;
             }
             String path = (String)obj[3];
-            String dir = "D:\\选手证件照\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2];
+
+            String dir = "D:\\跳绳\\太原站\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2];
             try{
                 downloadFile(path, dir);
             } catch (Exception e) {