root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request 'xxl-job跳转路径修改' (#85) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Details

Browse Source 
Reviewed-on: #85
This commit is contained in:
root 2024-10-29 17:00:06 +08:00
commit 072c6367ba
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/client/OAuth2Client.java
View File

@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets;
@Component
public class OAuth2Client {
private static final String BASE_URL = "https://mt.ptzykjgs.com/admin-api/system/oauth2";
private static final String BASE_URL = "http://121.36.203.133/admin-api/system/oauth2";
/**
* 租户编号

2
ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/client/UserClient.java
View File

@ -21,7 +21,7 @@ import org.springframework.web.client.RestTemplate;
@Component
public class UserClient {
private static final String BASE_URL = "https://mt.ptzykjgs.com/admin-api/system/oauth2/user";
private static final String BASE_URL = "http://121.36.203.133/admin-api/system/oauth2/user";
// @Resource // 可优化，注册一个 RestTemplate Bean，然后注入
private final RestTemplate restTemplate = new RestTemplate();

2
ludu-job-admin/ludu-job-admin-biz/src/main/resources/static/js/common.1.js
View File

@ -23,7 +23,7 @@ $(function(){
title: I18n.system_tips,
content: ('已退出登录！' || I18n.logout_success)
});*/
window.location.href = "https://mt.ptzykjgs.com/admin/logout"
window.location.href = "http://121.36.203.133/admin/logout"
/*$.post(base_url + "/logout", function(data, status) {
if (data.code == "200") {
layer.msg( I18n.logout_success );

8
ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl
View File

@ -47,9 +47,9 @@
*/
function ssoLogin() {
const clientId = 'ludu-job-admin'; // 可以改写成，你的 clientId
const redirectUri = encodeURIComponent('https://mt.ptzykjgs.com/xxl-job-admin/toLogin'); // 注意，需要使用 encodeURIComponent 编码地址
const redirectUri = encodeURIComponent('http://121.36.203.133/xxl-job-admin/toLogin'); // 注意，需要使用 encodeURIComponent 编码地址
const responseType = 'code'; // 1）授权码模式，对应 code；2）简化模式，对应 token
window.location.href = 'https://mt.ptzykjgs.com/admin/sso?client_id=' + clientId
window.location.href = 'http://121.36.203.133/admin/sso?client_id=' + clientId
+ '&redirect_uri=' + redirectUri
+ '&response_type=' + responseType;
}
@ -69,9 +69,9 @@
ssoLogin();
} else {
// 提交
const redirectUri = 'https://mt.ptzykjgs.com/xxl-job-admin/toLogin'; // 需要修改成，你回调的地址，就是在 index.html 拼接的 redirectUri
const redirectUri = 'http://121.36.203.133/xxl-job-admin/toLogin'; // 需要修改成，你回调的地址，就是在 index.html 拼接的 redirectUri
$.ajax({
url: "https://mt.ptzykjgs.com/xxl-job-admin/auth/login-by-code?code=" + code
url: "http:///xxl-job-admin/auth/login-by-code?code=" + code
+ '&redirectUri=' + redirectUri,
method: 'POST',
success: function (result) {