Переглянути джерело

修改统一的回调地址配置

luoshi 5 роки тому
батько
коміт
58d0032654

+ 0 - 10
src/main/java/com/qmth/ops/aliyun/config/SlsConfig.java

@@ -15,8 +15,6 @@ public class SlsConfig {
 
     private String accessSecret;
 
-    private String redirectUrl;
-
     private String queryUrl;
 
     private String tokenUrl;
@@ -55,14 +53,6 @@ public class SlsConfig {
         this.accessSecret = accessSecret;
     }
 
-    public String getRedirectUrl() {
-        return redirectUrl;
-    }
-
-    public void setRedirectUrl(String redirectUrl) {
-        this.redirectUrl = redirectUrl;
-    }
-
     public String getQueryUrl() {
         return queryUrl;
     }

+ 6 - 2
src/main/java/com/qmth/ops/aliyun/utils/SlsService.java

@@ -5,6 +5,7 @@ import com.aliyuncs.sts.model.v20150401.AssumeRoleResponse;
 import com.qmth.ops.aliyun.config.SlsConfig;
 import com.sun.deploy.net.URLEncoder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -28,6 +29,9 @@ public class SlsService {
     @Autowired
     private SlsConfig config;
 
+    @Value("${ops.host}")
+    private String hostUrl;
+
     public List<SlsProject> getProject() {
         return projectList;
     }
@@ -49,8 +53,8 @@ public class SlsService {
     }
 
     private Mono<String> getSignUrl(Mono<String> token, String project, String store) {
-        return token.flatMap(t -> Mono.just(MessageFormat.format(config.getSignUrl(), param(config.getRedirectUrl()),
-                param(MessageFormat.format(config.getQueryUrl(), project, store)), param(t))));
+        return token.flatMap(t -> Mono.just(MessageFormat
+                .format(config.getSignUrl(), param(hostUrl), param(MessageFormat.format(config.getQueryUrl(), project, store)), param(t))));
     }
 
     private static String param(String content) {

+ 1 - 1
src/main/resources/application.properties

@@ -3,12 +3,12 @@ server.port=8080
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 
+ops.host=https://ops.qmth.com.cn
 
 sls.ramName=monitor
 sls.ramAssumeRole=acs:ram::30078572:role/monitor
 sls.accessKey=LTAI4GF81QrVMW8oiBg1YwmK
 sls.accessSecret=GFbqps8W87cOb3vna20IptoY0fcjXh
-sls.redirectUrl=https://ops.qmth.com.cn
 sls.queryUrl=https://sls4service.console.aliyun.com/next/project/{0}/logsearch/{1}?readOnly=true&hideSidebar=true&hideTopbar=true
 sls.tokenUrl=https://signin.aliyun.com/federation?Action=GetSigninToken&AccessKeyId={0}&AccessKeySecret={1}&SecurityToken={2}&TicketType=mini
 sls.signUrl=https://signin.aliyun.com/federation?Action=Login&LoginUrl={0}&Destination={1}&SigninToken={2}