diff --git a/src/main/java/com/ccsens/filedeal/service/FileService.java b/src/main/java/com/ccsens/filedeal/service/FileService.java index ad52d61..d5cde0f 100644 --- a/src/main/java/com/ccsens/filedeal/service/FileService.java +++ b/src/main/java/com/ccsens/filedeal/service/FileService.java @@ -158,6 +158,7 @@ public class FileService extends AbstractRedisService implements IFileService { @Override public FileVo.FilePosition getById(Long id) { +// return fileDao.getByLinkId(id); return fileDao.getByLinkId(id); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 200a520..d9a072b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8001 + port: 7180 spring: snowflake: datacenterId: 1 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 3d89325..40f4fc1 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8001 + port: 7180 spring: snowflake: datacenterId: 1 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 43682f3..0437921 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,5 +1,5 @@ server: - port: 8001 + port: 7180 spring: snowflake: datacenterId: 1 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d7b5c1e..0ee65bb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod + active: test include: common diff --git a/src/main/resources/druid-prod.yml b/src/main/resources/druid-prod.yml index 5a8c8af..c5a6049 100644 --- a/src/main/resources/druid-prod.yml +++ b/src/main/resources/druid-prod.yml @@ -15,8 +15,8 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 -# password: 7cdefb88e0b8c8a401b66a83ee0cf80387461268074d1c3dcb146ab485318633 - password: + password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 +# password: poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -28,7 +28,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://127.0.0.1/common?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://www.tall.wiki/common?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL - env: CCSENS_HEALTH \ No newline at end of file + env: CCSENS_TALL \ No newline at end of file diff --git a/src/main/resources/mapper_dao/FileDao.xml b/src/main/resources/mapper_dao/FileDao.xml index 971c8d2..97e1d5e 100644 --- a/src/main/resources/mapper_dao/FileDao.xml +++ b/src/main/resources/mapper_dao/FileDao.xml @@ -32,7 +32,7 @@ t_file_commit c WHERE l.commit_id = c.id - AND c.id = #{linkId} + AND l.id = #{linkId} AND l.rec_status = 0 AND c.rec_status = 0 limit 1