Commit 4b86dac1 authored by wangjinjing's avatar wangjinjing

发布版本

parent 851aaae7
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/videoaipay.iml" filepath="$PROJECT_DIR$/.idea/videoaipay.iml" />
</modules>
</component>
</project>
\ No newline at end of file
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.5</version> <version>2.4.5</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/>
</parent> </parent>
<groupId>com.example</groupId> <groupId>com.video</groupId>
<artifactId>videoai</artifactId> <artifactId>VideoAI</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>videoai</name> <name>VideoAI</name>
<properties> <properties>
<java.version>8</java.version> <java.version>8</java.version>
</properties> </properties>
...@@ -24,11 +24,6 @@ ...@@ -24,11 +24,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<!--<dependency>-->
<!--<groupId>org.mybatis.spring.boot</groupId>-->
<!--<artifactId>mybatis-spring-boot-starter</artifactId>-->
<!--<version>2.1.4</version>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
...@@ -45,6 +40,7 @@ ...@@ -45,6 +40,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>8.0.27</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -56,15 +52,6 @@ ...@@ -56,15 +52,6 @@
<artifactId>alipay-sdk-java</artifactId> <artifactId>alipay-sdk-java</artifactId>
<version>4.19.0.ALL</version> <version>4.19.0.ALL</version>
</dependency> </dependency>
<!-- 支持Thymeleaf的非严格语法的第三方插件 -->
<!-- https://mvnrepository.com/artifact/net.sourceforge.nekohtml/nekohtml -->
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>1.9.22</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId> <artifactId>druid-spring-boot-starter</artifactId>
...@@ -84,6 +71,11 @@ ...@@ -84,6 +71,11 @@
<artifactId>xml-apis</artifactId> <artifactId>xml-apis</artifactId>
<version>1.4.01</version> <version>1.4.01</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -4,24 +4,24 @@ server: ...@@ -4,24 +4,24 @@ server:
# 应用程序名配置 # 应用程序名配置
spring: spring:
datasource: datasource:
url: jdbc:mysql://172.16.24.29:3306/videoorder?useUnicode=true&characterEncoding=utf-8&serverTimezone = GMT%2B8 url: jdbc:mysql://192.168.78.31:3307/videoorder?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT%2B8
username: root username: root
password: 123456 password: 123456
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
initialSize: 5
minIdle: 5
maxActive: 20 maxActive: 20
initialSize: 1
maxWait: 60000 maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000 timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000 minEvictableIdleTimeMillis: 300000
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true testWhileIdle: true
testOnBorrow: false testOnBorrow: false
testOnReturn: false testOnReturn: false
poolPreparedStatements: true poolPreparedStatements: true
maxPoolPreparedStatementPerConnectionSize: 20 maxOpenPreparedStatements: 20
#配置阿里支付结果通知服务,必须为外网
alipay: alipay:
notify_url: http://zjh189.ncpoi.cc:20000/videopay/alipay/notifyUrl notify_url: http://zjh189.ncpoi.cc:20000/videopay/alipay/notifyUrl
return_url : http://zjh189.ncpoi.cc:20000/videopay/alipay/returnUrl return_url : http://zjh189.ncpoi.cc:20000/videopay/alipay/returnUrl
......
...@@ -4,10 +4,10 @@ server: ...@@ -4,10 +4,10 @@ server:
spring: spring:
datasource: datasource:
url: jdbc:mysql://localhost:3306/videoorder?useUnicode=true&characterEncoding=utf-8&serverTimezone = GMT%2B8 url: jdbc:mysql://localhost:3306/videoorder?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT
username: root username: root
password: root password: root
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
initialSize: 5 initialSize: 5
minIdle: 5 minIdle: 5
......
spring: spring:
profiles: profiles:
active: dev active: devaipay
application: application:
name: videoai name: videoai
server: server:
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment