|
@@ -1,8 +1,7 @@
|
|
-package cn.feishu.sdk.provider;
|
|
|
|
|
|
+package cn.com.feishu.provider;
|
|
|
|
|
|
-import cn.feishu.sdk.common.ApiConstant;
|
|
|
|
-import cn.feishu.sdk.util.HttpUtil;
|
|
|
|
-import cn.feishu.sdk.util.PropertiesUtils;
|
|
|
|
|
|
+import cn.com.ctop.common.module.utils.HttpUtils;
|
|
|
|
+import cn.com.feishu.constant.FeishuConstant;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.io.UnsupportedEncodingException;
|
|
@@ -17,10 +16,9 @@ public class AuthProvider {
|
|
* @throws UnsupportedEncodingException
|
|
* @throws UnsupportedEncodingException
|
|
* @throws MalformedURLException
|
|
* @throws MalformedURLException
|
|
*/
|
|
*/
|
|
- public static String getAuthUrl(String state) throws UnsupportedEncodingException, MalformedURLException {
|
|
|
|
- String redirectUri = PropertiesUtils.getConfig("callback_url");
|
|
|
|
- System.out.println(ApiConstant.FEISHU_API_URL+ApiConstant.AUTH_INDEX+"?redirect_uri="+ URLEncoder.encode(redirectUri,"UTF-8")+"&app_id="+ApiConstant.FEISHU_APP_ID+"&state="+state);
|
|
|
|
- return HttpUtil.feishuGetRequestString(ApiConstant.FEISHU_API_URL+ApiConstant.AUTH_INDEX+"?redirect_uri="+ URLEncoder.encode(redirectUri,"UTF-8")+"&app_id="+ApiConstant.FEISHU_APP_ID+"&state="+state);
|
|
|
|
|
|
+ public static String getAuthUrl(String state) throws UnsupportedEncodingException {
|
|
|
|
+ String redirectUrl = FeishuConstant.REDIRECT_URL;
|
|
|
|
+ return FeishuConstant.FEISHU_API_URL+FeishuConstant.AUTH_INDEX+"?redirect_uri="+ URLEncoder.encode(redirectUrl,"UTF-8")+"&app_id="+FeishuConstant.FEISHU_APP_ID+"&state="+state;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -34,7 +32,7 @@ public class AuthProvider {
|
|
params.put("app_access_token",getAppAccessToken());
|
|
params.put("app_access_token",getAppAccessToken());
|
|
params.put("grant_type","authorization_code");
|
|
params.put("grant_type","authorization_code");
|
|
params.put("code",code);
|
|
params.put("code",code);
|
|
- return HttpUtil.feishuPostRequest(ApiConstant.FEISHU_API_URL+ApiConstant.AUTH_ACCESS_TOKEN,params);
|
|
|
|
|
|
+ return HttpUtils.feishuPostRequest(FeishuConstant.FEISHU_API_URL+FeishuConstant.AUTH_ACCESS_TOKEN,params);
|
|
}
|
|
}
|
|
|
|
|
|
public static JSONObject refreshAccessToken(String refreshToken) throws Exception{
|
|
public static JSONObject refreshAccessToken(String refreshToken) throws Exception{
|
|
@@ -42,13 +40,13 @@ public class AuthProvider {
|
|
params.put("app_access_token",getAppAccessToken());
|
|
params.put("app_access_token",getAppAccessToken());
|
|
params.put("grant_type","refresh_token");
|
|
params.put("grant_type","refresh_token");
|
|
params.put("refresh_token",refreshToken);
|
|
params.put("refresh_token",refreshToken);
|
|
- return HttpUtil.feishuPostRequest(ApiConstant.FEISHU_API_URL+ApiConstant.REFRESH_AUTH_ACCESS_TOKEN,params);
|
|
|
|
|
|
+ return HttpUtils.feishuPostRequest(FeishuConstant.FEISHU_API_URL+FeishuConstant.REFRESH_AUTH_ACCESS_TOKEN,params);
|
|
}
|
|
}
|
|
|
|
|
|
public static JSONObject getUserInfo(String accessToken){
|
|
public static JSONObject getUserInfo(String accessToken){
|
|
JSONObject params = new JSONObject();
|
|
JSONObject params = new JSONObject();
|
|
params.put("user_access_token",accessToken);
|
|
params.put("user_access_token",accessToken);
|
|
- return HttpUtil.feishuGetRequest("Bearer user_access_token",ApiConstant.FEISHU_API_URL+ApiConstant.USER_INFO,params);
|
|
|
|
|
|
+ return HttpUtils.feishuGetRequest("Bearer user_access_token",FeishuConstant.FEISHU_API_URL+FeishuConstant.USER_INFO,params);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -59,9 +57,9 @@ public class AuthProvider {
|
|
*/
|
|
*/
|
|
public static String getAppAccessToken() throws Exception {
|
|
public static String getAppAccessToken() throws Exception {
|
|
JSONObject params = new JSONObject();
|
|
JSONObject params = new JSONObject();
|
|
- params.put("app_id",ApiConstant.FEISHU_APP_ID);
|
|
|
|
- params.put("app_secret",ApiConstant.FEISHU_APP_SECRET);
|
|
|
|
- JSONObject resultNode = HttpUtil.feishuPostRequest(ApiConstant.FEISHU_API_URL+ApiConstant.APP_ACCESS_TOKEN,params);
|
|
|
|
|
|
+ params.put("app_id",FeishuConstant.FEISHU_APP_ID);
|
|
|
|
+ params.put("app_secret",FeishuConstant.FEISHU_APP_SECRET);
|
|
|
|
+ JSONObject resultNode = HttpUtils.feishuPostRequest(FeishuConstant.FEISHU_API_URL+FeishuConstant.APP_ACCESS_TOKEN,params);
|
|
if (resultNode.getIntValue("code")==0){
|
|
if (resultNode.getIntValue("code")==0){
|
|
return resultNode.getString("app_access_token");
|
|
return resultNode.getString("app_access_token");
|
|
}else {
|
|
}else {
|
|
@@ -77,9 +75,9 @@ public class AuthProvider {
|
|
*/
|
|
*/
|
|
public static String getTenantAccessToken() throws Exception {
|
|
public static String getTenantAccessToken() throws Exception {
|
|
JSONObject params = new JSONObject();
|
|
JSONObject params = new JSONObject();
|
|
- params.put("app_id",ApiConstant.FEISHU_APP_ID);
|
|
|
|
- params.put("app_secret",ApiConstant.FEISHU_APP_SECRET);
|
|
|
|
- JSONObject resultNode = HttpUtil.feishuPostRequest(ApiConstant.FEISHU_API_URL+ApiConstant.TENANT_ACCESS_TOKEN,params);
|
|
|
|
|
|
+ params.put("app_id",FeishuConstant.FEISHU_APP_ID);
|
|
|
|
+ params.put("app_secret",FeishuConstant.FEISHU_APP_SECRET);
|
|
|
|
+ JSONObject resultNode = HttpUtils.feishuPostRequest(FeishuConstant.FEISHU_API_URL+FeishuConstant.TENANT_ACCESS_TOKEN,params);
|
|
if (resultNode.getIntValue("code")==0){
|
|
if (resultNode.getIntValue("code")==0){
|
|
return resultNode.getString("tenant_access_token");
|
|
return resultNode.getString("tenant_access_token");
|
|
}else {
|
|
}else {
|