From bd4634e240ff004b524afc8cfe1007f4ca52a3c6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 10:46:52 +0800
Subject: [PATCH] minio 连接地址修改
---
src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java | 2
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 2
src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java | 4 +-
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 24 ++++++------
src/main/java/org/springblade/modules/equipage/controller/fixed.java | 2
src/main/resources/application-dev.yml | 7 +++
src/main/resources/application-prod.yml | 4 +-
src/main/java/org/springblade/modules/system/controller/UserController.java | 4 +-
src/main/resources/application-test.yml | 4 +-
pom.xml | 5 ++
src/main/java/org/springblade/modules/qrcode/QrCodeController.java | 6 +-
src/main/resources/application.yml | 1
12 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0511766..0f52159 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,6 +279,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
+ <!-- rabbitmq-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-amqp</artifactId>
+ </dependency>
<!--ureport-->
<!-- <dependency>-->
<!-- <groupId>com.syyai.spring.boot</groupId>-->
diff --git a/src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java b/src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java
index 2bc0c6c..a26abff 100644
--- a/src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java
@@ -173,7 +173,7 @@
//如果保安证编号不为空
if (null != accreditationRecordsVo.getSecurityNumber() && accreditationRecordsVo.getSecurityNumber() != "") {
//去生成二维码
- String url = "http://223.82.109.183:2080/securityInfo.html";
+ String url = "http://61.131.136.25:2080/securityInfo.html";
String encoded = null;
try {
encoded = URLEncoder.encode(accreditationRecordsVo.getSecurityNumber(), "UTF-8");
diff --git a/src/main/java/org/springblade/modules/equipage/controller/fixed.java b/src/main/java/org/springblade/modules/equipage/controller/fixed.java
index fc41a99..06d4ec9 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/fixed.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/fixed.java
@@ -324,7 +324,7 @@
params.put("beginTime", df.format(calendar.getTime()));
params.put("endTime", df.format(new Date()));
params.put("rectify", 0);
- params.put("callbackUrl", "http://223.82.109.183:2080/api/locus/SaveUrl");
+ params.put("callbackUrl", "http://61.131.136.25:2080/api/locus/SaveUrl");
params.put("callbackId", maps.get(i).get("carnumber").toString());
params.put("appId", "PO00000761");
params.put("timestamp", System.currentTimeMillis());
diff --git a/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java b/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java
index 13f6446..2ff8661 100644
--- a/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java
+++ b/src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java
@@ -284,7 +284,7 @@
* @param file
*/
private String putFile(MultipartFile file) throws IOException, InvalidKeyException, InvalidResponseException, InsufficientDataException, NoSuchAlgorithmException, ServerException, InternalException, XmlParserException, ErrorResponseException {
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -318,7 +318,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//返回url
diff --git a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
index f368d26..f966eed 100644
--- a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
+++ b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -46,7 +46,7 @@
@GetMapping("/getQrCode")
public ResponseEntity<byte[]> getQrCode(String securityNumber) throws UnsupportedEncodingException {
// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
- String url = "http://223.82.109.183:2080/securityInfo.html";
+ String url = "http://61.131.136.25:2080/securityInfo.html";
if (null!=securityNumber) {
String encoded = URLEncoder.encode(securityNumber,"UTF-8");
String content = url + "?securityNumber=" + encoded;
@@ -85,7 +85,7 @@
@GetMapping("/getQrCodeBase64")
public String getQrCodeBase64(String securityNumber) throws Exception{
// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
- String url = "http://223.82.109.183:2080/securityInfo.html";
+ String url = "http://61.131.136.25:2080/securityInfo.html";
if (null!=securityNumber) {
String encoded = URLEncoder.encode(securityNumber,"UTF-8");
String content = url + "?securityNumber=" + encoded;
@@ -105,7 +105,7 @@
@GetMapping("/getQrCodeDown")
public String getQrCodeDown(String securityNumber) throws Exception{
// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
- String url = "http://223.82.109.183:2080/securityInfo.html";
+ String url = "http://61.131.136.25:2080/securityInfo.html";
if (null!=securityNumber) {
String encoded = URLEncoder.encode(securityNumber,"UTF-8");
String content = url + "?securityNumber=" + encoded;
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index 49f2d04..efe64d1 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -194,7 +194,7 @@
@PostMapping("/put-file-user-avatar")
public R putFileUserAvatar(@RequestParam MultipartFile file) {
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -228,7 +228,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -246,7 +246,7 @@
@PostMapping("put-file-app")
public R putFileApp(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -280,7 +280,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
return R.data(urls);
}
@@ -293,7 +293,7 @@
@PostMapping("put-files")
public R putFiles(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -327,7 +327,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
@@ -346,7 +346,7 @@
public R putFileZip(@RequestParam MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<>(1);
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -419,7 +419,7 @@
.headers(headers)
.build());
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//取出身份证号,查询用户信息，更新用户信息
@@ -471,7 +471,7 @@
public R putFileExamPaymentZip(@RequestParam MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<>(1);
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -525,7 +525,7 @@
.headers(headers)
.build());
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip +"/zhba/"+ newName;
//取出身份证号,查询用户信息，更新用户信息
@@ -589,7 +589,7 @@
@PostMapping("put-files-talk")
public R putFilestak(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -625,7 +625,7 @@
InputStream inputStream = file.getInputStream();
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//数据封装
Map<String, Object> map = new HashMap<>(2);
map.put("name", newName);
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index a683e9a..c7643ed 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -658,7 +658,7 @@
}
}
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -691,7 +691,7 @@
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
//外围url
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//返回
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 934229d..2bd6f17 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -1691,7 +1691,7 @@
*/
@Override
public void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId) {
- String url = "http://223.82.109.183:2080/securityInfo.html";
+ String url = "http://61.131.136.25:2080/securityInfo.html";
//二维码生成
data.forEach(qrCodeExcel -> {
if (null!=qrCodeExcel.getSecuritynumber()) {
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e7d5b87..6fa9695 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -16,6 +16,11 @@
# url: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
# username: root
# password: ZHba@0112
+ rabbitmq:
+ host: 192.168.0.191
+ port: 5672
+ username: admin
+ password: admin
datasource:
# MySql
@@ -56,7 +61,7 @@
jsonUrl: /home/zhongsong/anbao/
username: root
password: ZHba@0112
-# qfqkBaseApiUrl: http://223.82.109.183:2082/api
+# qfqkBaseApiUrl: http://61.131.136.25:2082/api
qfqkBaseApiUrl: http://localhost:83
#第三方登陆
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 96e46c1..ea13821 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -26,7 +26,7 @@
#username: BLADEX_BOOT
#password: BLADEX_BOOT
# SqlServer
- #url: jdbc:sqlserver://223.82.109.183:1433;DatabaseName=zhbaw
+ #url: jdbc:sqlserver://61.131.136.25:1433;DatabaseName=zhbaw
#username: sa
#password: zhbaw@2021
#
@@ -49,7 +49,7 @@
jsonUrl: /home/zhongsong/anbao/
username: root
password: 123456
- # qfqkBaseApiUrl: http://223.82.109.183:2082/api
+ # qfqkBaseApiUrl: http://61.131.136.25:2082/api
qfqkBaseApiUrl: http://localhost:83
#第三方登陆
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index d2a6b49..20ecdd9 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -46,12 +46,12 @@
ftpPassword: 123456
ftpPath: anbao/
localPath: E:\\anbao\\
- ip: http://223.82.109.183:2081
+ ip: http://61.131.136.25:2081
jsonUrl: E:\\anbao\\
username: zhbaw
password: 123456
qfqkBaseApiUrl: http://192.168.0.198:83
-# qfqkBaseApiUrl : http://223.82.109.183:2082/api
+# qfqkBaseApiUrl : http://61.131.136.25:2082/api
#第三方登陆
social:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8ab2e94..c26d52b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -226,6 +226,7 @@
- /attendance/AppSave
- /electronRail/**
- /scheduled/**
+ - /rabbitmq/**
#授权认证配置
auth:
--
Gitblit v1.9.3