diff --git a/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java b/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java index d7aa8f79..87f38f5a 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java @@ -34,6 +34,9 @@ public class Log implements Serializable { /** 操作用户 */ private String username; + @TableField(exist = false) + private String nickname; + /** 描述 */ private String description; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java index 4ff5a55b..b6fb0442 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java @@ -24,7 +24,7 @@ import java.io.Serializable; public class YxMaterial implements Serializable { /** PK */ - @TableId + @TableId(type = IdType.UUID) private String id; /** 逻辑删除标记(0:显示;1:隐藏) */ diff --git a/yshop-system/src/main/resources/config/application-dev.yml b/yshop-system/src/main/resources/config/application-dev.yml index ff44b968..183962ea 100644 --- a/yshop-system/src/main/resources/config/application-dev.yml +++ b/yshop-system/src/main/resources/config/application-dev.yml @@ -8,7 +8,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: root - password: 123456 + password: root # 初始化配置 initial-size: 3 @@ -51,7 +51,7 @@ spring: database: 0 host: 127.0.0.1 port: 6379 - password: + password: root #连接超时时间 timeout: 5000 @@ -89,7 +89,7 @@ file: # 文件大小 /M maxSize: 100 avatarMaxSize: 5 - localUrl: + localUrl: http://127.0.0.1:8000 mybatis-plus: check-config-location: true