fix: stop redis server in localhost

guzijian
1 parent 8f2f8ad0
Showing 6 changed files with 40 additions and 21 deletions
docker-compose.yml
ruoyi-admin/src/main/java/com/ruoyi/common/SignInEnum.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/resources/application-druid-dev.yml
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/application-druid-uat.yml
@@ -49,17 +49,18 @@ services:
     ports:
       - 3306:3306
-  redis-server:
-    container_name: redis-server
-    image: redis:6.2
-    build:
-      context: .
-      dockerfile: redis-dockerfile
-    environment:
-      REDIS_PASSWORD: guzijian
-    volumes:
-      - "/ruoyi/redis/redis.conf:/etc/redis/redis.conf"
-      - "/ruoyi/redis/data:/data"
-    restart: always
-    ports:
-      - 6379:6379
 \ No newline at end of file
+# 内存不够暂停redis服务
+#  redis-server:
+#    container_name: redis-server
+#    image: redis:6.2
+#    build:
+#      context: .
+#      dockerfile: redis-dockerfile
+#    environment:
+#      REDIS_PASSWORD: guzijian
+#    volumes:
+#      - "/ruoyi/redis/redis.conf:/etc/redis/redis.conf"
+#      - "/ruoyi/redis/data:/data"
+#    restart: always
+#    ports:
+#      - 6379:6379
 \ No newline at end of file
@@ -4,7 +4,7 @@ public interface SignInEnum {
     /**
      * 签到
      */
-    Integer SIGNIN = 1;
+    Integer SIGN_IN = 1;
     /**
      * 签退
      */
 package com.ruoyi.in.service.impl;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Base64;
@@ -11,12 +10,10 @@ import java.util.Objects;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.exception.file.FileException;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.SignInEnum;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
@@ -26,7 +23,6 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
-import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;
 /**
@@ -73,7 +69,7 @@ public class SignInServiceImpl implements ISignInService {
         signIn.setIp(IpUtils.getIpAddr());
         signIn.setCreateTime(DateUtils.getNowDate());
         if (signIn.getType() == null) {
-            signIn.setType(SignInEnum.SIGNIN);
+            signIn.setType(SignInEnum.SIGN_IN);
         }
         return signInMapper.insertSignIn(signIn);
     }
@@ -123,6 +123,13 @@ mybatis-plus:
     mapperLocations: classpath*:mapper/**/*Mapper.xml
     # 加载全局的配置文件
     configLocation: classpath:mybatis/mybatis-config.xml
+# Swagger配置
+swagger:
+    # 是否开启swagger
+    enabled: true
+    # 请求前缀
+    #  pathMapping: /dev-api
+    pathMapping: /
 api:
     url:
         # all 为获取所有驾驶员信息
@@ -134,4 +141,5 @@ api:
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
         # 随机字符串
-        nonce: adfsad
 \ No newline at end of file
+        nonce: adfsad
+
@@ -83,6 +83,13 @@ mybatis-plus:
     mapperLocations: classpath*:mapper/**/*Mapper.xml
     # 加载全局的配置文件
     configLocation: classpath:mybatis/mybatis-config.xml
+# Swagger配置
+swagger:
+    # 是否开启swagger
+    enabled: false
+    # 请求前缀
+    #  pathMapping: /dev-api
+    pathMapping: /
 api:
     url:
         # all 为获取所有驾驶员信息
@@ -142,6 +142,13 @@ mybatis-plus:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  #  pathMapping: /dev-api
+  pathMapping: /
 api:
   url:
     # all 为获取所有驾驶员信息