Skip to content

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

Merge branch 'dev-20200113-token' into 'release' 

合并分支到release

user_token_tourist的处理

See merge request !23
上级 68a7da6a 2249ba88
流水线 #24548 已失败 于阶段
    in 3 second
    展开全部 隐藏空白字符变更
    内嵌 并排
    正在显示 包含 865 行增加 和 707 行删除
    server/pom.xml
    浏览文件 @ c37dd5a6
    ......@@ -29,6 +29,12 @@
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    <exclusions>
    <exclusion>
    <artifactId>spring-boot-starter-logging</artifactId>
    <groupId>org.springframework.boot</groupId>
    </exclusion>
    </exclusions>
    </dependency>
    <!--Spring cloud dependencies begin-->
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/AccountBaseController.java
    浏览文件 @ c37dd5a6
    ......@@ -171,6 +171,7 @@ public abstract class AccountBaseController extends BaseController {
    accountUser.setLoginFrom(this.getSourceType());
    accountUser.setLoginPlatform(this.getProductType());
    accountUser.setLoginIp(super.getIpAddr());
    accountUser.setUserTokenTourist(this.getUserTokenTourist());
    return accountUser;
    }
    ......@@ -216,4 +217,9 @@ public abstract class AccountBaseController extends BaseController {
    }
    return null;
    }
    public String getUserTokenTourist() {
    HttpServletRequest request = super.getRequest();
    return request.getHeader("user_token_tourist");
    }
    }
    server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java
    浏览文件 @ c37dd5a6
    ......@@ -69,6 +69,7 @@ public class LoginController extends AccountBaseController {
    Integer sourceType = super.getSourceType();
    request.setSourceType(sourceType);
    request.setLoginIp(super.getIpAddr());
    request.setUserTokenTourist(super.getUserTokenTourist());
    AccountUtils.checkMobilePhone(request.getMobile());
    AccountUtils.checkPassword(request.getPassword());
    LoginResult login = loginService.login(request);
    ......@@ -95,6 +96,7 @@ public class LoginController extends AccountBaseController {
    Integer sourceType = super.getSourceType();
    request.setSourceType(sourceType);
    request.setLoginIp(super.getIpAddr());
    request.setUserTokenTourist(super.getUserTokenTourist());
    LoginResult login = loginService.loginAndRegister(request);
    if (SourceTypeEnum.SAAS.getCode().equals(sourceType)) {
    login.setDoctorId("");
    ......@@ -111,6 +113,7 @@ public class LoginController extends AccountBaseController {
    request.setProductType(super.getProductType());
    request.setSourceType(super.getSourceType());
    request.setLoginIp(super.getIpAddr());
    request.setUserTokenTourist(super.getUserTokenTourist());
    LoginResult result = loginService.loginByWeChat(request);
    return PicaResponse.toResponse(result);
    }
    ......@@ -122,6 +125,7 @@ public class LoginController extends AccountBaseController {
    request.setProductType(super.getProductType());
    request.setSourceType(super.getSourceType());
    request.setLoginIp(super.getIpAddr());
    request.setUserTokenTourist(super.getUserTokenTourist());
    LoginResult result = loginService.loginByWeChatStep(request);
    return PicaResponse.toResponse(result);
    }
    ......@@ -137,7 +141,7 @@ public class LoginController extends AccountBaseController {
    @PostMapping("/login/wechat/bind")
    public PicaResponse bindWeChat(@RequestBody EncryptEntity entity) throws Exception {
    BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
    request.setUserTokenTourist(super.getUserTokenTourist());
    Long result = cacheClient.setnx(cache_prifix + request.getWeChatCode(), request.getWeChatCode());
    if (result == 1) {
    try {
    ......@@ -187,7 +191,7 @@ public class LoginController extends AccountBaseController {
    String newToken = tokenService.getToken(headersMap);
    LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, super.getProductType(), super.getSourceType(),
    AccountTypeEnum.LOGIN_OUT.getCode(), super.getIpAddr(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(), AccountTypeEnum.LOG_TYPE_LOGIN.getCode(),
    newToken);
    newToken,0,super.getUserTokenTourist());
    picaLogUtils.info(entity);
    return PicaResponse.toResponse(newToken);
    } else {
    ......@@ -229,6 +233,7 @@ public class LoginController extends AccountBaseController {
    request.setProductType(super.getProductType());
    request.setSourceType(super.getSourceType());
    request.setLoginIp(super.getIpAddr());
    request.setUserTokenTourist(super.getUserTokenTourist());
    return PicaResponse.toResponse(loginService.loginByApple(request));
    }
    ......@@ -239,6 +244,7 @@ public class LoginController extends AccountBaseController {
    request.setProductType(super.getProductType());
    request.setSourceType(super.getSourceType());
    request.setLoginIp(super.getIpAddr());
    request.setUserTokenTourist(super.getUserTokenTourist());
    return PicaResponse.toResponse(loginService.loginByAppleStep(request));
    }
    ......@@ -250,6 +256,7 @@ public class LoginController extends AccountBaseController {
    req.setProductType(super.getProductType());
    req.setSourceType(super.getSourceType());
    req.setLoginIp(super.getIpAddr());
    req.setUserTokenTourist(super.getUserTokenTourist());
    LoginResult oneClickLoginResultVo = loginService.oneClickLogin(req);
    return PicaResponse.toResponse(oneClickLoginResultVo);
    }
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/RegisterController.java
    浏览文件 @ c37dd5a6
    ......@@ -50,6 +50,7 @@ public class RegisterController extends AccountBaseController {
    Integer sourceType = super.getSourceType();
    request.setSourceType(sourceType);
    request.setLoginIp(super.getIpAddr());
    request.setUserTokenTourist(super.getUserTokenTourist());
    result = registerService.register(request);
    if (sourceType==3){
    result.setDoctorId("");
    ......
    server/src/main/java/com/pica/cloud/account/account/server/entity/AccountUser.java
    浏览文件 @ c37dd5a6
    ......@@ -15,6 +15,17 @@ public class AccountUser extends PicaUser {
    //登录ip
    private String loginIp;
    //用户本地token
    private String userTokenTourist;
    public String getUserTokenTourist() {
    return userTokenTourist;
    }
    public void setUserTokenTourist(String userTokenTourist) {
    this.userTokenTourist = userTokenTourist;
    }
    public Integer getAcctId() {
    return acctId;
    }
    ......
    server/src/main/java/com/pica/cloud/account/account/server/entity/LogLoginEntity.java
    浏览文件 @ c37dd5a6
    ......@@ -40,6 +40,26 @@ public class LogLoginEntity extends AccountLogEntity {
    private String token;
    private int isLogin;
    private String userTokenTourist;
    public int getIsLogin() {
    return isLogin;
    }
    public void setIsLogin(int isLogin) {
    this.isLogin = isLogin;
    }
    public String getUserTokenTourist() {
    return userTokenTourist;
    }
    public void setUserTokenTourist(String userTokenTourist) {
    this.userTokenTourist = userTokenTourist;
    }
    private QueryMobileEntity queryMobileEntity;
    public QueryMobileEntity getQueryMobileEntity() {
    ......
    server/src/main/java/com/pica/cloud/account/account/server/log/AccountLogEntityUtils.java
    浏览文件 @ c37dd5a6
    ......@@ -21,7 +21,7 @@ public class AccountLogEntityUtils {
    * @return
    */
    public static LogLoginEntity getLogLoginEntity(Integer acctId, Integer productType, Integer sourceType,
    int code, String ipAddr, int code1, int code2,String token) {
    int code, String ipAddr, int code1, int code2,String token,int isLogin,String userTokenTourist) {
    LogLoginEntity entity = new LogLoginEntity();
    Date currentTime = new Date();
    entity.setAcctId(acctId);
    ......@@ -38,6 +38,8 @@ public class AccountLogEntityUtils {
    entity.setLoginStatus(code1);
    entity.setLogType(code2);
    entity.setToken(token);
    entity.setIsLogin(isLogin);
    entity.setUserTokenTourist(userTokenTourist);
    return entity;
    }
    ......
    server/src/main/java/com/pica/cloud/account/account/server/req/BaseRequest.java
    浏览文件 @ c37dd5a6
    ......@@ -52,6 +52,16 @@ public class BaseRequest {
    private Integer xPos;
    @ApiModelProperty("h5端适配缩放后背景图实际宽度")
    private Integer imageW;
    @ApiModelProperty("用户本地token")
    private String userTokenTourist;
    public String getUserTokenTourist() {
    return userTokenTourist;
    }
    public void setUserTokenTourist(String userTokenTourist) {
    this.userTokenTourist = userTokenTourist;
    }
    public String getCaptchaToken() {
    return captchaToken;
    ......
    server/src/main/java/com/pica/cloud/account/account/server/req/OneClickLoginReq.java
    浏览文件 @ c37dd5a6
    ......@@ -15,6 +15,8 @@ public class OneClickLoginReq {
    private Integer productType = 0;
    private String userTokenTourist;
    public String getLoginIp() {
    return loginIp;
    }
    ......@@ -46,4 +48,14 @@ public class OneClickLoginReq {
    public void setSourceType(Integer sourceType) {
    this.sourceType = sourceType;
    }
    public String getUserTokenTourist() {
    return userTokenTourist;
    }
    public void setUserTokenTourist(String userTokenTourist) {
    this.userTokenTourist = userTokenTourist;
    }
    }
    server/src/main/java/com/pica/cloud/account/account/server/service/AccountService.java
    浏览文件 @ c37dd5a6
    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/RegisterServiceImpl.java
    浏览文件 @ c37dd5a6
    ......@@ -139,7 +139,7 @@ public class RegisterServiceImpl implements RegisterService {
    result.setMobile(mobile);
    LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, productType, baseRequest.getSourceType(),
    AccountTypeEnum.LOGIN_REGISTER.getCode(), baseRequest.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(),
    AccountTypeEnum.LOG_TYPE_LOGIN.getCode(),newToken);
    AccountTypeEnum.LOG_TYPE_LOGIN.getCode(),newToken,1,baseRequest.getUserTokenTourist());
    if(queryMobileEntity != null){
    entity.setQueryMobileEntity(queryMobileEntity);
    }
    ......
    server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java
    浏览文件 @ c37dd5a6
    ......@@ -13,6 +13,7 @@ import javax.crypto.spec.IvParameterSpec;
    import javax.crypto.spec.SecretKeySpec;
    import java.math.BigInteger;
    import java.util.ArrayList;
    import java.util.List;
    /**
    * Created on 2019/10/21 13:20
    ......@@ -26,7 +27,7 @@ public class AESUtil {
    //算法
    private static final String ALGORITHMSTR = "AES/ECB/PKCS5Padding";
    public static final String privateKey = "";
    public static final String privateKey = "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAKdXMOUboMkHBOyfuMWuIo6bOp+b53i/LoO0qox+sQ+DqFTdt9tH1dF/CoAWtLj5CjDJum7JYJrsMXIqXQnIRr8ZKt+NtdKlqUUeGZYfTPSEIXWb9S+U8DQFqJgXL25xcX1SHxFoeRkZWZX5FtUhKTimOVl1FwrkRDmFyIEUa2AbAgMBAAECgYEAlEZHxtoiL74OePRVrqNLb3zQBxkHkxAj0QPGktK3ZP3Nq9UB0kTmisi8rx5vZ+8TPoOgtAWvmdZrQbOT2NUjCUYKkGS+Wi1fXpP0Az2UJwDIQK4aQTZtNbM04f3Rmi5i24eASmSdl1svjHEv0YS6IC6sR1cbElZs94uDFshUeqECQQDTrmZda8fo6ZNsHVYWcjTwr8JKTIgjaD/hPi0JP6hhL0GVEAVwb2rsfJf5o2TR5RsNT8ANUYgFPRaAymLLe+5zAkEAymA9V55K6IJhnSp7HmWfGVmxvTrwZFJIzPv7DLi/RAS3yFPfTpyJGLirAnBQfKO/vwjxhAuwD21aDYHMTrj1uQJBAJdAikw+cz1tiLU70QOA32sLaxyDytLh7qMXNj7hiYLHrWjBZeGM+y23aTArHCMOPWIpleTuWO7FU4r7EdSr3RkCQQCliu4CwyhRY33H210U81memgFLYnAMEEce7qxgrqs+T4Gqa/lJy8BVqZGxkAA2xJfwA7fUJN9i7zdvvxJJ/wB5AkA+OKfnTXTp8qF4lZiVMrGl3d5sgg87q1DhC5XruviH6a3u6JOLlRNQy2+TGxzWMYaJ1RwEfygqBYOgyvoqNR3Q";
    private static final String charset = "UTF-8";
    /**
    ......@@ -185,9 +186,13 @@ public class AESUtil {
    * 测试
    */
    public static void main(String[] args) throws Exception {
    String KEY="zJJ$c5md3$yuuhWW";
    System.out.println("-------------加密---------");
    String content = "15607241351";
    String content = "18709744120";
    System.out.println("加密前：" + content);
    ......@@ -199,11 +204,38 @@ public class AESUtil {
    String decrypt = aesDecrypt(encrypt, KEY);
    System.out.println("解密后：" + decrypt);
    //请求参数解密处理
    // String key="am1pnysCRlz80Rl/eTDj/UE/Pe8zkxb2yP73jvrUWEk3x5/lK9hi104MSmsKbl45cPzJfJXBxO+VeItkA63ZqfaUNA0ezdMd7Ord7rGqvWK+4RqAm1T3Qo3lw/5bT0GwgWMWZBrDr30NHCYLmjg6vwVbv3YCEewwQK+rL7bUXu0=";
    // List<String> list = new ArrayList<>();
    //
    // String str="13330782565,13638247234,15208346780,13665702440,13171898394,13526001352,15637729989,18282702080,17839157550,13733479385,13873347938,18192022131,17868481983,13389208740,15130643581,18743289267,15025550691,18706903023,15153299810,13400213017,13400213014,13809393727,15082898689,15181524146,13067777147,15936327251,13982581989,13055116890,13183128853,13526235120,13620258773,13470126432,15379993781,15612968111,15930496256,13504498834,13328506266,13405379887,18636815186,18638124991,18997577751,18742986968,13737844850,15249387846,13890801202,18294832224,15329652816,13453947981,17393142302,18219810087,15031950900,18670808468,18670508468,18670508568,15566394123,18719884109,13789221826,13939497532,13939925847,13791830377,18919411543,18893835167,18194329526,13207866808,13082126549,15802548543,15879451129,15390381641,13132431383,18279911958,13827920609,15209825253,15509825253,18184482231,13325225232,15908034636,15352111767,18709744120,15807269519,19971489100,13721734937,13765575183,15329652819,13883396206,18085581329,15090694439,15090694436,13782477033,13207995156,13630682016,15607241351,13830780802";
    // String[] arr = str.split(",");
    // for (int i = 0; i < arr.length; i++) {
    // String KEY="zJJ$c5md3$yuuhWW";
    // System.out.println("-------------加密---------");
    // String content = arr[i];
    // System.out.println("加密前：" + content);
    // System.out.println("加密密钥和解密密钥：" + KEY);
    //
    // System.out.println("-------------解密---------");
    // String encrypt = aesEncrypt(content, KEY);
    // System.out.println("加密后：" + encrypt);
    // String decrypt = aesDecrypt(encrypt, KEY);
    // System.out.println("解密后：" + decrypt);
    // list.add(encrypt);
    // }
    //
    // for (int i = 0; i < list.size(); i++) {
    // System.out.println(list.get(i));
    // }
    // 请求参数解密处理
    // String key="HSBPIMChYBYHKMb/wmq0dYIKnUU5UvlzeWrWkmxWUJ0RI2cgEf9jcISPHfLsJurCjj5xwTz6KjPnm0Z+ylaiVDpiLT55vKWHC0HnPqVePSR6Sn6cdaESDCMMGbNdJb+crnjvfTo0v4zQwqvjUJBDR9KRc5C3Dr07dITbPQbJXJk=";
    // String decrypt = RSAUtil.decrypt(key,privateKey);
    // System.out.println(decrypt);
    // String content="d9eKA7DGhNx7295N0g82rqzaUOeAvBeuR2gXtOX3Y+VV3ei+zW0BQn9moQgN4mRT8XIzq3x2n3qiqCuOzcDvrlGC0kIcUClM0gt8xDaBw+haVpMAw/7R4FgWNPeVRL5k";
    // String content="L/05P603DA9u/as3uHbzsF+LqYhfxJonT80u0oH0YobLCta/wR1xEH//NccyJlQ";
    // String result = AESUtil.aesDecrypt(content, decrypt);
    // System.out.println(result);
    ......
    server/src/main/resources/log4j2.xml 0 → 100644
    浏览文件 @ c37dd5a6
    <?xml version="1.0" encoding="UTF-8"?>
    <Configuration status="INFO" monitorInterval="30">
    <properties>
    <property name="logPath" value="${sys:LOG_PATH:-/opt/tomcat-log}"/>
    <property name="logPatternLayout"
    value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%t] %class{36}.%M - %msg%xEx%n"/>
    <property name="logRolloverSize" value="100M"/>
    <property name="logKeepDays" value="15d"/>
    <property name="logDirNumberOfFiles" value="300"/>
    </properties>
    <Appenders>
    <!--CONSOLE-->
    <Console name="CONSOLE" target="SYSTEM_OUT">
    <PatternLayout charset="UTF-8" pattern="${logPatternLayout}"/>
    </Console>
    <!--TRACE-->
    <RollingFile name="TRACE" filename="${logPath}/trace.log"
    filepattern="${logPath}/$${date:yyyy-MM-dd}/trace-%d{yyyyMMdd}-%i.log">
    <PatternLayout charset="UTF-8" pattern="${logPatternLayout}"/>
    <Filters>
    <ThresholdFilter level="debug" onMatch="DENY" onMismatch="NEUTRAL"/>
    <ThresholdFilter level="trace" onMatch="ACCEPT" onMismatch="DENY"/>
    </Filters>
    <Policies>
    <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
    <SizeBasedTriggeringPolicy size="${logRolloverSize}"/>
    </Policies>
    <DefaultRolloverStrategy max="${logDirNumberOfFiles}">
    <Delete basePath="${logPath}" maxDepth="3">
    <IfFileName glob="*/trace*.log"/>
    <IfLastModified age="${logKeepDays}"/>
    </Delete>
    </DefaultRolloverStrategy>
    </RollingFile>
    <!--DEBUG-->
    <RollingFile name="DEBUG" filename="${logPath}/debug.log"
    filepattern="${logPath}/$${date:yyyy-MM-dd}/debug-%d{yyyyMMdd}-%i.log">
    <PatternLayout charset="UTF-8" pattern="${logPatternLayout}"/>
    <Filters>
    <ThresholdFilter level="info" onMatch="DENY" onMismatch="NEUTRAL"/>
    <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
    </Filters>
    <Policies>
    <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
    <SizeBasedTriggeringPolicy size="${logRolloverSize}"/>
    </Policies>
    <DefaultRolloverStrategy max="${logDirNumberOfFiles}">
    <Delete basePath="${logPath}" maxDepth="3">
    <IfFileName glob="*/debug*.log"/>
    <IfLastModified age="${logKeepDays}"/>
    </Delete>
    </DefaultRolloverStrategy>
    </RollingFile>
    <!--INFO-->
    <RollingFile name="INFO" filename="${logPath}/info.log"
    filepattern="${logPath}/$${date:yyyy-MM-dd}/info-%d{yyyyMMdd}-%i.log">
    <PatternLayout charset="UTF-8" pattern="${logPatternLayout}"/>
    <Filters>
    <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
    <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
    </Filters>
    <Policies>
    <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
    <SizeBasedTriggeringPolicy size="${logRolloverSize}"/>
    </Policies>
    <DefaultRolloverStrategy max="${logDirNumberOfFiles}">
    <Delete basePath="${logPath}" maxDepth="3">
    <IfFileName glob="*/info*.log"/>
    <IfLastModified age="${logKeepDays}"/>
    </Delete>
    </DefaultRolloverStrategy>
    </RollingFile>
    <!--WARN-->
    <RollingFile name="WARN" filename="${logPath}/warn.log"
    filepattern="${logPath}/$${date:yyyy-MM-dd}/warn-%d{yyyyMMdd}-%i.log">
    <PatternLayout charset="UTF-8" pattern="${logPatternLayout}"/>
    <Filters>
    <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL"/>
    <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
    </Filters>
    <Policies>
    <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
    <SizeBasedTriggeringPolicy size="${logRolloverSize}"/>
    </Policies>
    <DefaultRolloverStrategy max="${logDirNumberOfFiles}">
    <Delete basePath="${logPath}" maxDepth="3">
    <IfFileName glob="*/warn*.log"/>
    <IfLastModified age="${logKeepDays}"/>
    </Delete>
    </DefaultRolloverStrategy>
    </RollingFile>
    <!--ERROR-->
    <RollingFile name="ERROR" filename="${logPath}/error.log"
    filepattern="${logPath}/$${date:yyyy-MM-dd}/error-%d{yyyyMMdd}-%i.log">
    <PatternLayout charset="UTF-8" pattern="${logPatternLayout}"/>
    <Filters>
    <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
    </Filters>
    <Policies>
    <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
    <SizeBasedTriggeringPolicy size="${logRolloverSize}"/>
    </Policies>
    <DefaultRolloverStrategy max="${logDirNumberOfFiles}">
    <Delete basePath="${logPath}" maxDepth="3">
    <IfFileName glob="*/error*.log"/>
    <IfLastModified age="${logKeepDays}"/>
    </Delete>
    </DefaultRolloverStrategy>
    </RollingFile>
    <CatAppender name="CatAppender"/>
    </Appenders>
    <Loggers>
    <Root level="INFO">
    <appender-ref ref="CONSOLE"/>
    <appender-ref ref="TRACE"/>
    <appender-ref ref="DEBUG"/>
    <appender-ref ref="INFO"/>
    <appender-ref ref="WARN"/>
    <appender-ref ref="ERROR"/>
    <appender-ref ref="CatAppender"/>
    </Root>
      
    <Logger name="org.apache.catalina.startup.DigesterFactory" level="error"/>
            
    <Logger name="org.apache.catalina.util.LifecycleBase" level="error"/>
            
    <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn"/>
            
    <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
            
    <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn"/>
            
    <Logger name="org.crsh.plugin" level="warn"/>
            
    <logger name="org.crsh.ssh" level="warn"/>
            
    <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error"/>
            
    <Logger name="org.hibernate.validator.internal.util.Version" level="warn"/>
            
    <logger name="org.springframework.boot.actuate.autoconfigure.CrshAutoConfiguration" level="warn"/>
            
    <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
            
    <logger name="org.thymeleaf" level="warn"/>
    </Loggers>
    </Configuration>
    \ No newline at end of file
    server/src/main/resources/logback.xml 已删除 100644 → 0
    浏览文件 @ 68a7da6a
    <?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>UTF-8</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>UTF-8</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>UTF-8</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>UTF-8</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>UTF-8</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
    server/src/main/resources/mybatis/LogLoginEntityMapper.xml
    浏览文件 @ c37dd5a6
    ......@@ -40,12 +40,12 @@
    product_type, source_type, login_type,
    login_ip, login_time, login_status,
    create_id, create_time, modify_id,
    modify_time, delete_flag,token)
    modify_time, delete_flag,token,is_login,user_token_tourist)
    values (#{acctId,jdbcType=INTEGER}, #{acctName,jdbcType=VARCHAR},
    #{productType,jdbcType=TINYINT}, #{sourceType,jdbcType=TINYINT}, #{loginType,jdbcType=TINYINT},
    #{loginIp,jdbcType=VARCHAR}, #{loginTime,jdbcType=TIMESTAMP}, #{loginStatus,jdbcType=TINYINT},
    #{createId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{modifyId,jdbcType=INTEGER},
    #{modifyTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=TINYINT},#{token})
    #{modifyTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=TINYINT},#{token},#{isLogin},#{userTokenTourist})
    </insert>
    ......
    Markdown 格式
    0% or
    您添加了 0 人 到此讨论。请谨慎行事。
    先完成此消息的编辑！
    想要评论请 注册 或