sandu-common/src/main/java/com/sandu/common/file/impl/AliOssFileServiceImpl.java
@@ -14,6 +14,7 @@ import com.sandu.common.file.FileUploadDto; import com.sandu.common.file.IFileUpload; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; @@ -35,10 +36,15 @@ @Component public class AliOssFileServiceImpl implements IFileUpload { private final String endPoint = "oss-cn-shanghai.aliyuncs.com"; private final String keyId = "LTAI5tPdpt5wvJyLipRijFSP"; private final String keySecret = "1ahYfCKd0yTddsUnuDLQzI23MLh4VQ"; private final String bucketName = "ximonsmart"; @Value("${oss-conf.end-point}") private String endPoint; @Value("${oss-conf.key-id}") private String keyId; @Value("${oss-conf.key-secret}") private String keySecret; @Value("${oss-conf.bucket-name}") private String bucketName; private String host; @Override ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/MqttMainBoardConfig.java
@@ -1,28 +1,43 @@ package com.sandu.ximon.admin.manager.iot.amqp; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; /** * @author chenjiantian * @date 2021/12/2 17:02 * iot产品配置类 */ @Component @Configuration public class MqttMainBoardConfig implements IAmqpSubscriptionConfig { public final static String ACCESS_KEY = "LTAI4G27Af8MZEF55phdMQ4y"; public final static String ACCESS_SECRET = "KUc2yOtr7TRB4FuF5Wr0dWeTblbEuh"; public static String ACCESS_KEY; public static String ACCESS_SECRET; @Value("${iot.access_key}") public String accessKey; @Value("${iot.access_secret}") public String accessSecret; @Override @Value("${iot.access_key}") public String getAccessKey() { ACCESS_KEY = accessKey; return ACCESS_KEY; } @Override @Value("${iot.access_secret}") public String getAccessSecret() { ACCESS_SECRET = accessSecret; return ACCESS_SECRET; } @Override public String getConsumerGroupId() { // return "oOS84YAW41j6S3za2eIk000100"; ximon-admin/src/main/resources/application-local.yml
@@ -10,11 +10,10 @@ connection-init-sqls: set names utf8mb4 driver-class-name: com.mysql.cj.jdbc.Driver redis: host: 112.74.63.130 # Redis服务器地址 database: 0 # Redis数据库索引（默认为0） port: 6379 # Redis服务器连接端口 password: uIEFHmj4bC0wJCyM # Redis服务器连接密码（默认为空） timeout: 10000ms # 连接超时时间（毫秒） host: 39.103.154.108 password: zhxm2512209 port: 6379 database: 0 server: port: 20017 sandu: @@ -39,7 +38,7 @@ enable: true listenter: isOpen: true isOpen: false minio: endpoint: 47.106.172.9 @@ -63,6 +62,18 @@ nova-conf: #诺瓦回调 notify-url: http://112.74.63.130:20017/serv/vnnox/progress screen-shot-notify-url: http://112.74.63.130:20017/serv/vnnox/screenshot status-notify-url: http://112.74.63.130:20017/serv/vnnox/asyncStatus notify-url: http://39.103.154.108:20018/serv/vnnox/progress screen-shot-notify-url: http://39.103.154.108:20018/serv/vnnox/screenshot status-notify-url: http://39.103.154.108:20018/serv/vnnox/asyncStatus #iot产品秘钥 iot: access_key: LTAI4G27Af8MZEF55phdMQ4y access_secret: KUc2yOtr7TRB4FuF5Wr0dWeTblbEuh #阿里云oss配置 oss-conf: end-point: oss-cn-shanghai.aliyuncs.com key-id: LTAI5tPdpt5wvJyLipRijFSP key-secret: 1ahYfCKd0yTddsUnuDLQzI23MLh4VQ bucket-name: ximonsmart ximon-admin/src/main/resources/application-prod.yml
@@ -58,4 +58,17 @@ nova-conf: #诺瓦回调 notify-url: http://39.103.154.108:20018/serv/vnnox/progress screen-shot-notify-url: http://39.103.154.108:20018/serv/vnnox/screenshot status-notify-url: http://39.103.154.108:20018/serv/vnnox/asyncStatus status-notify-url: http://39.103.154.108:20018/serv/vnnox/asyncStatus #iot产品秘钥 iot: access_key: LTAI4G27Af8MZEF55phdMQ4y access_secret: KUc2yOtr7TRB4FuF5Wr0dWeTblbEuh #阿里云oss配置 oss-conf: end-point: oss-cn-shanghai.aliyuncs.com key-id: LTAI5tPdpt5wvJyLipRijFSP key-secret: 1ahYfCKd0yTddsUnuDLQzI23MLh4VQ bucket-name: ximonsmart
