diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/HdSchemaExecutor.java b/api-admin/src/main/java/com/glxp/sale/admin/config/HdSchemaExecutor.java index f93f1bd..462082a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/config/HdSchemaExecutor.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/HdSchemaExecutor.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -@Order(1) +@Order(value = 1) @Component @Slf4j public class HdSchemaExecutor implements ApplicationRunner { @@ -75,7 +75,7 @@ public class HdSchemaExecutor implements ApplicationRunner { public void buildSchemas() { schema.add(new SchemaData("v2.1", "schema_v2.1.sql")); -// schema.add(new SchemaData("v2.2", "schema_v2.2.sql")); + schema.add(new SchemaData("v2.2", "schema_v2.2.sql")); // schema.add(new SchemaData("v2.3", "schema_v2.3.sql")); } } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java index 8cd8b2e..b450830 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java @@ -35,7 +35,6 @@ public class DeviceKeyController { // @Resource // private JavaMailSender javaMailSender; - @AuthRuleAnnotation("") @GetMapping("sale/device/registerList") public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) { List deviceKeyEntities = deviceKeyService.findDeviceKey(filterDeviceKeyRequest); @@ -61,7 +60,6 @@ public class DeviceKeyController { } - @AuthRuleAnnotation("") @PostMapping("/sale/info/registerKey") public BaseResponse registerKey(@RequestBody DeviceKeyEntity deviceKeyEntity) { String key = md5("glxp2020" + deviceKeyEntity.getImei()); @@ -86,7 +84,7 @@ public class DeviceKeyController { } - @AuthRuleAnnotation("") + @PostMapping("sale/device/register") public BaseResponse saveRegister(@RequestBody DeviceKeyEntity deviceKeyEntity, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/CleanDataTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/CleanDataTask.java index c632a1a..1cd2cbd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/CleanDataTask.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/CleanDataTask.java @@ -7,6 +7,7 @@ import com.glxp.sale.admin.service.basic.BasicDownloadService; import com.glxp.sale.admin.service.basic.BasicExportService; import com.glxp.sale.admin.service.thrsys.*; import lombok.extern.slf4j.Slf4j; +import org.springframework.core.annotation.Order; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; @@ -19,6 +20,7 @@ import javax.annotation.Resource; * 删除数据 */ @Slf4j +@Order(value = 10) @Component @EnableScheduling public class CleanDataTask implements SchedulingConfigurer { diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 9685ef0..672acd8 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ server.port=9996 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 diff --git a/api-admin/src/main/resources/schemas/schema_v2.2.sql b/api-admin/src/main/resources/schemas/schema_v2.2.sql new file mode 100644 index 0000000..72664ff --- /dev/null +++ b/api-admin/src/main/resources/schemas/schema_v2.2.sql @@ -0,0 +1,7 @@ +INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark) +VALUES +(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据'); + +INSERT ignore INTO system_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain ) +VALUES + ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是,0:否' ); \ No newline at end of file