Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhangjian1949
apollo
提交
dcc49834
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
dcc49834
编写于
12月 08, 2018
作者:
J
Jason Song
提交者:
GitHub
12月 08, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1752 from nobodyiam/1.2.0
1.2.0
上级
0bc25e30
d3a2dd0b
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
33 addition
and
32 deletion
+33
-32
apollo-adminservice/pom.xml
apollo-adminservice/pom.xml
+1
-1
apollo-adminservice/src/main/docker/Dockerfile
apollo-adminservice/src/main/docker/Dockerfile
+4
-5
apollo-assembly/pom.xml
apollo-assembly/pom.xml
+1
-1
apollo-biz/pom.xml
apollo-biz/pom.xml
+1
-1
apollo-buildtools/pom.xml
apollo-buildtools/pom.xml
+1
-1
apollo-client/README.md
apollo-client/README.md
+1
-1
apollo-client/pom.xml
apollo-client/pom.xml
+1
-1
apollo-common/pom.xml
apollo-common/pom.xml
+1
-1
apollo-configservice/pom.xml
apollo-configservice/pom.xml
+1
-1
apollo-configservice/src/main/docker/Dockerfile
apollo-configservice/src/main/docker/Dockerfile
+4
-5
apollo-core/pom.xml
apollo-core/pom.xml
+1
-1
apollo-demo/pom.xml
apollo-demo/pom.xml
+1
-1
apollo-mockserver/pom.xml
apollo-mockserver/pom.xml
+1
-1
apollo-openapi/pom.xml
apollo-openapi/pom.xml
+1
-1
apollo-portal/pom.xml
apollo-portal/pom.xml
+1
-1
apollo-portal/src/main/docker/Dockerfile
apollo-portal/src/main/docker/Dockerfile
+4
-5
apollo-portal/src/main/resources/static/user-manage.html
apollo-portal/src/main/resources/static/user-manage.html
+7
-3
pom.xml
pom.xml
+1
-1
未找到文件。
apollo-adminservice/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-adminservice/src/main/docker/Dockerfile
浏览文件 @
dcc49834
# Dockerfile for apollo-adminservice
# Build with:
# docker build -t apollo-adminservice .
# Run with:
# docker run -p 8090:8090 -d -v /tmp/logs:/opt/logs --name apollo-adminservice apollo-adminservice
# 1. Copy apollo-adminservice-${VERSION}-github.zip to current directory
# 2. Build with: docker build -t apollo-adminservice .
# 3. Run with: docker run -p 8090:8090 -d -v /tmp/logs:/opt/logs --name apollo-adminservice apollo-adminservice
FROM
openjdk:8-jre-alpine
MAINTAINER
ameizi <sxyx2008@163.com>
ENV
VERSION 1.2.0
-SNAPSHOT
ENV
VERSION 1.2.0
RUN
echo
"http://mirrors.aliyun.com/alpine/v3.8/main"
>
/etc/apk/repositories
\
&&
echo
"http://mirrors.aliyun.com/alpine/v3.8/community"
>>
/etc/apk/repositories
\
...
...
apollo-assembly/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-biz/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-biz
</artifactId>
...
...
apollo-buildtools/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-client/README.md
浏览文件 @
dcc49834
...
...
@@ -88,7 +88,7 @@ If you need this functionality, you could specify the cluster as follows:
<dependency>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo-client
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
</dependency>
## III. Client Usage
...
...
apollo-client/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-common/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-configservice/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-configservice/src/main/docker/Dockerfile
浏览文件 @
dcc49834
# Dockerfile for apollo-configservice
# Build with:
# docker build -t apollo-configservice .
# Run with:
# docker run -p 8080:8080 -d -v /tmp/logs:/opt/logs --name apollo-configservice apollo-configservice
# 1. Copy apollo-configservice-${VERSION}-github.zip to current directory
# 2. Build with: docker build -t apollo-configservice .
# 3. Run with: docker run -p 8080:8080 -d -v /tmp/logs:/opt/logs --name apollo-configservice apollo-configservice
FROM
openjdk:8-jre-alpine
MAINTAINER
ameizi <sxyx2008@163.com>
ENV
VERSION 1.2.0
-SNAPSHOT
ENV
VERSION 1.2.0
RUN
echo
"http://mirrors.aliyun.com/alpine/v3.8/main"
>
/etc/apk/repositories
\
&&
echo
"http://mirrors.aliyun.com/alpine/v3.8/community"
>>
/etc/apk/repositories
\
...
...
apollo-core/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-demo/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<artifactId>
apollo
</artifactId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-demo
</artifactId>
...
...
apollo-mockserver/pom.xml
浏览文件 @
dcc49834
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apollo
</artifactId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-openapi/pom.xml
浏览文件 @
dcc49834
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
apollo
</artifactId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-portal/pom.xml
浏览文件 @
dcc49834
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-portal/src/main/docker/Dockerfile
浏览文件 @
dcc49834
# Dockerfile for apollo-portal
# Build with:
# docker build -t apollo-portal .
# Run with:
# docker run -p 8070:8070 -d -v /tmp/logs:/opt/logs --name apollo-portal apollo-portal
# 1. Copy apollo-portal-${VERSION}-github.zip to current directory
# 2. Build with: docker build -t apollo-portal .
# 3. Run with: docker run -p 8070:8070 -d -v /tmp/logs:/opt/logs --name apollo-portal apollo-portal
FROM
openjdk:8-jre-alpine
MAINTAINER
ameizi <sxyx2008@163.com>
ENV
VERSION 1.2.0
-SNAPSHOT
ENV
VERSION 1.2.0
RUN
echo
"http://mirrors.aliyun.com/alpine/v3.8/main"
>
/etc/apk/repositories
\
&&
echo
"http://mirrors.aliyun.com/alpine/v3.8/community"
>>
/etc/apk/repositories
\
...
...
apollo-portal/src/main/resources/static/user-manage.html
浏览文件 @
dcc49834
...
...
@@ -23,6 +23,9 @@
<div
class=
"panel"
>
<header
class=
"panel-heading"
>
用户管理
<small>
(仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth)
</small>
</header>
<form
class=
"form-horizontal panel-body"
name=
"appForm"
ng-controller=
"UserController"
...
...
@@ -32,15 +35,16 @@
<label
class=
"col-sm-2 control-label"
>
<apollorequiredfield></apollorequiredfield>
用户名
</label>
<div
class=
"col-sm-
4
"
>
<div
class=
"col-sm-
5
"
>
<input
type=
"text"
class=
"form-control"
name=
"username"
ng-model=
"user.username"
>
<small>
输入的用户名如果不存在,则新建。若已存在,则更新。
</small>
</div>
</div>
<div
class=
"form-group"
valdr-form-group
>
<label
class=
"col-sm-2 control-label"
>
<apollorequiredfield></apollorequiredfield>
密码
</label>
<div
class=
"col-sm-
4
"
>
<div
class=
"col-sm-
5
"
>
<input
type=
"text"
class=
"form-control"
name=
"password"
ng-model=
"user.password"
>
</div>
</div>
...
...
@@ -48,7 +52,7 @@
<label
class=
"col-sm-2 control-label"
>
<apollorequiredfield></apollorequiredfield>
邮箱
</label>
<div
class=
"col-sm-
4
"
>
<div
class=
"col-sm-
5
"
>
<input
type=
"text"
class=
"form-control"
name=
"password"
ng-model=
"user.email"
>
</div>
</div>
...
...
pom.xml
浏览文件 @
dcc49834
...
...
@@ -5,7 +5,7 @@
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
1.2.0
-SNAPSHOT
</version>
<version>
1.2.0
</version>
<name>
Apollo
</name>
<packaging>
pom
</packaging>
<description>
Ctrip Configuration Center
</description>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录