controller接口单元测试
diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java b/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
index 5596b24..65e525a 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
@@ -10,6 +10,7 @@
public static final String STATUS_NORMAL = "normal";
public static final String STATUS_CLOSED = "closed";
public static final String STATUS_LOCKED = "locked";
+ public static final String SUBJNO_SHOP = "locked";
/**
* 流水状态
diff --git a/src/main/kotlin/com/supwisdom/dlpay/DlpayApplication.kt b/src/main/kotlin/com/supwisdom/dlpay/DlpayApplication.kt
index a9cea45..0a4f46a 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/DlpayApplication.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/DlpayApplication.kt
@@ -8,7 +8,6 @@
@ComponentScan("com.supwisdom.dlpay")
@SpringBootApplication
-@PropertySource("file:\${catalina.home}/conf/dlpay_config.properties")
class DlpayApplication
fun main(args: Array<String>) {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e69de29..c151216 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -0,0 +1,17 @@
+#######################################springboot配置 start#################################
+# 单库数据库配置
+spring.datasource.url=jdbc:oracle:thin:@172.28.201.101:47922:orcl
+spring.datasource.username=dlpay
+spring.datasource.password=kingstar
+spring.datasource.driver.class=oracle.jdbc.driver.OracleDriver
+spring.jpa.database-platform=org.hibernate.dialect.Oracle10gDialect
+spring.jpa.show-sql=true
+spring.datasource.hikari.connection-timeout=60000
+spring.datasource.hikari.maximum-pool-size=5
+spring.jpa.hibernate.ddl-auto=update
+# logging
+logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} %-5level %logger{36} - %msg%n
+logging.level.org.hibernate.SQL=debug
+#################### JSP PAGE ####################
+spring.mvc.view.prefix=/pages/
+spring.mvc.view.suffix=.jsp
\ No newline at end of file