Browse Source

20210705

pt
zy_Java 4 years ago
parent
commit
3d81480e60
  1. 2
      cloudutil/src/main/resources/application-util-dev.yml
  2. 2
      tall/src/main/resources/application-dev.yml
  3. 4
      tall/src/main/resources/application.yml
  4. 34
      util/src/test/java/com/ccsens/util/VideoTest.java
  5. 6
      wisdomcar/src/main/resources/application-prod.yml
  6. 5
      wisdomcar/src/main/resources/druid-prod.yml

2
cloudutil/src/main/resources/application-util-dev.yml

@ -33,6 +33,8 @@ eureka:
ribbon: ribbon:
ConnectTimeout: 60000 ConnectTimeout: 60000
ReadTimeout: 60000 ReadTimeout: 60000
eureka:
enable: true
feign: feign:
client: client:
config: config:

2
tall/src/main/resources/application-dev.yml

@ -11,7 +11,7 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
# host: 192.168.4.113 # host: 192.168.4.113
host: 127.0.0.1 host: 127.0.0.1
password: guest password: guest
port: 5672 port: 5672

4
tall/src/main/resources/application.yml

@ -1,5 +1,5 @@
spring: spring:
profiles: profiles:
active: greenvalley active: dev
include: util-greenvalley,common include: util-dev,common

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

@ -96,24 +96,24 @@ public class VideoTest {
*/ */
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// 指定资源地址,下载文件测试 //指定资源地址,下载文件测试
// downloadFile("http://1258473962.vod2.myqcloud.com/1e124671vodcq1258473962/76557f735285890810478037694/VCj25SXUgFsA.mp4", "D:/temp/"); // 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\\逗\\Desktop\\跳绳比赛选手证件照.xlsx"), 0, null, 0, false);
// for (int i = 0; i < objects.size(); i++) { for (int i = 0; i < objects.size(); i++) {
// Object[] obj = objects.get(i); Object[] obj = objects.get(i);
// if (obj == null || obj.length < 4) { if (obj == null || obj.length < 4) {
// continue; continue;
// } }
// String path = (String)obj[3]; String path = (String)obj[3];
// String dir = "D:\\选手证件照\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2]; String dir = "D:\\选手证件照\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2];
// try{ try{
// downloadFile(path, dir); downloadFile(path, dir);
// } catch (Exception e) { } catch (Exception e) {
// System.out.println("下载失败:" + dir); System.out.println("下载失败:" + dir);
// e.printStackTrace(); e.printStackTrace();
//
// } }
// } }
} }
} }

6
wisdomcar/src/main/resources/application-prod.yml

@ -4,8 +4,8 @@ server:
context-path: context-path:
spring: spring:
application: application:
name: wisdomcar2 # name: wisdomcar2
# name: wisdomcar name: wisdomcar
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
@ -32,7 +32,7 @@ swagger:
enable: true enable: true
eureka: eureka:
instance: instance:
ip-address: 81.70.54.64 ip-address: 119.3.214.36
gatewayUrl: https://www.tall.wiki/gateway/ gatewayUrl: https://www.tall.wiki/gateway/
notGatewayUrl: https://www.tall.wiki/ notGatewayUrl: https://www.tall.wiki/

5
wisdomcar/src/main/resources/druid-prod.yml

@ -15,7 +15,8 @@ spring:
maxWait: 60000 maxWait: 60000
minEvictableIdleTimeMillis: 300000 minEvictableIdleTimeMillis: 300000
minIdle: 5 minIdle: 5
password: # password:
password: 37080c1f223685592316b02dad8816c019290a476e54ebb638f9aa3ba8b6bdb9
poolPreparedStatements: true poolPreparedStatements: true
servletLogSlowSql: true servletLogSlowSql: true
servletLoginPassword: 111111 servletLoginPassword: 111111
@ -28,7 +29,7 @@ spring:
testWhileIdle: true testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000 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://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 username: root
validationQuery: SELECT 1 FROM DUAL validationQuery: SELECT 1 FROM DUAL
env: CCSENS_GAME env: CCSENS_GAME
Loading…
Cancel
Save