diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 311a735c..55672070 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,11 +1,11 @@ -server.port=7766 +server.port=5567 #datasource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.url=jdbc:mysql://18.167.251.121:33006/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.url=jdbc:mysql://localhost:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=root +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 #security spring.security.jwtSecret=JWTSECRET @@ -15,7 +15,7 @@ spring.security.jwtTokenPrefix=Bearer- spring.security.jwtExpiration=8640000000 #spring security权限设置 认证了token还要认证权限 不然报错Full authentication is required to access this resource spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\ - /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/** + /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/** spring.security.authApi=/auth/login @@ -25,23 +25,53 @@ rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8 mybatis-plus.global-config.banner=false mybatis-plus.mapper-locations=classpath:mapper/*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 +mybatis-plus.global-config.db-config.logic-not-delete-value=0 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 - +spring.servlet.multipart.max-file-size = 10MB +spring.servlet.multipart.max-request-size= 10MB #访问python服务的ip(对应环境) -#access.python.ip=http://18.167.251.121 -access.python.ip=http://43.198.80.117 +#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=9990 +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 +spring.rabbitmq.host=18.167.251.121 +spring.rabbitmq.port=5672 +spring.rabbitmq.username=rabbit +spring.rabbitmq.password=123456 +spring.rabbitmq.virtual-host=/ +spring.redis.host=172.31.11.32 +#spring.redis.host=18.167.251.121 +spring.redis.port=6379 +spring.redis.database=1 +spring.redis.password=Aidlab +spring.redis.lettuce.pool.max-active=8 +spring.redis.lettuce.pool.max-idle=8 +spring.redis.lettuce.pool.min-idle=0 +spring.redis.lettuce.pool.max-wait=5 +redis.key.consumptionOrder=ConsumptionOrder +redis.key.cancelSet=CancelSet +redis.key.exceptionMap=ExceptionMap +redis.key.resultMap=ResultMap \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 59ce6439..e4df2d00 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,11 +1,10 @@ -server.port=5567 +server.port=5566 #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.password=QWa998345 +spring.datasource.url=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.username=root +spring.datasource.password=QWa998345 #security spring.security.jwtSecret=JWTSECRET diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8550475d..f00b793a 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=dev #����application-dev�ļ�(��������) #spring.profiles.active=dev