强提

pom.xml

@@ -41,6 +41,10 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <exclusions>
                 <exclusion>

scripts/main.sh

 #!/bin/bash
  
 #Current home
-CURR_HOME=$(dirname $(readlink -f $0))
+#CURR_HOME=$(dirname $(readlink -f $0))
+CURR_HOME=$(cd $(dirname $0); pwd)
 
 #jvm options
-JAVA_OPTS="-Xms1g -Xmx1g -Djava.awt.headless=true -XX:MaxPermSize=512m -server -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=85  -Xnoclassgc -Xverify:none -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled"
+JAVA_OPTS="-Xms256m -Xmx256m -Djava.awt.headless=true -XX:MaxPermSize=512m -server -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=85  -Xnoclassgc -Xverify:none -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled"
 JAR_FILE="$CURR_HOME/../${artifactId}-${version}.jar"
 
-CMD="nohup java $JAVA_OPTS -jar $JAR_FILE > /dev/null 2>&1 &"
+#CMD="nohup java $JAVA_OPTS -jar $JAR_FILE > /dev/null 2>&1 &"
+CMD="nohup java $JAVA_OPTS -jar $JAR_FILE > ./run.log 2>&1 &"
 
 PID_FILE="${providers-path}/${artifactId}/run/${artifactId}-${profiles.active}.pid"
 echo $JAR_FILE

src/main/java/com/lanren/huhu/partner/controller/PartnerController.java

-package com.lanren.huhu.partner.controller;
import com.lanren.huhu.partner.manager.PartnerAccountManager;import com.lanren.huhu.partner.model.Partner;import com.lanren.huhu.partner.model.PartnerRsp;import com.lanren.huhu.partner.result.Result;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.http.HttpHeaders;import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;import java.time.LocalDateTime;
/**
 * @author houseme
 * @date 2019-06-26 11:00
 * @Project partner
 * @Package com.lanren.huhu.partner.controller
 * @File: PartnerController
 */@RestController@RequestMapping("/v1/partner")public class PartnerController {
    private static Logger logger = LoggerFactory.getLogger(PartnerController.class);

    @Autowired
    private PartnerAccountManager partnerAccountManager;
//    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
//    public Result<PartnerAccount> one(@PathVariable("id") Integer id, @RequestHeader HttpHeaders headers) {
//        if (logger.isInfoEnabled()) {
//            logger.info("partner one userId:{ },header:{},time:{}", id, headers.keySet().toArray(), LocalDateTime.now());
//        }
//        return partnerAccountManager.findByUserId(id);
//    }

    @RequestMapping(value = "/level", method = RequestMethod.POST)
    public Result<PartnerRsp> getPartnerLevel(@RequestBody @Valid Partner partner, @RequestHeader HttpHeaders headers) {
        if (logger.isInfoEnabled()) {
            logger.info("getPartnerLevel userId:{ },header:{},time:{}", partner.getUserId(), headers.keySet().toArray(), LocalDateTime.now());
        }
        return partnerAccountManager.getPartnerLevel(partner.getUserId());
    }
}
\ No newline at end of file
+package com.lanren.huhu.partner.controller;
import com.lanren.huhu.partner.domain.PartnerAccount;import com.lanren.huhu.partner.manager.PartnerAccountManager;import com.lanren.huhu.partner.model.Partner;import com.lanren.huhu.partner.model.PartnerRsp;import com.lanren.huhu.partner.result.Result;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.http.HttpHeaders;import org.springframework.validation.BindingResult;import org.springframework.validation.ObjectError;import org.springframework.validation.annotation.Validated;import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;import java.time.LocalDateTime;import java.util.ArrayList;import java.util.List;

/**
 * @Author houseme
 * @Date 2019-06-26 11:00
 * @Project partner
 * @Package com.lanren.huhu.partner.controller
 * @File: PartnerController
 */@RestController@RequestMapping("/v1/partner")public class PartnerController {
    private static Logger logger = LoggerFactory.getLogger(PartnerController.class);

    @Autowired
    private PartnerAccountManager partnerAccountManager;

    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
    public Result<PartnerAccount> one(@PathVariable("id") Integer id, @RequestHeader HttpHeaders headers) {
        if (logger.isInfoEnabled()) {
            logger.info("partner one userId:{},header:{},time:{}", id,
                    headers.entrySet().toString(),
                    LocalDateTime.now());
        }
        return partnerAccountManager.findByUserId(id);
    }

    @RequestMapping(value = "/userId/{id}", method = RequestMethod.POST)
    public Result<PartnerAccount> getOne(@PathVariable("id") Integer id,
                                         @RequestBody @Validated Partner partner, @RequestHeader HttpHeaders headers,
                                         BindingResult result) {
        if (logger.isInfoEnabled()) {
            List<String> list = new ArrayList<>();
            if (result.hasErrors()) {
                List<ObjectError> errors = result.getAllErrors();
                for (ObjectError objectError : errors) {
                    list.add(objectError.getDefaultMessage());
                }
                Result<PartnerAccount> objectResult = new Result<>();
                objectResult.setMessage(list.toString());
                return objectResult;
            }
            logger.info("partner one userId:{},header:{},time:{}", id,
                    headers.entrySet().toString(),
                    LocalDateTime.now());
        }
        return partnerAccountManager.findByUserId(id);
    }


    @RequestMapping(value = "/level", method = RequestMethod.POST)
    public Result<PartnerRsp> getPartnerLevel(@RequestBody @Valid Partner partner, @RequestHeader HttpHeaders headers) {
        if (logger.isInfoEnabled()) {
            logger.info("getPartnerLevel userId:{ },header:{},time:{}", partner.getUserId(), headers.keySet().toArray(), LocalDateTime.now());
        }
        return partnerAccountManager.getPartnerLevel(partner.getUserId());
    }}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/manager/PartnerAccountManager.java

-package com.lanren.huhu.partner.manager;
import com.lanren.huhu.partner.domain.PartnerAccount;import com.lanren.huhu.partner.model.PartnerRsp;import com.lanren.huhu.partner.result.Result;import com.lanren.huhu.partner.service.PartnerAccountService;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Component;
import java.time.LocalDateTime;import java.util.HashMap;import java.util.Map;
/**
 * @author houseme
 * @date 2019-06-26 10:56
 * @Project partner
 * @Package com.lanren.huhu.partner.manager
 * @File: PartnerAccountManager
 */@Componentpublic class PartnerAccountManager {
    private static Logger logger = LoggerFactory.getLogger(PartnerAccountManager.class);

    @Autowired
    private PartnerAccountService partnerAccountService;

    /***
     * 获取合伙人账户信息
     * @param userId
     * @return
     */
    public Result<PartnerAccount> findByUserId(Integer userId) {
        Result<PartnerAccount> result = new Result<>();
        if (logger.isDebugEnabled()) {
            logger.info("PartnerAccountManager findByUserId userId:{},time:{}", userId, LocalDateTime.now());
        }
        result.setData(partnerAccountService.getOneByUserId(userId));
        return result;
    }

    /***
     * 获取合伙人等级 10 普通, 20 高级, 30 超级
     * @param userId
     * @return
     */
    public Result<PartnerRsp> getPartnerLevel(Integer userId) {
        if (logger.isDebugEnabled()) {
            logger.info("PartnerAccountManager getPartnerLevel userId:{},time:{}", userId, LocalDateTime.now());
        }
        Result<PartnerRsp> result = new Result<>();
        int partnerLevel;
        PartnerAccount partnerAccount = partnerAccountService.getOneByUserId(userId);
        if (null != partnerAccount) {
            if (partnerAccount.getIsSuperPartner() ==1) {
                partnerLevel = 30;
            } else {
                partnerLevel = partnerAccount.getPartnerLevel();
            }
        } else {
            partnerLevel = -1;
            result.setCode(60404);
        }
        result.setData(new PartnerRsp(partnerLevel));
        return result;
    }}
\ No newline at end of file
+package com.lanren.huhu.partner.manager;
import com.lanren.huhu.partner.domain.PartnerAccount;import com.lanren.huhu.partner.model.PartnerRsp;import com.lanren.huhu.partner.result.Result;import com.lanren.huhu.partner.service.PartnerAccountService;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
/**
 * @author houseme
 * @date 2019-06-26 10:56
 * @Project partner
 * @Package com.lanren.huhu.partner.manager
 * @File: PartnerAccountManager
 */@Componentpublic class PartnerAccountManager {
    private static Logger logger = LoggerFactory.getLogger(PartnerAccountManager.class);

    @Autowired
    private PartnerAccountService partnerAccountService;

    /***
     * 获取合伙人账户信息
     * @param userId
     * @return
     */
    public Result<PartnerAccount> findByUserId(Integer userId) {
        Result<PartnerAccount> result = new Result<>();
        if (logger.isDebugEnabled()) {
            logger.info("PartnerAccountManager findByUserId userId:{},time:{}", userId, LocalDateTime.now());
        }
        PartnerAccount partnerAccount = partnerAccountService.getOneByUserId(userId);
        logger.info("findByUserId {}", partnerAccount);
        result.setData(partnerAccount);
        return result;
    }

    /***
     * 获取合伙人等级 10 普通, 20 高级, 30 超级
     * @param userId
     * @return
     */
    public Result<PartnerRsp> getPartnerLevel(Integer userId) {
        if (logger.isDebugEnabled()) {
            logger.info("PartnerAccountManager getPartnerLevel userId:{},time:{}", userId, LocalDateTime.now());
        }
        Result<PartnerRsp> result = new Result<>();
        int partnerLevel;
        PartnerAccount partnerAccount = partnerAccountService.getOneByUserId(userId);
        if (null != partnerAccount) {
            if (partnerAccount.getIsSuperPartner() == 1) {
                partnerLevel = 30;
            } else {
                partnerLevel = partnerAccount.getPartnerLevel();
            }
        } else {
            partnerLevel = -1;
            result.setCode(60404);
        }
        result.setData(new PartnerRsp(partnerLevel));
        return result;
    }}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/model/Partner.java

+<<<<<<< HEAD
 package com.lanren.huhu.partner.model;
import com.lanren.huhu.partner.model.base.BaseModel;import lombok.Data;
import javax.validation.constraints.Digits;import javax.validation.constraints.Min;import javax.validation.constraints.NotEmpty;import javax.validation.constraints.NotNull;import java.io.Serializable;
/**
 * @author houseme
 * @date 2019-06-26 11:47
 * @Project partner
 * @Package com.lanren.huhu.partner.model
 * @File: Partner
 */@Datapublic class Partner extends BaseModel {
    @NotNull(message = "userId 不能为空")
    @Min(value = 1, message = "userId 需要大于0")
    private int userId;

    private int level;}
+=======
+package com.lanren.huhu.partner.model;
import lombok.Data;
import javax.validation.constraints.Min;import javax.validation.constraints.NotNull;import java.io.Serializable;
/**
 * @author houseme
 * @date 2019-06-26 11:47
 * @Project partner
 * @Package com.lanren.huhu.partner.model
 * @File: Partner
 */@Datapublic class Partner implements Serializable {

    private static final long serialVersionUID = 1L;

    @NotNull(message = "userId 不能为空")
    @Min(value = 1, message = "userId 需要大于0")
    private int userId;

    private int level;}
+>>>>>>> 478bfc0d38ef17c50b36f0ae58a32183187f6bbf

src/main/resources/ValidationMessages.properties

+partner.user.id=\u7528\u6237id\u4E0D\u80FD\u5C0F\u4E8E0
partner.level.min=\u5408\u4F19\u4EBA\u7B49\u7EA7\u6700\u4F4E\u662F10
partner.level.max=\u5408\u4F19\u4EBA\u7B49\u7EA7\u6700\u9AD8\u662F30
\ No newline at end of file