Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhangjian1949
apollo
提交
d6779624
apollo
项目概览
zhangjian1949
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d6779624
编写于
4月 28, 2016
作者:
Y
Yiming Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update start script by leverage spring boot launch
上级
39fb6a84
变更
23
隐藏空白更改
内联
并排
Showing
23 changed file
with
126 addition
and
69 deletion
+126
-69
apollo-adminservice/pom.xml
apollo-adminservice/pom.xml
+3
-0
apollo-adminservice/src/assembly/assembly-descriptor.xml
apollo-adminservice/src/assembly/assembly-descriptor.xml
+14
-2
apollo-adminservice/src/main/config/apollo-adminservice.conf
apollo-adminservice/src/main/config/apollo-adminservice.conf
+3
-0
apollo-adminservice/src/main/resources/logback.xml
apollo-adminservice/src/main/resources/logback.xml
+10
-0
apollo-adminservice/src/main/scripts/env.sh
apollo-adminservice/src/main/scripts/env.sh
+0
-0
apollo-adminservice/src/main/scripts/shutdown.sh
apollo-adminservice/src/main/scripts/shutdown.sh
+2
-3
apollo-adminservice/src/main/scripts/startup.sh
apollo-adminservice/src/main/scripts/startup.sh
+10
-3
apollo-biz/src/main/resources/application-dev.example.properties
...biz/src/main/resources/application-dev.example.properties
+4
-0
apollo-biz/src/main/resources/application.properties
apollo-biz/src/main/resources/application.properties
+0
-1
apollo-buildtools/src/main/scripts/common.sh
apollo-buildtools/src/main/scripts/common.sh
+0
-46
apollo-configservice/src/assembly/assembly-descriptor.xml
apollo-configservice/src/assembly/assembly-descriptor.xml
+13
-1
apollo-configservice/src/main/config/apollo-configservice.conf
...o-configservice/src/main/config/apollo-configservice.conf
+3
-0
apollo-configservice/src/main/resources/logback.xml
apollo-configservice/src/main/resources/logback.xml
+10
-0
apollo-configservice/src/main/scripts/env.sh
apollo-configservice/src/main/scripts/env.sh
+0
-0
apollo-configservice/src/main/scripts/shutdown.sh
apollo-configservice/src/main/scripts/shutdown.sh
+2
-3
apollo-configservice/src/main/scripts/startup.sh
apollo-configservice/src/main/scripts/startup.sh
+11
-3
apollo-portal/pom.xml
apollo-portal/pom.xml
+3
-0
apollo-portal/src/assembly/assembly-descriptor.xml
apollo-portal/src/assembly/assembly-descriptor.xml
+13
-1
apollo-portal/src/main/config/apollo-portal.conf
apollo-portal/src/main/config/apollo-portal.conf
+3
-0
apollo-portal/src/main/resources/logback.xml
apollo-portal/src/main/resources/logback.xml
+10
-0
apollo-portal/src/main/scripts/env.sh
apollo-portal/src/main/scripts/env.sh
+0
-0
apollo-portal/src/main/scripts/shutdown.sh
apollo-portal/src/main/scripts/shutdown.sh
+1
-3
apollo-portal/src/main/scripts/startup.sh
apollo-portal/src/main/scripts/startup.sh
+11
-3
未找到文件。
apollo-adminservice/pom.xml
浏览文件 @
d6779624
...
...
@@ -83,6 +83,9 @@
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<executable>
true
</executable>
</configuration>
</plugin>
<plugin>
<artifactId>
maven-assembly-plugin
</artifactId>
...
...
apollo-adminservice/src/assembly/assembly-descriptor.xml
浏览文件 @
d6779624
...
...
@@ -12,7 +12,7 @@
<useAllReactorProjects>
true
</useAllReactorProjects>
<includes>
<include>
*:apollo-buildtools:*
</include>
<include>
*:apollo-adminervice:*
</include>
<include>
*:apollo-admin
s
ervice:*
</include>
</includes>
<sources>
<includeModuleDirectory>
false
</includeModuleDirectory>
...
...
@@ -30,6 +30,18 @@
<fileSet>
<directory>
src/main/config
</directory>
<outputDirectory>
config
</outputDirectory>
<excludes>
<exclude>
apollo-adminservice.conf
</exclude>
</excludes>
<lineEnding>
unix
</lineEnding>
</fileSet>
<fileSet>
<directory>
src/main/config
</directory>
<outputDirectory>
/
</outputDirectory>
<includes>
<include>
apollo-adminservice.conf
</include>
</includes>
<lineEnding>
unix
</lineEnding>
</fileSet>
<!--artifact -->
<fileSet>
...
...
@@ -38,7 +50,7 @@
<includes>
<include>
${project.artifactId}-*.jar
</include>
</includes>
<fileMode>
0
444
</fileMode>
<fileMode>
0
755
</fileMode>
</fileSet>
</fileSets>
</sources>
...
...
apollo-adminservice/src/main/config/apollo-adminservice.conf
0 → 100644
浏览文件 @
d6779624
MODE
=
service
PID_FOLDER
=.
LOG_FOLDER
=/
opt
/
logs
/
100003172
/
\ No newline at end of file
apollo-adminservice/src/main/resources/logback.xml
0 → 100644
浏览文件 @
d6779624
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include
resource=
"org/springframework/boot/logging/logback/defaults.xml"
/>
<property
name=
"LOG_FILE"
value=
"${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-adminservice.log}"
/>
<include
resource=
"org/springframework/boot/logging/logback/file-appender.xml"
/>
<root
level=
"INFO"
>
<appender-ref
ref=
"FILE"
/>
</root>
</configuration>
\ No newline at end of file
apollo-adminservice/src/main/scripts/env.sh
已删除
100644 → 0
浏览文件 @
39fb6a84
apollo-adminservice/src/main/scripts/shutdown.sh
浏览文件 @
d6779624
#!/bin/bash
SERVICE_NAME
=
apollo-adminservice
PATH_TO_JAR
=
$SERVICE_NAME
"-0.0.1-SNAPSHOT.jar"
LOG_PATH
=
/opt/logs/100003172/
cd
`
dirname
$0
`
/..
source
bin/common.sh stop
\ No newline at end of file
./
$SERVICE_NAME
".jar"
stop
apollo-adminservice/src/main/scripts/startup.sh
浏览文件 @
d6779624
#!/bin/bash
SERVICE_NAME
=
apollo-adminservice
PATH_TO_JAR
=
$SERVICE_NAME
"-0.0.1-SNAPSHOT.jar"
LOG_PATH
=
/opt/logs/100003172/
VERSION
=
0.0.1-SNAPSHOT
PATH_TO_JAR
=
$SERVICE_NAME
"-"
$VERSION
".jar"
cd
`
dirname
$0
`
/..
source
bin/common.sh start
if
[[
-f
$SERVICE_NAME
".jar"
]]
;
then
rm
-rf
$SERVICE_NAME
".jar"
fi
ln
$PATH_TO_JAR
$SERVICE_NAME
".jar"
./
$SERVICE_NAME
".jar"
start
exit
0
;
\ No newline at end of file
apollo-biz/src/main/resources/application-dev.example.properties
0 → 100644
浏览文件 @
d6779624
# DataSource
spring.datasource.url
=
spring.datasource.username =
spring.datasource.password
=
apollo-biz/src/main/resources/application.properties
浏览文件 @
d6779624
...
...
@@ -7,4 +7,3 @@ spring.datasource.validationQuery=SELECT 1
spring.jpa.hibernate.naming_strategy
=
org.hibernate.cfg.EJB3NamingStrategy
spring.jpa.hibernate.globally_quoted_identifiers
=
true
spring.jpa.properties.hibernate.globally_quoted_identifiers
=
true
spring.jpa.properties.hibernate.show_sql
=
true
apollo-buildtools/src/main/scripts/common.sh
已删除
100644 → 0
浏览文件 @
39fb6a84
#!/bin/bash
# directories
SYSOUT_LOG
=
$LOG_PATH
/sysout.log
mkdir
-p
$LOG_PATH
PID_PATH_NAME
=
$SERVICE_NAME
".pid"
case
$1
in
start
)
echo
"Starting
$SERVICE_NAME
..."
if
[
!
-f
$PID_PATH_NAME
]
;
then
nohup
java
-jar
$PATH_TO_JAR
/tmp 2>>
$SYSOUT_LOG
>>
$SYSOUT_LOG
&
echo
$!
>
$PID_PATH_NAME
echo
"
$SERVICE_NAME
started ..."
else
echo
"
$SERVICE_NAME
is already running ..."
fi
;;
stop
)
if
[
-f
$PID_PATH_NAME
]
;
then
PID
=
$(
cat
$PID_PATH_NAME
)
;
echo
"
$SERVICE_NAME
stopping ..."
kill
$PID
;
echo
"
$SERVICE_NAME
stopped ..."
rm
$PID_PATH_NAME
else
echo
"
$SERVICE_NAME
is not running ..."
fi
;;
restart
)
if
[
-f
$PID_PATH_NAME
]
;
then
PID
=
$(
cat
$PID_PATH_NAME
)
;
echo
"
$SERVICE_NAME
stopping ..."
;
kill
$PID
;
echo
"
$SERVICE_NAME
stopped ..."
;
rm
$PID_PATH_NAME
echo
"
$SERVICE_NAME
starting ..."
nohup
java
-jar
$PATH_TO_JAR
/tmp 2>>
$SYSOUT_LOG
>>
$SYSOUT_LOG
&
echo
$!
>
$PID_PATH_NAME
echo
"
$SERVICE_NAME
started ..."
else
echo
"
$SERVICE_NAME
is not running ..."
fi
;;
esac
exit
0
\ No newline at end of file
apollo-configservice/src/assembly/assembly-descriptor.xml
浏览文件 @
d6779624
...
...
@@ -30,6 +30,18 @@
<fileSet>
<directory>
src/main/config
</directory>
<outputDirectory>
config
</outputDirectory>
<excludes>
<exclude>
apollo-configservice.conf
</exclude>
</excludes>
<lineEnding>
unix
</lineEnding>
</fileSet>
<fileSet>
<directory>
src/main/config
</directory>
<outputDirectory>
/
</outputDirectory>
<includes>
<include>
apollo-configservice.conf
</include>
</includes>
<lineEnding>
unix
</lineEnding>
</fileSet>
<!--artifact -->
<fileSet>
...
...
@@ -38,7 +50,7 @@
<includes>
<include>
${project.artifactId}-*.jar
</include>
</includes>
<fileMode>
0
444
</fileMode>
<fileMode>
0
755
</fileMode>
</fileSet>
</fileSets>
</sources>
...
...
apollo-configservice/src/main/config/apollo-configservice.conf
0 → 100644
浏览文件 @
d6779624
MODE
=
service
PID_FOLDER
=.
LOG_FOLDER
=/
opt
/
logs
/
100003171
/
apollo-configservice/src/main/resources/logback.xml
0 → 100644
浏览文件 @
d6779624
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include
resource=
"org/springframework/boot/logging/logback/defaults.xml"
/>
<property
name=
"LOG_FILE"
value=
"${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-configservice.log}"
/>
<include
resource=
"org/springframework/boot/logging/logback/file-appender.xml"
/>
<root
level=
"INFO"
>
<appender-ref
ref=
"FILE"
/>
</root>
</configuration>
\ No newline at end of file
apollo-configservice/src/main/scripts/env.sh
已删除
100644 → 0
浏览文件 @
39fb6a84
apollo-configservice/src/main/scripts/shutdown.sh
浏览文件 @
d6779624
#!/bin/bash
SERVICE_NAME
=
apollo-configservice
PATH_TO_JAR
=
$SERVICE_NAME
"-0.0.1-SNAPSHOT.jar"
LOG_PATH
=
/opt/logs/100003171/
source
bin/common.sh stop
\ No newline at end of file
cd
`
dirname
$0
`
/..
./
$SERVICE_NAME
".jar"
stop
\ No newline at end of file
apollo-configservice/src/main/scripts/startup.sh
浏览文件 @
d6779624
#!/bin/bash
SERVICE_NAME
=
apollo-configservice
PATH_TO_JAR
=
$SERVICE_NAME
"-0.0.1-SNAPSHOT.jar"
LOG_PATH
=
/opt/logs/100003171/
VERSION
=
0.0.1-SNAPSHOT
PATH_TO_JAR
=
$SERVICE_NAME
"-"
$VERSION
".jar"
cd
`
dirname
$0
`
/..
source
bin/common.sh start
if
[[
-f
$SERVICE_NAME
".jar"
]]
;
then
rm
-rf
$SERVICE_NAME
".jar"
fi
ln
$PATH_TO_JAR
$SERVICE_NAME
".jar"
./
$SERVICE_NAME
".jar"
start
exit
0
;
\ No newline at end of file
apollo-portal/pom.xml
浏览文件 @
d6779624
...
...
@@ -29,6 +29,9 @@
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<executable>
true
</executable>
</configuration>
</plugin>
<plugin>
<artifactId>
maven-assembly-plugin
</artifactId>
...
...
apollo-portal/src/assembly/assembly-descriptor.xml
浏览文件 @
d6779624
...
...
@@ -30,6 +30,18 @@
<fileSet>
<directory>
src/main/config
</directory>
<outputDirectory>
config
</outputDirectory>
<excludes>
<exclude>
apollo-portal.conf
</exclude>
</excludes>
<lineEnding>
unix
</lineEnding>
</fileSet>
<fileSet>
<directory>
src/main/config
</directory>
<outputDirectory>
/
</outputDirectory>
<includes>
<include>
apollo-portal.conf
</include>
</includes>
<lineEnding>
unix
</lineEnding>
</fileSet>
<!--artifact -->
<fileSet>
...
...
@@ -38,7 +50,7 @@
<includes>
<include>
${project.artifactId}-*.jar
</include>
</includes>
<fileMode>
0
444
</fileMode>
<fileMode>
0
755
</fileMode>
</fileSet>
</fileSets>
</sources>
...
...
apollo-portal/src/main/config/apollo-portal.conf
0 → 100644
浏览文件 @
d6779624
MODE
=
service
PID_FOLDER
=.
LOG_FOLDER
=/
opt
/
logs
/
100003173
/
apollo-portal/src/main/resources/logback.xml
0 → 100644
浏览文件 @
d6779624
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include
resource=
"org/springframework/boot/logging/logback/defaults.xml"
/>
<property
name=
"LOG_FILE"
value=
"${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-portal.log}"
/>
<include
resource=
"org/springframework/boot/logging/logback/file-appender.xml"
/>
<root
level=
"INFO"
>
<appender-ref
ref=
"FILE"
/>
</root>
</configuration>
\ No newline at end of file
apollo-portal/src/main/scripts/env.sh
已删除
100644 → 0
浏览文件 @
39fb6a84
apollo-portal/src/main/scripts/shutdown.sh
浏览文件 @
d6779624
#!/bin/bash
SERVICE_NAME
=
apollo-portal
PATH_TO_JAR
=
$SERVICE_NAME
"-0.0.1-SNAPSHOT.jar"
LOG_PATH
=
/opt/logs/100003173/
cd
`
dirname
$0
`
/..
source
bin/common.sh stop
\ No newline at end of file
./
$SERVICE_NAME
".jar"
stop
\ No newline at end of file
apollo-portal/src/main/scripts/startup.sh
浏览文件 @
d6779624
#!/bin/bash
SERVICE_NAME
=
apollo-portal
PATH_TO_JAR
=
$SERVICE_NAME
"-0.0.1-SNAPSHOT.jar"
LOG_PATH
=
/opt/logs/100003173/
VERSION
=
0.0.1-SNAPSHOT
PATH_TO_JAR
=
$SERVICE_NAME
"-"
$VERSION
".jar"
cd
`
dirname
$0
`
/..
source
bin/common.sh start
if
[[
-f
$SERVICE_NAME
".jar"
]]
;
then
rm
-rf
$SERVICE_NAME
".jar"
fi
ln
$PATH_TO_JAR
$SERVICE_NAME
".jar"
./
$SERVICE_NAME
".jar"
start
exit
0
;
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录