fix(): 代码结构,风格更改
parent
2a235b198e
commit
8d4047d3ca
|
@ -1,6 +1,6 @@
|
||||||
# Tomcat
|
# Tomcat
|
||||||
server:
|
server:
|
||||||
port: 9200
|
port: 9500
|
||||||
|
|
||||||
# nacos线上地址
|
# nacos线上地址
|
||||||
nacos:
|
nacos:
|
||||||
|
|
|
@ -20,7 +20,7 @@ public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogServic
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RemoteLogService create (Throwable throwable) {
|
public RemoteLogService create (Throwable throwable) {
|
||||||
log.error("日志服务调用失败:{}", throwable.getMessage());
|
log.error("日志服务调用失败:{}", throwable.getMessage(), throwable);
|
||||||
return new RemoteLogService() {
|
return new RemoteLogService() {
|
||||||
@Override
|
@Override
|
||||||
public Result<Boolean> saveLog (SysOperLog sysOperLog, String source) {
|
public Result<Boolean> saveLog (SysOperLog sysOperLog, String source) {
|
||||||
|
|
|
@ -44,6 +44,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
|
||||||
ServerHttpRequest.Builder mutate = request.mutate();
|
ServerHttpRequest.Builder mutate = request.mutate();
|
||||||
|
|
||||||
String url = request.getURI().getPath();
|
String url = request.getURI().getPath();
|
||||||
|
log.info("请求路径:[{}]", url);
|
||||||
// 跳过不需要验证的路径
|
// 跳过不需要验证的路径
|
||||||
if (StringUtils.matches(url, ignoreWhite.getWhites())) {
|
if (StringUtils.matches(url, ignoreWhite.getWhites())) {
|
||||||
return chain.filter(exchange);
|
return chain.filter(exchange);
|
||||||
|
|
|
@ -11,6 +11,8 @@ nacos:
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
allow-bean-definition-overriding: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: cloud-gen
|
name: cloud-gen
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
//
|
//
|
||||||
// // quartz参数
|
// // quartz参数
|
||||||
// Properties prop = new Properties();
|
// Properties prop = new Properties();
|
||||||
// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
|
// prop.put("org.quartz.scheduler.instanceName", "MuYuScheduler");
|
||||||
// prop.put("org.quartz.scheduler.instanceId", "AUTO");
|
// prop.put("org.quartz.scheduler.instanceId", "AUTO");
|
||||||
// // 线程池配置
|
// // 线程池配置
|
||||||
// prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
|
// prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
// prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
|
// prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
|
||||||
// factory.setQuartzProperties(prop);
|
// factory.setQuartzProperties(prop);
|
||||||
//
|
//
|
||||||
// factory.setSchedulerName("RuoyiScheduler");
|
// factory.setSchedulerName("MuYuScheduler");
|
||||||
// // 延时启动
|
// // 延时启动
|
||||||
// factory.setStartupDelay(1);
|
// factory.setStartupDelay(1);
|
||||||
// factory.setApplicationContextSchedulerContextKey("applicationContextKey");
|
// factory.setApplicationContextSchedulerContextKey("applicationContextKey");
|
||||||
|
|
|
@ -11,6 +11,8 @@ nacos:
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
allow-bean-definition-overriding: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: cloud-job
|
name: cloud-job
|
||||||
|
|
|
@ -162,7 +162,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
||||||
.title(menu.getMenuName())
|
.title(menu.getMenuName())
|
||||||
.icon(menu.getIcon())
|
.icon(menu.getIcon())
|
||||||
.noCache(StringUtils.equals("1", menu.getIsCache()))
|
.noCache(StringUtils.equals("1", menu.getIsCache()))
|
||||||
.link(menu.getPath())
|
.link(StringUtils.ishttp(menu.getPath())? menu.getPath():null)
|
||||||
.build()
|
.build()
|
||||||
);
|
);
|
||||||
List<SysMenu> cMenus = menu.getChildren();
|
List<SysMenu> cMenus = menu.getChildren();
|
||||||
|
@ -182,7 +182,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
||||||
.title(menu.getMenuName())
|
.title(menu.getMenuName())
|
||||||
.icon(menu.getIcon())
|
.icon(menu.getIcon())
|
||||||
.noCache(StringUtils.equals("1", menu.getIsCache()))
|
.noCache(StringUtils.equals("1", menu.getIsCache()))
|
||||||
.link(menu.getPath())
|
.link(StringUtils.ishttp(menu.getPath())? menu.getPath():null)
|
||||||
.build()
|
.build()
|
||||||
);
|
);
|
||||||
children.setQuery(menu.getQuery());
|
children.setQuery(menu.getQuery());
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Tomcat
|
# Tomcat
|
||||||
server:
|
server:
|
||||||
port: 9201
|
port: 9701
|
||||||
|
|
||||||
# nacos线上地址
|
# nacos线上地址
|
||||||
nacos:
|
nacos:
|
||||||
|
@ -11,6 +11,8 @@ nacos:
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
allow-bean-definition-overriding: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: cloud-system
|
name: cloud-system
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
-javaagent:.\skywalking-agent\skywalking-agent.jar
|
||||||
|
-Dskywalking.agent.service_name=muyu::serverName
|
Loading…
Reference in New Issue