FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-06-14 22:13:58 +08:00
parent 36c9a0ccd0 d6a0d897de
commit ea026e57e2
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+4
View File
@@ -15,6 +15,7 @@ import com.adc.da.sys.service.IUserEOService;
import com.adc.da.util.Encodes; import com.adc.da.util.Encodes;
import com.adc.da.util.PasswordUtils; import com.adc.da.util.PasswordUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -127,7 +128,10 @@ public class LoginRestController {
@PostMapping(value = "/getTokenToWeLink") @PostMapping(value = "/getTokenToWeLink")
@ResponseBody @ResponseBody
public ResponseMessage getIftappCodeByWelinkCode(HttpServletRequest request, WeLinkVO linkVO) throws UnsupportedEncodingException { public ResponseMessage getIftappCodeByWelinkCode(HttpServletRequest request, WeLinkVO linkVO) throws UnsupportedEncodingException {
log.info(JSONObject.toJSONString(linkVO));
String account = weLinkUtil.getIftappCodeByWelinkCode(linkVO); String account = weLinkUtil.getIftappCodeByWelinkCode(linkVO);
// String account = "zhangyanduan001";
log.info("userAccount:" +account);
if(StringUtils.isBlank(account)){ if(StringUtils.isBlank(account)){
return Result.error("r0011", "用户不存在"); return Result.error("r0011", "用户不存在");
} }
adc-da-jwtLogin/src/main/java/com/adc/da/login/util/WeLinkUtil.java
+15 -9
View File
@@ -18,11 +18,15 @@ public class WeLinkUtil {
@Autowired @Autowired
private OkHttpUtil okHttpUtil; private OkHttpUtil okHttpUtil;
// 测试环境地址
// private final String access_url = "https://iftappdev.foton.com.cn/devservertest/welink/";
//正式环境地址
private final String access_url = "https://iftappwelink.foton.com.cn/devserver/welink/"; private final String access_url = "https://iftappwelink.foton.com.cn/devserver/welink/";
public String getIftappCodeByWelinkCode(WeLinkVO linkVO){ public String getIftappCodeByWelinkCode(WeLinkVO linkVO){
try{ try{
String access_token = ""; String authCode = "";
Map<String,String> param = new HashMap<>(); Map<String,String> param = new HashMap<>();
param.put("code",linkVO.getCode()); param.put("code",linkVO.getCode());
param.put("name",linkVO.getName().replace("-"," ")); param.put("name",linkVO.getName().replace("-"," "));
@@ -32,28 +36,30 @@ public class WeLinkUtil {
if(StringUtils.isNotBlank(linkVO.getCorpCode())){ if(StringUtils.isNotBlank(linkVO.getCorpCode())){
param.put("corpCode",linkVO.getCorpCode()); param.put("corpCode",linkVO.getCorpCode());
} }
log.debug("第一个接口请求地址:"+access_url+"getIftappCodeByWelinkCode");
log.debug("请求参数为："+ JSONObject.fromObject(param).toString());
String access_token_str = okHttpUtil.post(access_url+"getIftappCodeByWelinkCode",param,new HashMap<>()); String access_token_str = okHttpUtil.post(access_url+"getIftappCodeByWelinkCode",param,new HashMap<>());
JSONObject atJsonObj = JSONObject.fromObject(access_token_str); JSONObject atJsonObj = JSONObject.fromObject(access_token_str);
System.out.println("AccessTokenJSON:" + atJsonObj); log.info("AccessTokenJSON: "+access_token_str);
if (atJsonObj.has("data")) { if (atJsonObj.has("data")) {
System.out.println("data:" + atJsonObj.get("data"));
JSONObject obj = JSONObject.fromObject(atJsonObj.getOrDefault("data","")); JSONObject obj = JSONObject.fromObject(atJsonObj.getOrDefault("data",""));
if(obj.has("access_token")){ if(obj.has("authCode")){
access_token = obj.getOrDefault("access_token","").toString(); authCode = obj.getOrDefault("authCode","").toString();
} }
} }
if(StringUtils.isBlank(access_token)){ if(StringUtils.isBlank(authCode)){
return ""; return "";
} }
Map<String,String> param_p = new HashMap<>(); Map<String,String> param_p = new HashMap<>();
param_p.put("code",access_token); param_p.put("code",authCode);
log.debug("第二个接口请求地址："+access_url+"getUserInfoByAuthCode");
log.debug("请求参数为："+JSONObject.fromObject(param_p).toString());
String principal_json = okHttpUtil.get(access_url+"getUserInfoByAuthCode",param_p,new HashMap<>()); String principal_json = okHttpUtil.get(access_url+"getUserInfoByAuthCode",param_p,new HashMap<>());
JSONObject pfjsonObj = JSONObject.fromObject(principal_json); JSONObject pfjsonObj = JSONObject.fromObject(principal_json);
log.info("getUserInfoByAuthCode "+principal_json);
if (pfjsonObj.has("data")) { if (pfjsonObj.has("data")) {
System.out.println("data:" + pfjsonObj.get("data"));
JSONObject obj = JSONObject.fromObject(pfjsonObj.getOrDefault("data","")); JSONObject obj = JSONObject.fromObject(pfjsonObj.getOrDefault("data",""));
if(obj.has("username")){ if(obj.has("username")){
return obj.getOrDefault("username","").toString(); return obj.getOrDefault("username","").toString();
} }