root/rl_mg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ludj
2023-02-14 19:39:23 +08:00
parent 45a0645559
commit 7060ccc1ef
3 changed files with 62 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nladmin-system/nlsso-server/pom.xml
View File

@@ -27,7 +27,7 @@
<hutool.version>5.7.14</hutool.version> <hutool.version>5.7.14</hutool.version>
<jjwt.version>0.11.1</jjwt.version> <jjwt.version>0.11.1</jjwt.version>
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 --> <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
<jna.version>5.9.0</jna.version> <jna.version>5.8.0</jna.version>
<configuration.version>1.9</configuration.version> <configuration.version>1.9</configuration.version>
<netty.version>4.1.59.Final</netty.version> <netty.version>4.1.59.Final</netty.version>
</properties> </properties>
@@ -380,6 +380,14 @@
<version>1.9.2</version> <version>1.9.2</version>
</dependency> </dependency>
<!-- 重试机制-->
<dependency>
<groupId>org.springframework.retry</groupId>
<artifactId>spring-retry</artifactId>
</dependency>
<!--接口限流--> <!--接口限流-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@@ -472,7 +480,7 @@
<dependency> <dependency>
<groupId>com.github.oshi</groupId> <groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId> <artifactId>oshi-core</artifactId>
<version>5.0.1</version> <version>6.1.4</version>
</dependency> </dependency>
<dependency> <dependency>

3
nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
View File

@@ -11,7 +11,7 @@ import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactor
import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.retry.annotation.EnableRetry;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
@EnableMethodCache(basePackages = "org.nl") @EnableMethodCache(basePackages = "org.nl")
@EnableCreateCacheAnnotation @EnableCreateCacheAnnotation
@MapperScan("org.nl.**.mapper") @MapperScan("org.nl.**.mapper")
@EnableRetry //https://juejin.cn/post/7094613787973517343
public class AppRun { public class AppRun {
public static void main(String[] args) { public static void main(String[] args) {

8
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
View File

@@ -12,7 +12,7 @@ import org.nl.common.aspect.exception.BadRequestException;
import org.nl.common.domain.query.PageQuery; import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.MapOf; import org.nl.common.utils.MapOf;
import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.SecurityUtils;
import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.dao.Param; import org.nl.system.service.param.dao.Param;
import org.nl.system.service.param.dao.mapper.SysParamMapper; import org.nl.system.service.param.dao.mapper.SysParamMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -22,9 +22,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* <p>
* 系统参数表 服务实现类 * 系统参数表 服务实现类
* </p>
* *
* @author generator * @author generator
* @since 2022-12-14 * @since 2022-12-14
@@ -33,13 +31,13 @@ import java.util.Map;
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
@Transactional @Transactional
public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> implements ISysParamService { public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param>
implements ISysParamService {
private final SysParamMapper paramMapper; private final SysParamMapper paramMapper;
@Override @Override
public Page<Param> queryPage(Map whereJson, PageQuery page) { public Page<Param> queryPage(Map whereJson, PageQuery page) {
log.info("111");
QueryWrapper<Param> queryWrapper = new QueryWrapper<>(); QueryWrapper<Param> queryWrapper = new QueryWrapper<>();
queryWrapper.orderBy(true, true, "create_time"); queryWrapper.orderBy(true, true, "create_time");
Page<Param> paramPage = paramMapper.selectPage(page.build(), queryWrapper); Page<Param> paramPage = paramMapper.selectPage(page.build(), queryWrapper);