记得上下班打卡 | git大法好,push需谨慎

Commit f85a555b authored by anjiabin's avatar anjiabin

Merge branch 'dev_member_voucher_social' of...

Merge branch 'dev_member_voucher_social' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_member_voucher_social
parents 5f8f3243 857c87cc
...@@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface FeignAdamChimeClient { public interface FeignAdamChimeClient {
@PostMapping("user/register") @PostMapping("user/register")
ResponseDto<String> registerForUser(@RequestParam @Validated String userId, ResponseDto<String> registerForUser(@RequestParam(value = "userId") String userId,
@RequestParam @Validated String sex, @RequestParam(value = "sex") String sex,
@RequestParam @Validated String tags, @RequestParam(value = "tags") String tags,
@RequestParam @Validated String operateType @RequestParam(value = "operateType") String operateType
); );
} }
...@@ -5,12 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -5,12 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner; import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.Arrays; import java.util.Arrays;
@Slf4j @Slf4j
@EnableFeignClients
@SpringBootApplication(scanBasePackages = {"com.liquidnet"}) @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
public class ServiceAdamApplication implements CommandLineRunner { public class ServiceAdamApplication implements CommandLineRunner {
@Autowired @Autowired
......
...@@ -144,7 +144,7 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService { ...@@ -144,7 +144,7 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
} catch (Exception e) { } catch (Exception e) {
log.error("同步`chime`用户标签信息异常", e); log.error("同步`chime`用户标签信息异常", e);
} }
log.debug("同步`chime`用户标签信息结果:{}", chimeRegisterRstFlg); log.debug("同步`chime`用户标签信息结果:{}", JsonUtils.toJson(chimeRegisterRstFlg));
} }
LinkedList<String> toMqSqls = CollectionUtil.linkedListString(); LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment