|
@@ -9,6 +9,7 @@ package cn.com.qmth.examcloud.app.core;
|
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
@@ -18,45 +19,43 @@ import org.springframework.stereotype.Component;
|
|
|
@Component
|
|
|
public class PropertyService {
|
|
|
private static Logger log = LoggerFactory.getLogger(PropertyService.class);
|
|
|
- @Value("${examcloud.base.info.url}")
|
|
|
- private String baseInfoUrl;//基础信息服务
|
|
|
- @Value("${examcloud.exam.admin.url}")
|
|
|
- private String examAdminUrl;//考务服务
|
|
|
- @Value("${examcloud.net.exam.url}")
|
|
|
- private String netExamUrl;//网考服务
|
|
|
- @Value("${examcloud.admin.exam.url}")
|
|
|
- private String netAdminExamUrl;//网考后端服务
|
|
|
- @Value("${examcloud.question.pool.url}")
|
|
|
- private String questionPoolUrl;//题库服务
|
|
|
- @Value("${examcloud.user.auth.url}")
|
|
|
- private String userAuthUrl;//认证中心服务
|
|
|
+ @Autowired
|
|
|
+ private CloudDiscoveryClient discoveryClient;
|
|
|
+
|
|
|
@Value("${examcloud.upyun.url}")
|
|
|
private String upYunUrl;//又拍云文件服务
|
|
|
+
|
|
|
@Value("${examcloud.sms.url}")
|
|
|
private String smsUrl;//短信服务地址
|
|
|
+
|
|
|
@Value("${examcloud.sms.sign}")
|
|
|
private String smsSign;//短信签名
|
|
|
+
|
|
|
@Value("${examcloud.sms.template}")
|
|
|
private String smsTemplate;//短信模板Code
|
|
|
|
|
|
public String getBaseInfoUrl() {
|
|
|
- return baseInfoUrl;
|
|
|
+ return discoveryClient.getInstanceUrl(Constants.EC_CORE_BASIC);
|
|
|
}
|
|
|
|
|
|
public String getExamAdminUrl() {
|
|
|
- return examAdminUrl;
|
|
|
+ return discoveryClient.getInstanceUrl(Constants.EC_CORE_EXAMWORK);
|
|
|
}
|
|
|
|
|
|
public String getNetExamUrl() {
|
|
|
- return netExamUrl;
|
|
|
+ return discoveryClient.getInstanceUrl(Constants.EC_CORE_OE_STUDENT);
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getNetAdminExamUrl() {
|
|
|
+ return discoveryClient.getInstanceUrl(Constants.EC_CORE_OE_ADMIN);
|
|
|
}
|
|
|
|
|
|
public String getQuestionPoolUrl() {
|
|
|
- return questionPoolUrl;
|
|
|
+ return discoveryClient.getInstanceUrl(Constants.EC_CORE_QUESTION);
|
|
|
}
|
|
|
|
|
|
public String getUserAuthUrl() {
|
|
|
- return userAuthUrl;
|
|
|
+ return discoveryClient.getInstanceUrl(Constants.EC_CORE_BASIC);
|
|
|
}
|
|
|
|
|
|
public String getUpYunUrl() {
|
|
@@ -75,12 +74,4 @@ public class PropertyService {
|
|
|
return smsTemplate;
|
|
|
}
|
|
|
|
|
|
- public String getNetAdminExamUrl() {
|
|
|
- return netAdminExamUrl;
|
|
|
- }
|
|
|
-
|
|
|
- public void setNetAdminExamUrl(String netAdminExamUrl) {
|
|
|
- this.netAdminExamUrl = netAdminExamUrl;
|
|
|
- }
|
|
|
-
|
|
|
}
|