guzijian / bsth-alcohol-sign · Commits

Commit 21ce1feb1715031eb99c155424d185c88ad2b6e3

Authored by guzijian
1 parent 8f2f8ad0

fix: stop redis server in localhost

Inline Side-by-side
Showing 6 changed files with 40 additions and 21 deletions
docker-compose.yml
  View file @21ce1fe
... ... @@ -49,17 +49,18 @@ services:
49 49 ports:
50 50 - 3306:3306
51 51  
52   - redis-server:
53   - container_name: redis-server
54   - image: redis:6.2
55   - build:
56   - context: .
57   - dockerfile: redis-dockerfile
58   - environment:
59   - REDIS_PASSWORD: guzijian
60   - volumes:
61   - - "/ruoyi/redis/redis.conf:/etc/redis/redis.conf"
62   - - "/ruoyi/redis/data:/data"
63   - restart: always
64   - ports:
65   - - 6379:6379
66 52 \ No newline at end of file
  53 +# 内存不够暂停redis服务
  54 +# redis-server:
  55 +# container_name: redis-server
  56 +# image: redis:6.2
  57 +# build:
  58 +# context: .
  59 +# dockerfile: redis-dockerfile
  60 +# environment:
  61 +# REDIS_PASSWORD: guzijian
  62 +# volumes:
  63 +# - "/ruoyi/redis/redis.conf:/etc/redis/redis.conf"
  64 +# - "/ruoyi/redis/data:/data"
  65 +# restart: always
  66 +# ports:
  67 +# - 6379:6379
67 68 \ No newline at end of file
... ...
ruoyi-admin/src/main/java/com/ruoyi/common/SignInEnum.java
  View file @21ce1fe
... ... @@ -4,7 +4,7 @@ public interface SignInEnum {
4 4 /**
5 5 * 签到
6 6 */
7   - Integer SIGNIN = 1;
  7 + Integer SIGN_IN = 1;
8 8 /**
9 9 * 签退
10 10 */
... ...
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
  View file @21ce1fe
1 1 package com.ruoyi.in.service.impl;
2 2  
3 3 import java.io.File;
4   -import java.io.FileNotFoundException;
5 4 import java.io.FileOutputStream;
6 5 import java.io.IOException;
7 6 import java.util.Base64;
... ... @@ -11,12 +10,10 @@ import java.util.Objects;
11 10  
12 11 import com.ruoyi.common.config.RuoYiConfig;
13 12 import com.ruoyi.common.constant.Constants;
14   -import com.ruoyi.common.exception.file.FileException;
15 13 import com.ruoyi.common.exception.file.FileUploadException;
16 14 import com.ruoyi.common.utils.DateUtils;
17 15 import com.ruoyi.common.SignInEnum;
18 16 import com.ruoyi.common.utils.StringUtils;
19   -import com.ruoyi.common.utils.file.FileUploadUtils;
20 17 import com.ruoyi.common.utils.ip.IpUtils;
21 18 import com.ruoyi.common.utils.uuid.Seq;
22 19 import com.ruoyi.common.utils.uuid.UUID;
... ... @@ -26,7 +23,6 @@ import org.springframework.stereotype.Service;
26 23 import com.ruoyi.in.mapper.SignInMapper;
27 24 import com.ruoyi.in.domain.SignIn;
28 25 import com.ruoyi.in.service.ISignInService;
29   -import org.springframework.web.multipart.MultipartFile;
30 26 import sun.misc.BASE64Decoder;
31 27  
32 28 /**
... ... @@ -73,7 +69,7 @@ public class SignInServiceImpl implements ISignInService {
73 69 signIn.setIp(IpUtils.getIpAddr());
74 70 signIn.setCreateTime(DateUtils.getNowDate());
75 71 if (signIn.getType() == null) {
76   - signIn.setType(SignInEnum.SIGNIN);
  72 + signIn.setType(SignInEnum.SIGN_IN);
77 73 }
78 74 return signInMapper.insertSignIn(signIn);
79 75 }
... ...
ruoyi-admin/src/main/resources/application-druid-dev.yml
  View file @21ce1fe
... ... @@ -123,6 +123,13 @@ mybatis-plus:
123 123 mapperLocations: classpath*:mapper/**/*Mapper.xml
124 124 # 加载全局的配置文件
125 125 configLocation: classpath:mybatis/mybatis-config.xml
  126 +# Swagger配置
  127 +swagger:
  128 + # 是否开启swagger
  129 + enabled: true
  130 + # 请求前缀
  131 + # pathMapping: /dev-api
  132 + pathMapping: /
126 133 api:
127 134 url:
128 135 # all 为获取所有驾驶员信息
... ... @@ -134,4 +141,5 @@ api:
134 141 config:
135 142 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
136 143 # 随机字符串
137   - nonce: adfsad
138 144 \ No newline at end of file
  145 + nonce: adfsad
  146 +
... ...
ruoyi-admin/src/main/resources/application-druid-prd.yml
  View file @21ce1fe
... ... @@ -83,6 +83,13 @@ mybatis-plus:
83 83 mapperLocations: classpath*:mapper/**/*Mapper.xml
84 84 # 加载全局的配置文件
85 85 configLocation: classpath:mybatis/mybatis-config.xml
  86 +# Swagger配置
  87 +swagger:
  88 + # 是否开启swagger
  89 + enabled: false
  90 + # 请求前缀
  91 + # pathMapping: /dev-api
  92 + pathMapping: /
86 93 api:
87 94 url:
88 95 # all 为获取所有驾驶员信息
... ...
ruoyi-admin/src/main/resources/application-druid-uat.yml
  View file @21ce1fe
... ... @@ -142,6 +142,13 @@ mybatis-plus:
142 142 mapperLocations: classpath*:mapper/**/*Mapper.xml
143 143 # 加载全局的配置文件
144 144 configLocation: classpath:mybatis/mybatis-config.xml
  145 +# Swagger配置
  146 +swagger:
  147 + # 是否开启swagger
  148 + enabled: true
  149 + # 请求前缀
  150 + # pathMapping: /dev-api
  151 + pathMapping: /
145 152 api:
146 153 url:
147 154 # all 为获取所有驾驶员信息
... ...