feat: 修改配置文件

guzijian
1 parent 25773475
Showing 7 changed files with 24 additions and 21 deletions
Bsth-admin/pom.xml
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/TempCache.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/application-druid-prd.yml
Bsth-admin/src/main/resources/application-druid-uat.yml
@@ -136,7 +136,7 @@
                 </configuration>   
            </plugin>   
         </plugins>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>${project.artifactId}-sign</finalName>
     </build>
 </project>
 \ No newline at end of file
@@ -28,7 +28,7 @@ public class SchedulingCache {
     //    @Value("${api.url.getSchedulingInfoNew}")
-    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";
+    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";
     //    @Value("${api.config.nonce}")
     private static final String NONCE = "adfsad";
     //    @Value("${api.config.password}")
@@ -9,8 +9,8 @@ public class TempCache {
     static {
         map = new ConcurrentHashMap<>();
-        map.put("620001", true);
-        map.put("620002", true);
+//        map.put("620001", true);
+//        map.put("620002", true);
         map.put("700001", true);
         map.put("722717", true);
     }
@@ -386,6 +386,9 @@ public class DriverServiceImpl implements IDriverService {
                 if (!CollectionUtil.isEmpty(dto)) {
                     vo.setPlanAction(TempCache.querySignStatus(item.getJobCode()) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING);
                     vo.setCheckAlcohol(TempCache.querySignStatus(item.getJobCode()));
+                    vo.setNbbm("YTCD-076");
+                    vo.setLineName("88号线");
+                    vo.setSchedulingFlag(false);
 //                    vo.setCheckAlcohol(false);
                     vos.add(vo);
                 }
@@ -400,7 +403,7 @@ public class DriverServiceImpl implements IDriverService {
                             TempCache.querySignStatus(item.getJobCode()) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING,
                             needCheckAlcoholDevice ? TempCache.querySignStatus(item.getJobCode()) : false,
 //                            false,
-                            true, "测试", "测试", "测试"));
+                            false, "YTCD-076", "6", "88号线"));
                 }
                 // 上面可删除
             } else {
@@ -97,8 +97,8 @@ spring:
     redis:
         # 地址
 #            host: 121.41.83.61
-        host: 127.0.0.1
-        database: 0
+        host: 192.168.168.124
+        database: 14
 #            password: "guzijian"
         port: 6379
         # 连接超时时间
@@ -28,7 +28,7 @@ spring:
             # 主库数据源
             master:
                 # 测试地址
-                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
+                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
                 username: root
                 password: qinpugongjiao20230730
             # 从库数据源
@@ -97,10 +97,10 @@ spring:
     redis:
         # 地址
 #            host: 121.41.83.61
-        host: 127.0.0.1
+        host: 192.168.40.121
         database: 0
 #        password: qpgjredis
-        port: 6379
+        port: 6378
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -133,7 +133,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置E:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: E:/ruoyi/uploadPath
+    profile: /home/qpbssign/server/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -141,7 +141,7 @@ ruoyi:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 8080
+    port: 8100
     servlet:
         # 应用的访问路径
         context-path: /
@@ -176,18 +176,18 @@ springfox:
         auto-startup: false
         enabled: false
 log:
-    path: E:/ruoyi/logs
+    path: /home/qpbssign/server/logs
 api:
     template: 车队与线路匹配模板
     url:
         # all 为获取所有驾驶员信息
-        getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
+        getDriverInfo: http://192.168.50.120:9089/webservice/rest/person/%s
         # 获取公司编码下的员工信息 暂时没用
-        getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+        getCompanyInfo: http://192.168.50.120:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
         # 获取排班信息
-        getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-        getSchedulingInfoNew: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfo: http://192.168.50.120:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://192.168.50.120:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         # 固定密码
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
@@ -28,7 +28,7 @@ spring:
       # 主库数据源
       master:
         # 测试地址
-        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
+        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
         username: root
         password: guzijian
       # 从库数据源
@@ -97,7 +97,7 @@ spring:
   redis:
     # 地址
 #      host: 1.14.107.94
-    host: 121.41.83.61
+    host: 192.168.168.124
     database: 0
     password: "guzijian"
     port: 6379
@@ -133,7 +133,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /home/ruoyi/uploadPath
+  profile: /home/sign/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -198,4 +198,4 @@ api:
     people:
       url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 log:
-  path: /home/ruoyi/logs
 \ No newline at end of file
+  path: /home/sign/logs
 \ No newline at end of file