@@ -1,3 +1,6 @@
+server:
+ tomcat:
+ basedir: /opt/tmp/tomcat
dubbo:
registry:
address: zookeeper://127.0.0.1:2181
address: zookeeper://192.168.0.110:2181
@@ -1,5 +1,6 @@
#!/bin/bash
-app='oss-store.jar'
-app_path=`pwd`/${app}
-nohup java -jar ${app_path} > console.log 2>&1 &
+app_dir=`pwd`
+app_name='oss-store.jar'
+# 使用 mvn clean package -Dmaven.test.skip -Ptest 生成的 jar 运行时加载 application.yml 和 application-test.yml 两个配置文件, 分别位于 classpath 和文件系统路径
+java -jar ${app_dir}"/"${app_name} --spring.config.location=classpath:/application.yml,file:${app_dir}/application-test.yml > console.log 2>&1 &
@@ -1,17 +0,0 @@
-dubbo:
- registry:
- address: zookeeper://127.0.0.1:2181
-spring:
- redis:
- database: 0
- host: 127.0.0.1
- port: 6379
- password: Dev@123456
- datasource:
- url: jdbc:mysql://localhost:3306/reghao_oss_rdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
- username: dev
-oss:
- domain: oss.reghao.cn
- mountedDirs:
- - /opt/oss/disk/13f654c8-af87-4710-aac9-7aa086c99aec/
@@ -8,8 +8,6 @@ dubbo:
base-packages: cn.reghao.oss.store.rpc
server:
port: 8010
- tomcat:
- basedir: /opt/tmp/tomcat
spring:
servlet:
multipart: