Skip to content

P
pica-cloud-account
提交 d5b220b1 编写于 作者: xixian.wang@picahealth.com's avatar xixian.wang@picahealth.com
浏览文件
操作

升级service-starter 1.3.0

上级 63a0788d
流水线 #16486 已失败 于阶段
    in 0 second
    显示空白字符变更
    内嵌 并排
    正在显示 包含 92 行增加 和 279 行删除
    client/pom.xml
    浏览文件 @ d5b220b1
    ......@@ -11,7 +11,7 @@
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-client</artifactId>
    <version>1.0.1</version>
    <version>1.3.0</version>
    <name>pica-cloud-account-client</name>
    <packaging>jar</packaging>
    ......@@ -25,25 +25,27 @@
    </properties>
    <dependencies>
    <dependency>
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.0.1</version>
    </dependency>
    <dependency>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-netflix-core</artifactId>
    <version>1.4.5.RELEASE</version>
    <artifactId>spring-cloud-starter-feign</artifactId>
    <scope>provided</scope>
    </dependency>
    <dependency>
    <groupId>org.springframework</groupId>
    <artifactId>spring-web</artifactId>
    <version>4.3.18.RELEASE</version>
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.3.0</version>
    </dependency>
    <dependency>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-entity</artifactId>
    <version>1.2.0</version>
    <version>1.3.0</version>
    <scope>provided</scope>
    </dependency>
    <dependency>
    <groupId>com.dianping.cat</groupId>
    <artifactId>cat-client</artifactId>
    <version>3.0.0</version>
    <scope>provided</scope>
    </dependency>
    </dependencies>
    ......
    client/src/main/java/com/pica/cloud/account/account/client/AccountInfoClient.java
    浏览文件 @ d5b220b1
    ......@@ -11,7 +11,7 @@ import java.util.List;
    * @author andong
    * @create 2019/7/19
    */
    @FeignClient(name = "13201-pica-cloud-account")
    @FeignClient(name = "13201-pica-cloud-account", configuration = CatFeignConfiguration.class)
    public interface AccountInfoClient {
    @PostMapping("/account/info/count")
    ......
    client/src/main/java/com/pica/cloud/account/account/client/CatFeignConfiguration.java 0 → 100644
    浏览文件 @ d5b220b1
    package com.pica.cloud.account.account.client;
    import com.dianping.cat.Cat;
    import feign.RequestInterceptor;
    import feign.RequestTemplate;
    import java.util.HashMap;
    import java.util.Map;
    public class CatFeignConfiguration implements RequestInterceptor {
    @Override
    public void apply(RequestTemplate requestTemplate) {
    CatContextImpl catContext = new CatContextImpl();
    Cat.logRemoteCallClient(catContext, Cat.getManager().getDomain());
    requestTemplate.header("X-CAT-ROOT-MESSAGE-ID", catContext.getProperty(Cat.Context.ROOT));
    requestTemplate.header("X-CAT-ROOT-PARENT-ID", catContext.getProperty(Cat.Context.PARENT));
    requestTemplate.header("X-CAT-ROOT-CHILD-ID", catContext.getProperty(Cat.Context.CHILD));
    }
    private class CatContextImpl implements Cat.Context{
    private Map<String, String> properties = new HashMap<>();
    @Override
    public void addProperty(String key, String value) {
    properties.put(key, value);
    }
    @Override
    public String getProperty(String key) {
    return properties.get(key);
    }
    }
    }
    client/src/main/java/com/pica/cloud/account/account/client/RegisterClient.java
    浏览文件 @ d5b220b1
    ......@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
    * author:crs
    * Description:RegisterClient
    */
    @FeignClient(name = "13201-pica-cloud-account")
    @FeignClient(name = "13201-pica-cloud-account", configuration = CatFeignConfiguration.class)
    public interface RegisterClient {
    @PostMapping(value = "/account/register")
    ......
    common/pom.xml
    浏览文件 @ d5b220b1
    ......@@ -11,7 +11,7 @@
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.0.1</version>
    <version>1.3.0</version>
    <name>pica-cloud-account-common</name>
    <packaging>jar</packaging>
    ......@@ -27,6 +27,7 @@
    <groupId>io.swagger</groupId>
    <artifactId>swagger-annotations</artifactId>
    <version>1.5.14</version>
    <scope>provided</scope>
    </dependency>
    </dependencies>
    ......
    server/pom.xml
    浏览文件 @ d5b220b1
    ......@@ -4,9 +4,10 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account</artifactId>
    <version>1.0.0</version>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-service-starter-parent</artifactId>
    <version>1.3.0</version>
    <relativePath/>
    </parent>
    <groupId>com.pica.cloud.account</groupId>
    ......@@ -15,102 +16,26 @@
    <packaging>jar</packaging>
    <properties>
    <maven.deploy.skip>true</maven.deploy.skip>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
    <maven.compiler.source>1.8</maven.compiler.source>
    <maven.compiler.target>1.8</maven.compiler.target>
    <java.version>1.8</java.version>
    <spring-cloud.version>Edgware.SR4</spring-cloud.version>
    <spring-boot.version>1.5.19.RELEASE</spring-boot.version>
    <encryption.version>1.0.2</encryption.version>
    </properties>
    <dependencies>
    <!--Spring boot dependencies begin -->
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    </dependency>
    <!--Spring cloud dependencies begin-->
    <dependency>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-starter-config</artifactId>
    </dependency>
    <dependency>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-starter-eureka</artifactId>
    </dependency>
    <!--Third party dependencies begin-->
    <dependency>
    <groupId>mysql</groupId>
    <artifactId>mysql-connector-java</artifactId>
    <version>5.1.39</version>
    </dependency>
    <dependency>
    <groupId>org.mybatis.spring.boot</groupId>
    <artifactId>mybatis-spring-boot-starter</artifactId>
    <version>1.3.2</version>
    </dependency>
    <!--pica dependencies begin-->
    <dependency>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-service-starter</artifactId>
    <version>1.2.5-SNAPSHOT</version>
    <exclusions>
    <exclusion>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-redis</artifactId>
    </exclusion>
    <exclusion>
    <groupId>com.xuxueli</groupId>
    <artifactId>xxl-job-core</artifactId>
    </exclusion>
    <exclusion>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
    </exclusion>
    </exclusions>
    <version>1.3.0</version>
    </dependency>
    <dependency>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
    </dependency>
    <dependency>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-utils</artifactId>
    <version>2.0.1-SNAPSHOT</version>
    <exclusions>
    <exclusion>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    </exclusion>
    <exclusion>
    <groupId>org.springframework</groupId>
    <artifactId>spring-web</artifactId>
    </exclusion>
    <exclusion>
    <groupId>com.dianping.cat</groupId>
    <artifactId>cat-client</artifactId>
    </exclusion>
    <exclusion>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-entity</artifactId>
    </exclusion>
    </exclusions>
    </dependency>
    <!--zipkin dependencies begin-->
    <dependency>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-starter-zipkin</artifactId>
    </dependency>
    <dependency>
    <groupId>org.springframework.kafka</groupId>
    <artifactId>spring-kafka</artifactId>
    <version>1.3.5.RELEASE</version>
    </dependency>
    <dependency>
    ......@@ -127,41 +52,31 @@
    <dependency>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-encryption-client</artifactId>
    <version>1.0.2</version>
    <version>${encryption.version}</version>
    <exclusions>
    <exclusion>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-entity</artifactId>
    </exclusion>
    <exclusion>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-utils</artifactId>
    <groupId>*</groupId>
    <artifactId>*</artifactId>
    </exclusion>
    </exclusions>
    </dependency>
    </dependencies>
    <dependencyManagement>
    <dependencies>
    <dependency>
    <groupId>org.springframework.cloud</groupId>
    <artifactId>spring-cloud-dependencies</artifactId>
    <version>${spring-cloud.version}</version>
    <type>pom</type>
    <scope>import</scope>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-encryption-common</artifactId>
    <version>${encryption.version}</version>
    <exclusions>
    <exclusion>
    <groupId>*</groupId>
    <artifactId>*</artifactId>
    </exclusion>
    </exclusions>
    </dependency>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-parent</artifactId>
    <version>${spring-boot.version}</version>
    <type>pom</type>
    <scope>import</scope>
    <groupId>org.glassfish.jersey.core</groupId>
    <artifactId>jersey-common</artifactId>
    <version>2.27</version>
    </dependency>
    </dependencies>
    </dependencyManagement>
    <repositories>
    <repository>
    ......
    server/src/main/java/com/pica/cloud/account/account/server/App.java
    浏览文件 @ d5b220b1
    package com.pica.cloud.account.account.server;
    import com.pica.cloud.foundation.service.starter.XxlJobConfiguration;
    import org.mybatis.spring.annotation.MapperScan;
    import org.springframework.boot.SpringApplication;
    import org.springframework.boot.autoconfigure.SpringBootApplication;
    ......@@ -9,7 +8,7 @@ import org.springframework.cloud.netflix.feign.EnableFeignClients;
    import org.springframework.transaction.annotation.EnableTransactionManagement;
    import springfox.documentation.swagger2.annotations.EnableSwagger2;
    @SpringBootApplication(scanBasePackages = "com.pica.cloud", exclude = {XxlJobConfiguration.class})
    @SpringBootApplication(scanBasePackages = "com.pica.cloud")
    @EnableDiscoveryClient
    @EnableSwagger2
    @EnableFeignClients(basePackages = "com.pica.cloud")
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/AccountBaseController.java
    浏览文件 @ d5b220b1
    ......@@ -10,8 +10,9 @@ import com.pica.cloud.account.account.server.exception.AccountException;
    import com.pica.cloud.account.account.server.util.PICAPSendMsgModel;
    import com.pica.cloud.foundation.entity.PicaException;
    import com.pica.cloud.foundation.entity.PicaResultCode;
    import com.pica.cloud.foundation.redis.ICacheClient;
    import com.pica.cloud.foundation.service.starter.common.BaseController;
    import com.pica.cloud.foundation.utils.constants.SysCode;
    import com.pica.cloud.foundation.utils.controller.BaseController;
    import com.pica.cloud.foundation.utils.entity.PicaUser;
    import com.pica.cloud.foundation.utils.utils.HttpClientUtil;
    import com.pica.cloud.foundation.utils.utils.MD5Util;
    ......@@ -36,6 +37,8 @@ public abstract class AccountBaseController extends BaseController {
    private Logger logger = LoggerFactory.getLogger(AccountBaseController.class);
    @Autowired
    private PropertiesConfiguration configuration;
    @Autowired
    private ICacheClient redisClient;
    //从token获取医生ID
    public long getDoctorIdByToken() {
    ......@@ -49,7 +52,7 @@ public abstract class AccountBaseController extends BaseController {
    //获取deviceInfo信息
    public String getDeviceInfo(String key) {
    String deviceInfo = super.getDeviceInfo();
    String deviceInfo = super.getDeviceInfoFromHeader();
    if (StringUtils.isBlank(key) || StringUtils.isBlank(deviceInfo)) {
    return StringUtils.EMPTY;
    }
    ......@@ -67,14 +70,14 @@ public abstract class AccountBaseController extends BaseController {
    picaUser.setToken(token);
    }
    String sysCode = super.getSysCode();
    String sysCode = super.getSysCodeFromHeader();
    if ("9".equals(sysCode)) {
    sysCode = "saas";
    } else if ("10".equals(sysCode)) {
    sysCode = "app";
    }
    String tokenValue = super.getRedisClient().get(KEY_PREFIX + picaUser.getId().toString() + "-" + sysCode);
    String tokenValue = redisClient.get(KEY_PREFIX + picaUser.getId().toString() + "-" + sysCode);
    if (StringUtils.isNotBlank(tokenValue)) {
    return tokenValue.replace("token-", ""); //token已经存在则直接返回
    }
    ......@@ -82,7 +85,7 @@ public abstract class AccountBaseController extends BaseController {
    try {
    Map<String, String> data = Object2Map.objectToMapString("yyyy-MM-dd HH:mm:ss", picaUser, new String[0]);
    data.put("sysCode", sysCode);
    return super.getRedisClient().saveToken(data, 365 * 24 * 3600); //token有效期365天
    return redisClient.saveToken(data, 365 * 24 * 3600); //token有效期365天
    } catch (Exception ex) {
    logger.error("保存token失败，doctorId: {}", picaUser.getId());
    return StringUtils.EMPTY;
    ......@@ -91,7 +94,7 @@ public abstract class AccountBaseController extends BaseController {
    //发送手机短信
    public void sendMobileMessage(String mobile, String content, long senderId) {
    String sysCodeStr = super.getSysCode();
    String sysCodeStr = super.getSysCodeFromHeader();
    int sysCode = 10; //默认移动端
    if (StringUtils.isNotBlank(sysCodeStr)) {
    try {
    ......@@ -138,8 +141,8 @@ public abstract class AccountBaseController extends BaseController {
    */
    public AccountUser getAccountUser() {
    //把所有请求头信息都封装到当前模型中
    String token = this.getToken();
    AccountUser accountUser = super.getRedisClient().getToken(token, AccountUser.class);
    String token = this.getTokenFromHeader();
    AccountUser accountUser = redisClient.getToken(token, AccountUser.class);
    accountUser.setLoginFrom(this.getSourceType());
    accountUser.setLoginPlatform(this.getProductType());
    accountUser.setLoginIp(super.getIpAddr());
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java
    浏览文件 @ d5b220b1
    ......@@ -3,7 +3,6 @@ package com.pica.cloud.account.account.server.controller;
    import com.pica.cloud.account.account.server.entity.Account;
    import com.pica.cloud.account.account.server.entity.EncryptEntity;
    import com.pica.cloud.account.account.server.entity.LoginResult;
    import com.pica.cloud.account.account.server.mapper.AccountMapper;
    import com.pica.cloud.account.account.server.req.AccountReq;
    import com.pica.cloud.account.account.server.req.BaseRequest;
    import com.pica.cloud.account.account.server.service.AccountService;
    ......@@ -53,7 +52,6 @@ public class AccountController extends AccountBaseController {
    private CaptchaService captchaService;
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient redisClient;
    @GetMapping("/test")
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/AutoCodeController.java
    浏览文件 @ d5b220b1
    package com.pica.cloud.account.account.server.controller;
    import com.pica.cloud.account.account.server.entity.Account;
    import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
    import com.pica.cloud.account.account.server.entity.AccountUnionEntity;
    import com.pica.cloud.account.account.server.entity.EncryptEntity;
    import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
    ......@@ -24,14 +22,12 @@ import com.pica.cloud.foundation.utils.utils.ValidateUtils;
    import io.swagger.annotations.Api;
    import io.swagger.annotations.ApiOperation;
    import org.apache.commons.lang3.StringUtils;
    import org.apache.ibatis.logging.Log;
    import org.slf4j.Logger;
    import org.slf4j.LoggerFactory;
    import org.springframework.beans.factory.annotation.Autowired;
    import org.springframework.beans.factory.annotation.Qualifier;
    import org.springframework.web.bind.annotation.PostMapping;
    import org.springframework.web.bind.annotation.RequestBody;
    import org.springframework.web.bind.annotation.RequestMapping;
    import org.springframework.web.bind.annotation.RestController;
    @Api(description = "短信验证码资源")
    ......@@ -54,7 +50,6 @@ public class AutoCodeController extends AccountBaseController {
    private AccountService accountService;
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient cacheClient;
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/DoctorController.java
    浏览文件 @ d5b220b1
    ......@@ -39,7 +39,7 @@ public class DoctorController extends AccountBaseController {
    Integer userId = accountUser.getId();
    Doctor doctorInfo = doctorService.getDoctorInfo(userId);
    String mobilePhone = doctorInfo.getMobilePhone();
    String dencrypt = EncryptUtils.decryptContent(mobilePhone, EncryptConstants.ENCRYPT_TYPE_MOBILE, super.getToken());
    String dencrypt = EncryptUtils.decryptContent(mobilePhone, EncryptConstants.ENCRYPT_TYPE_MOBILE, super.getTokenFromHeader());
    mobilePhone = dencrypt.substring(0, 3) + "****" + dencrypt.substring(7, 11);
    doctorInfo.setMobilePhone(mobilePhone);
    return PicaResponse.toResponse(doctorInfo);
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java
    浏览文件 @ d5b220b1
    ......@@ -32,7 +32,6 @@ public class LoginController extends AccountBaseController {
    private LoginService loginService;
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient redisClient;
    @Autowired
    ......@@ -142,7 +141,7 @@ public class LoginController extends AccountBaseController {
    @ApiOperation(value = "退出登录接口")
    @GetMapping("/logout")
    public PicaResponse<String> loginOut() {
    String token = super.getToken();
    String token = super.getTokenFromHeader();
    if (StringUtils.isNotEmpty(token)) {
    Long doctorId = super.getDoctorIdByToken();
    Doctor doctorInfo = doctorService.getDoctorInfo(doctorId.intValue());
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/RegisterController.java
    浏览文件 @ d5b220b1
    ......@@ -38,7 +38,6 @@ public class RegisterController extends AccountBaseController {
    private AccountUtils accountUtils;
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient redisClient;
    @ApiOperation("PC端，移动端注册接口")
    ......
    server/src/main/java/com/pica/cloud/account/account/server/service/AccountService.java
    浏览文件 @ d5b220b1
    package com.pica.cloud.account.account.server.service;
    import ch.qos.logback.core.rolling.helper.IntegerTokenConverter;
    import com.pica.cloud.account.account.server.entity.Account;
    import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
    ......
    server/src/main/java/com/pica/cloud/account/account/server/service/impl/AccountServiceImpl.java
    浏览文件 @ d5b220b1
    ......@@ -39,7 +39,6 @@ public class AccountServiceImpl implements AccountService {
    @Autowired
    private AccountInfoDetailMapper accountInfoDetailMapper;
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient cacheClient;
    @Value("${doubleWritingMode}")
    ......
    server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java
    浏览文件 @ d5b220b1
    ......@@ -65,7 +65,6 @@ public class LoginServiceImpl implements LoginService {
    private DoctorService doctorService;
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient redisClient;
    @Value("${doubleWritingMode}")
    ......
    server/src/main/java/com/pica/cloud/account/account/server/service/impl/TokenServiceImpl.java
    浏览文件 @ d5b220b1
    ......@@ -26,7 +26,6 @@ import static com.pica.cloud.foundation.utils.utils.json.Object2Map.objectToMapS
    public class TokenServiceImpl implements TokenService {
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient redisClient;
    @Override
    ......
    server/src/main/java/com/pica/cloud/account/account/server/util/AccountUtils.java
    浏览文件 @ d5b220b1
    ......@@ -15,7 +15,6 @@ import org.apache.commons.lang3.StringUtils;
    import org.slf4j.Logger;
    import org.slf4j.LoggerFactory;
    import org.springframework.beans.factory.annotation.Autowired;
    import org.springframework.beans.factory.annotation.Qualifier;
    import org.springframework.stereotype.Component;
    /**
    ......@@ -25,7 +24,6 @@ import org.springframework.stereotype.Component;
    public class AccountUtils {
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient cacheClient;
    private Logger logger = LoggerFactory.getLogger(AccountController.class);
    ......
    server/src/main/java/com/pica/cloud/account/account/server/util/TokenUtils.java
    浏览文件 @ d5b220b1
    ......@@ -24,7 +24,6 @@ public class TokenUtils {
    private Logger logger = LoggerFactory.getLogger(this.getClass());
    @Autowired
    @Qualifier("cacheMigrateClient")
    private ICacheClient cacheClient;
    ......
    server/src/main/resources/META-INF/app.properties 已删除 100644 → 0
    浏览文件 @ 63a0788d
    app.name=com.pica.cloud.account.account
    \ No newline at end of file
    server/src/main/resources/bootstrap-dev.properties
    浏览文件 @ d5b220b1
    ......@@ -19,9 +19,7 @@ eureka.instance.lease-renewal-interval-in-seconds=10
    eureka.instance.lease-expiration-duration-in-seconds=10
    eureka.instance.hostname=${spring.cloud.client.ipAddress}
    eureka.instance.prefer-ip-address=true
    #logback settings
    logging.level.ROOT=INFO
    logging.path=c:/tomcat-log/${spring.application.name}
    #job settings
    #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
    #feign settings
    ......
    server/src/main/resources/bootstrap-prod.properties
    浏览文件 @ d5b220b1
    ......@@ -19,10 +19,6 @@ eureka.instance.lease-expiration-duration-in-seconds=10
    eureka.instance.hostname=${spring.cloud.client.ipAddress}
    eureka.instance.prefer-ip-address=true
    #logback setting
    logging.level.ROOT=INFO
    logging.path=/opt/tomcat-log/${spring.application.name}
    #job setting
    #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
    ......
    server/src/main/resources/bootstrap-test1.properties
    浏览文件 @ d5b220b1
    ......@@ -18,10 +18,6 @@ eureka.instance.lease-expiration-duration-in-seconds=10
    eureka.instance.hostname=${spring.cloud.client.ipAddress}
    eureka.instance.prefer-ip-address=true
    #logback setting
    logging.level.ROOT=INFO
    logging.path=/opt/tomcat-log/${spring.application.name}
    #job setting
    #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
    ......
    server/src/main/resources/bootstrap-test2.properties
    浏览文件 @ d5b220b1
    ......@@ -18,10 +18,6 @@ eureka.instance.lease-expiration-duration-in-seconds=10
    eureka.instance.hostname=${spring.cloud.client.ipAddress}
    eureka.instance.prefer-ip-address=true
    #logback setting
    logging.level.ROOT=INFO
    logging.path=/opt/tomcat-log/${spring.application.name}
    #job setting
    #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
    ......
    server/src/main/resources/bootstrap-uat.properties
    浏览文件 @ d5b220b1
    ......@@ -18,10 +18,6 @@ eureka.instance.lease-expiration-duration-in-seconds=10
    eureka.instance.hostname=${spring.cloud.client.ipAddress}
    eureka.instance.prefer-ip-address=true
    #logback setting
    logging.level.ROOT=INFO
    logging.path=/opt/tomcat-log/${spring.application.name}
    #job setting
    #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
    ......
    server/src/main/resources/logback.xml 已删除 100644 → 0
    浏览文件 @ 63a0788d
    <?xml version="1.0" encoding="UTF-8"?>
    <configuration debug="true" scan="true" scanPeriod="30 seconds">
    <property name="encoder.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{req.xForwardedFor} %X{req.method} %X{req.requestURL} %X{req.queryString} %X{req.userAgent} %-5level %logger{36} - %msg%n"/>
    <property name="rollingPolicy.maxFileSize" value="5MB"/>
    <property name="rollingPolicy.maxHistory" value="30"/>
    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
    <Target>System.out</Target>
    <encoder>
    <pattern>${encoder.pattern}</pattern>
    </encoder>
    </appender>
    <appender name="TRACE" class="ch.qos.logback.core.rolling.RollingFileAppender">
    <encoder>
    <pattern>${encoder.pattern}</pattern>
    <charset>GBK</charset>
    </encoder>
    <filter class="ch.qos.logback.classic.filter.LevelFilter">
    <level>TRACE</level>
    <onMatch>ACCEPT</onMatch>
    <onMismatch>DENY</onMismatch>
    </filter>
    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
    <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/trace.%i.log</fileNamePattern>
    <maxHistory>${rollingPolicy.maxHistory}</maxHistory>
    <maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
    </rollingPolicy>
    </appender>
    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
    <encoder>
    <pattern>${encoder.pattern}</pattern>
    <charset>GBK</charset>
    </encoder>
    <filter class="ch.qos.logback.classic.filter.LevelFilter">
    <level>INFO</level>
    <onMatch>ACCEPT</onMatch>
    <onMismatch>DENY</onMismatch>
    </filter>
    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
    <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info.%i.log</fileNamePattern>
    <maxHistory>${rollingPolicy.maxHistory}</maxHistory>
    <maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
    </rollingPolicy>
    </appender>
    <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
    <encoder>
    <pattern>${encoder.pattern}</pattern>
    <charset>GBK</charset>
    </encoder>
    <filter class="ch.qos.logback.classic.filter.LevelFilter">
    <level>DEBUG</level>
    <onMatch>ACCEPT</onMatch>
    <onMismatch>DENY</onMismatch>
    </filter>
    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
    <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/debug.%i.log</fileNamePattern>
    <maxHistory>${rollingPolicy.maxHistory}</maxHistory>
    <maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
    </rollingPolicy>
    </appender>
    <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
    <encoder>
    <pattern>${encoder.pattern}</pattern>
    <charset>GBK</charset>
    </encoder>
    <filter class="ch.qos.logback.classic.filter.LevelFilter">
    <level>WARN</level>
    <onMatch>ACCEPT</onMatch>
    <onMismatch>DENY</onMismatch>
    </filter>
    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
    <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/warn.%i.log</fileNamePattern>
    <maxHistory>${rollingPolicy.maxHistory}</maxHistory>
    <maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
    </rollingPolicy>
    </appender>
    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
    <encoder>
    <pattern>${encoder.pattern}</pattern>
    <charset>GBK</charset>
    </encoder>
    <filter class="ch.qos.logback.classic.filter.LevelFilter">
    <level>ERROR</level>
    <onMatch>ACCEPT</onMatch>
    <onMismatch>DENY</onMismatch>
    </filter>
    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
    <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/error.%i.log</fileNamePattern>
    <maxHistory>${rollingPolicy.maxHistory}</maxHistory>
    <maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
    </rollingPolicy>
    </appender>
    <!--logger-->
    <logger name="com.ibatis" level="DEBUG" />
    <logger name="com.ibatis.common.jdbc.SimpleDataSource" level="DEBUG" />
    <logger name="com.ibatis.common.jdbc.ScriptRunner" level="DEBUG" />
    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG" />
    <logger name="java.sql.Connection" level="DEBUG" />
    <logger name="java.sql.Statement" level="DEBUG" />
    <logger name="java.sql.PreparedStatement" level="DEBUG" />
    <!--root-->
    <root level="INFO">
    <appender-ref ref="CONSOLE" />
    <appender-ref ref="INFO" />
    <appender-ref ref="ERROR" />
    </root>
    </configuration>
    \ No newline at end of file
    Markdown 格式
    0% or
    您添加了 0 人 到此讨论。请谨慎行事。
    先完成此消息的编辑！
    想要评论请 注册 或