diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 9027b77f..1e4491a9 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -1,15 +1,22 @@ server.port=5567 #datasource -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.username=aida_con -spring.datasource.password=123456 +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +#spring.datasource.username=aida_con +#spring.datasource.password=123456 +#spring.datasource.password=QWa998345 +spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.primary.username=aida_con +spring.datasource.primary.password=123456 + +spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_retrieval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.secondary.username=aida_con +spring.datasource.secondary.password=123456 + -#??? -spring.datasource.hikari.minimum-idle=5 -spring.datasource.hikari.maximum-pool-size=40 -spring.datasource.hikari.idle-timeout=60000 #security spring.security.jwtSecret=JWTSECRET @@ -27,7 +34,8 @@ rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8 #mybatis mybatis-plus.global-config.banner=false -mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml +#mybatis-plus.mapper-locations=classpath:mapper/secondary/*.xml +mybatis-plus.mapper-locations=classpath:mapper/*/*.xml #mybatis-plus.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl mybatis-plus.global-config.db-config.logic-delete-field=isDeleted mybatis-plus.global-config.db-config.logic-delete-value=1 @@ -38,30 +46,23 @@ spring.mvc.pathmatch.matching-strategy=ant_path_matcher file.mac.path=~/file/ file.linux.path=/workspace/home/aida/file/ #linux服务器域名(预览和下载用) -#file.linuxDomain=http://18.162.111.141:5568/download/ -#file.linuxDomain=http://18.167.251.121:5568/download/ file.linuxDomain=https://www.aida.com.hk/download/ file.windows.path=D:\\upload\\ - spring.servlet.multipart.max-file-size = 5MB spring.servlet.multipart.max-request-size= 5MB - #访问python服务的ip(对应环境) #access.python.ip=http://43.198.80.117 access.python.ip=http://18.167.251.121 #access.python.ip=http://18.167.251.121:9991/ -#access.python.port=9992 access.python.port=9990 -# minIO服务配置之信息 minio.endpoint=https://www.minio.aida.com.hk:9000 minio.accessKey=admin minio.secretKey=admin123 minio.bucketName.clothing=aida-clothing +minio.bucketName.mannequins=aida-mannequins minio.bucketName.results=aida-results minio.bucketName.sysImage=aida-sys-image minio.bucketName.users=aida-users minio.bucketName.collectionElement=aida-collection-element - - - +redirect_url=http://18.167.251.121:7788 \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8550475d..47a99eb3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ #spring.profiles.active=test #����application-prod�ļ�(��������) -spring.profiles.active=prod +spring.profiles.active=test #����application-dev�ļ�(��������) #spring.profiles.active=dev