xxl-job跳转路径修改

Reviewed-on: #84

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

@@ -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";
 
     /**
      * 租户编号

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

@@ -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();

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

@@ -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 );

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

@@ -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) {

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/clients/LargeScreenClient.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.infra.clients;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -17,4 +18,49 @@ public interface LargeScreenClient {
 
     @GetMapping("/api/checkticket")
     Object checkTicketTotal(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/checkticket/qushi")
+    Object findByTimeTemp(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/saledata/thisyear")
+    Object thisYearNum(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/saledata/lastyear")
+    Object lastYearNum(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/saledata/gender")
+    Object findByGender(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/saledata/age")
+    Object findByage(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/saledata/lastyear/region")
+    Object lastYearFindByRegion(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/saledata/thisyear/region")
+    Object thisYearFindByRegion(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/saledata/salemethod")
+    Object findBySaleMethod(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+    @GetMapping("/api/saledata/itemType")
+    Object findByItemType(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+
+//    @GetMapping("/api/saledata/gender")
+//    Object findByWuYi(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+//
+//    @GetMapping("/api/saledata/gender")
+//    Object findByGuoQing(@RequestParam("starTime") String starTime, @RequestParam("endTime") String endTime);
+//
+//    @GetMapping("/api/saledata/rijunthisyear/{startTime}")
+//    Object findThisYearRiJun(@PathVariable("startTime") String startTime);
+//
+//    @GetMapping("/api/saledata/rijunlastyear/{startTime}")
+//    Object findLastYearRiJun(@PathVariable("startTime") String startTime);
+
+    @GetMapping("/api/saledata/thisyear/nianjun")
+    Object findMoneyThisYear();
+
+    @GetMapping("/api/saledata/lastyear/nianjun")
+    Object findMoneyLastYear();
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/job/largeScreenHeartbeat/LargeScreenHeartbeat.java

@@ -40,6 +40,17 @@ public class LargeScreenHeartbeat {
         this.methodUtils(map, "assetCount", largeScreenClient.assetMethod1());
         this.methodUtils(map,"saleDataTotal",largeScreenClient.saleDataTotal(dataUtils,dataUtils));
         this.methodUtils(map,"checkTicketTotal",largeScreenClient.checkTicketTotal(dataUtils,dataUtils));
+        this.methodUtils(map,"findByTimeTemp",largeScreenClient.findByTimeTemp(dataUtils,dataUtils));
+        this.methodUtils(map,"thisYearNum",largeScreenClient.thisYearNum(dataUtils,dataUtils));
+        this.methodUtils(map,"lastYearNum",largeScreenClient.lastYearNum(dataUtils,dataUtils));
+        this.methodUtils(map,"findByGender",largeScreenClient.findByGender(dataUtils,dataUtils));
+        this.methodUtils(map,"findByage",largeScreenClient.findByage(dataUtils,dataUtils));
+        this.methodUtils(map,"lastYearFindByRegion",largeScreenClient.lastYearFindByRegion(dataUtils,dataUtils));
+        this.methodUtils(map,"thisYearFindByRegion",largeScreenClient.thisYearFindByRegion(dataUtils,dataUtils));
+        this.methodUtils(map,"findBySaleMethod",largeScreenClient.findBySaleMethod(dataUtils,dataUtils));
+        this.methodUtils(map,"findByItemType",largeScreenClient.findByItemType(dataUtils,dataUtils));
+        this.methodUtils(map,"findMoneyThisYear",largeScreenClient.findMoneyThisYear());
+        this.methodUtils(map,"findMoneyLastYear",largeScreenClient.findMoneyLastYear());
         webSocketSenderApi.sendObject(2,1L,"1",map);
     }