diff --git a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java index 32d96dae..8e939cdc 100644 --- a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java +++ b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java @@ -107,7 +107,7 @@ public interface ShopConstants { /** * 签到天数 */ - String YSHOP_SIGN_DAY_NUM = "sign_day_num"; + String YSHOP_SIGN_DAY_NUM = "yshop_sign_day_num"; /** * 打印机配置 diff --git a/yshop-system/src/main/resources/config/application-dev.yml b/yshop-system/src/main/resources/config/application-dev.yml index a9d5da67..c0d33ce5 100644 --- a/yshop-system/src/main/resources/config/application-dev.yml +++ b/yshop-system/src/main/resources/config/application-dev.yml @@ -94,12 +94,4 @@ file: avatarMaxSize: 5 localUrl: http://127.0.0.1:8000 -mybatis-plus: - check-config-location: true - configuration: - map-underscore-to-camel-case: true - global-config: - db-config: - id-type: auto - logic-delete-value: 1 - logic-not-delete-value: 0 + diff --git a/yshop-system/src/main/resources/config/application-prod.yml b/yshop-system/src/main/resources/config/application-prod.yml index f951a401..a8dc4fca 100644 --- a/yshop-system/src/main/resources/config/application-prod.yml +++ b/yshop-system/src/main/resources/config/application-prod.yml @@ -6,7 +6,7 @@ spring: druid: type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://localhost:3366/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false + url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: root password: root @@ -96,17 +96,7 @@ file: # 文件大小 /M maxSize: 100 avatarMaxSize: 5 - localUrl: https://cdn.jidanguo10.com -mybatis-plus: - check-config-location: true - configuration: - map-underscore-to-camel-case: true - global-config: - db-config: - id-type: id_worker - logic-delete-value: 1 - logic-not-delete-value: 0 - mapper-locations: classpath*:mapper/**/*Mapper.xml + localUrl: yshop: hApi: https://127.0.0.1:8000 diff --git a/yshop-system/src/main/resources/config/application.yml b/yshop-system/src/main/resources/config/application.yml index cc58e477..dac1457e 100644 --- a/yshop-system/src/main/resources/config/application.yml +++ b/yshop-system/src/main/resources/config/application.yml @@ -54,7 +54,16 @@ yshop: appKey: 81f43a2e-f504-45c4-9b54-2637d59f8190 apiUrl: http://127.0.0.1:8009/api - +mybatis-plus: + check-config-location: true + configuration: + map-underscore-to-camel-case: true + global-config: + db-config: + id-type: auto + logic-delete-value: 1 + logic-not-delete-value: 0 + mapper-locations: classpath*:mapper/**/*Mapper.xml # PageHelper分页插件 pagehelper: helperDialect: mysql