From b689d744720a49408d24808ec0b13a5d8cf31e26 Mon Sep 17 00:00:00 2001 From: stivepeim Date: Sat, 7 Oct 2023 15:32:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zbkj/admin}/acpect/ControllerAspect.java | 4 ++-- crmeb/crmeb-admin/src/main/resources/application.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename crmeb/{crmeb-common/src/main/java/com/zbkj/common => crmeb-admin/src/main/java/com/zbkj/admin}/acpect/ControllerAspect.java (94%) diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/acpect/ControllerAspect.java similarity index 94% rename from crmeb/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java rename to crmeb/crmeb-admin/src/main/java/com/zbkj/admin/acpect/ControllerAspect.java index f9e51661..1e043a8c 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/acpect/ControllerAspect.java @@ -1,4 +1,4 @@ -package com.zbkj.common.acpect; +package com.zbkj.admin.acpect; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -29,7 +29,7 @@ public class ControllerAspect { Logger logger = LoggerFactory.getLogger(ControllerAspect.class); - @Pointcut("execution(* com.zbkj.crmeb.system.controller.*.*(..))") + @Pointcut("execution(* com.zbkj.admin.controller.*.*(..))") private void pointCutMethodController() { } diff --git a/crmeb/crmeb-admin/src/main/resources/application.yml b/crmeb/crmeb-admin/src/main/resources/application.yml index febde3b1..02720d8f 100644 --- a/crmeb/crmeb-admin/src/main/resources/application.yml +++ b/crmeb/crmeb-admin/src/main/resources/application.yml @@ -38,14 +38,14 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://118.178.234.105:3306/crmeb_test01?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: crmeb_test01 - password: F52EH5FLAfYDzZ66 + url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 + username: crmeb + password: 111111 redis: - host: 118.178.234.105 #地址 + host: 127.0.0.1 #地址 port: 6379 #端口 - password: 1qazxsw2 + password: 111111 timeout: 30000 # 连接超时时间（毫秒） database: 15 #默认数据库 jedis: