diff --git a/cloudutil/src/main/resources/application-util-prod.yml b/cloudutil/src/main/resources/application-util-prod.yml index 53261534..443213d8 100644 --- a/cloudutil/src/main/resources/application-util-prod.yml +++ b/cloudutil/src/main/resources/application-util-prod.yml @@ -20,7 +20,8 @@ eureka: service-url: # 指定eureka server通信地址，注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ - defaultZone: http://admin:admin@140.143.228.3:7010/eureka/ +# defaultZone: http://admin:admin@140.143.228.3:7010/eureka/ + defaultZone: http://admin:admin@81.70.54.64:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server prefer-ip-address: true diff --git a/ht/src/main/resources/application-prod.yml b/ht/src/main/resources/application-prod.yml index d459dbb8..22df93c5 100644 --- a/ht/src/main/resources/application-prod.yml +++ b/ht/src/main/resources/application-prod.yml @@ -7,23 +7,23 @@ spring: name: ht datasource: type: com.alibaba.druid.pool.DruidDataSource - rabbitmq: - host: api.ccsens.com - password: 111111 - port: 5672 - username: admin - redis: - database: 0 - host: 127.0.0.1 - jedis: - pool: - max-active: 200 - max-idle: 10 - max-wait: -1ms - min-idle: 0 - password: 'areowqr!@43ef' - port: 6379 - timeout: 1000ms + rabbitmq: + host: 127.0.0.1 + password: 111111 + port: 5672 + username: admin + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: '' + port: 6379 + timeout: 1000ms swagger: @@ -37,4 +37,4 @@ ht: name: 认知功能评测云平台系统 eureka: instance: - ip-address: 140.143.228.3 \ No newline at end of file + ip-address: 81.70.54.64 \ No newline at end of file diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml index 5889ff7f..d082c0ea 100644 --- a/ht/src/main/resources/application.yml +++ b/ht/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: prod + include: common, util-prod \ No newline at end of file diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml index 602cd0ca..46ef7920 100644 --- a/tall/src/main/resources/application-prod.yml +++ b/tall/src/main/resources/application-prod.yml @@ -11,20 +11,20 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: api.ccsens.com + host: 127.0.0.1 password: 111111 port: 5672 username: admin redis: database: 0 - host: www.tall.wiki + host: 127.0.0.1 jedis: pool: max-active: 200 max-idle: 10 max-wait: -1ms min-idle: 0 - password: 'areowqr!@43ef' + password: '' port: 6379 timeout: 1000ms swagger: @@ -33,6 +33,6 @@ eureka: instance: # www.tall.wiki # ip-address: 140.143.228.3 - ip-address: 192.144.182.42 + ip-address: 81.70.54.64 gatewayUrl: https://www.tall.wiki/gateway/ \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b2acd365..4fc2efe4 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: util-dev,common + active: prod + include: util-prod,common diff --git a/tall/src/main/resources/druid-prod.yml b/tall/src/main/resources/druid-prod.yml index 2d3f9983..ee0316bc 100644 --- a/tall/src/main/resources/druid-prod.yml +++ b/tall/src/main/resources/druid-prod.yml @@ -3,7 +3,7 @@ spring: druid: connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 driverClassName: com.mysql.cj.jdbc.Driver - dynamicUrl: jdbc:mysql://api.ccsens.com:3306/${schema} + dynamicUrl: jdbc:mysql://127.0.0.1:3306/${schema} filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*' filterName: druidFilter filterProfileEnable: true @@ -15,7 +15,8 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: 7cdefb88e0b8c8a401b66a83ee0cf80387461268074d1c3dcb146ab485318633 +# password: 7cdefb88e0b8c8a401b66a83ee0cf80387461268074d1c3dcb146ab485318633 + password: poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -27,7 +28,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://api.ccsens.com/tall?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_HEALTH \ No newline at end of file diff --git a/util/src/test/java/com/ccsens/util/Base64Test.java b/util/src/test/java/com/ccsens/util/Base64Test.java index cafd9a33..4da556b6 100644 --- a/util/src/test/java/com/ccsens/util/Base64Test.java +++ b/util/src/test/java/com/ccsens/util/Base64Test.java @@ -1,19 +1,11 @@ package com.ccsens.util; import cn.hutool.core.codec.Base64; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import com.ccsens.util.wx.WxXcxUtil; +import cn.hutool.core.util.ZipUtil; import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import javax.servlet.ServletOutputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; /** * @description: @@ -38,8 +30,6 @@ public class Base64Test { @Test public void test02() throws Exception { - String s = ""; - String[] projectIds = s.split(","); - System.out.println(projectIds.toString()); + ZipUtil.zip("C:\\Users\\逗\\Desktop\\新建文件夹","C:\\Users\\逗\\Desktop\\ht.zip"); } }