From 9af6657ee58f9fbaf17cf12a59244efd2fc92a84 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 22 Sep 2025 12:55:57 +0800
Subject: [PATCH] 生产环境打包配置环境-prod
---
oying-system/src/main/resources/config/application-dev.yml | 10 ++---
oying-common/src/main/java/com/oying/config/webConfig/WebSocketConfig.java | 36 +++++++++---------
oying-tools/src/main/java/com/oying/service/impl/BucketStorageServiceImpl.java | 6 +++
oying-tools/src/main/java/com/oying/utils/ObsProperties.java | 1
oying-system/pom.xml | 1
oying-system/src/main/resources/config/application-prod.yml | 16 ++++---
oying-system/src/main/java/com/oying/AppRun.java | 14 ++++++
7 files changed, 52 insertions(+), 32 deletions(-)
diff --git a/oying-common/src/main/java/com/oying/config/webConfig/WebSocketConfig.java b/oying-common/src/main/java/com/oying/config/webConfig/WebSocketConfig.java
index 6a151d5..a5be6d3 100644
--- a/oying-common/src/main/java/com/oying/config/webConfig/WebSocketConfig.java
+++ b/oying-common/src/main/java/com/oying/config/webConfig/WebSocketConfig.java
@@ -1,18 +1,18 @@
-package com.oying.config.webConfig;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-/**
- * @author Z
- * @date 2019-08-24 15:44
- */
-@Configuration
-public class WebSocketConfig {
-
- @Bean
- public ServerEndpointExporter serverEndpointExporter() {
- return new ServerEndpointExporter();
- }
-}
+//package com.oying.config.webConfig;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+//
+///** 打war包注释
+// * @author Z
+// * @date 2019-08-24 15:44
+// */
+//@Configuration
+//public class WebSocketConfig {
+//
+// @Bean
+// public ServerEndpointExporter serverEndpointExporter() {
+// return new ServerEndpointExporter();
+// }
+//}
diff --git a/oying-system/pom.xml b/oying-system/pom.xml
index 0eab0b3..d020cdc 100644
--- a/oying-system/pom.xml
+++ b/oying-system/pom.xml
@@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>oying-system</artifactId>
+ <packaging>war</packaging>
<name>核心模块</name>
<properties>
diff --git a/oying-system/src/main/java/com/oying/AppRun.java b/oying-system/src/main/java/com/oying/AppRun.java
index 1616dd6..1b96648 100644
--- a/oying-system/src/main/java/com/oying/AppRun.java
+++ b/oying-system/src/main/java/com/oying/AppRun.java
@@ -7,7 +7,9 @@
import com.oying.utils.SpringBeanHolder;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.ApplicationPidFileWriter;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.bind.annotation.RestController;
@@ -21,7 +23,7 @@
@Api(hidden = true)
@SpringBootApplication
@EnableTransactionManagement
-public class AppRun {
+public class AppRun extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication springApplication = new SpringApplication(AppRun.class);
@@ -35,6 +37,16 @@
log.info("---------------------------------------------");
}
+ /**
+ * 打war包配置
+ *
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+ // 注意这里要指向原先用main方法执行的Application启动类
+ return builder.sources(AppRun.class);
+ }
+
@Bean
public SpringBeanHolder springContextHolder() {
return new SpringBeanHolder();
diff --git a/oying-system/src/main/resources/config/application-dev.yml b/oying-system/src/main/resources/config/application-dev.yml
index 3b94915..913769e 100644
--- a/oying-system/src/main/resources/config/application-dev.yml
+++ b/oying-system/src/main/resources/config/application-dev.yml
@@ -154,16 +154,12 @@
swift-pass:
# 密钥
key: vJB6683s4NtQtXBgHTvE1hWOUtcre7nj
- # 密钥2
- key-2: s7Jf1eEM5QlxihWSxZh673pDhGY7p0s0
# 私钥
mch-private-key: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC2YNuGqSAFcIVOc9mnmIbnVfQoyyMBoyGqTD3beiy/UsXZrGF4OIrPEevwXnwHktURupjHAKvt92PL4L9wTz7cknaQkF0NH5saOdY3sL88xH7F3qSgIwHPvkRileFeEHx+pKnXBms8yiliDqPk0MV3iRRoXKhRnojrWAYJhyz+1iJ13qWXCWcpr9hf77Uu/r1N7wsJKN4Z75M2qQC6LgRTaHoBroLGVtld4PM30ee6o9RR8yiFVx4FDVukinGR15nTsrNh+sUx3piVXqYrq23UPjUWVtJlf9cEvfNVXCMsa71LGEzUl0zxDfeyXRQhel3E27p2oovEYvhl5s+pZhtXAgMBAAECggEBAKXZLKinccwgh8lRBrQmuz7x5ieWms3pWDryPCozTy/pCKyq2rQlzu0BIiqi8W09tG773eTSEodDOkhzqANsvQB+XD2YWlYN0NEnmUtpem67TYGItvI9A2+0WaHBJIGSwnO0MBKu7qQIP1vBbn8s7vWF/b3tzM70ORSzJkJR37QY435+ZG9rKMKyL/tuGW7E5AgrHmyl2aK9me3vgUrZct2e9l5XLrn9oU1niEmbDbFARhphXDCEPIvFiu7WtFDBmp/jEOc4u/y/sYMjS1RWpO9iOyTZDO8Mi9iofXugmoot4Tn0lBckeR6YVRb/I3EcVADoMfk1iaN1aWv1u+Ska8ECgYEA3ZFYMvo5y7SztrEbyLpWGsp6aM4a5ght8p52/rFhSHD5CGS7Uywhp4LxxIjLTRBNa/UkBzOq1Xt1+PVDNHf0E1yYZqEv9OXWC0yiCsnwO6b7o9hc3VnnX4jw7FkS0+pjfgCK4/A9hFj9xUI+qX3L3+pOCseioUeYofqTc2bn7ncCgYEA0rhvvNO30EisLACdOIem8XgbL4LjKJ47FnYS/TEZ9cDhJW5G2pAxgyFsqhN/GuTVg8uSQ7a6PlcBxzTuOwdZg05RcCAdmsXUdGjVbKk2i4CBp0K1j4QYfr8Wt18x0RLfzIQDrZQajWssVGjo8sfMn8qmjbRNbMmokRTflGIkEiECgYEAxChaYn9fzbYEaRixlWtKsdtSthjKfZ8239ZlWSVnEEBcaY7svTzT6r6mFq5Y9rgZIxvbsriOZQQxtKBGyFvubXnLvwizMWiNsGE/ELgphFZYcH0r8hgXHGBbk5NkdNMNFE+cpyJZBCPZP9tfKKUjavC/+RE3LPv66GS0SDXx3g8CgYAYOIT3cmqFcWUA5c0si0MgLEsLqgLMT2vBSC8klTlDqzj14XgZdUuLpBLmdbk9cSIttP+J8v3zXnLg3++mL1EVq7HmrnpYqPajrs0hYU3YuRuuCxfteCSMpRBKYZHLU10QF/iIQibPLIt65FgqV9boYxXD4f6oS4Gps3mDh8hXoQKBgBKojPBWgp4/WBMfh8nUzFzTiW7ACyG2jAxGtu0dtqfwx2LkesUKGhD1JGlxdDQ6jSv9tbhAgbZjTAULSo03626ZaiSDF+nCwFsobd3wRiij8LiL9amW5t6XBeX6bS5SCh45GbgnNBtzBqUI19/CGH09YXNpCYnADsY4fab4wNpR
# 公钥
plat-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmDbhqkgBXCFTnPZp5iG51X0KMsjAaMhqkw923osv1LF2axheDiKzxHr8F58B5LVEbqYxwCr7fdjy+C/cE8+3JJ2kJBdDR+bGjnWN7C/PMR+xd6koCMBz75EYpXhXhB8fqSp1wZrPMopYg6j5NDFd4kUaFyoUZ6I61gGCYcs/tYidd6llwlnKa/YX++1Lv69Te8LCSjeGe+TNqkAui4EU2h6Aa6CxlbZXeDzN9HnuqPUUfMohVceBQ1bpIpxkdeZ07KzYfrFMd6YlV6mK6tt1D41FlbSZX/XBL3zVVwjLGu9SxhM1JdM8Q33sl0UIXpdxNu6dqKLxGL4ZebPqWYbVwIDAQAB
# 门店编号
mch-id: 1030238092
- # 门店编号2
- mch-id-2: 1030238093
# 签名方式
sign-type: MD5
# 原生JS
@@ -173,11 +169,13 @@
# 请求url
req-url: https://pay.hstypay.com/v2/pay/gateway
# 支付通知地址
- notify-url: http://1.95.124.88:8088/api/swiftPass/alipayCallback
+ notify-url: http://api.o-ying.cn:8088/oying/api/swiftPass/alipayCallback
# 退款通知地址
- refund-url: http://1.95.124.88:8088/api/swiftPass/returnNotify
+ refund-url: http://api.o-ying.cn:8088/oying/api/swiftPass/returnNotify
obs:
+ # 测试环境
+ enabled: true
access_key_id: RZ1UIOZDZ58DD4NWPD6Q
access_key_secret: QpE58YEFtgoIwUoGNlN5JlNY7t6qVu7vMkix8gAI
bucket: oying
diff --git a/oying-system/src/main/resources/config/application-prod.yml b/oying-system/src/main/resources/config/application-prod.yml
index 92ff604..cbb66cf 100644
--- a/oying-system/src/main/resources/config/application-prod.yml
+++ b/oying-system/src/main/resources/config/application-prod.yml
@@ -4,9 +4,9 @@
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:oying}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
- username: ${DB_USER:root}
- password: ${DB_PWD:123456}
+ url: jdbc:mysql://${DB_HOST:192.168.0.5}:${DB_PORT:3306}/${DB_NAME:oying}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+ username: ${DB_USER:oydbroot}
+ password: ${DB_PWD:Ly123456@(^)9}
# 初始连接数，建议设置为与最小空闲连接数相同
initial-size: 20
# 最小空闲连接数，保持足够的空闲连接以应对请求
@@ -164,7 +164,7 @@
# 汇旺财
swift-pass:
# 密钥
- key: vJB6683s4NtQtXBgHTvE1hWOUtcre7nj
+ key: s7Jf1eEM5QlxihWSxZh673pDhGY7p0s0
# 密钥2
key-2: s7Jf1eEM5QlxihWSxZh673pDhGY7p0s0
# 私钥
@@ -172,7 +172,7 @@
# 公钥
plat-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmDbhqkgBXCFTnPZp5iG51X0KMsjAaMhqkw923osv1LF2axheDiKzxHr8F58B5LVEbqYxwCr7fdjy+C/cE8+3JJ2kJBdDR+bGjnWN7C/PMR+xd6koCMBz75EYpXhXhB8fqSp1wZrPMopYg6j5NDFd4kUaFyoUZ6I61gGCYcs/tYidd6llwlnKa/YX++1Lv69Te8LCSjeGe+TNqkAui4EU2h6Aa6CxlbZXeDzN9HnuqPUUfMohVceBQ1bpIpxkdeZ07KzYfrFMd6YlV6mK6tt1D41FlbSZX/XBL3zVVwjLGu9SxhM1JdM8Q33sl0UIXpdxNu6dqKLxGL4ZebPqWYbVwIDAQAB
# 门店编号
- mch-id: 1030238092
+ mch-id: 1030238093
# 门店编号2
mch-id-2: 1030238093
# 签名方式
@@ -184,11 +184,13 @@
# 请求url
req-url: https://pay.hstypay.com/v2/pay/gateway
# 支付通知地址
- notify-url: http://1.95.124.88:8088/api/swiftPass/alipayCallback
+ notify-url: https://o-ying.cn/oying/api/swiftPass/alipayCallback
# 退款通知地址
- refund-url: http://1.95.124.88:8088/api/swiftPass/returnNotify
+ refund-url: https://o-ying.cn/oying/api/swiftPass/returnNotify
obs:
+ # 测试环境
+ enabled: false
access_key_id: RZ1UIOZDZ58DD4NWPD6Q
access_key_secret: QpE58YEFtgoIwUoGNlN5JlNY7t6qVu7vMkix8gAI
bucket: oying
diff --git a/oying-tools/src/main/java/com/oying/service/impl/BucketStorageServiceImpl.java b/oying-tools/src/main/java/com/oying/service/impl/BucketStorageServiceImpl.java
index fca0ba4..7ac8038 100644
--- a/oying-tools/src/main/java/com/oying/service/impl/BucketStorageServiceImpl.java
+++ b/oying-tools/src/main/java/com/oying/service/impl/BucketStorageServiceImpl.java
@@ -58,6 +58,9 @@
String type = FileUtil.getFileType(suffix);
String reaName = System.currentTimeMillis() + "." + suffix;
String objectKey = type + "/" + reaName;
+ if (properties.getEnabled()) {
+ objectKey = "test/" +objectKey;
+ }
PutObjectResult result = ObsUtils.putObject(properties, file, objectKey, AccessControlList.REST_CANNED_PUBLIC_READ);
if (ObjectUtil.isNull(result)) {
throw new BadRequestException("上传失败");
@@ -83,6 +86,9 @@
String type = FileUtil.getFileType(suffix);
String reaName = IdUtil.getSnowflake(1, 1).nextId() + "." + suffix;
String objectKey = type + "/" + reaName;
+ if (properties.getEnabled()) {
+ objectKey = "test/" +objectKey;
+ }
PutObjectResult result = ObsUtils.putObject(properties, FileUtil.toFile(file), objectKey, AccessControlList.REST_CANNED_PUBLIC_READ);
if (ObjectUtil.isNull(result)) {
throw new BadRequestException("上传失败");
diff --git a/oying-tools/src/main/java/com/oying/utils/ObsProperties.java b/oying-tools/src/main/java/com/oying/utils/ObsProperties.java
index c6e0724..bdd8e8c 100644
--- a/oying-tools/src/main/java/com/oying/utils/ObsProperties.java
+++ b/oying-tools/src/main/java/com/oying/utils/ObsProperties.java
@@ -18,4 +18,5 @@
private String accessKeySecret;
private String bucket;
private String endpoint;
+ private Boolean enabled;
}
--
Gitblit v1.9.3