From d3a2dd0b5f4b21639e3a1d64616be30c88b3919e Mon Sep 17 00:00:00 2001
From: nobodyiam <nobodyiam@gmail.com>
Date: Sat, 8 Dec 2018 19:38:28 +0800
Subject: [PATCH] minor fix

---
 apollo-adminservice/src/main/docker/Dockerfile         |  7 +++----
 apollo-configservice/src/main/docker/Dockerfile        |  7 +++----
 apollo-portal/src/main/docker/Dockerfile               |  7 +++----
 .../src/main/resources/static/user-manage.html         | 10 +++++++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/apollo-adminservice/src/main/docker/Dockerfile b/apollo-adminservice/src/main/docker/Dockerfile
index fcf60cb88..287388b65 100755
--- 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
index f1aace31d..5d1fb56fe 100755
--- 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
index f63eb1e08..1fff5899a 100755
--- 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
index b2eb5d5b9..7638529be 100644
--- 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,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>
-- 
GitLab