Commit e086a99029e98dec5a04a9e3c4d23123d062af9d

Authored by guzijian
1 parent 246d1c1e

fix: update yml file

ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
@@ -64,7 +64,7 @@ public class DriverJob implements InitializingBean { @@ -64,7 +64,7 @@ public class DriverJob implements InitializingBean {
64 long timestamp = System.currentTimeMillis(); 64 long timestamp = System.currentTimeMillis();
65 65
66 // 获取驾驶员信息 66 // 获取驾驶员信息
67 - List<Driver> drivers = getDrivers(getDriverInfoUrl,String.valueOf(timestamp)); 67 + List<Driver> drivers = getDrivers(getDriverInfoUrl, String.valueOf(timestamp));
68 68
69 // http://114.80.178.12:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s 69 // http://114.80.178.12:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
70 // String getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", DateUtils.getDate("yyyyMMdd"), String.valueOf(timestamp), NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp)))); 70 // String getSchedulingInfoUrl = String.format(GET_SCHEDULING_INFO_URL, "99", DateUtils.getDate("yyyyMMdd"), String.valueOf(timestamp), NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
@@ -94,7 +94,7 @@ public class DriverJob implements InitializingBean { @@ -94,7 +94,7 @@ public class DriverJob implements InitializingBean {
94 94
95 } 95 }
96 96
97 - private static List<Driver> getDrivers(String format,String timestamp) throws Exception { 97 + private static List<Driver> getDrivers(String format, String timestamp) throws Exception {
98 Map<String, String> configMap = getStringStringMap(timestamp); 98 Map<String, String> configMap = getStringStringMap(timestamp);
99 String sign = getSHA1(configMap); 99 String sign = getSHA1(configMap);
100 String url = format 100 String url = format
@@ -160,17 +160,17 @@ public class DriverJob implements InitializingBean { @@ -160,17 +160,17 @@ public class DriverJob implements InitializingBean {
160 160
161 } 161 }
162 162
163 - public static void main(String[] args) throws Exception{ 163 + public static void main(String[] args) throws Exception {
164 RestTemplate restTemplate1 = new RestTemplate(); 164 RestTemplate restTemplate1 = new RestTemplate();
165 // String url = "http://101.95.136.206:9089/webservice/rest/person/company/%s"; 165 // String url = "http://101.95.136.206:9089/webservice/rest/person/company/%s";
166 - String url = "http://114.80.178.12:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s"; 166 + String url = "http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
167 167
168 long timestamp = System.currentTimeMillis(); 168 long timestamp = System.currentTimeMillis();
169 Map<String, String> configMap = new HashMap<>(5); 169 Map<String, String> configMap = new HashMap<>(5);
170 configMap.put("timestamp", String.valueOf(timestamp)); 170 configMap.put("timestamp", String.valueOf(timestamp));
171 configMap.put("nonce", "NONCE"); 171 configMap.put("nonce", "NONCE");
172 configMap.put("password", "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464"); 172 configMap.put("password", "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464");
173 - String format = String.format(url,"99",DateUtils.getDate("yyyyMMdd"), timestamp,"NONCE","c4dd3d8cb9a82f6d6a625818618b28ca7bebb464",getSHA1(configMap)); 173 + String format = String.format(url, "99", DateUtils.getDate("yyyyMMdd"), timestamp, "NONCE", "c4dd3d8cb9a82f6d6a625818618b28ca7bebb464", getSHA1(configMap));
174 // String sign = getSHA1(configMap); 174 // String sign = getSHA1(configMap);
175 // String httpUrl = format 175 // String httpUrl = format
176 // + "?timestamp=" + timestamp 176 // + "?timestamp=" + timestamp
ruoyi-admin/src/main/resources/application-druid-dev.yml
@@ -130,7 +130,7 @@ api: @@ -130,7 +130,7 @@ api:
130 # 获取公司编码下的员工信息 暂时没用 130 # 获取公司编码下的员工信息 暂时没用
131 getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s 131 getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
132 # 获取排班信息 132 # 获取排班信息
133 - getSchedulingInfo: http://114.80.178.12:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s 133 + getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
134 config: 134 config:
135 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464 135 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
136 # 随机字符串 136 # 随机字符串
ruoyi-admin/src/main/resources/application-druid-prd.yml
@@ -90,7 +90,7 @@ api: @@ -90,7 +90,7 @@ api:
90 # 获取公司编码下的员工信息 暂时没用 90 # 获取公司编码下的员工信息 暂时没用
91 getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s 91 getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
92 # 获取排班信息 92 # 获取排班信息
93 - getSchedulingInfo: http://114.80.178.12:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s 93 + getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
94 config: 94 config:
95 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464 95 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
96 # 随机字符串 96 # 随机字符串
ruoyi-admin/src/main/resources/application-druid-uat.yml
@@ -148,7 +148,7 @@ api: @@ -148,7 +148,7 @@ api:
148 # 获取公司编码下的员工信息 暂时没用 148 # 获取公司编码下的员工信息 暂时没用
149 getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s 149 getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
150 # 获取排班信息 150 # 获取排班信息
151 - getSchedulingInfo: http://114.80.178.12:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s 151 + getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
152 config: 152 config:
153 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464 153 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
154 # 随机字符串 154 # 随机字符串
ruoyi-admin/src/main/resources/application.yml
@@ -142,7 +142,7 @@ api: @@ -142,7 +142,7 @@ api:
142 # 获取公司编码下的员工信息 暂时没用 142 # 获取公司编码下的员工信息 暂时没用
143 getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s 143 getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
144 # 获取排班信息 144 # 获取排班信息
145 - getSchedulingInfo: http://114.80.178.12:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s 145 + getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
146 config: 146 config:
147 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464 147 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
148 # 随机字符串 148 # 随机字符串