MaxKey 3 anos atrás
pai
commit
25150ada53

+ 17 - 17
README_zh.md

@@ -29,27 +29,27 @@ QQ交流群:<b>434469201</b>
 
 | 序号    | 协议    |  支持   |
 | --------| :-----  | :----   |
-| 1.1     | OAuth 2.x/OpenID Connect    	|  高  |
-| 1.2     | SAML 2.0                    	|  高  |
-| 1.3     | JWT                         	|  高  |
-| 1.4     | CAS                         	|  高  |
-| 1.5     | FormBased                  		|  中  |
-| 1.6     | TokenBased(Post/Cookie)     	|  中  |
-| 1.7     | ExtendApi                   	|  低  |
-| 1.8     | EXT                         	|  低  |
+| 1.1     | OAuth 2.x/OpenID Connect        |  高  |
+| 1.2     | SAML 2.0                        |  高  |
+| 1.3     | JWT                             |  高  |
+| 1.4     | CAS                             |  高  |
+| 1.5     | FormBased                       |  中  |
+| 1.6     | TokenBased(Post/Cookie)         |  中  |
+| 1.7     | ExtendApi                       |  低  |
+| 1.8     | EXT                             |  低  |
 
 2. 登录支持
 
 | 序号    | 登录方式      |   支持  |
-| --------| :-----      | :----   |
-| 2.1     | 动态验证码  | 字母/数字/算术   | 
-| 2.2     | 双因素认证  | 短信/时间令牌/邮件 | 
-| 2.3     | 短信认证    | 腾讯云短信/阿里云短信/网易云信  |
-| 2.4     | 时间令牌    | 登录易/Google/Microsoft Authenticator/FreeOTP/支持TOTP或者HOTP |
-| 2.5     | 域认证         | Kerberos/SPNEGO/AD域 |
-| 2.6     | LDAP        | OpenLDAP/ActiveDirectory/标准LDAP服务器 |
-| 2.7     | 社交账号    | 微信/QQ/微博/钉钉/Google/Facebook/其他  | 
-| 2.8     | 扫码登录    | 企业微信/钉钉扫码登录  | 
+| --------| :-----        | :----   |
+| 2.1     | 动态验证码    | 字母/数字/算术   | 
+| 2.2     | 双因素认证    | 短信/时间令牌/邮件 | 
+| 2.3     | 短信认证      | 腾讯云短信/阿里云短信/网易云信  |
+| 2.4     | 时间令牌      | 登录易/Google/Microsoft Authenticator/FreeOTP/支持TOTP或者HOTP |
+| 2.5     | 域认证        | Kerberos/SPNEGO/AD域 |
+| 2.6     | LDAP          | OpenLDAP/ActiveDirectory/标准LDAP服务器 |
+| 2.7     | 社交账号      | 微信/QQ/微博/钉钉/Google/Facebook/其他  | 
+| 2.8     | 扫码登录      | 企业微信/钉钉扫码登录  | 
 
 
 3. 提供标准的认证接口以便于其他应用集成SSO,安全的移动接入,安全的API、第三方认证和互联网认证的整合。

+ 3 - 1
build.gradle

@@ -384,10 +384,12 @@ subprojects {
          implementation  group: 'com.thoughtworks.xstream', name: 'xstream', version: "${xstreamVersion}"
          implementation  group: 'org.passay', name: 'passay', version: "${passayVersion}"
          implementation  group: 'io.micrometer', name: 'micrometer-core', version: "${micrometercoreVersion}"
+         implementation  group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: "${micrometercoreVersion}"
          implementation  group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}"
          implementation  group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}"
          implementation  group: 'org.reflections', name: 'reflections', version: '0.9.11'
-         implementation  group: 'io.prometheus', name: 'simpleclient', version: '0.5.0'
+         implementation  group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}"
+         implementation  group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation  group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"
          
           //阿里云

+ 1 - 0
gradle.properties

@@ -153,6 +153,7 @@ xpp3Version                     =1.1.6
 xstreamVersion                  =1.4.10
 passayVersion                   =1.6.0
 micrometercoreVersion           =1.8.1
+prometheusVersion               =0.14.1
 LatencyUtilsVersion             =2.0.3
 stax2apiVersion                 =4.2.1
 mapstructVersion                =1.4.1.Final

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties

@@ -316,7 +316,7 @@ maxkey.saml.v20.sp.issuing.entity.id                            =client.maxkey.o
 ############################################################################
 management.security.enabled                     =false
 #management.endpoints.jmx.exposure.include=health,info
-#management.endpoints.web.exposure.include=metrics,health,info,env
+#management.endpoints.web.exposure.include=metrics,health,info,env,prometheus
 management.endpoints.web.exposure.include       =*
 management.endpoint.health.show-details         =ALWAYS
 #Spring Boot Admin Client

+ 1 - 1
maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties

@@ -318,7 +318,7 @@ maxkey.saml.v20.sp.issuing.entity.id                            =client.maxkey.o
 ############################################################################
 management.security.enabled                     =false
 #management.endpoints.jmx.exposure.include=health,info
-#management.endpoints.web.exposure.include=metrics,health,info,env
+#management.endpoints.web.exposure.include=metrics,health,info,env,prometheus
 management.endpoints.web.exposure.include       =*
 management.endpoint.health.show-details         =ALWAYS
 #Spring Boot Admin Client

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties

@@ -223,7 +223,7 @@ maxkey.job.cron.enable                          =true
 ############################################################################
 management.security.enabled                     =false
 #management.endpoints.jmx.exposure.include=health,info
-#management.endpoints.web.exposure.include=metrics,health,info,env
+#management.endpoints.web.exposure.include=metrics,health,info,env,prometheus
 management.endpoints.web.exposure.include       =*
 management.endpoint.health.show-details         =ALWAYS
 #Spring Boot Admin Client