|
@@ -186,8 +186,8 @@ namespace TEAMModelOS.Controllers
|
|
|
Type = "xkw"
|
|
|
};
|
|
|
await table.SaveOrUpdate<OAuthUser>(authUser);
|
|
|
- return Ok(new { status = 1, url=client.SERVICE_URL});
|
|
|
- //return Redirect($"bind?status=1&accessToken={client.AccessToken}&openId={client.OpenId}&userId={client.UserId}&domain={domain}&msg={HttpUtility.UrlEncode("认证成功")}");
|
|
|
+ //return Ok(new { status = 1, url=client.SERVICE_URL});
|
|
|
+ return Redirect(client.SERVICE_URL);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -282,6 +282,22 @@ namespace TEAMModelOS.Controllers
|
|
|
string OAuth_Xkw_RedirectUrl = configs[0].RedirectUrl;
|
|
|
string OAuth_Xkw_OAuthHost = configs[0].OAuthHost;
|
|
|
string OAuth_Xkw_ServiceUrl = configs[0].ServiceUrl;
|
|
|
+ try {
|
|
|
+ List<ServiceModule> services= configs[0].ServiceUrl.ToObject<List<ServiceModule>>();
|
|
|
+ ServiceModule serviceModule= services.Find(x => x.module.Equals(module));
|
|
|
+ if (serviceModule != null)
|
|
|
+ {
|
|
|
+ OAuth_Xkw_ServiceUrl = serviceModule.url;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ OAuth_Xkw_ServiceUrl = "http://www.zxxk.com/";
|
|
|
+ }
|
|
|
+ } catch (Exception ex) {
|
|
|
+ if (!OAuth_Xkw_ServiceUrl.StartsWith("http://www.zxxk.com"))
|
|
|
+ {
|
|
|
+ OAuth_Xkw_ServiceUrl = "http://www.zxxk.com/";
|
|
|
+ }
|
|
|
+ }
|
|
|
string OAuth_Xkw_Domain= configs[0].Domain;
|
|
|
string OAuth_Xkw_Param =$"tmdid={tmdid}&module={module}&state={Guid.NewGuid().ToString()}";
|
|
|
var client = new XkwOAuthClient(OAuth_Xkw_AppKey, OAuth_Xkw_AppSecret, OAuth_Xkw_RedirectUrl, OAuth_Xkw_OAuthHost, OAuth_Xkw_Domain, accessToken, openId, userId, OAuth_Xkw_Param);
|