mysql
修改密码漏洞修复完成 6 months ago
parent ba7deb683c
commit d407de3865

@ -5,16 +5,15 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="eacd3dd8-1e95-428c-a6af-1aadb9921989" name="Default Changelist" comment=""> <list default="true" id="eacd3dd8-1e95-428c-a6af-1aadb9921989" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/OracleTemperatureService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/impl/OracleTemperatureServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/utils/JdbcUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -26,14 +25,22 @@
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Enum" /> <option value="Enum" />
<option value="Class" />
<option value="Interface" /> <option value="Interface" />
<option value="Class" />
</list> </list>
</option> </option>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="GitSEFilterConfiguration">
<file-type-list>
<filtered-out-file-type name="LOCAL_BRANCH" />
<filtered-out-file-type name="REMOTE_BRANCH" />
<filtered-out-file-type name="TAG" />
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
</file-type-list>
</component>
<component name="MarkdownSettingsMigration"> <component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" /> <option name="stateVersion" value="1" />
</component> </component>
@ -63,7 +70,7 @@
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$USER_HOME$/Documents/admin-client-temperature" /> <property name="last_opened_file_path" value="$USER_HOME$/Documents/admin-client-temperature" />
<property name="nodejs_package_manager_path" value="npm" /> <property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Project" /> <property name="project.structure.last.edited" value="SDKs" />
<property name="project.structure.proportion" value="0.0" /> <property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.20052427" /> <property name="project.structure.side.proportion" value="0.20052427" />
<property name="settings.editor.selected.configurable" value="MavenSettings" /> <property name="settings.editor.selected.configurable" value="MavenSettings" />
@ -182,6 +189,8 @@
<workItem from="1747644155888" duration="5369000" /> <workItem from="1747644155888" duration="5369000" />
<workItem from="1747658293616" duration="1309000" /> <workItem from="1747658293616" duration="1309000" />
<workItem from="1748326418665" duration="908000" /> <workItem from="1748326418665" duration="908000" />
<workItem from="1748698008368" duration="2000" />
<workItem from="1748698034154" duration="7358000" />
</task> </task>
<servers /> <servers />
</component> </component>

@ -107,7 +107,7 @@ public class MqttRSAClient {
System.out.println("topic:"+s); System.out.println("topic:"+s);
System.out.println("Qos:"+mqttMessage.getQos()); System.out.println("Qos:"+mqttMessage.getQos());
System.out.println("message RSA:"+strData); System.out.println("message RSA:"+strData);
//temperatureService.saveTemperature(strData,s); temperatureService.saveTemperature(strData,s);
} }
@Override @Override

@ -26,13 +26,13 @@ import java.util.Date;
//同时创建普通索引和组合索引,注意普通索引每个索引名都不同,注意组合索引每个索引名都相同 //同时创建普通索引和组合索引,注意普通索引每个索引名都不同,注意组合索引每个索引名都相同
@Table(indexes = {@Index(name = "idx_dataDate", columnList = "dataDate"),@Index(name = "idx_locationDesc", columnList = "locationDesc"),@Index(name = "idx_dataHour", columnList = "dataHour"),@Index(name = "idx_dataMinute", columnList = "dataMinute"),@Index(name = "data_date_location_desc", columnList = "dataDate"),@Index(name = "data_date_location_desc", columnList = "locationDesc")}) @Table(indexes = {@Index(name = "idx_dataDate", columnList = "dataDate"),@Index(name = "idx_locationDesc", columnList = "locationDesc"),@Index(name = "idx_dataHour", columnList = "dataHour"),@Index(name = "idx_dataMinute", columnList = "dataMinute"),@Index(name = "data_date_location_desc", columnList = "dataDate"),@Index(name = "data_date_location_desc", columnList = "locationDesc")})
public class Temperature implements Serializable { public class Temperature implements Serializable {
// @Id
// @GeneratedValue(strategy = GenerationType.IDENTITY)
// @ApiModelProperty(value = "主键")
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
@GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq") // @Id
@SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver") // @ApiModelProperty(value = "主键")
// @GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq")
// @SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver")
private Long id; private Long id;
@ApiModelProperty(value = "温度") @ApiModelProperty(value = "温度")

@ -16,13 +16,9 @@ import java.util.Date;
@Data @Data
@Entity @Entity
public class WebServiceProvince implements Serializable { public class WebServiceProvince implements Serializable {
// @Id
// @GeneratedValue(strategy = GenerationType.IDENTITY)
// @ApiModelProperty(value = "主键")
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "webService_province_seq")
@SequenceGenerator(name = "webService_province_seq", sequenceName = "webService_province_seq")
private Long id; private Long id;
@ApiModelProperty(value = "洲、国内外省份") @ApiModelProperty(value = "洲、国内外省份")

@ -29,13 +29,9 @@ import java.util.Date;
// @Index(name = "data_create_date_city_name", columnList = "cityName"), @Index(name = "data_create_date_city_name", columnList = "createDate")}) // @Index(name = "data_create_date_city_name", columnList = "cityName"), @Index(name = "data_create_date_city_name", columnList = "createDate")})
public class WebServiceWeatherInfo { public class WebServiceWeatherInfo {
// @Id
// @GeneratedValue(strategy = GenerationType.IDENTITY)
// @ApiModelProperty(value = "主键")
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "webService_weather_info_seq")
@SequenceGenerator(name = "webService_weather_info_seq", sequenceName = "webService_weather_info_seq")
private Long id; private Long id;
@Column(length = 100) @Column(length = 100)

@ -0,0 +1,8 @@
package com.rehome.mqttclienttemperature.service;
import com.rehome.mqttclienttemperature.dto.ResponseDto;
import com.rehome.mqttclienttemperature.entity.Temperature;
public interface OracleTemperatureService {
ResponseDto saveTemperature(Temperature temperature);
}

@ -0,0 +1,65 @@
package com.rehome.mqttclienttemperature.service.impl;
import com.google.gson.Gson;
import com.rehome.mqttclienttemperature.datasource.DataSource;
import com.rehome.mqttclienttemperature.dto.ResponseDto;
import com.rehome.mqttclienttemperature.entity.Temperature;
import com.rehome.mqttclienttemperature.service.OracleTemperatureService;
import com.rehome.mqttclienttemperature.utils.JdbcUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@Slf4j
@Service
public class OracleTemperatureServiceImpl implements OracleTemperatureService {
public static DataSource ds = new DataSource();
static {
//配置数据源
ds.setId("200");
ds.setName("oracle");
ds.setUrl("jdbc:oracle:thin:@192.168.3.9:1521/orcl");
ds.setUsername("appserver");
ds.setPassword("appserver");
ds.setDriver("oracle.jdbc.driver.OracleDriver");
}
@Override
public ResponseDto saveTemperature(Temperature temperature) {
// 自定义一个线程池,内部包含8个线程
ExecutorService customPool = Executors.newFixedThreadPool(8);
CompletableFuture<String> future = CompletableFuture.supplyAsync(() -> {
String sql = "insert into temperature(id,temperature, humidity, data_date, data_hour, data_minute, topic, location_desc, create_date) values(temperature_seq_appserver.NEXTVAL, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP)";
List<Object> jdbcParamValues = new ArrayList<>();
jdbcParamValues.add(temperature.getTemperature());
jdbcParamValues.add(temperature.getHumidity());
jdbcParamValues.add(temperature.getDataDate());
jdbcParamValues.add(temperature.getDataHour());
jdbcParamValues.add(temperature.getDataMinute());
jdbcParamValues.add(temperature.getTopic());
jdbcParamValues.add(temperature.getLocationDesc());
//jdbcParamValues.add(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(temperature.getCreateDate()));
Gson gson = new Gson();
ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues);
String dbQueryResult = gson.toJson(responseDto);
log.info(dbQueryResult);
jdbcParamValues.clear();
return "数据库同步成功";
}, customPool);
future.thenApply(result -> {
log.info("Result: " + result);
return ResponseDto.successWithMsg(result);
}).join();
return ResponseDto.successWithMsg("数据库正在同步...");
}
}

@ -2,6 +2,7 @@ package com.rehome.mqttclienttemperature.service.impl;
import com.rehome.mqttclienttemperature.dao.TemperatureRepository; import com.rehome.mqttclienttemperature.dao.TemperatureRepository;
import com.rehome.mqttclienttemperature.entity.Temperature; import com.rehome.mqttclienttemperature.entity.Temperature;
import com.rehome.mqttclienttemperature.service.OracleTemperatureService;
import com.rehome.mqttclienttemperature.service.TemperatureService; import com.rehome.mqttclienttemperature.service.TemperatureService;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
@ -21,6 +22,8 @@ public class TemperatureServiceImpl implements TemperatureService {
@Resource @Resource
private TemperatureRepository temperatureRepository; private TemperatureRepository temperatureRepository;
@Resource
private OracleTemperatureService oracleTemperatureService;
@Override @Override
public void saveTemperature(String temperatureAndHumidityData,String topic) { public void saveTemperature(String temperatureAndHumidityData,String topic) {
@ -56,7 +59,8 @@ public class TemperatureServiceImpl implements TemperatureService {
temperature.setHumidity(strDataTemperature[0]); temperature.setHumidity(strDataTemperature[0]);
temperature.setTemperature(strDataTemperature[1]); temperature.setTemperature(strDataTemperature[1]);
this.temperatureRepository.save(temperature); //this.temperatureRepository.save(temperature);
this.oracleTemperatureService.saveTemperature(temperature);
} }
} }

@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject;
import com.rehome.mqttclienttemperature.datasource.DataSource; import com.rehome.mqttclienttemperature.datasource.DataSource;
import com.rehome.mqttclienttemperature.dto.ResponseDto; import com.rehome.mqttclienttemperature.dto.ResponseDto;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.sql.*; import java.sql.*;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;

@ -22,18 +22,18 @@ spring:
#url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.1.24:3306/weather?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.1.24:3306/weather?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.3.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.3.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
#url: jdbc:mysql://47.242.184.139:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://47.242.184.139:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
# driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver url: jdbc:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
# username: root driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver
# password: Skyinno251, username: root
driverClassName: oracle.jdbc.driver.OracleDriver password: Skyinno251,
url: jdbc:oracle:thin:@192.168.3.9:1521/orcl # driverClassName: oracle.jdbc.driver.OracleDriver
username: appserver # url: jdbc:oracle:thin:@192.168.3.9:1521/orcl
password: appserver # username: appserver
# password: appserver
jpa: jpa:
database: oracle # 配置 DBMS 类型 database: mysql # 配置 DBMS 类型
show-sql: true # 配置是否将执行的 SQL 输出到日志 show-sql: true # 配置是否将执行的 SQL 输出到日志
open-in-view: true open-in-view: true
hibernate: hibernate:

Loading…
Cancel
Save