Просмотр исходного кода

切换数据库

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
d457da50c2
10 измененных файлов: 17 добавлений и 12 удалений
  1. +1
    -1
      mallinkAdmin/src/main/resources/application-dev.yml
  2. +1
    -1
      mallinkBApi/src/main/resources/application-dev.yml
  3. +1
    -1
      mallinkCApi/src/main/resources/application-dev.yml
  4. +1
    -1
      mallinkCallback/src/main/resources/application-dev.yml
  5. +1
    -1
      mallinkMQConsumer/src/main/resources/application-dev.yml
  6. +1
    -1
      mallinkPosApi/src/main/resources/application-dev.yml
  7. +1
    -1
      mallinkSchedule/src/main/resources/application-dev.yml
  8. +8
    -3
      mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java
  9. +1
    -1
      mallinkSysAdmin/src/main/resources/application-dev.yml
  10. +1
    -1
      mallinkWebSocketServer/src/main/resources/application-dev.yml

+ 1
- 1
mallinkAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -4,7 +4,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkBApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -4,7 +4,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkCApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -4,7 +4,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkCallback/src/main/resources/application-dev.yml Просмотреть файл

@@ -4,7 +4,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkMQConsumer/src/main/resources/application-dev.yml Просмотреть файл

@@ -4,7 +4,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkPosApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -4,7 +4,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallinkDevGroup1?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkSchedule/src/main/resources/application-dev.yml Просмотреть файл

@@ -4,7 +4,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


+ 8
- 3
mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java Просмотреть файл

@@ -21,6 +21,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumPayWay;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.exception.MallinkException;
import com.iformall.file.aliyun.AliyunOSS;
import com.iformall.service.MallResourceService;
import com.iformall.service.QrCodeService;
import com.iformall.service.WxAppinfoService;
@@ -57,7 +58,9 @@ public class QrCodeServiceImpl implements QrCodeService {
@Autowired
private String fmUploadDir;
@Autowired
private PayServiceFactory payServiceFactory;
private PayServiceFactory payServiceFactory;
@Autowired
private AliyunOSS aliyunOSS;

private AmazonS3 s3 = null;

@@ -238,14 +241,16 @@ public class QrCodeServiceImpl implements QrCodeService {

String fn = UUID.randomUUID().toString();
int dot = fileName.lastIndexOf('.');
String fileFormat = "";
if (dot >= 0) {
String fileFormat = dest.getName().substring(dot, dest.getName().length());
fileFormat = dest.getName().substring(dot, dest.getName().length());
fn = getFileName(tenantEntity, fn + fileFormat);
} else {
fn = getFileName(tenantEntity, fn);
}

ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity);
// ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity);
ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(dest));
org.apache.commons.io.FileUtils.forceDelete(dest);
return data;
} catch (Exception e) {


+ 1
- 1
mallinkSysAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -3,7 +3,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkWebSocketServer/src/main/resources/application-dev.yml Просмотреть файл

@@ -4,7 +4,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallink_phone?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
username: root
password: fm2020test
type: com.alibaba.druid.pool.DruidDataSource


Загрузка…
Отмена
Сохранить