minor fix

apolloconfig · Dec 8, 2018 · d3a2dd0 · d3a2dd0
1 parent 2803271
commit d3a2dd0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/apollo-adminservice/src/main/docker/Dockerfile b/apollo-adminservice/src/main/docker/Dockerfile
@@ -1,8 +1,7 @@
 # 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>

diff --git a/apollo-configservice/src/main/docker/Dockerfile b/apollo-configservice/src/main/docker/Dockerfile
@@ -1,8 +1,7 @@
 # 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>

diff --git a/apollo-portal/src/main/docker/Dockerfile b/apollo-portal/src/main/docker/Dockerfile
@@ -1,8 +1,7 @@
 # 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>

diff --git a/apollo-portal/src/main/resources/static/user-manage.html b/apollo-portal/src/main/resources/static/user-manage.html
@@ -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,23 +35,24 @@
                         <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>
                     <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.email">
                         </div>
                     </div>