From 794b6e8d50cc501b99e21e0f67b32e0399664cb0 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 11 八月 2025 17:25:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'huliguo/master'

---
 /dev/null                                     |  105 --------------------------
 guns-admin/src/main/resources/application.yml |   84 +++++++++-----------
 2 files changed, 39 insertions(+), 150 deletions(-)

diff --git a/guns-admin/src/main/resources/application.yml b/guns-admin/src/main/resources/application.yml
index 2c6dd6d..78efb2e 100644
--- a/guns-admin/src/main/resources/application.yml
+++ b/guns-admin/src/main/resources/application.yml
@@ -12,9 +12,9 @@
 spring:
   redis:
     database: 0
-    host: localhost
+    host: 10.25.14.40
     port: 6379
-    password: 123456
+    password: 34b7b13ce8a711e4:chengshI2014
 
 ---
 
@@ -41,11 +41,6 @@
   typeAliasesPackage: com.stylefeng.guns.modular
   configuration:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-# 日志配置
-logging:
-  level:
-    com.stylefeng: debug
-    org.springframework: warn
 
 
 ---
@@ -60,12 +55,11 @@
 #线上环境
 spring:
   datasource:
-    url: jdbc:mysql://192.168.110.85:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://rm-m5e57gbu0gdv901ub.mysql.rds.aliyuncs.com:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+    username: vehicleInspection
+    password: SYzt1953123456
     db-name: guns #用来搜集数据库的所有表
-#    filters: wall,mergeStat
+    filters: wall,mergeStat
 
 
 #多数据源情况的配置
@@ -80,38 +74,38 @@
 #      - dataSourceBiz
 
 ---
-#spring:
-#  quartz:
-#    job-store-type: jdbc
-#    jdbc:
-#      initialize-schema: embedded
-#    properties:
-#      org:
-#        quartz:
-#          scheduler:
-#            # 调度器实例名称
-#            instanceName: QuartzScheduler
-#            # 分布式节点ID自动生成
-#            instanceId: AUTO
-#          jobStore:
-#            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
-#            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-#            # 表前缀
-#            tablePrefix: qrtz_
-#            # 是否开启集群
-#            isClustered: false
-#            # 数据源别名(自定义)
-#            dataSource: vehicle_inspection
-#            # 分布式节点有效性检查时间间隔(毫秒)
-#            clusterCheckinInterval: 10000
-#            useProperties: false
-#          # 线程池配置
-#          threadPool:
-#            class: org.quartz.simpl.SimpleThreadPool
-#            threadCount: 10
-#            threadPriority: 5
-#            threadsInheritContextClassLoaderOfInitializingThread: true
-#
+spring:
+  quartz:
+    job-store-type: jdbc
+    jdbc:
+      initialize-schema: embedded
+    properties:
+      org:
+        quartz:
+          scheduler:
+            # 调度器实例名称
+            instanceName: QuartzScheduler
+            # 分布式节点ID自动生成
+            instanceId: AUTO
+          jobStore:
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            # 表前缀
+            tablePrefix: qrtz_
+            # 是否开启集群
+            isClustered: false
+            # 数据源别名(自定义)
+            dataSource: vehicle_inspection
+            # 分布式节点有效性检查时间间隔(毫秒)
+            clusterCheckinInterval: 10000
+            useProperties: false
+          # 线程池配置
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            threadsInheritContextClassLoaderOfInitializingThread: true
+
 ---
 # 任务执行最大线程数
-maxThreadCount: 50
\ No newline at end of file
+maxThreadCount: 20
\ No newline at end of file
diff --git a/guns-admin/src/test/java/com/stylefeng/guns/HLGTest.java b/guns-admin/src/test/java/com/stylefeng/guns/HLGTest.java
deleted file mode 100644
index 2873ef4..0000000
--- a/guns-admin/src/test/java/com/stylefeng/guns/HLGTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.stylefeng.guns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.modular.api.PatrolTaskController;
-import com.stylefeng.guns.modular.system.model.vo.*;
-import com.stylefeng.guns.modular.system.service.IPatrolTaskService;
-import com.stylefeng.guns.modular.system.service.ITaskDetailService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class HLGTest {
-    @Resource
-    private IPatrolTaskService patrolTaskService;
-    @Resource
-    private ITaskDetailService taskDetailService;
-    @Resource
-    private PatrolTaskController patrolTaskController;
-
-    @Test
-    public void test(){
-        //任务详情
-        TaskDetailListVo vo = new TaskDetailListVo();
-        vo.setLimit(0);
-        vo.setOffset(10);
-        vo.setStartTime(LocalDateTime.now().minusDays(100));
-        vo.setEndTime(LocalDateTime.now().minusDays(50));
-        vo.setStatus(Arrays.asList(1,2,3,4));
-        Page<TaskDetailList> pageInfo = new Page(vo.getLimit(), vo.getOffset());
-        List<TaskDetailList> taskDetailList = taskDetailService.getTaskDetailList(pageInfo, vo);
-        System.err.println("11111111111111");
-        taskDetailList.forEach(System.err::println);
-    }
-
-    @Test
-    public void test5(){
-        //任务详情
-        PictureDetailsVo vo = new PictureDetailsVo();
-        vo.setLimit(0);
-        vo.setOffset(100);
-        vo.setSysStatus(Arrays.asList(3));
-        vo.setId(215);
-        vo.setHavePic(1);
-        Page<PictureDetails> pageInfo = new Page(vo.getLimit(), vo.getOffset());
-        List<PictureDetails> taskDetailList = taskDetailService.getPictureDetails(pageInfo, vo);
-        System.err.println("11111111111111");
-        taskDetailList.forEach(System.err::println);
-    }
-
-
-    @Test
-    public void test1(){
-        //任务记录
-        TaskRecordListVo vo = new TaskRecordListVo();
-        vo.setLimit(0);
-        vo.setOffset(10);
-        vo.setStatus(Arrays.asList(1,2,3,4));
-        vo.setType(1);
-        System.err.println("11111111111111");
-        List<TaskRecordList> taskRecordList = patrolTaskController.getTaskRecordList(vo).getRows();
-
-        taskRecordList.forEach(System.err::println);
-    }
-
-    @Test
-    public void test2(){
-        TaskDetailListVo vo = new TaskDetailListVo();
-        patrolTaskController.getTaskDetailList(vo);
-    }
-
-    @Test
-    public void test3(){
-        //审核
-        ManualAuditVo vo = new ManualAuditVo();
-        vo.setId(Arrays.asList(20092));
-        vo.setStatus(2);
-        vo.setRemark("测试");
-        taskDetailService.manualAudit(vo, "1");
-    }
-
-
-
-    @Test
-    public void test4(){
-        // 1. 创建 MockHttpServletResponse 对象
-        MockHttpServletResponse mockResponse = new MockHttpServletResponse();
-        //导出
-        List<String> id = null;
-        String ids="215";
-        String[] split = ids.split(",");
-        id = Arrays.asList(split);
-        taskDetailService.downloadTaskRecord(id,null, null,3, mockResponse);
-
-    }
-}

--
Gitblit v1.7.1