20190827 日志异步存储

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.EnumsType;
 import com.pica.cloud.account.account.server.enums.ExceptionType;
+import com.pica.cloud.account.account.server.log.PicaLogUtils;
 import com.pica.cloud.account.account.server.req.RegisterReq;
 import com.pica.cloud.account.account.server.service.*;
 import com.pica.cloud.account.account.server.util.AccountUtils;
@@ -54,7 +55,6 @@ public class LoginController extends AccountBaseController {
     @Autowired
     private AccountUtils accountUtils;
 
-
     @ApiOperation("登录接口")
     @PostMapping("/login")
     public PicaResponse<String> loginByPassword(@RequestBody String params) throws Exception {
@@ -230,7 +230,9 @@ public class LoginController extends AccountBaseController {
         account.setCreatTime(new Date());
         account.setRegisterSource(super.getSourceType());
         String newToken = tokenUtils.generateToken(account);
+
         AccountUser accountUser = cacheClient.getToken(newToken, AccountUser.class);
+
         accountUser.setLoginFrom(super.getSourceType());
         accountUser.setLoginPlatform(super.getProductType());
         accountUser.setLoginIp(super.getIpAddr());

server/src/main/java/com/pica/cloud/account/account/server/entity/AccountInfo.java

 package com.pica.cloud.account.account.server.entity;
 
+import com.pica.cloud.account.account.server.log.PicaLogEntity;
+
 import java.util.Date;
 
-public class AccountInfo {
+public class AccountInfo extends PicaLogEntity {
     private Long id;
 
     private String password;

server/src/main/java/com/pica/cloud/account/account/server/entity/LogPasswordModify.java

 package com.pica.cloud.account.account.server.entity;
 
+import com.pica.cloud.account.account.server.log.PicaLogEntity;
+
 import java.util.Date;
 
-public class LogPasswordModify {
+public class LogPasswordModify extends PicaLogEntity {
 
 
     private Long id;

server/src/main/java/com/pica/cloud/account/account/server/entity/LoginLog.java

 package com.pica.cloud.account.account.server.entity;
 
+import com.pica.cloud.account.account.server.log.PicaLogEntity;
+
 import java.util.Date;
 
-public class LoginLog {
+public class LoginLog extends PicaLogEntity {
 
     public LoginLog() {
         this.loginTime = new Date();
@@ -86,8 +88,9 @@ public class LoginLog {
         return loginType;
     }
 
-    public void setLoginType(Integer loginType) {
+    public LoginLog setLoginType(Integer loginType) {
         this.loginType = loginType;
+        return this;
     }
 
     public String getLoginIp() {
@@ -102,16 +105,17 @@ public class LoginLog {
         return loginPlatform;
     }
 
-    public void setLoginPlatform(Integer loginPlatform) {
+    public LoginLog setLoginPlatform(Integer loginPlatform) {
         this.loginPlatform = loginPlatform;
+        return this;
     }
-
     public Integer getLoginStatus() {
         return loginStatus;
     }
 
     public void setLoginStatus(Integer loginStatus) {
         this.loginStatus = loginStatus;
+
     }
 
     public Integer getCreateId() {

server/src/main/java/com/pica/cloud/account/account/server/enums/EnumsType.java

@@ -32,10 +32,14 @@ public enum EnumsType {
     SYSCODE_TYPE_RESET_PASSWORD(4, "重置密码"),
 
     //联合登录类型
-    UNION_LOGIN_WE_CHAT(1,"微信"),
-    UNION_LOGIN_QQ(2,"QQ"),
-    union_login_blog(3,"微博");
+    UNION_LOGIN_WE_CHAT(1, "微信"),
+    UNION_LOGIN_QQ(2, "QQ"),
+    union_login_blog(3, "微博"),
 
+    //日志类型枚举
+    LOG_TYPE_LOGIN(1, "登录日志"),
+    LOG_TYPE_PASSWORD(2, "密码更新日志"),
+    LOG_TYPE_USER_INFO(3, "用户信息更新日志");
 
     private int code;
     private String type;

server/src/main/java/com/pica/cloud/account/account/server/log/PicaLogEntity.java

+package com.pica.cloud.account.account.server.log;
+
+/**
+ * 日志记录
+ */
+public class PicaLogEntity {
+
+    //标记当前记录的是哪种日志
+    private int logType;
+
+    public int getLogType() {
+        return logType;
+    }
+
+    public void setLogType(int logType) {
+        this.logType = logType;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/log/PicaLogTask.java

+package com.pica.cloud.account.account.server.log;
+
+import com.pica.cloud.account.account.server.entity.AccountInfo;
+import com.pica.cloud.account.account.server.entity.LogPasswordModify;
+import com.pica.cloud.account.account.server.entity.LoginLog;
+import com.pica.cloud.account.account.server.enums.EnumsType;
+import com.pica.cloud.account.account.server.mapper.AccountDetailsMapper;
+import com.pica.cloud.account.account.server.mapper.LogPwdModifyMapper;
+import com.pica.cloud.account.account.server.mapper.LogLoginMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class PicaLogTask implements Runnable {
+
+    @Autowired
+    private LogLoginMapper loginLogMapper;
+
+    @Autowired
+    private LogPwdModifyMapper logPasswordModifyMapper;
+
+    @Autowired
+    private AccountDetailsMapper accountDetailsMapper;
+
+    /**
+     * 日志类型
+     */
+    private int type;
+
+    /**
+     * 日志内容
+     */
+    private PicaLogEntity picaLogEntity;
+
+    PicaLogTask(PicaLogEntity picaLogEntity) {
+        this.picaLogEntity = picaLogEntity;
+        type = picaLogEntity.getLogType();
+
+    }
+
+    @Override
+    public void run() {
+        if (type == EnumsType.LOG_TYPE_LOGIN.getCode()) {
+            loginLogMapper.insertSelective((LoginLog) picaLogEntity);
+        } else if (type == EnumsType.LOG_TYPE_PASSWORD.getCode()) {
+            logPasswordModifyMapper.insertSelective((LogPasswordModify) picaLogEntity);
+        } else if (type == EnumsType.LOG_TYPE_USER_INFO.getCode()) {
+            accountDetailsMapper.insertSelective((AccountInfo) picaLogEntity);
+        }
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/log/PicaLogUtils.java

+package com.pica.cloud.account.account.server.log;
+
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Component
+public class PicaLogUtils {
+
+    /**
+     * 开启一个线程池
+     */
+    ExecutorService executor = Executors.newFixedThreadPool(30);
+
+    /**
+     * 日志记录方法
+     *
+     * @param picaLogEntity
+     */
+    public void info(PicaLogEntity picaLogEntity) {
+        executor.submit(new PicaLogTask(picaLogEntity));
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/mapper/LoginLogMapper.java → server/src/main/java/com/pica/cloud/account/account/server/mapper/LogLoginMapper.java

@@ -3,7 +3,7 @@ package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.LoginLog;
 
-public interface LoginLogMapper {
+public interface LogLoginMapper {
 
     int insert(LoginLog record);
 

server/src/main/java/com/pica/cloud/account/account/server/mapper/LogPasswordModifyMapper.java → server/src/main/java/com/pica/cloud/account/account/server/mapper/LogPwdModifyMapper.java

@@ -3,7 +3,7 @@ package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.LogPasswordModify;
 
-public interface LogPasswordModifyMapper {
+public interface LogPwdModifyMapper {
     int deleteByPrimaryKey(Long id);
 
     int insert(LogPasswordModify record);

server/src/main/java/com/pica/cloud/account/account/server/service/impl/AccountLoginServiceImpl.java

@@ -4,8 +4,9 @@ import com.pica.cloud.account.account.server.entity.AccountContact;
 import com.pica.cloud.account.account.server.entity.AccountInfo;
 import com.pica.cloud.account.account.server.entity.AccountUser;
 import com.pica.cloud.account.account.server.entity.LoginLog;
+import com.pica.cloud.account.account.server.enums.EnumsType;
+import com.pica.cloud.account.account.server.log.PicaLogUtils;
 import com.pica.cloud.account.account.server.mapper.AccountDetailsMapper;
-import com.pica.cloud.account.account.server.mapper.LoginLogMapper;
 import com.pica.cloud.account.account.server.service.AccountContactService;
 import com.pica.cloud.account.account.server.service.AccountLoginService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
@@ -16,19 +17,23 @@ import org.springframework.stereotype.Service;
 @Service
 public class AccountLoginServiceImpl implements AccountLoginService {
 
-    @Autowired
-    private LoginLogMapper loginLogMapper;
     @Autowired
     private AccountContactService accountContactServer;
     @Autowired
     private AccountDetailsMapper accountDetailsMapper;
 
+    @Autowired
+    private PicaLogUtils picaLogUtils;
+
     @Override
     public void insertLoginLog(AccountUser accountUser, Integer loginType, Integer status) {
         LoginLog loginLog = AccountUtils.getLoginLog(accountUser);
         loginLog.setLoginStatus(status);
         loginLog.setLoginType(loginType);
-        loginLogMapper.insertSelective(loginLog);
+        loginLog.setLogType(EnumsType.LOG_TYPE_LOGIN.getCode());
+
+        picaLogUtils.info(loginLog);
+//        loginLogMapper.insertSelective(loginLog);
     }
 
     @Override

server/src/main/java/com/pica/cloud/account/account/server/service/impl/PasswordServiceImpl.java

@@ -6,7 +6,7 @@ import com.pica.cloud.account.account.server.entity.AccountInfo;
 import com.pica.cloud.account.account.server.entity.LogPasswordModify;
 import com.pica.cloud.account.account.server.mapper.AccountContactMapper;
 import com.pica.cloud.account.account.server.mapper.AccountDetailsMapper;
-import com.pica.cloud.account.account.server.mapper.LogPasswordModifyMapper;
+import com.pica.cloud.account.account.server.mapper.LogPwdModifyMapper;
 import com.pica.cloud.account.account.server.req.ForgetPasswordReq;
 import com.pica.cloud.account.account.server.req.PasswordReq;
 import com.pica.cloud.account.account.server.service.PasswordService;
@@ -21,7 +21,7 @@ public class PasswordServiceImpl implements PasswordService {
     private AccountDetailsMapper accountDetailsMapper;
 
     @Autowired
-    private LogPasswordModifyMapper logPasswordModifyMapper;
+    private LogPwdModifyMapper logPasswordModifyMapper;
 
     @Autowired
     private AccountContactMapper accountContactMapper;

server/src/main/java/com/pica/cloud/account/account/server/util/AccountUtils.java

@@ -107,8 +107,8 @@ public class AccountUtils {
      * @return
      */
     public static <T> T getRequestEntity(String params, Class<T> zClass) throws Exception {
-//        String json = RSAUtils.decryptByPrivateKey(params,RSAUtils.PRIVATE_KEY);
-        return JSONObject.parseObject(params, zClass);
+        String json = EncryptCreateUtil.dencrypt(params);
+        return JSONObject.parseObject(json, zClass);
     }
 
     /**

server/src/main/java/com/pica/cloud/account/account/server/util/BASE64Utils.java

-package com.pica.cloud.account.account.server.util;
-
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
-import java.security.MessageDigest;
-
-public class BASE64Utils {
-
-    public static final String KEY_SHA = "SHA";
-    public static final String KEY_MD5 = "MD5";
-
-    /**
-     * BASE64解密
-     *
-     * @param key
-     * @return
-     * @throws Exception
-     */
-    public static byte[] decryptBASE64(String key) throws Exception {
-        return (new BASE64Decoder()).decodeBuffer(key);
-    }
-
-    /**
-     * BASE64加密
-     *
-     * @param key
-     * @return
-     * @throws Exception
-     */
-    public static String encryptBASE64(byte[] key) throws Exception {
-        return (new BASE64Encoder()).encodeBuffer(key);
-    }
-
-    /**
-     * MD5加密
-     *
-     * @param data
-     * @return
-     * @throws Exception
-     */
-    public static byte[] encryptMD5(byte[] data) throws Exception {
-
-        MessageDigest md5 = MessageDigest.getInstance(KEY_MD5);
-        md5.update(data);
-
-        return md5.digest();
-
-    }
-
-    /**
-     * SHA加密
-     *
-     * @param data
-     * @return
-     * @throws Exception
-     */
-    public static byte[] encryptSHA(byte[] data) throws Exception {
-
-        MessageDigest sha = MessageDigest.getInstance(KEY_SHA);
-        sha.update(data);
-
-        return sha.digest();
-
-    }
-
-}

server/src/main/resources/mybatis/LogPasswordModifyMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pica.cloud.account.account.server.mapper.LogPasswordModifyMapper" >
+<mapper namespace="com.pica.cloud.account.account.server.mapper.LogPwdModifyMapper" >
   <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.LogPasswordModify" >
     <id column="id" property="id" jdbcType="BIGINT" />
     <result column="mobile_phone" property="mobilePhone" jdbcType="VARCHAR" />

server/src/main/resources/mybatis/LoginLogMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pica.cloud.account.account.server.mapper.LoginLogMapper" >
+<mapper namespace="com.pica.cloud.account.account.server.mapper.LogLoginMapper" >
   <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.LoginLog" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="acct_id" property="acctId" jdbcType="INTEGER" />