>191
|
191
|
|
|
192
|
192
|
if (!loginFlag) {
|
|
193
|
193
|
logger.debug("再次调用北向接口登录失败");
|
|
194
|
|
return new HashMap<String, String>();
|
|
|
194
|
return new HashMap<String, Object>();
|
|
195
|
195
|
}
|
|
196
|
196
|
|
|
197
|
197
|
try {
|
|
|
@ -202,12 +202,12 @@ public class NorthboundInterfaceUtil {
|
|
202
|
202
|
resultMap = JSON.parseObject(fianlresultJson, Map.class);
|
|
203
|
203
|
} catch (Exception e) {
|
|
204
|
204
|
logger.error("再次调用北向接口失败: " + e.getMessage());
|
|
205
|
|
return new HashMap<String, String>();
|
|
|
205
|
return new HashMap<String, Object>();
|
|
206
|
206
|
}
|
|
207
|
207
|
|
|
208
|
208
|
if (resultMap == null) {
|
|
209
|
209
|
logger.error("再次调用北向接口返回值为空");
|
|
210
|
|
return new HashMap<String, String>();
|
|
|
210
|
return new HashMap<String, Object>();
|
|
211
|
211
|
}
|
|
212
|
212
|
}
|
|
213
|
213
|
|
|
|
@ -3,10 +3,10 @@ server.port=8086
|
|
3
|
3
|
|
|
4
|
4
|
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
|
|
5
|
5
|
#spring.datasource.url=jdbc:mysql://localhost:3306/cmp
|
|
6
|
|
spring.datasource.url=jdbc:mysql://10.11.20.120:3306/common_frm?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
|
|
|
6
|
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy
|
|
7
|
7
|
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
|
8
|
|
spring.datasource.username=comon_frm
|
|
9
|
|
spring.datasource.password=1qaz@WSX
|
|
|
8
|
spring.datasource.username=ebc
|
|
|
9
|
spring.datasource.password=ebc@123
|
|
10
|
10
|
|
|
11
|
11
|
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
|
|
12
|
12
|
#spring.jpa.database=default
|