fix:提供kylin调用API;

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -141,12 +141,12 @@ global-auth:
     - /webjars/**
     - /swagger-resources/**
     - /v2/api-docs*
-#    - /login/sms
-#    - /login/mobile
-#    - /login/tpa
     - /login/*
     - /send
     - /member/info
+    - /enters/query/depth
+    - /addr/query/depth
+    - /member/check/depth
 
 # -----------------------------------------------------------
 

liquidnet-bus-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/api/FeignAdamBaseClient.java

@@ -7,8 +7,6 @@ import feign.hystrix.FallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Component
@@ -17,13 +15,13 @@ import org.springframework.web.bind.annotation.RequestParam;
         fallback = FallbackFactory.Default.class)
 public interface FeignAdamBaseClient {
 
-    @PostMapping("enters/query/{id}")
-    ResponseDto<AdamEntersVo> queryEnters(@PathVariable(value = "id") String entersId,
-                                          @RequestParam(value = "uid", required = false) String uid);
+    @GetMapping("enters/query/depth")
+    ResponseDto<AdamEntersVo> queryEnters(@RequestParam("entersId") String entersId,
+                                                  @RequestParam("uid") String uid);
 
-    @PostMapping("addr/query/{id}")
-    ResponseDto<AdamAddressesVo> queryAddresses(@PathVariable(value = "id") String addrId,
-                                                @RequestParam(value = "uid", required = false) String uid);
+    @GetMapping("addr/query/depth")
+    ResponseDto<AdamAddressesVo> queryAddresses(@RequestParam(value = "addrId") String addrId,
+                                                        @RequestParam(value = "uid") String uid);
 
     /**
      * 判断是否会员
@@ -31,6 +29,6 @@ public interface FeignAdamBaseClient {
      * @param uid 用户ID
      * @return 是否会员：true-是
      */
-    @GetMapping("member/check")
+    @GetMapping("member/check/depth")
     ResponseDto<Boolean> isMember(@RequestParam("uid") String uid);
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java

@@ -102,9 +102,8 @@ public class AdamAddressesController {
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "收货地址详情")
     @PostMapping("query/{id}")
-    public ResponseDto<AdamAddressesVo> query(@NotBlank @PathVariable(name = "id") String addrId,
-                                              @RequestParam(required = false) String uid) {
-        AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, addrId);
+    public ResponseDto<AdamAddressesVo> query(@NotBlank @PathVariable(name = "id") String addrId) {
+        AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(CurrentUtil.getCurrentUid(), addrId);
         return null == vo ? ResponseDto.failure(ErrorMapping.get("10106")) : ResponseDto.success(vo);
     }
 
@@ -114,4 +113,11 @@ public class AdamAddressesController {
     public ResponseDto<AdamAddressesVo> queryDef() {
         return ResponseDto.success(adamAddressesService.queryDefault(CurrentUtil.getCurrentUid()));
     }
+
+    @GetMapping("query/depth")
+    public ResponseDto<AdamAddressesVo> queryForDepth(@NotBlank @RequestParam String addrId,
+                                                      @NotBlank @RequestParam String uid) {
+        AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(uid, addrId);
+        return null == vo ? ResponseDto.failure(ErrorMapping.get("10106")) : ResponseDto.success(vo);
+    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java

@@ -108,9 +108,8 @@ public class AdamEntersController {
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "入场人详情")
     @PostMapping("query/{entersId}")
-    public ResponseDto<AdamEntersVo> query(@NotBlank @PathVariable String entersId,
-                                           @RequestParam(required = false) String uid) {
-        AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, entersId);
+    public ResponseDto<AdamEntersVo> query(@NotBlank @PathVariable String entersId) {
+        AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(CurrentUtil.getCurrentUid(), entersId);
         return null == vo ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vo);
     }
 
@@ -120,4 +119,11 @@ public class AdamEntersController {
     public ResponseDto<AdamEntersVo> queryDef() {
         return ResponseDto.success(adamEntersService.queryDefault(CurrentUtil.getCurrentUid()));
     }
+
+    @GetMapping("query/depth")
+    public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank @PathVariable String entersId,
+                                                   @NotBlank @RequestParam(required = false) String uid) {
+        AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(uid, entersId);
+        return null == vo ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vo);
+    }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -124,9 +124,7 @@ public class AdamLoginController {
         log.debug("mobile:{},code:{}", mobile, code);
         if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure(ErrorMapping.get("10002"));
 
-        long startTime = System.currentTimeMillis();
         String uid = adamRdmService.getUidByMobile(mobile);
-        log.info("redis getUidByMobile calltime: {}",System.currentTimeMillis() - startTime);
 
         boolean toRegister = StringUtils.isEmpty(uid);
         AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
@@ -221,10 +219,10 @@ public class AdamLoginController {
     public ResponseDto<Object> close() {
         log.info("###close:uid:{}", CurrentUtil.getCurrentUid());
 
-        adamUserService.close(CurrentUtil.getCurrentUid());
-
         this.logout();
 
+        adamUserService.close(CurrentUtil.getCurrentUid());
+
         return ResponseDto.success();
     }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -65,11 +65,6 @@ public class AdamMemberController {
         return ResponseDto.success(adamRdmService.getMemberAgreement());
     }
 
-    @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "是否会员")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户ID[64]", example = "1"),
-    })
     @GetMapping("check")
     public ResponseDto<Boolean> isMember(@NotBlank @RequestParam String uid) {
         AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -10,19 +10,22 @@ adam_real_name.add=INSERT INTO adam_real_name (real_name_id, `uid`, `type`, `nam
 
 # ----------------------------------------------------
 adam_third_party.add=INSERT INTO adam_third_party (`uid`, open_id, avatar, nickname, platform, `state`, created_at) values (?,?,?,?,?,?,?) 
-adam_third_party.unbind=UPDATE adam_third_party SET `state`=2, updated_at=? WHERE `uid`=? AND platform=? AND `state`=1
+adam_third_party.unbind=UPDATE adam_third_party SET `state`=2, updated_at=? WHERE `uid`=? AND platform=? 
+adam_third_party.close=UPDATE adam_third_party SET `state`=2, updated_at=?, comment='close' WHERE `uid`=? 
 
 # ----------------------------------------------------
 adam_addresses.add=INSERT INTO adam_addresses (addresses_id, `uid`, `name`, phone, province, city, county, address, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
 adam_addresses.edit=UPDATE adam_addresses SET `name`=?, phone=?, province=?, city=?, county=?, address=?, updated_at=? WHERE addresses_id=? 
-adam_addresses.update.is_default=UPDATE adam_addresses SET is_default=?, updated_at=? where addresses_id=? 
-adam_addresses.remove=UPDATE adam_addresses SET is_default=0, `state`=2, updated_at=?, deleted_at=? where addresses_id=? 
+adam_addresses.update.is_default=UPDATE adam_addresses SET is_default=?, updated_at=? WHERE addresses_id=? 
+adam_addresses.remove=UPDATE adam_addresses SET is_default=0, `state`=2, updated_at=?, deleted_at=? WHERE addresses_id=? 
+adam_addresses.close=UPDATE adam_addresses SET `state`=2, updated_at=?, deleted_at=? WHERE uid=? 
 
 # ----------------------------------------------------
 adam_enters.add=INSERT INTO adam_enters (enters_id, `uid`, `type`,`name`, mobile, id_card, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?) 
 adam_enters.edit=UPDATE adam_enters SET `type`=?, `name`=?, mobile=?, id_card=?, is_default=?, `state`=?, updated_at=? where enters_id=? 
 adam_enters.update.is_default=UPDATE adam_enters set is_default=?, updated_at=? where enters_id=? 
-adam_enters.remove=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
+adam_enters.remove=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
+adam_enters.close=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=?, comment='close' where uid=? 
 
 # ----------------------------------------------------
 adam_member.add=INSERT INTO adam_member ( `name`, `title`, `sub_title`, `icon`, `avatar`, `start_no`, `type`, `interests_detail`, `notes`, `is_notice`, `notice_info`, `notice_title`, `need_question`, `display_agreement`, `agreement`, `member_id`, `limitation`) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
@@ -38,6 +41,7 @@ adam_member_order.update=UPDATE adam_member_order SET `state`=?, member_no=?, pa
 # ----------------------------------------------------
 adam_user_member.add=INSERT INTO adam_user_member (`uid`, member_id, member_no, `state`, expiry_at, created_at) VALUES (?,?,?,?,?,?) 
 adam_user_member.update=UPDATE adam_user_member SET `state`=?, expiry_at=?, updated_at=? WHERE `uid`=? 
+adam_user_member.close=UPDATE adam_user_member SET `state`=2, updated_at=?, comment='close' WHERE `uid`=? 
 
 # ----------------------------------------------------