perf:代码调整

This commit is contained in:
曾文豪
2023-01-10 14:19:23 +08:00
parent 84a5b756c9
commit 6281cd3682
19 changed files with 77 additions and 98 deletions

View File

@@ -11,5 +11,5 @@ import org.springframework.context.annotation.ComponentScan;
"com.tiesheng.core.**.*",
})
@MapperScan("com.tiesheng.core.mapper")
public class CoreAutoImportSelector {
public class CoreAutoConfigurer {
}

View File

@@ -1,8 +1,8 @@
package com.tiesheng.core;
import com.tiesheng.login.LoginAutoImportSelector;
import com.tiesheng.login.LoginAutoConfigurer;
import com.tiesheng.message.MessageAutoConfigurer;
import com.tiesheng.migration.MigrationAutoImportSelector;
import com.tiesheng.migration.MigrationAutoConfigurer;
import com.tiesheng.util.UtilAutoConfigurer;
import org.springframework.context.annotation.Import;
@@ -17,9 +17,9 @@ import java.lang.annotation.*;
@Import({
UtilAutoConfigurer.class,
MessageAutoConfigurer.class,
CoreAutoImportSelector.class,
LoginAutoImportSelector.class,
MigrationAutoImportSelector.class
CoreAutoConfigurer.class,
LoginAutoConfigurer.class,
MigrationAutoConfigurer.class
})
public @interface EnableTieshengWeb {
}

View File

@@ -2,7 +2,7 @@ package com.tiesheng.core.config.exception;
import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.extra.spring.SpringUtil;
import com.tiesheng.core.config.web.TieshengWebConfigurer;
import com.tiesheng.core.service.TieshengWebConfigurer;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.exception.ApiRespEnum;
import com.tiesheng.util.pojos.ApiResp;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.controller.config;
package com.tiesheng.core.controller;
import cn.hutool.core.util.StrUtil;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.controller.log;
package com.tiesheng.core.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.controller.tool;
package com.tiesheng.core.controller;
import cn.hutool.captcha.LineCaptcha;

View File

@@ -1,4 +1,4 @@
package com.tiesheng.core.config.web.bean;
package com.tiesheng.core.pojos;
public class CurrentWebUser {

View File

@@ -3,15 +3,15 @@ package com.tiesheng.core.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.json.JSONUtil;
import com.tiesheng.core.config.web.TieshengWebConfigurer;
import com.tiesheng.core.config.web.bean.CurrentWebUser;
import com.tiesheng.core.mapper.CoreLogLoginMapper;
import com.tiesheng.core.mapper.CoreLogMessageMapper;
import com.tiesheng.core.mapper.CoreLogOperationMapper;
import com.tiesheng.core.pojos.CurrentWebUser;
import com.tiesheng.core.pojos.dao.CoreLogLogin;
import com.tiesheng.core.pojos.dao.CoreLogMessage;
import com.tiesheng.core.pojos.dao.CoreLogOperation;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.login.config.token.TsTokenConfig;
import com.tiesheng.message.pojos.MessageReqResp;
import com.tiesheng.message.service.TieshengMessageConfigurer;
import com.tiesheng.util.ServletKit;
@@ -53,7 +53,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
*/
public void addOperationLog(String title, String subject, Object params) {
CoreLogOperation operation = new CoreLogOperation();
CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName();
CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(TsTokenConfig.get().getId());
operation.setUserId(currentWebUser.getId());
operation.setUserName(currentWebUser.getName());
operation.setTitle(title);
@@ -78,12 +78,11 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
HttpServletRequest request = ServletKit.getRequest();
String ip = ServletUtil.getClientIP(request);
CoreLogLogin login = new CoreLogLogin();
login.setUserId(platformUnique.getUserId());
login.setPlatform(platformUnique.getPlatform());
CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName();
CurrentWebUser currentWebUser = tieshengWebConfigurer.getCurrentUserName(platformUnique.getUserId());
login.setUserName(currentWebUser.getName());
login.setIp(ip);

View File

@@ -2,10 +2,9 @@ package com.tiesheng.core.service;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.tiesheng.core.config.web.TieshengWebConfigurer;
import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.login.config.TieshengLoginConfigurer;
import com.tiesheng.login.service.TieshengLoginConfigurer;
import com.tiesheng.login.config.token.bean.TokenBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

View File

@@ -3,7 +3,6 @@ package com.tiesheng.core.service;
import cn.hutool.core.io.FileTypeUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import com.tiesheng.core.config.web.TieshengWebConfigurer;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.pojos.FileUploadPath;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.config.web;
package com.tiesheng.core.service;
import cn.hutool.log.LogFactory;
import com.tiesheng.core.config.web.bean.CurrentWebUser;
import com.tiesheng.core.pojos.CurrentWebUser;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.exception.ApiException;
@@ -23,7 +23,7 @@ public interface TieshengWebConfigurer {
*
* @return
*/
CurrentWebUser getCurrentUserName();
CurrentWebUser getCurrentUserName(String userId);
/**

View File

@@ -1,7 +1,7 @@
package com.tiesheng.core.config.web;
package com.tiesheng.core.service.impl;
import com.tiesheng.core.config.web.bean.CurrentWebUser;
import com.tiesheng.login.config.token.TsTokenConfig;
import com.tiesheng.core.pojos.CurrentWebUser;
import com.tiesheng.core.service.TieshengWebConfigurer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Configuration;
@@ -14,11 +14,10 @@ import org.springframework.context.annotation.Configuration;
public class DefaultWebConfigurer implements TieshengWebConfigurer {
@Override
public CurrentWebUser getCurrentUserName() {
public CurrentWebUser getCurrentUserName(String userId) {
CurrentWebUser webUser = new CurrentWebUser();
webUser.setId(TsTokenConfig.getWithoutThr().getId());
webUser.setId(userId);
webUser.setName(webUser.getId());
return webUser;
}
}