添加文档，并且修改版本为，1.6.0-RC1

kawhii · Oct 16, 2017 · ac37626 · ac37626
1 parent 08e1817
commit ac37626
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.carl.auth</groupId>
     <artifactId>sso</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.0-RC1</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/sso-client-demo/pom.xml b/sso-client-demo/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.carl.auth</groupId>
         <artifactId>sso-spring-dependencies</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0-RC1</version>
         <relativePath>../sso-spring-dependencies</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sso-client-demo/sso-cas-client-demo/pom.xml b/sso-client-demo/sso-cas-client-demo/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>sso-client-demo</artifactId>
         <groupId>com.carl.auth</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sso-client-demo/sso-client-shiro-demo/pom.xml b/sso-client-demo/sso-client-shiro-demo/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>sso-client-demo</artifactId>
         <groupId>com.carl.auth</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sso-config/pom.xml b/sso-config/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.carl.auth</groupId>
         <artifactId>sso-spring-dependencies</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0-RC1</version>
         <relativePath>../sso-spring-dependencies</relativePath>
     </parent>
 

diff --git a/sso-config/src/main/resources/config/sso-dev.properties b/sso-config/src/main/resources/config/sso-dev.properties
@@ -8,7 +8,7 @@ server.context-path=/cas
 server.port=8443
 #SSL\u914D\u7F6E
 server.ssl.enabled=true
-server.ssl.key-store=classpath:tomcat.keystore
+server.ssl.key-store=classpath:tomcat.keystorede
 server.ssl.key-store-password=123456
 server.ssl.keyAlias=passport.sso.com
 #SSL\u914D\u7F6E
@@ -209,37 +209,47 @@ cas.logout.followServiceRedirects=true
 #\u5BC6\u7801\u7BA1\u7406 \u5F00\u59CB
 #\u5141\u8BB8\u5185\u7F6E\u5BC6\u7801\u7BA1\u7406
 cas.authn.pm.enabled=true
+#\u91CD\u7F6E\u4FE1\u606F https://apereo.github.io/cas/5.1.x/installation/Configuration-Properties.html#password-management
+cas.authn.pm.reset.from=${spring.mail.username}
+#\u53D1\u9001\u90AE\u4EF6\u6807\u9898
+cas.authn.pm.reset.subject=SSO DEMO \u91CD\u7F6E\u5BC6\u7801
+#\u90AE\u4EF6\u5185\u5BB9\uFF0C\u5FC5\u987B\u8981\u6709%s\uFF0C\u56E0\u4E3A\u4F1A\u751F\u6210\u4E00\u4E2A\u8FDE\u63A5\u5E76\u4E14\u5E26\u4E86token\uFF0C\u5426\u5219\u65E0\u6CD5\u6253\u5F00\u94FE\u63A5\uFF0C\u5F53\u7136\u8FD9\u4E2A\u94FE\u63A5\u4E5F\u548Ccas.server.prefix\u6709\u5173\u7CFB
+cas.authn.pm.reset.text=\u6253\u5F00\u4EE5\u4E0B\u94FE\u63A5\u91CD\u7F6E\u60A8\u7684\u5BC6\u7801\uFF08SSO-DEMO\uFF09: %s
+#token\u5931\u6548\u5206\u949F\u6570
+cas.authn.pm.reset.expirationMinutes=10
+cas.authn.pm.reset.emailAttribute=mail
+#\u662F\u5426\u5F00\u542F\u95EE\u9898\u56DE\u7B54
+cas.authn.pm.reset.securityQuestionsEnabled=true
+#\u65B0\u5BC6\u7801\u5FC5\u987B\u5339\u914D\u8868\u8FBE\u5F0F
+cas.authn.pm.policyPattern=\\d{3,10}
 
 #\u53D1\u9001\u90AE\u4EF6
 spring.mail.host=smtp.qq.com
 spring.mail.port=465
+#\u90AE\u7BB1\u7528\u6237\u540D
 spring.mail.username=[email protected]
+#\u90AE\u7BB1\u6388\u6743\u7801
 spring.mail.password=judnarjvmhsfbdji
 spring.mail.testConnection=false
 spring.mail.properties.mail.smtp.auth=true
+#\u5FC5\u987Bssl
 spring.mail.properties.mail.smtp.ssl.enable=true
 
 #\u90AE\u7BB1\u67E5\u627E
+#\u6839\u636E\u7528\u6237\u540D\u67E5\u627E\u95EE\u9898
 cas.authn.pm.jdbc.sqlSecurityQuestions=select question, answer from sys_user_question where username=?
+#\u6839\u636E\u7528\u6237\u540D\u67E5\u627E\u90AE\u7BB1
 cas.authn.pm.jdbc.sqlFindEmail=select email from sys_user where username=?
+#\u4FEE\u6539\u5BC6\u7801
 cas.authn.pm.jdbc.sqlChangePassword=update sys_user set password=? where username=?
 cas.authn.pm.jdbc.url=${cas.authn.jdbc.query[0].url}
 cas.authn.pm.jdbc.user=${cas.authn.jdbc.query[0].user}
 cas.authn.pm.jdbc.password=${cas.authn.jdbc.query[0].password}
 cas.authn.pm.jdbc.dialect=${cas.authn.jdbc.query[0].dialect}
 cas.authn.pm.jdbc.driverClass=${cas.authn.jdbc.query[0].driverClass}
+#\u5BC6\u7801\u4FEE\u6539\u52A0\u5BC6\u89C4\u5219\uFF0C\u8FD9\u4E2A\u5FC5\u987B\u8981\u548C\u539F\u59CB\u5BC6\u7801\u52A0\u5BC6\u89C4\u5219\u4E00\u81F4
 cas.authn.pm.jdbc.passwordEncoder.type=${cas.authn.jdbc.query[0].passwordEncoder.type}
 cas.authn.pm.jdbc.passwordEncoder.characterEncoding=${cas.authn.jdbc.query[0].passwordEncoder.characterEncoding}
 cas.authn.pm.jdbc.passwordEncoder.encodingAlgorithm=${cas.authn.jdbc.query[0].passwordEncoder.encodingAlgorithm}
 cas.authn.pm.jdbc.passwordEncoder.secret=${cas.authn.jdbc.query[0].passwordEncoder.secret}
-
-#\u91CD\u7F6E\u4FE1\u606F https://apereo.github.io/cas/5.1.x/installation/Configuration-Properties.html#password-management
-cas.authn.pm.reset.from=[email protected]
-cas.authn.pm.reset.subject=SSO DEMO \u91CD\u7F6E\u5BC6\u7801
-cas.authn.pm.reset.text=\u6253\u5F00\u4EE5\u4E0B\u94FE\u63A5\u91CD\u7F6E\u60A8\u7684\u5BC6\u7801\uFF08SSO-DEMO\uFF09: %s
-cas.authn.pm.reset.expirationMinutes=10
-cas.authn.pm.reset.emailAttribute=mail
-cas.authn.pm.reset.securityQuestionsEnabled=true
-#\u65B0\u5BC6\u7801\u5FC5\u987B\u5339\u914D\u8868\u8FBE\u5F0F
-cas.authn.pm.policyPattern=\\d{3,10}
 #\u5BC6\u7801\u7BA1\u7406 \u7ED3\u675F
diff --git a/sso-management/pom.xml b/sso-management/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>sso</artifactId>
         <groupId>com.carl.auth</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sso-server/pom.xml b/sso-server/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.carl.auth</groupId>
         <artifactId>sso</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/sso-spring-dependencies/pom.xml b/sso-spring-dependencies/pom.xml
@@ -16,7 +16,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.carl.auth</groupId>
     <artifactId>sso-spring-dependencies</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.0-RC1</version>
     <packaging>pom</packaging>
 
     <dependencies>