diff --git a/cloudutil/src/main/resources/application-util-dev.yml b/cloudutil/src/main/resources/application-util-dev.yml index d30e2c34..384f2ec7 100644 --- a/cloudutil/src/main/resources/application-util-dev.yml +++ b/cloudutil/src/main/resources/application-util-dev.yml @@ -33,6 +33,8 @@ eureka: ribbon: ConnectTimeout: 60000 ReadTimeout: 60000 + eureka: + enable: true feign: client: config: diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index 832f6180..e6e0f046 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -11,7 +11,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: -# host: 192.168.4.113 + # host: 192.168.4.113 host: 127.0.0.1 password: guest port: 5672 diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index 9e02c3e8..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: greenvalley - include: util-greenvalley,common + active: dev + include: util-dev,common diff --git a/util/src/test/java/com/ccsens/util/VideoTest.java b/util/src/test/java/com/ccsens/util/VideoTest.java index e658be51..221000b6 100644 --- a/util/src/test/java/com/ccsens/util/VideoTest.java +++ b/util/src/test/java/com/ccsens/util/VideoTest.java @@ -96,24 +96,24 @@ public class VideoTest { */ public static void main(String[] args) throws Exception { - // 指定资源地址,下载文件测试 + //指定资源地址,下载文件测试 // downloadFile("http://1258473962.vod2.myqcloud.com/1e124671vodcq1258473962/76557f735285890810478037694/VCj25SXUgFsA.mp4", "D:/temp/"); -// List objects = PoiUtil.readExce(new File("C:\\Users\\逗\\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]; -// try{ -// downloadFile(path, dir); -// } catch (Exception e) { -// System.out.println("下载失败:" + dir); -// e.printStackTrace(); -// -// } -// } + List objects = PoiUtil.readExce(new File("C:\\Users\\逗\\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]; + try{ + downloadFile(path, dir); + } catch (Exception e) { + System.out.println("下载失败:" + dir); + e.printStackTrace(); + + } + } } } diff --git a/wisdomcar/src/main/resources/application-prod.yml b/wisdomcar/src/main/resources/application-prod.yml index 11b00884..fd961e42 100644 --- a/wisdomcar/src/main/resources/application-prod.yml +++ b/wisdomcar/src/main/resources/application-prod.yml @@ -4,8 +4,8 @@ server: context-path: spring: application: - name: wisdomcar2 -# name: wisdomcar +# name: wisdomcar2 + name: wisdomcar datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: @@ -32,7 +32,7 @@ swagger: enable: true eureka: instance: - ip-address: 81.70.54.64 + ip-address: 119.3.214.36 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/wisdomcar/src/main/resources/druid-prod.yml b/wisdomcar/src/main/resources/druid-prod.yml index 5fd6025b..19d2f2f9 100644 --- a/wisdomcar/src/main/resources/druid-prod.yml +++ b/wisdomcar/src/main/resources/druid-prod.yml @@ -15,7 +15,8 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: +# password: + password: 37080c1f223685592316b02dad8816c019290a476e54ebb638f9aa3ba8b6bdb9 poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -28,7 +29,7 @@ spring: testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 # url: jdbc:mysql://127.0.0.1/wisdomcar?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true - url: jdbc:mysql://127.0.0.1/wisdomcar?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://121.36.3.207/wisdomcar?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_GAME \ No newline at end of file