guzijian / bsth-alcohol-sign · Commits

Commit 9c617f4602a0f240a52ed9f390218b91da24cb01

Authored by guzijian
1 parent c880dc07

fix: 修复日志文件,新增日志

Inline Side-by-side
Showing 3 changed files with 11 additions and 10 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
  View file @9c617f4
@@ -161,6 +161,7 @@ public class SignInServiceImpl implements ISignInService { @@ -161,6 +161,7 @@ public class SignInServiceImpl implements ISignInService {
161 161
162 // 查询地址 162 // 查询地址
163 Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId()); 163 Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
  164 + System.out.println("设备信息:" + equipment);
164 SignInResponseVo vo = new SignInResponseVo(); 165 SignInResponseVo vo = new SignInResponseVo();
165 vo.setAddress(equipment.getAddress()); 166 vo.setAddress(equipment.getAddress());
166 vo.setDeviceId(signIn.getDeviceId()); 167 vo.setDeviceId(signIn.getDeviceId());
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
  View file @9c617f4
@@ -46,14 +46,14 @@ public class DriverJob implements InitializingBean { @@ -46,14 +46,14 @@ public class DriverJob implements InitializingBean {
46 private String getDriverInfoUrl; 46 private String getDriverInfoUrl;
47 47
48 48
49 - @Value("${api.personnel.token.tokenUrl}")  
50 - private String tokenUrl; 49 +// @Value("${api.personnel.token.tokenUrl}")
  50 +// private String tokenUrl;
51 51
52 - @Value("${api.personnel.token.appKey}")  
53 - private String appKey; 52 +// @Value("${api.personnel.token.appKey}")
  53 +// private String appKey;
54 54
55 - @Value("${api.personnel.token.appSecret}")  
56 - private String appSecret; 55 +// @Value("${api.personnel.token.appSecret}")
  56 +// private String appSecret;
57 57
58 @Value("${api.url.getSchedulingInfo}") 58 @Value("${api.url.getSchedulingInfo}")
59 private String getSchedulingInfoUrl; 59 private String getSchedulingInfoUrl;
@@ -256,8 +256,8 @@ public class DriverJob implements InitializingBean { @@ -256,8 +256,8 @@ public class DriverJob implements InitializingBean {
256 REDIS_CACHE = redisCache; 256 REDIS_CACHE = redisCache;
257 GET_SCHEDULING_INFO_URL = getSchedulingInfoUrl; 257 GET_SCHEDULING_INFO_URL = getSchedulingInfoUrl;
258 258
259 - TOKEN_URL = tokenUrl;  
260 - APP_KEY = appKey;  
261 - APP_SECRET = appSecret; 259 +// TOKEN_URL = tokenUrl;
  260 +// APP_KEY = appKey;
  261 +// APP_SECRET = appSecret;
262 } 262 }
263 } 263 }
ruoyi-admin/src/main/resources/application-druid-uat.yml
  View file @9c617f4
@@ -169,5 +169,5 @@ api: @@ -169,5 +169,5 @@ api:
169 tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken 169 tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
170 appKey: dingsclwvxui5zilg1xk 170 appKey: dingsclwvxui5zilg1xk
171 appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5 171 appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
172 - personnel: 172 + people:
173 url: https://api.dingtalk.com/v1.0/yida/forms/instances/search 173 url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
174 \ No newline at end of file 174 \ No newline at end of file