|
@@ -7,6 +7,7 @@ import cn.com.qmth.examcloud.tool.utils.JsonMapper;
|
|
|
import cn.com.qmth.examcloud.tool.vo.Pager;
|
|
|
import cn.com.qmth.examcloud.tool.vo.user.User;
|
|
|
import com.fasterxml.jackson.core.type.TypeReference;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -28,27 +29,33 @@ public class CommonService {
|
|
|
public User login(Long rootOrgId, String loginName, String password) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
params.put("rootOrgId", rootOrgId);
|
|
|
+ params.put("accountType", "COMMON_LOGIN_NAME");
|
|
|
params.put("accountValue", loginName);
|
|
|
params.put("password", password);
|
|
|
- return this.doLogin(params);
|
|
|
+ return this.doLogin(sysProperty.getServerUrl(), params);
|
|
|
}
|
|
|
|
|
|
- public User login(String domain, String loginName, String password) {
|
|
|
- if (!domain.contains(".ecs.qmth.com.cn")) {
|
|
|
- domain += ".ecs.qmth.com.cn";
|
|
|
- }
|
|
|
+ public User login(String serverUrl, String loginName, String password, String smsCode) {
|
|
|
+
|
|
|
+ String[] values = serverUrl.split("\\.");
|
|
|
+ String domain = values[0] + ".ecs.qmth.com.cn";
|
|
|
+ String httpUrl = "https://" + serverUrl;
|
|
|
+ log.info("serverUrl:{} domain:{}", httpUrl, domain);
|
|
|
+
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
params.put("domain", domain);
|
|
|
+ params.put("accountType", "COMMON_LOGIN_NAME");
|
|
|
params.put("accountValue", loginName);
|
|
|
params.put("password", password);
|
|
|
- return this.doLogin(params);
|
|
|
- }
|
|
|
+ if (StringUtils.isNotBlank(smsCode)) {
|
|
|
+ params.put("smsCode", smsCode);
|
|
|
+ }
|
|
|
|
|
|
- private User doLogin(Map<String, Object> params) {
|
|
|
- params.put("accountType", "COMMON_LOGIN_NAME");
|
|
|
- params.put("smsCode", "5220");
|
|
|
+ return this.doLogin(httpUrl, params);
|
|
|
+ }
|
|
|
|
|
|
- String url = sysProperty.getServerUrl() + "/api/ecs_core/auth/login";
|
|
|
+ private User doLogin(String serverUrl, Map<String, Object> params) {
|
|
|
+ String url = serverUrl + "/api/ecs_core/auth/login";
|
|
|
String result = HttpHelper.post(url, null, params);
|
|
|
log.info("LOGIN_IN {}", result);
|
|
|
|
|
@@ -73,6 +80,7 @@ public class CommonService {
|
|
|
|
|
|
JsonMapper jsonMapper = new JsonMapper();
|
|
|
Pager<CourseVO> page = jsonMapper.parseJson(json, new TypeReference<Pager<CourseVO>>() {
|
|
|
+
|
|
|
});
|
|
|
|
|
|
if (page != null && page.getContent() != null) {
|