guzijian / bsth-alcohol-sign · Commits

Commit c9e951165249cbfeaf4dc7772b3ff80d798c3d36

Authored by guzijian
1 parent 25773475

feat: 修改配置文件

Inline Side-by-side
Showing 7 changed files with 24 additions and 21 deletions
Bsth-admin/pom.xml
  View file @c9e9511
... ... @@ -136,7 +136,7 @@
136 136 </configuration>
137 137 </plugin>
138 138 </plugins>
139   - <finalName>${project.artifactId}</finalName>
  139 + <finalName>${project.artifactId}-sign</finalName>
140 140 </build>
141 141  
142 142 </project>
143 143 \ No newline at end of file
... ...
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
  View file @c9e9511
... ... @@ -28,7 +28,7 @@ public class SchedulingCache {
28 28  
29 29  
30 30 // @Value("${api.url.getSchedulingInfoNew}")
31   - private static final String getSchedulingInfoUrl = "http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
  31 + private static final String getSchedulingInfoUrl = "http://192.168.50.120:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
32 32 // @Value("${api.config.nonce}")
33 33 private static final String NONCE = "adfsad";
34 34 // @Value("${api.config.password}")
... ...
Bsth-admin/src/main/java/com/ruoyi/common/cache/TempCache.java
  View file @c9e9511
... ... @@ -9,8 +9,8 @@ public class TempCache {
9 9  
10 10 static {
11 11 map = new ConcurrentHashMap<>();
12   - map.put("620001", true);
13   - map.put("620002", true);
  12 +// map.put("620001", true);
  13 +// map.put("620002", true);
14 14 map.put("700001", true);
15 15 map.put("722717", true);
16 16 }
... ...
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
  View file @c9e9511
... ... @@ -386,6 +386,9 @@ public class DriverServiceImpl implements IDriverService {
386 386 if (!CollectionUtil.isEmpty(dto)) {
387 387 vo.setPlanAction(TempCache.querySignStatus(item.getJobCode()) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING);
388 388 vo.setCheckAlcohol(TempCache.querySignStatus(item.getJobCode()));
  389 + vo.setNbbm("YTCD-076");
  390 + vo.setLineName("88号线");
  391 + vo.setSchedulingFlag(false);
389 392 // vo.setCheckAlcohol(false);
390 393 vos.add(vo);
391 394 }
... ... @@ -400,7 +403,7 @@ public class DriverServiceImpl implements IDriverService {
400 403 TempCache.querySignStatus(item.getJobCode()) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING,
401 404 needCheckAlcoholDevice ? TempCache.querySignStatus(item.getJobCode()) : false,
402 405 // false,
403   - true, "测试", "测试", "测试"));
  406 + false, "YTCD-076", "6", "88号线"));
404 407 }
405 408 // 上面可删除
406 409 } else {
... ...
Bsth-admin/src/main/resources/application-druid-dev.yml
  View file @c9e9511
... ... @@ -97,8 +97,8 @@ spring:
97 97 redis:
98 98 # 地址
99 99 # host: 121.41.83.61
100   - host: 127.0.0.1
101   - database: 0
  100 + host: 192.168.168.124
  101 + database: 14
102 102 # password: "guzijian"
103 103 port: 6379
104 104 # 连接超时时间
... ...
Bsth-admin/src/main/resources/application-druid-prd.yml
  View file @c9e9511
... ... @@ -28,7 +28,7 @@ spring:
28 28 # 主库数据源
29 29 master:
30 30 # 测试地址
31   - url: jdbc:mysql://127.0.0.1:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
  31 + url: jdbc:mysql://192.168.40.121:3307/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
32 32 username: root
33 33 password: qinpugongjiao20230730
34 34 # 从库数据源
... ... @@ -97,10 +97,10 @@ spring:
97 97 redis:
98 98 # 地址
99 99 # host: 121.41.83.61
100   - host: 127.0.0.1
  100 + host: 192.168.40.121
101 101 database: 0
102 102 # password: qpgjredis
103   - port: 6379
  103 + port: 6378
104 104 # 连接超时时间
105 105 timeout: 10s
106 106 lettuce:
... ... @@ -133,7 +133,7 @@ ruoyi:
133 133 # 实例演示开关
134 134 demoEnabled: true
135 135 # 文件路径 示例（ Windows配置E:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
136   - profile: E:/ruoyi/uploadPath
  136 + profile: /home/qpbssign/server/uploadPath
137 137 # 获取ip地址开关
138 138 addressEnabled: false
139 139 # 验证码类型 math 数字计算 char 字符验证
... ... @@ -141,7 +141,7 @@ ruoyi:
141 141 # 开发环境配置
142 142 server:
143 143 # 服务器的HTTP端口，默认为8080
144   - port: 8080
  144 + port: 8100
145 145 servlet:
146 146 # 应用的访问路径
147 147 context-path: /
... ... @@ -176,18 +176,18 @@ springfox:
176 176 auto-startup: false
177 177 enabled: false
178 178 log:
179   - path: E:/ruoyi/logs
  179 + path: /home/qpbssign/server/logs
180 180  
181 181 api:
182 182 template: 车队与线路匹配模板
183 183 url:
184 184 # all 为获取所有驾驶员信息
185   - getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
  185 + getDriverInfo: http://192.168.50.120:9089/webservice/rest/person/%s
186 186 # 获取公司编码下的员工信息 暂时没用
187   - getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
  187 + getCompanyInfo: http://192.168.50.120:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
188 188 # 获取排班信息
189   - getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
190   - getSchedulingInfoNew: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
  189 + getSchedulingInfo: http://192.168.50.120:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
  190 + getSchedulingInfoNew: http://192.168.50.120:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
191 191 config:
192 192 # 固定密码
193 193 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
... ...
Bsth-admin/src/main/resources/application-druid-uat.yml
  View file @c9e9511
... ... @@ -28,7 +28,7 @@ spring:
28 28 # 主库数据源
29 29 master:
30 30 # 测试地址
31   - url: jdbc:mysql://1.14.107.94:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
  31 + url: jdbc:mysql://192.168.168.124:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
32 32 username: root
33 33 password: guzijian
34 34 # 从库数据源
... ... @@ -97,7 +97,7 @@ spring:
97 97 redis:
98 98 # 地址
99 99 # host: 1.14.107.94
100   - host: 121.41.83.61
  100 + host: 192.168.168.124
101 101 database: 0
102 102 password: "guzijian"
103 103 port: 6379
... ... @@ -133,7 +133,7 @@ ruoyi:
133 133 # 实例演示开关
134 134 demoEnabled: true
135 135 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
136   - profile: /home/ruoyi/uploadPath
  136 + profile: /home/sign/uploadPath
137 137 # 获取ip地址开关
138 138 addressEnabled: false
139 139 # 验证码类型 math 数字计算 char 字符验证
... ... @@ -198,4 +198,4 @@ api:
198 198 people:
199 199 url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
200 200 log:
201   - path: /home/ruoyi/logs
202 201 \ No newline at end of file
  202 + path: /home/sign/logs
203 203 \ No newline at end of file
... ...