java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'pre-production'

master
pref_mail@163.com 2 months ago
parent
f7d30841d7 a906b7077f
commit
e6211bb7ca
34 changed files with 79 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      blade-biz-common/src/main/java/org/springblade/common/component/MockLoginService.java
  2. 8
      blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java
  3. 3
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/aspect/JobAnnotationAspect.java
  4. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/ChangeAsyncAnnotationAspect.java
  5. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/JobAnnotationAspect.java
  6. 3
      blade-service/logpm-business/src/main/java/com/logpm/business/aspect/ChangeAsyncAnnotationAspect.java
  7. 3
      blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/interceptor/LocalServerLoginAccountsInterceptor.java
  8. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/aspect/ChangeAsyncAnnotationAspect.java
  9. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/aspect/JobAnnotationAspect.java
  10. 3
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/aspect/JobAnnotationAspect.java
  11. 3
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/FactoryAccountsInterceptor.java
  12. 3
      blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/LocalServerLoginAccountsInterceptor.java
  13. 3
      blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/interceptor/LocalServerLoginAccountsInterceptor.java
  14. 3
      blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/interceptor/LocalServerLoginAccountsInterceptor.java
  15. 3
      blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/aspect/JobAnnotationAspect.java
  16. 3
      blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/interceptor/LocalServerLoginAccountsInterceptor.java
  17. 3
      blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/JobAnnotationAspect.java
  18. 3
      blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/interceptor/LocalServerLoginAccountsInterceptor.java
  19. 3
      blade-service/logpm-factory-data/logpm-factory-data-oupai/src/main/java/com/logpm/factorydata/oupai/interceptor/LocalServerLoginAccountsInterceptor.java
  20. 3
      blade-service/logpm-factory-data/logpm-factory-data-pan/src/main/java/com/logpm/factorydata/pan/interceptor/LocalServerLoginAccountsInterceptor.java
  21. 3
      blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/aspect/JobAnnotationAspect.java
  22. 3
      blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/FactoryAccountsInterceptor.java
  23. 3
      blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/LocalServerLoginAccountsInterceptor.java
  24. 3
      blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/interceptor/LocalServerLoginAccountsInterceptor.java
  25. 3
      blade-service/logpm-factory/src/main/java/com/logpm/factory/aspect/JobAnnotationAspect.java
  26. 3
      blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java
  27. 3
      blade-service/logpm-patch/src/main/java/com/logpm/patch/aspect/JobAnnotationAspect.java
  28. 3
      blade-service/logpm-patch/src/main/java/com/logpm/patch/interceptor/LocalServerLoginAccountsInterceptor.java
  29. 3
      blade-service/logpm-report/src/main/java/com/logpm/report/aspect/JobAnnotationAspect.java
  30. 3
      blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/LocalServerLoginAccountsInterceptor.java
  31. 8
      blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/DeliveryDataServiceImpl.java
  32. 3
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/aspect/JobAnnotationAspect.java
  33. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/aspect/ChangeAsyncAnnotationAspect.java
  34. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/interceptor/LocalServerLoginAccountsInterceptor.java

3
blade-biz-common/src/main/java/org/springblade/common/component/MockLoginService.java
Unescape View File

@ -4,6 +4,7 @@ import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONObject;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.LauncherConstant;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
@ -14,9 +15,11 @@ import java.util.Objects;
@Component
@AllArgsConstructor
@Slf4j
public class MockLoginService {
private final Environment environment;
public JSONObject mockToken(String tenantId,String account) {
log.info("mockToken >>> tenantId={} account={} ",tenantId,account);
String url = "http://" + LauncherConstant.loginAddr(Objects.requireNonNull(environment.getActiveProfiles()[0])) + "/blade-auth/oauth/token";
HttpRequest urlRequest = HttpRequest.post(url);
// urlRequest.header("Authorization", "Basic c2FiZXI6c2FiZXJfc2VjcmV0");

8
blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java
Unescape View File

@ -0,0 +1,8 @@
package org.springblade.common.utils;
public class DefaultUserTokenConfig {
/**
* 默认用户的token 超时时间
*/
public static final Long EXPIRE_TIME = 7 *24 * 60 * 60 * 1000L;
}

3
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/aspect/JobAnnotationAspect.java
Unescape View File

@ -11,6 +11,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -75,7 +76,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/ChangeAsyncAnnotationAspect.java
Unescape View File

@ -11,6 +11,7 @@ import org.aspectj.lang.reflect.MethodSignature;
import org.springblade.common.annotations.ChangeAsync;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -80,7 +81,7 @@ public class ChangeAsyncAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/JobAnnotationAspect.java
Unescape View File

@ -11,6 +11,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -74,7 +75,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-business/src/main/java/com/logpm/business/aspect/ChangeAsyncAnnotationAspect.java
Unescape View File

@ -11,6 +11,7 @@ import org.aspectj.lang.reflect.MethodSignature;
import org.springblade.common.annotations.ChangeAsync;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -80,7 +81,7 @@ public class ChangeAsyncAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -6,6 +6,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -51,7 +52,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/aspect/ChangeAsyncAnnotationAspect.java
Unescape View File

@ -12,6 +12,7 @@ import org.springblade.common.annotations.ChangeAsync;
import org.springblade.common.annotations.LogpmAsync;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -82,7 +83,7 @@ public class ChangeAsyncAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/aspect/JobAnnotationAspect.java
Unescape View File

@ -8,6 +8,7 @@ import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -69,7 +70,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/aspect/JobAnnotationAspect.java
Unescape View File

@ -11,6 +11,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -74,7 +75,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/FactoryAccountsInterceptor.java
Unescape View File

@ -14,6 +14,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -119,7 +120,7 @@ public class FactoryAccountsInterceptor implements HandlerInterceptor {
data = bladeRedis.get(key);
if (Objects.isNull(data)) {
data = mockLoginService.mockToken(tenantId, account);
bladeRedis.setEx(key, data, 2591990L);
bladeRedis.setEx(key, data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -8,6 +8,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -72,7 +73,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -9,6 +9,7 @@ import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -55,7 +56,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -6,6 +6,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -50,7 +51,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/aspect/JobAnnotationAspect.java
Unescape View File

@ -8,6 +8,7 @@ import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -69,7 +70,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -9,6 +9,7 @@ import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -55,7 +56,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/JobAnnotationAspect.java
Unescape View File

@ -11,6 +11,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -74,7 +75,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -9,6 +9,7 @@ import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -55,7 +56,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-oupai/src/main/java/com/logpm/factorydata/oupai/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -6,6 +6,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -50,7 +51,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-pan/src/main/java/com/logpm/factorydata/pan/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -6,6 +6,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -50,7 +51,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/aspect/JobAnnotationAspect.java
Unescape View File

@ -8,6 +8,7 @@ import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -69,7 +70,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/FactoryAccountsInterceptor.java
Unescape View File

@ -12,6 +12,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -118,7 +119,7 @@ public class FactoryAccountsInterceptor implements HandlerInterceptor {
data = bladeRedis.get(key);
if (Objects.isNull(data)) {
data = mockLoginService.mockToken(tenantId, account);
bladeRedis.setEx(key, data, 2591990L);
bladeRedis.setEx(key, data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -8,6 +8,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -72,7 +73,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -9,6 +9,7 @@ import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -55,7 +56,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory/src/main/java/com/logpm/factory/aspect/JobAnnotationAspect.java
Unescape View File

@ -8,6 +8,7 @@ import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -67,7 +68,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -9,6 +9,7 @@ import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -55,7 +56,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-patch/src/main/java/com/logpm/patch/aspect/JobAnnotationAspect.java
Unescape View File

@ -11,6 +11,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -74,7 +75,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-patch/src/main/java/com/logpm/patch/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -9,6 +9,7 @@ import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -57,7 +58,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-report/src/main/java/com/logpm/report/aspect/JobAnnotationAspect.java
Unescape View File

@ -8,6 +8,7 @@ import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -67,7 +68,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -6,6 +6,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -51,7 +52,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

8
blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/DeliveryDataServiceImpl.java
Unescape View File

@ -23,8 +23,12 @@ public class DeliveryDataServiceImpl implements IDeliveryDataService {
public DeliveryDataVO getDeliveryAllData(Integer isYear) {
DeliveryDataVO deliveryDataVO = new DeliveryDataVO();
String startTime = isYear.equals(1) ? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-01-01 00:00:00")) : null;
String endTime = isYear.equals(1) ? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-12-31 23:59:59")) : null;
String startTime = isYear.equals(1)
? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-01-01 00:00:00"))
: LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-01 00:00:00")) ;
String endTime = isYear.equals(1)
? LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-12-31 23:59:59"))
: LocalDateTime.now().plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM-01 00:00:00"));
DeliveryDataVO deliveryAllData = deliveryDataMapper.getDeliveryAllData(startTime, endTime);
DeliveryDataVO delivery2CData = deliveryDataMapper.getDelivery2CData(startTime, endTime);

3
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/aspect/JobAnnotationAspect.java
Unescape View File

@ -8,6 +8,7 @@ import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -69,7 +70,7 @@ public class JobAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/aspect/ChangeAsyncAnnotationAspect.java
Unescape View File

@ -11,6 +11,7 @@ import org.aspectj.lang.reflect.MethodSignature;
import org.springblade.common.annotations.ChangeAsync;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
import org.springblade.core.redis.lock.RedisLockClient;
@ -80,7 +81,7 @@ public class ChangeAsyncAnnotationAspect {
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/interceptor/LocalServerLoginAccountsInterceptor.java
Unescape View File

@ -6,6 +6,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.cache.CacheNames;
import org.springblade.common.component.MockLoginService;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.DefaultUserTokenConfig;
import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.LockType;
@ -48,7 +49,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
data =bladeRedis.get(key);
if(Objects.isNull(data)){
data = mockLoginService.mockToken(tenantId,account);
bladeRedis.setEx(key,data,2591990L);
bladeRedis.setEx(key,data, DefaultUserTokenConfig.EXPIRE_TIME);
redisLockClient.unLock(lockKey, LockType.FAIR);
}
}

Write Preview
Loading…
Cancel
Save