☰

ModelAndView mv=new ModelAndView("你好");

tag-icon • tag-icon svn
ModelAndView mv=new ModelAndView("你好");

我已经完成了 svn 更新，但引起了冲突。

现在我想得到我的工作副本

所以请有人告诉我撤消 svn 更新的方法

这是我的控制器类有冲突

最终静态 Logger logger = Logger.getLogger(ChromeExtentionController.class); <<<<<<< .mine

private static final String HttpServletRequest = null;

@RequestMapping(value = "/lead/test", method = RequestMethod.GET)
public String welcome() {

    // return new ModelAndView("redirect:/hello");
    ModelAndView mv = new ModelAndView("hello");

||||||| .r8587

@RequestMapping(value="/lead/test",method=RequestMethod.GET)
public String welcome(){

    //return new ModelAndView("redirect:/hello");

ModelAndView mv=new ModelAndView("你好");

CustomJMSProducer producer=new CustomJMSProducer();

@RequestMapping(value="/lead/test",method=RequestMethod.GET)
public String welcome(){

    //return new ModelAndView("redirect:/hello");
    ModelAndView mv=new ModelAndView("hello");

.r9063 mv.addObject("Message", "Success"); System.out.println("我的字符串 " + mv.toString()); 返回“success”;

}

@RequestMapping(value = "/scraper/submit1", method = RequestMethod.GET)
public String postDataForChromeExtension1() {
    CustomJMSProducer c = new CustomJMSProducer();
    // c.messageToQueue();
    return "Success";

}

<<<<<<< .我的

@RequestMapping(value = "/scraper/submit", method = RequestMethod.POST)

public String postDataForChromeExtension(@RequestBody String scraperInput) {
    if (scraperInput == null || scraperInput.isEmpty()) {
        logger.info("Null in request body");
        System.out.println("Null in request body");
        return "NULL BODY";
    } else {

        CustomJMSProducer c = new CustomJMSProducer();
        ObjectMapper mapper = new ObjectMapper();
        Map incomingRequest = null;
        String url = null;

||||||| .r8587

@RequestMapping(value="/scraper/submit",method = RequestMethod.POST)
public String postDataForChromeExtension(@RequestBody String scraperInput){
    if(scraperInput==null || scraperInput.isEmpty()){
        logger.info("Null in request body");
        System.out.println("Null in request body");
        return "NULL BODY";
    }else{

    CustomJMSProducer c=new CustomJMSProducer();
    ObjectMapper mapper = new ObjectMapper();
    Map incomingRequest=null;
    String url=null;

尝试 {

@RequestMapping(value="/scraper/submit",method = RequestMethod.POST)
public String postDataForChromeExtension(@RequestBody String scraperInput){


    try {

.r9063 <<<<<<< .mine try { try { comingRequest = mapper.readValue(scraperInput, Map.class); url = comingRequest.get("url") != null ? comingRequest.get("url").toString() : ""; } catch (Exception e) { logger.info("映射到 map 时出错" + e.getMessage()); logger.error("映射到 map 时出错" + e.getMessage()); }

            c.messageToQueue(scraperInput, url);
        } catch (Exception e) {
            logger.error("Error while sending HTML to queue" + e.getMessage());
            return "error";
        }

        return "OK";

|||||||| .r8587 try { comingfromRequest = mapper.readValue(scraperInput, Map.class); url = comingfromRequest.get("url") != null ? comingfromRequest.get("url").toString() : ""; } catch (Exception e) { logger.info("映射到 map 时出错"+e.getMessage()); logger.error("映射到 map 时出错"+e.getMessage()); }

        c.messageToQueue(scraperInput,url);
    } catch (Exception e) {
        logger.error("Error while sending HTML to queue"+e.getMessage());

返回“错误”；

        producer.send(scraperInput);
        return "OK";
    } catch (Exception e) {
        logger.error("Error while sending HTML to queue"+e.getMessage());
        return "error";

.r9063 } }

    @RequestMapping(value = "/abc", method = RequestMethod.GET)
    public ModelAndView getData() {

        ModelAndView model = new ModelAndView("hello");

<<<<<<< .矿山回报模型；

    }

||||||| .r8587 返回“OK”；

}

.r9063

相关内容