256 Commits b3f895ed91 ... a91873c70b

Author SHA1 Message Date
  xuchaolang a91873c70b Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin 6 years ago
  xuchaolang 313c021e60 /heatBeart -> /heartBeat 6 years ago
  xuchaolang 28e9deb473 Merge branch 'heart_beat' into release/1.0.0 6 years ago
  guozhaoshun 0dadbb2e36 fix recommend num 6 years ago
  guozhaoshun 664b5a5ccc recover file 6 years ago
  guozhaoshun 03a368021a angelBell HN provinceCode = 90 6 years ago
  guozhaoshun ea9b83742d angelBell HN provinceCode = 90 6 years ago
  guozhaoshun 9efc79ba32 angelBell HN provinceCode = 90 6 years ago
  guozhaoshun 714dc6003e ProvinceUtil get 43 -> 90 6 years ago
  guozhaoshun 6a73cabad1 fix video update 6 years ago
  guozhaoshun 3256f1321c ProvinceUtil get HN 43|90 6 years ago
  guozhaoshun 250b07a14b update ProvinceUtil change provinceCode HN = "90" 6 years ago
  guozhaoshun 1c4c12f106 fix 6 years ago
  guozhaoshun 925d3e0715 fix resource/list find by type 6 years ago
  guozhaoshun a3c1fea9d7 API support audioImg resource 6 years ago
  xuchaolang ce6c7b8208 Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin 6 years ago
  xuchaolang 4e69f04b87 Merge branch 'release/1.0.0' 6 years ago
  guozhaoshun 0eea46bf57 courseware support audioImg resource 6 years ago
  guozhaoshun 81538f7bf4 courseware support audioImg resource 6 years ago
  guozhaoshun 21518e8d80 fix url AudioImg 6 years ago
  guozhaoshun bdc6143ab5 Merge branch 'dev20180611' 6 years ago
  guozhaoshun 78120e41c4 support AudioImg 6 years ago
  guozhaoshun af8fd89f3b UserTag support copy from tag 6 years ago
  guozhaoshun 2e09eec0bf support AudioImg 6 years ago
  guozhaoshun c18b9479e5 CMS add AudioImg module 6 years ago
  guozhaoshun 4ffe74f10f support AudioImg 6 years ago
  guozhaoshun 2bce02f682 fix change video resource url | https:// 6 years ago
  guozhaoshun 1e5447c99c fix change video resource url | https:// 6 years ago
  guozhaoshun 8c6c5e2f6f fix 6 years ago
  guozhaoshun 84fcec2c52 fix 6 years ago
  guozhaoshun addf733cef optimize change video resource url | https:// 6 years ago
  guozhaoshun e25a1087b2 API support UserTag UserRecommend module 6 years ago
  guozhaoshun c1cafa0dde CMS support UserTag UserRecommend module 6 years ago
  guozhaoshun b7f7ae4fbd CMS support UserTag UserRecommend module 6 years ago
  guozhaoshun 68e668299a change ItemController package 6 years ago
  guozhaoshun 179ebf9818 support UserTag UserRecommend module 6 years ago
  guozhaoshun 53870c5081 add UserTag UserRecommend module 6 years ago
  guozhaoshun 9a91434191 add UserTag module 6 years ago
  guozhaoshun 3f669d5d8d add UserRecommend module 6 years ago
  guozhaoshun f342259060 UserTag UserRecommend UserTagProductRelation 6 years ago
  guozhaoshun bcf2a31407 img resource replace the blank space 6 years ago
  guozhaoshun f222501fd2 optimize poster 6 years ago
  guozhaoshun 13173f2b4d optimize poster 6 years ago
  guozhaoshun e9a0dde366 optimize 6 years ago
  guozhaoshun bac3f345a1 video list sort by createTime DESC 6 years ago
  guozhaoshun 7553ae7a1e video list sort by updateTime DESC 6 years ago
  guozhaoshun 394cf45ea7 video list sort by createTime DESC 6 years ago
  guozhaoshun 4e742c737a restore file 6 years ago
  guozhaoshun 1549a46a4d fix tag support update typeCode,merchant; 6 years ago
  guozhaoshun 33b5c15d60 change video resource url | https:// 6 years ago
  guozhaoshun 506effdb57 change video resource url | https:// 6 years ago
  guozhaoshun 9e8234ef28 terminalUser add deviceStatus 6 years ago
  guozhaoshun 816b823469 change video resource url | https:// 6 years ago
  guozhaoshun 6272cefc73 fix optimize the recommended course 6 years ago
  guozhaoshun b9de4f6722 optimize the recommended course 6 years ago
  guozhaoshun 3ffe8c3f5e fix updateResource 6 years ago
  guozhaoshun f3fb2065fc fix updateResource 6 years ago
  guozhaoshun a387a6d808 fix updateResource 6 years ago
  guozhaoshun f477dadf3d fix updateResource 6 years ago
  guozhaoshun 9311a32594 fix updateResource 6 years ago
  guozhaoshun f9b5490ab0 fix updateResource 6 years ago
  guozhaoshun 9d1b06ca5e fix poster 6 years ago
  guozhaoshun b1444f5476 fix poster 6 years ago
  guozhaoshun 6bdbf70ab7 fix picture list sort by gmtModified DESC 6 years ago
  guozhaoshun f7dd51ab62 from the update resource document; 1 video | 0 audio 6 years ago
  xuchaolang 9933ecdbfe Merge branch 'fix_bug.0525' 6 years ago
  xuchaolang 28d6e829ce Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin 6 years ago
  xuchaolang 56ef2ae8da Fix bug, check idList if empty while find in repo 6 years ago
  guozhaoshun 1a88c54723 fix tag support update typeCode,merchant; 6 years ago
  guozhaoshun 7d2928ebf6 fix poster 6 years ago
  guozhaoshun c8a3defbf6 fix poster 6 years ago
  guozhaoshun fef1be4ad4 fix saveRemoteResource 6 years ago
  guozhaoshun 2232e69783 fix poster 6 years ago
  guozhaoshun d64df3cd1d fix poster 6 years ago
  guozhaoshun c6323af106 Merge branch 'dev001' 6 years ago
  xuchaolang 33f4ed14cc cms-web-api, /resource PUT, id pass in body 6 years ago
  xuchaolang 42d7a7fde9 web-api, /package/<pid>, return goods 6 years ago
  xuchaolang 80337f7aee Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin 6 years ago
  xuchaolang e0359d50e8 Accomplish /user/messages/productExpiredAlert, /package/<pid> 6 years ago
  xuchaolang 4f2db3edf5 Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin 6 years ago
  xuchaolang a6153d0f3e ProductService.getRelatedPackages, filter offline pkgs by status 6 years ago
  xuchaolang 5b06485ee2 return code in /product/<pid>/relatedPkg, move shopQR into Goods 6 years ago
  xuchaolang a6a6614946 ProductService.getRelatedPkgs, set goods 6 years ago
  xuchaolang 4c631931cd ProductService.getRelatedPackges, check pkgId but not productId while scaning relatedPkgs 6 years ago
  xuchaolang 6991a10393 ProductService, move ProductController from controller.cms package to controller package 6 years ago
  xuchaolang c6b6a14078 Accomplish Api /product/<pid>/relatedPkg 6 years ago
  xuchaolang e06c345575 Add /merchant prefix to Api /merchant/<merchantId>/posters 6 years ago
  xuchaolang cdc99ef674 service /user/<uid>/product/valid Resturn [] while user have no valid products 6 years ago
  xuchaolang 9e62064f53 Print product Log while get valid product from service 6 years ago
  xuchaolang 9ca21fe5ad Print User 6 years ago
  xuchaolang 6d90ff45c9 Temporarily add /user/product/valid in product service 6 years ago
  xuchaolang 027257e268 Merge branch 'dev.3.0' 6 years ago
  guozhaoshun 279f88c027 change TagTypeController /controller/app to /controller/ 6 years ago
  guozhaoshun f3ca8a50f5 add support video upload 6 years ago
  guozhaoshun d8011a4be3 tag create/update support tagType 6 years ago
  guozhaoshun 2f51c018ab tagType 6 years ago
  guozhaoshun 3d0665565c Tag create/update support typeCode 6 years ago
  guozhaoshun 671925bb7c merchant product name change source 6 years ago
  guozhaoshun 4f4b2067cd add /tagType/{code} 6 years ago
  guozhaoshun 150ce1a65d add 6 years ago
  guozhaoshun ebb60529f4 add 6 years ago
  xuchaolang fdcb5a30ea Fix getTagType request mapping value 6 years ago
  xuchaolang bb4f968336 restore pom.xml 6 years ago
  xuchaolang c3df828bef check if sign is empty while get it from header 6 years ago
  xuchaolang 00103a8f10 use Authentication while sign not Exist, For compatition with 2.x app verions 6 years ago
  guozhaoshun e35f33f816 recover yml 6 years ago
  guozhaoshun 967949bded test commit 6 years ago
  guozhaoshun eec791684a Merge remote-tracking branch 'origin/master' into dev 6 years ago
  guozhaoshun 75b5a94017 repair bug 6 years ago
  xuchaolang e554490545 skip shelf in relatedSupport 6 years ago
  xuchaolang 0ee63c8bde set dateDesc,openTime,closeTime 6 years ago
  xuchaolang 1cf7041a5d fix /training/{id} request map bug 6 years ago
  xuchaolang a5feaf286d change service api /app/training/{id} to /training/{id} 6 years ago
  xuchaolang d55840f63b TrainingController add log 6 years ago
  xuchaolang 150e531e17 check productid is null in findByIds 6 years ago
  xuchaolang c01366a887 fix training update 6 years ago
  xuchaolang 926e20469b return Training type in ProductService 6 years ago
  xuchaolang c35e78559c training.get only return training entity 6 years ago
  xuchaolang ba6772a241 add traing cms api 6 years ago
  xuchaolang 2a2b0f02ff add traing cms api 6 years ago
  xuchaolang 0839854e30 加入/training/<id>接口 6 years ago
  xuchaolang 1c593901be add course title to course/lesson 6 years ago
  huodongdong 8fb41e9d7e fix 6 years ago
  huodongdong 33dfe9086d fix white user search 6 years ago
  huodongdong 12ee9bd962 fix white user search request body 6 years ago
  huodongdong 46bb611eac fix 6 years ago
  huodongdong a7c33c52fe fix feign pathvariable error 6 years ago
  huodongdong 7450e47d4f fix 6 years ago
  huodongdong c9ecf201a9 add merchantId of white user 6 years ago
  huodongdong 8bb7d1122a add merchant name of white user 6 years ago
  huodongdong 50a2dd42d0 add api binder cms white user 6 years ago
  huodongdong ac39c034af add white user model 6 years ago
  huodongdong 2798495bf0 add white user table 6 years ago
  huodongdong e03a581e5a fix 6 years ago
  huodongdong de4cb52101 cms log level 6 years ago
  huodongdong 445c3c5ae5 cms delete redis app login data 6 years ago
  huodongdong 83fe73e0b3 add cms unbind device 6 years ago
  huodongdong db8ea62107 fix tag product sort bug 6 years ago
  huodongdong aeee85f461 add timeout session 6 years ago
  huodongdong 973392ebf0 fix 6 years ago
  huodongdong 6757e24f70 remove session 6 years ago
  huodongdong 938ebbaf0c fix lesson search 6 years ago
  huodongdong f37e9b6eb4 fix lesson empty exception 6 years ago
  huodongdong c635cbc670 add log 6 years ago
  huodongdong 9edd40418a fix 6 years ago
  huodongdong 9637fee49d fix group code 6 years ago
  huodongdong 27c762f9a1 add field of merchant simple 6 years ago
  huodongdong 473394bd12 fix 6 years ago
  huodongdong 9e1fe10b8f fix video url error 6 years ago
  huodongdong 190f0e601b fix bing terminal field null and log error 6 years ago
  huodongdong c27e8c256a add web login force 6 years ago
  huodongdong 73c7c88a25 fix terminal name 6 years ago
  huodongdong 19d3c3e4f7 modifiy terminal name to campusName + terminalName 6 years ago
  huodongdong fb221ea346 fix campus name remove - 6 years ago
  huodongdong c561799f73 fix 6 years ago
  huodongdong e9f308a413 fix 6 years ago
  huodongdong 5bc08795d5 fix 6 years ago
  huodongdong 69fe592df2 fix 6 years ago
  huodongdong 74f882a885 完成pushmsg push 6 years ago
  huodongdong 9585210305 complete app api 6 years ago
  huodongdong ed9f6583d9 fix device_code null 6 years ago
  huodongdong 8b7fc151e6 refresh token not signature 6 years ago
  huodongdong 53d28c7191 fix api recommend 6 years ago
  huodongdong 1c36c05943 fix recommend 6 years ago
  huodongdong 9bca91cc2a add refresh token 6 years ago
  huodongdong 05927ed824 remove test intercepter, same the terminal user id 6 years ago
  huodongdong b96f1f4298 fix 6 years ago
  huodongdong 5913d3072d valid login 6 years ago
  huodongdong 9c3aaf41f5 fix 6 years ago
  huodongdong b300458a22 fix 6 years ago
  huodongdong 5a764d1100 fix 6 years ago
  huodongdong c817e33b16 add status terminal user filter search 6 years ago
  huodongdong 4c5881db37 add product merchantId when search 6 years ago
  huodongdong ca84c38189 add tag sort 6 years ago
  huodongdong f813b6b318 deploy 6 years ago
  huodongdong cfbbf4c3c8 fix header and option request bug 6 years ago
  huodongdong 61522ff50e fix 6 years ago
  huodongdong 1f54a29d64 fix receive 6 years ago
  huodongdong 0a7d232e36 web api stash and fix charge 6 years ago
  huodongdong 8dfc0d3ea3 fix 6 years ago
  huodongdong b1908c474c add code and name order goods 6 years ago
  huodongdong 4f2560e16a order detail api 6 years ago
  huodongdong 1cd5f51282 fix transactional 6 years ago
  huodongdong 74b94275b4 add charge 6 years ago
  huodongdong a71b1653d0 add charge api 6 years ago
  huodongdong 9f8ce28658 fix MySQL5DialectUTF8 6 years ago
  huodongdong 29fbd94fa5 fix create table utf8 6 years ago
  huodongdong 23569b09dd fix 6 years ago
  huodongdong 2e49f4d8bd fix 6 years ago
  huodongdong 42bb7557bd modified yml config 6 years ago
  huodongdong 54ebcd3e0c fix 6 years ago
  huodongdong 43b3b23379 add merchantPrice of pakcageProductVo 6 years ago
  huodongdong af3de4ab65 add merchant price of product in package 6 years ago
  huodongdong c73ae0883f add category of courseware 6 years ago
  huodongdong e3bc647fdb fix 6 years ago
  huodongdong 504b10c476 config test 6 years ago
  huodongdong 4ddca8254e profile act 6 years ago
  huodongdong cc65c80444 test 6 years ago
  huodongdong 7ed2337ea0 add sub title 6 years ago
  huodongdong c36277375e modified cancel order api 6 years ago
  huodongdong 08bd31ccdf order search to post feign 6 years ago
  huodongdong c2cabfc0ac add goods type auto 6 years ago
  huodongdong 6b8d5122d3 same order status and order detail status 6 years ago
  huodongdong 75c5cd1338 fix 7 years ago
  huodongdong 4ef6d6bb47 add terminal user address 7 years ago
  huodongdong aa34b15a14 add merchant product list package info 7 years ago
  huodongdong 049d6eb4c8 add oderdetail and snapshot search api 7 years ago
  huodongdong d6aef08774 fix log 7 years ago
  huodongdong 30ccda2563 complete task 7 years ago
  huodongdong 4a50d6038c size 7 years ago
  huodongdong db4847d06a fix name 7 years ago
  huodongdong aa15ceede3 fix 7 years ago
  huodongdong b28be55f44 add status of goods package when put on sale 7 years ago
  huodongdong d20807fba1 fix 7 years ago
  huodongdong 072ea17be3 add sort when put on sale product 7 years ago
  huodongdong 21aa6d4df2 add cms merchantProduct 7 years ago
  huodongdong 466c98dfe4 add package update and on sale goods relation add and update 7 years ago
  huodongdong fc7f9598dd fix lesson api cms 7 years ago
  huodongdong bd88622c1f fix 7 years ago
  huodongdong 503a8f4481 fix lesson warelist 7 years ago
  huodongdong 3c50ba20cd add tag and group info 7 years ago
  huodongdong ea7d4da2c7 no 7 years ago
  huodongdong 72c1434dc3 @Modifying remove clearAutomatically=true 7 years ago
  huodongdong 72ae842ea9 add status product create 7 years ago
  huodongdong f99e29af74 fix 7 years ago
  huodongdong 47afdb4c32 product search string format error 7 years ago
  huodongdong 6b421cec99 fix support 7 years ago
  huodongdong 446296f16f fix ware data structure 7 years ago
  huodongdong 187f7f622b 订单分拆初版 7 years ago
  huodongdong ac7e27719b modified table name and createtime 7 years ago
  huodongdong 97e636322c api web test remove token check 7 years ago
  huodongdong 012209cc64 fix resource name 7 years ago
  huodongdong 723cceb4bb fix 7 years ago
  huodongdong 3214cf4a72 fix pom config 7 years ago
  huodongdong 76798122fa fix pom config 7 years ago
  huodongdong 7f082bf582 fix pom build config 7 years ago
  huodongdong 120f9de598 tmp 7 years ago
  huodongdong 1fe47abcc0 complete pay ok 7 years ago
  huodongdong 2bd43244b7 save 7 years ago
  huodongdong 857b5bb181 add package 7 years ago
  huodongdong 3b6e896596 complete product and goods recoding 7 years ago
  huodongdong 225693bfc7 product idea period 1 7 years ago
  huodongdong f15b6dbe00 stash 7 years ago
  huodongdong bbb144a1c9 campus and termianl user complete 7 years ago
  huodongdong 2ddd9d23e8 add cms web 7 years ago
  huodongdong 31ca7939f3 tag 7 years ago
  huodongdong 98f4431dcf version 1.0 dev 7 years ago
  huodongdong 1d57b2f9f0 shit commit and reset 7 years ago
  huodongdong 34a6cad675 nothing 7 years ago
  huodongdong d69395e6a7 version 1.1: id string and relation; hibernate relation 7 years ago
  huodongdong e428f275b5 resource service complete 7 years ago
  huodongdong 2f57ba34a8 first version 7 years ago
  huodongdong 05dfbac277 fix 7 years ago
  huodongdong bdc9fa3299 rename 7 years ago
  huodongdong 08fb34581d add ignore 7 years ago
  huodongdong dd01ec7ace first framework 7 years ago

+ 18 - 0
rankin-api-web/src/main/java/cn/rankin/apiweb/controller/HeartBeatController.java

@@ -0,0 +1,18 @@
+package cn.rankin.apiweb.controller;
+
+
+import cn.rankin.common.utils.api.model.APIResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HeartBeatController {
+
+    @RequestMapping(value = "/heartBeat", method = RequestMethod.GET)
+    public APIResult get(){
+        APIResult result = APIResult.ok();
+        result.setMessage("Beng Beng...");
+        return result;
+    }
+}

+ 10 - 2
rankin-api-web/src/main/java/cn/rankin/apiweb/intercepter/RequestSignatureInterceptor.java

@@ -62,16 +62,24 @@ public class RequestSignatureInterceptor implements HandlerInterceptor {
         //记录开始时间
         //记录开始时间
         startTimeThreadLocal.set(System.currentTimeMillis());//线程绑定变量(该数据只有当前请求的线程可见)
         startTimeThreadLocal.set(System.currentTimeMillis());//线程绑定变量(该数据只有当前请求的线程可见)
 
 
+
         //登录请求不拦截
         //登录请求不拦截
         String path = request.getServletPath();
         String path = request.getServletPath();
+
         if (ignorePaths.contains(path) && (HttpMethod.POST.matches(request.getMethod()) ||
         if (ignorePaths.contains(path) && (HttpMethod.POST.matches(request.getMethod()) ||
                 HttpMethod.PUT.matches(request.getMethod()))) {
                 HttpMethod.PUT.matches(request.getMethod()))) {
-            logger.info("url: {} do not intercepted!");
+            logger.info("url: {} do not intercepted!, method={}", path, request.getMethod());
             return true;
             return true;
         }
         }
+        else if(path.endsWith("/heartBeat")){
+            //heartBeat请求不拦截
+            logger.info("url: {} do not intercepted!", path);
+            return true;
+        }
+
 
 
         GlobalHeader headers = RequestHeaderManager.parseHeader(request);
         GlobalHeader headers = RequestHeaderManager.parseHeader(request);
-        logger.info("request start, path={}, headers={}", path, JSON.toJSONString(headers));
+        logger.info("request start, path={}, method={}, headers={}", path, request.getMethod(), JSON.toJSONString(headers));
 
 
         String uid = headers.getUid();
         String uid = headers.getUid();
         String sign = headers.getSign();
         String sign = headers.getSign();

+ 4 - 0
rankin-api-web/src/main/resources/bootstrap.yml

@@ -7,5 +7,9 @@ spring:
       label: master
       label: master
       profile: ${profile:dev}
       profile: ${profile:dev}
 
 
+ribbon:
+  ReadTimeout: 6000
+  ConnectTimeout: 6000
+
 server:
 server:
   port: 8600
   port: 8600