tsurumure 10 місяців тому
батько
коміт
791ece6d98

+ 14 - 11
.drone.yml

@@ -9,16 +9,16 @@ trigger:
 
 steps:
 
-  # # 获取缓存
-  # - name: restore-cache
-  #   image: drillster/drone-volume-cache
-  #   settings:
-  #     restore: true
-  #     mount:
-  #       - /root/.m2/repository
-  #   volumes:
-  #     - name: repository
-  #       path: /cache
+  # 获取缓存 (首次部署需要下载,不使用缓存)
+  - name: restore-cache
+    image: drillster/drone-volume-cache
+    settings:
+     restore: true
+     mount:
+       - /root/.m2/repository
+    volumes:
+     - name: repository
+       path: /cache
 
   # 参考:
   # https://www.jianshu.com/p/4aaac6c0c105
@@ -41,6 +41,8 @@ steps:
       # 将配置文件从最新的分支 拷贝到目标目录
       - cp Dockerfile /app/build/Dockerfile
       - cp docker-compose.yml /app/build/docker-compose.yml
+    when:
+      branch:master
 
   # # 更新缓存
   # - name: rebuild-cache
@@ -76,7 +78,8 @@ steps:
         # 启动容器 (根据 docker-compose.yml 配置)
         - sudo docker-compose up -d
         - sudo echo "Docker App started."
-
+    when:
+      branch: master
 
   # 清除冗余镜像
   - name: cleanup

+ 28 - 5
pom.xml

@@ -188,11 +188,11 @@
         </dependency>
 
         <!--健康检查(硬盘/内存)-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-            <version>3.1.2</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!--            <version>3.1.2</version>-->
+<!--        </dependency>-->
 
         <!-- WebSocket依赖 -->
         <dependency>
@@ -460,6 +460,18 @@
 
         <plugins>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <parameters>true</parameters>
+                    <source>17</source>
+                    <target>17</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+
             <!-- 如果不分包,则此处必填 -->
 <!--            <plugin>-->
 <!--                <groupId>org.springframework.boot</groupId>-->
@@ -511,4 +523,15 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>public</id>
+            <name>aliyun nexus</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
 </project>

+ 36 - 36
src/main/java/com/backendsys/controller/api/Systems/SysActuatorController.java

@@ -1,36 +1,36 @@
-package com.backendsys.controller.api.Systems;
-
-import com.backendsys.service.System.SysActuatorService;
-import com.backendsys.service.System.SysDictionaryService;
-import com.backendsys.utils.response.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class SysActuatorController {
-
-    @Autowired
-    private SysActuatorService sysActuatorService;
-
-    //@GetMapping("/api/actuator/metricsInfo")
-    //public Result metricsInfo() {
-    //    return Result.success(sysActuatorService.requestActuatorMetrics());
-    //}
-    @GetMapping("/api/system/actuator/systemInfo")
-    public Result systemInfo() {
-        return Result.success(sysActuatorService.querySystemInfo());
-    }
-
-    @RestController
-    public static class SysDictionaryController<T> {
-        @Autowired
-        private SysDictionaryService sysDictionaryService;
-
-        @GetMapping("/api/public/system/sysDictionary")
-        public Result getDictionary(T data) {
-            return Result.success(sysDictionaryService.queryDictionary(data));
-        }
-    }
-
-}
+//package com.backendsys.controller.api.Systems;
+//
+//import com.backendsys.service.System.SysActuatorService;
+//import com.backendsys.service.System.SysDictionaryService;
+//import com.backendsys.utils.response.Result;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//@RestController
+//public class SysActuatorController {
+//
+//    @Autowired
+//    private SysActuatorService sysActuatorService;
+//
+//    //@GetMapping("/api/actuator/metricsInfo")
+//    //public Result metricsInfo() {
+//    //    return Result.success(sysActuatorService.requestActuatorMetrics());
+//    //}
+//    @GetMapping("/api/system/actuator/systemInfo")
+//    public Result systemInfo() {
+//        return Result.success(sysActuatorService.querySystemInfo());
+//    }
+//
+//    @RestController
+//    public static class SysDictionaryController<T> {
+//        @Autowired
+//        private SysDictionaryService sysDictionaryService;
+//
+//        @GetMapping("/api/public/system/sysDictionary")
+//        public Result getDictionary(T data) {
+//            return Result.success(sysDictionaryService.queryDictionary(data));
+//        }
+//    }
+//
+//}

+ 0 - 1
src/main/java/com/backendsys/service/System/SysAuthServiceImpl.java

@@ -116,7 +116,6 @@ public class SysAuthServiceImpl implements SysAuthService {
     private Boolean isCaptchaValid(String captcha, String captchaRedisKey) {
         // 如果不是本地开发环境,则执行以下判断
         String profileActive = env.getProperty("spring.profiles.active");
-        System.out.println("spring.profiles.active: " + profileActive);
         if (!("local".equals(profileActive))) {
             // 判断验证码是否正确 (是否与Redis中的验证码匹配) (测试环境忽略)
             String captchaRedisValue = stringRedisTemplate.opsForValue().get(captchaRedisKey);

+ 2 - 0
src/main/resources/application.yml

@@ -2,6 +2,8 @@ spring:
   # 当前配置环境
   profiles:
     active: @profile.active@ # local  # local | dev | prod
+  main:
+    lazy-initialization: true           # 懒加载Bean
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss    # 设置全局的日期格式为年月日时分秒
     time-zone: GMT+8                    # 世界标准时间,为了方式时差,需要+8小时