Skip to content

P
pica-cloud-account
提交 9de66b21 编写于 作者: chenzhehao's avatar chenzhehao
浏览文件
操作

fix--垃圾的utils升级,parent升级

上级 6f2ef06b
流水线 #37734 已失败 于阶段
    隐藏空白字符变更
    内嵌 并排
    正在显示 包含 39 行增加 和 186 行删除
    common/pom.xml
    浏览文件 @ 9de66b21
    ......@@ -11,7 +11,7 @@
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.0.2.1</version>
    <version>1.0.2.2</version>
    <name>pica-cloud-account-common</name>
    <packaging>jar</packaging>
    ......@@ -28,6 +28,13 @@
    <artifactId>swagger-annotations</artifactId>
    <version>1.5.14</version>
    </dependency>
    <dependency>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-utils</artifactId>
    <version>1.3.2</version>
    <scope>provided</scope>
    </dependency>
    </dependencies>
    <distributionManagement>
    ......
    server/pom.xml
    浏览文件 @ 9de66b21
    ......@@ -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.6</version>
    <relativePath/>
    </parent>
    <groupId>com.pica.cloud.account</groupId>
    ......@@ -111,16 +112,9 @@
    </dependency>
    <dependency>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-utils</artifactId>
    <version>1.4.4</version>
    <scope>provided</scope>
    <exclusions>
    <exclusion>
    <artifactId>servlet-api</artifactId>
    <groupId>javax.servlet</groupId>
    </exclusion>
    </exclusions>
    <groupId>commons-collections</groupId>
    <artifactId>commons-collections</artifactId>
    <version>3.2.2</version>
    </dependency>
    <dependency>
    ......@@ -151,7 +145,7 @@
    <dependency>
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.0.2.1</version>
    <version>1.0.2.2</version>
    </dependency>
    <dependency>
    ......@@ -258,6 +252,13 @@
    <artifactId>pica-cloud-message-client</artifactId>
    <version>1.0.6-SNAPSHOT</version>
    </dependency>
    <dependency>
    <groupId>com.pica.cloud.foundation</groupId>
    <artifactId>pica-cloud-utils</artifactId>
    <version>1.3.2</version>
    </dependency>
    </dependencies>
    <dependencyManagement>
    ......
    server/src/main/java/com/pica/cloud/account/account/server/App.java
    浏览文件 @ 9de66b21
    ......@@ -6,6 +6,7 @@ import org.springframework.boot.SpringApplication;
    import org.springframework.boot.autoconfigure.SpringBootApplication;
    import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
    import org.springframework.cloud.netflix.feign.EnableFeignClients;
    import org.springframework.scheduling.annotation.EnableAsync;
    import org.springframework.transaction.annotation.EnableTransactionManagement;
    import springfox.documentation.swagger2.annotations.EnableSwagger2;
    ......@@ -15,9 +16,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
    @EnableFeignClients(basePackages = "com.pica.cloud")
    @MapperScan("com.pica.cloud.account.account.server.mapper")
    @EnableTransactionManagement
    @EnableAsync
    public class App {
    public static void main( String[] args ) {
    public static void main(String[] args) {
    SpringApplication.run(App.class, args);
    }
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/AutoCodeController.java
    浏览文件 @ 9de66b21
    package com.pica.cloud.account.account.server.controller;
    import com.alibaba.fastjson.JSON;
    import com.alibaba.fastjson.JSONObject;
    import com.pica.cloud.account.account.server.configuration.PropertiesConfiguration;
    import com.pica.cloud.account.account.server.constants.Constants;
    ......@@ -110,7 +109,7 @@ public class AutoCodeController extends AccountBaseController {
    // 4重置密码 5忘记密码 7患者招募提交问卷(效验) 8Appe登录绑定手机
    EncryptEntity entity = new EncryptEntity();
    if(StringUtils.isEmpty(authCodeReq.getKey()) && StringUtils.isEmpty(authCodeReq.getContent())){
    if (StringUtils.isEmpty(authCodeReq.getKey()) && StringUtils.isEmpty(authCodeReq.getContent())) {
    //明文时处理
    entity = RSAUtil.getAuthCodeEncrypt(authCodeReq);
    logger.info("AesAuthCodeReq getAuthCode:" + JSONObject.toJSONString(authCodeReq));
    ......@@ -123,7 +122,7 @@ public class AutoCodeController extends AccountBaseController {
    loginAes.setMobile(authCodeReq.getMobile());
    loginAes.setDeviceInfo(super.getDeviceInfoLow("deviceinfo"));
    loginService.insertLoginAesLog(loginAes);
    }else {
    } else {
    //执行原逻辑
    entity.setKey(authCodeReq.getKey());
    entity.setContent(authCodeReq.getContent());
    ......@@ -131,14 +130,14 @@ public class AutoCodeController extends AccountBaseController {
    BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
    request.setSourceType(super.getSourceType());
    logger.info("authCode/getAuthCode:{}",JSONObject.toJSONString(request));
    logger.info("authCode/getAuthCode:{}", JSONObject.toJSONString(request));
    AccountUtils.checkMobilePhone(request.getMobile());
    if (request.getBizType() != null && request.getBizType().equals(1)) {
    logger.info("app-rcValidate-start");
    // 调用风控接口
    authCodeService.rcValidate(req, request, super.getDeviceInfo(), super.getSourceType());
    authCodeService.rcValidate(req, request, this.getRequest().getHeader("deviceInfo"), super.getSourceType());
    // 发送短信验证码
    processSysCode(request.getMobile(), request.getFlag());
    return PicaResponse.toResponse();
    ......@@ -209,7 +208,7 @@ public class AutoCodeController extends AccountBaseController {
    //验证码保存到redis，失效时间10分钟
    cacheClient.set(this.getAuthCodeKey(mobilePhone, flag), authCode, 600);
    //处理验证码原子性的问题
    cacheClient.set(RegisterCodeKeyUtils.getRegisterKey(mobilePhone,authCode), 100, 600);
    cacheClient.set(RegisterCodeKeyUtils.getRegisterKey(mobilePhone, authCode), 100, 600);
    logger.info(this.getAuthCodeKey(mobilePhone, flag));
    //发送短信
    super.sendMobileMessage(mobilePhone, message, senderId);
    ......@@ -285,7 +284,7 @@ public class AutoCodeController extends AccountBaseController {
    private void processSendAuthCode(String mobilePhone, Integer flag, String authCodeKeySecure) {
    //接入新旭事务一致性
    String batchNo = IntactUtils.getUUID();
    intactUtil.sendIntact(batchNo,"processSendAuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"mobilePhone:"+mobilePhone+",flag:"+flag+",authCodeKeySecure:"+authCodeKeySecure);
    intactUtil.sendIntact(batchNo, "processSendAuthCode", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1, "mobilePhone:" + mobilePhone + ",flag:" + flag + ",authCodeKeySecure:" + authCodeKeySecure);
    long start = System.currentTimeMillis();
    String authCode = CommonUtil.createValidateCode();
    String message = "您的验证码是" + authCode + ",在10分钟内有效。如非本人操作，请忽略本短信！";
    ......@@ -294,17 +293,17 @@ public class AutoCodeController extends AccountBaseController {
    String authCodeKey = getAuthCodeKey(mobilePhone, flag.toString());
    boolean set = cacheClient.set(authCodeKey, authCode, 600);
    logger.info(cacheClient.get(authCodeKey));
    logger.info("验证码缓存是否成功----->："+set);
    logger.info("验证码缓存信息----->："+authCodeKey);
    logger.info("验证码缓存是否成功----->：" + set);
    logger.info("验证码缓存信息----->：" + authCodeKey);
    cacheClient.set(authCodeKeySecure, System.currentTimeMillis(), 60);
    //处理验证码原子性的问题
    cacheClient.set(RegisterCodeKeyUtils.getRegisterKey(mobilePhone,authCode), 100, 600);
    cacheClient.set(RegisterCodeKeyUtils.getRegisterKey(mobilePhone, authCode), 100, 600);
    long end1 = System.currentTimeMillis();
    logger.info("processSendAuthCode-1 used {} million seconds", end1-start);
    logger.info("processSendAuthCode-1 used {} million seconds", end1 - start);
    super.sendMobileMessage(mobilePhone, message, senderId);
    long end2 = System.currentTimeMillis();
    logger.info("processSendAuthCode-2 used {} million seconds", end2-start);
    intactUtil.sendIntact(batchNo,"processSendAuthCode",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"mobilePhone:"+mobilePhone+",flag:"+flag+",authCodeKeySecure:"+authCodeKeySecure);
    logger.info("processSendAuthCode-2 used {} million seconds", end2 - start);
    intactUtil.sendIntact(batchNo, "processSendAuthCode", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "mobilePhone:" + mobilePhone + ",flag:" + flag + ",authCodeKeySecure:" + authCodeKeySecure);
    }
    ......@@ -322,11 +321,10 @@ public class AutoCodeController extends AccountBaseController {
    @ApiOperation("微信获取验证码")
    @PostMapping(value = "/authCode/get")
    public PicaResponse getAuthCode(){
    public PicaResponse getAuthCode() {
    String cacheCode = cacheClient.get("authCode-j1VrU5MSc1uuZaEa82ZKfQ==");
    return PicaResponse.toResponse(cacheCode);
    }
    }
    server/src/main/resources/log4j2.xml 已删除 100644 → 0
    浏览文件 @ 6f2ef06b
    <?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
    Markdown 格式
    0% or
    您添加了 0 人 到此讨论。请谨慎行事。
    先完成此消息的编辑！
    想要评论请 注册 或