Skip to content

Commit 670b237

Browse files
author
shimingxy
committed
domain
1 parent c004cda commit 670b237

File tree

9 files changed

+361
-50
lines changed

9 files changed

+361
-50
lines changed

‎ReleaseNotes.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MaxKey v 2.0.0 GA 2020/07/**
2-
*(MAXKEY-200601) RBAC 基于角色的访问控制(Role-Based Access Control )支持
2+
*(MAXKEY-200601) RBAC 基于角色的访问控制(Role-Based Access Control)支持
33
*(MAXKEY-200602) xml配置改为Spring annotation，提升模块间的组件化
44
*(MAXKEY-200603) 管理MGT界面优化及增加菜单图标，认证Maxkey主题切换支持-黑色经典|薄荷清新|激情紫荆
55
*(MAXKEY-200604) 修复用户组访问权限删除问题
@@ -15,7 +15,9 @@
1515
*(MAXKEY-200614) OAuth2 secret修改后登陆错误修复
1616
*(MAXKEY-200615) CAS单点登陆后进行验证空指针的异常处理，原因权限调整
1717
*(MAXKEY-200616) LINUX操作系统支持
18-
*(MAXKEY-200617) 依赖jar升级,消除非必要依赖
18+
*(MAXKEY-200617) 修改测试域名为sso.maxkey.top
19+
*(MAXKEY-200618) 修复更新应用时状态问题
20+
*(MAXKEY-200619) 依赖jar升级,消除非必要依赖
1921
spring 5.2.7.RELEASE
2022
springBoot 2.3.1.RELEASE
2123
springSecurity 5.3.2.RELEASE

‎docs/tutorial.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ C:\Windows\System32\drivers\etc
88
</pre>
99
新增如下内容
1010
<pre><code class="ini hljs">
11-
127.0.0.1 sso.maxkey.org
12-
127.0.0.1 tokenbased.demo.maxkey.org
13-
127.0.0.1 cas.demo.maxkey.org
14-
127.0.0.1 oauth.demo.maxkey.org
11+
127.0.0.1 sso.maxkey.top
12+
127.0.0.1 tokenbased.demo.maxkey.top
13+
127.0.0.1 cas.demo.maxkey.top
14+
127.0.0.1 oauth.demo.maxkey.top
1515
</code></pre>
1616

1717
<h2>应用服务启动</h2>
@@ -42,13 +42,13 @@ start_maxkey_wiki.bat
4242
</thead>
4343
<tbody>
4444
<tr>
45-
<td>1</td><td>认证平台</td><td><a href="http://sso.maxkey.org/maxkey/login" target="blank">http://sso.maxkey.org/maxkey/login</a></td>
45+
<td>1</td><td>认证平台</td><td><a href="http://sso.maxkey.top/maxkey/login" target="blank">http://sso.maxkey.top/maxkey/login</a></td>
4646
</tr>
4747
<tr>
48-
<td>2</td><td>管理平台</td><td><a href="http://sso.maxkey.org:9521/maxkey-mgt/login" target="blank">http://sso.maxkey.org:9521/maxkey-mgt/login</a></td>
48+
<td>2</td><td>管理平台</td><td><a href="http://sso.maxkey.top:9521/maxkey-mgt/login" target="blank">http://sso.maxkey.top:9521/maxkey-mgt/login</a></td>
4949
</tr>
5050
<tr>
51-
<td>3</td><td>集成指南</td><td><a href="http://sso.maxkey.org:8080/wiki" target="blank">http://sso.maxkey.org:8080/wiki</a></td>
51+
<td>3</td><td>集成指南</td><td><a href="http://sso.maxkey.top:8080/wiki" target="blank">http://sso.maxkey.top:8080/wiki</a></td>
5252
</tr>
5353
<tr>
5454
<td>4</td><td>账户密码</td><td>admin/admin</td>

‎maxkey-dao/src/test/resources/application.properties‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
#spring.profiles.active=dev
2+
#application
3+
application.title=MaxKey
4+
application.name=MaxKey
5+
application.formatted-version=v2.0.0 GA
6+
#server config
7+
#spring.profiles.active=dev
8+
#server port
9+
#server.port=80
10+
server.port=443
11+
#ssl
12+
server.ssl.key-store=maxkeyserver.keystore
13+
server.ssl.key-alias=maxkey
14+
server.ssl.enabled=true
15+
server.ssl.key-store-password=maxkey
16+
server.ssl.key-store-type=JKS
17+
#web app context path
18+
server.servlet.context-path=/maxkey
19+
spring.servlet.multipart.enabled=true
20+
spring.servlet.multipart.max-file-size=4194304
21+
#encoding
22+
#server.servlet.encoding.charset=UTF-8
23+
#server.servlet.encoding.enabled=true
24+
#server.servlet.encoding.force=true
25+
#datasource
26+
spring.datasource.username=root
27+
spring.datasource.password=maxkey
28+
spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8
29+
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
30+
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
31+
#mybatis
32+
mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps,
33+
mybatis.mapper-locations=classpath*:/org/maxkey/dao/persistence/xml/mysql/*.xml
34+
#redis
35+
spring.redis.host=127.0.0.1
36+
spring.redis.port=6379
37+
spring.redis.password=password
38+
spring.redis.timeout=10000
39+
spring.redis.jedis.pool.max-wait=1000
40+
spring.redis.jedis.pool.max-idle=200
41+
spring.redis.lettuce.pool.max-active=-1
42+
spring.redis.lettuce.pool.min-idle=0
43+
#mail
44+
spring.mail.default-encoding=utf-8
45+
spring.mail.host=smtp.163.com
46+
spring.mail.port=465
47+
spring.mail.username=[email protected]
48+
spring.mail.password=password
49+
spring.mail.protocol=smtp
50+
spring.mail.properties.ssl=true
51+
spring.mail.properties.sender=[email protected]
52+
spring.mail.properties.mailotp.message.subject=MaxKey One Time PassWord
53+
spring.mail.properties.mailotp.message.template={0} You Token is {1} , it validity in {2} minutes.
54+
#for freemarker
55+
spring.freemarker.template-loader-path=classpath:/templates/views
56+
spring.freemarker.cache=false
57+
spring.freemarker.charset=UTF-8
58+
spring.freemarker.check-template-location=true
59+
spring.freemarker.content-type=text/html
60+
spring.freemarker.expose-request-attributes=false
61+
spring.freemarker.expose-session-attributes=false
62+
spring.freemarker.request-context-attribute=request
63+
spring.freemarker.suffix=.ftl
64+
#static resources
65+
spring.mvc.static-path-pattern=/static/**
66+
spring.messages.basename=classpath:messages/message
67+
spring.messages.encoding=UTF-8
68+
#main
69+
spring.main.banner-mode=log
70+
spring.main.allow-bean-definition-overriding=true
71+
72+
###########【Kafka集群】###########
73+
spring.kafka.bootstrap-servers=localhost:9092
74+
###########【初始化生产者配置】###########
75+
# 重试次数
76+
spring.kafka.producer.retries=0
77+
# 应答级别:多少个分区副本备份完成时向生产者发送ack确认(可选0、1、all/-1)
78+
spring.kafka.producer.acks=1
79+
# 批量大小
80+
spring.kafka.producer.batch-size=16384
81+
# 提交延时
82+
spring.kafka.producer.properties.linger.ms=0
83+
# 当生产端积累的消息达到batch-size或接收到消息linger.ms后,生产者就会将消息提交给kafka
84+
# linger.ms为0表示每接收到一条消息就提交给kafka,这时候batch-size其实就没用了
85+
86+
# 生产端缓冲区大小
87+
spring.kafka.producer.buffer-memory = 33554432
88+
# Kafka提供的序列化和反序列化类
89+
spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
90+
spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
91+
# 自定义分区器
92+
# spring.kafka.producer.properties.partitioner.class=com.felix.kafka.producer.CustomizePartitioner

‎maxkey-dao/src/test/resources/config/applicationConfig.properties‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎maxkey-dao/src/test/resources/maxkey.properties‎

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
############################################################################
2+
# MaxKey
3+
############################################################################
4+
# domain name configuration
5+
config.server.domain=maxkey.top
6+
config.server.domain.sub=sso.${config.server.domain}
7+
config.server.name=http://${config.server.domain.sub}
8+
config.server.prefix.uri=${config.server.name}/maxkey
9+
#default.uri
10+
config.server.default.uri=${config.server.prefix.uri}/maxkey/appList
11+
config.server.management.uri=${config.server.name}:9521/maxkey-mgt/login
12+
#InMemory 0 , jdbc 1, Redis 2
13+
config.server.persistence=0
14+
#identity
15+
config.identity.kafkasupport=false
16+
17+
config.app.issuer=CN=ConSec,CN=COM,CN=SH
18+
############################################################################
19+
# Login configuration
20+
#enable captcha
21+
config.login.captcha=true
22+
#text or arithmetic
23+
config.login.captcha.type=text
24+
#enable two factor,use one time password
25+
config.login.mfa=true
26+
#TimeBasedOtpAuthn MailOtpAuthn SmsOtpAuthnYunxin SmsOtpAuthnAliyun SmsOtpAuthnTencentCloud
27+
config.login.mfa.type=TimeBasedOtpAuthn
28+
#enable social sign on
29+
config.login.socialsignon=true
30+
#social sign on providers
31+
config.login.socialsignon.providers=sinaweibo,google,qq,dingtalk,microsoft,facebook
32+
#Enable kerberos/SPNEGO
33+
config.login.kerberos=true
34+
#wsFederation
35+
config.login.wsfederation=false
36+
#remeberme
37+
config.login.remeberme=true
38+
#validity
39+
config.login.remeberme.validity=0
40+
41+
#to default application web site
42+
config.login.default.uri=appList
43+
44+
config.ipaddress.whitelist=false
45+
46+
#SmsOtpAuthnYunxin SmsOtpAuthnAliyun SmsOtpAuthnTencentCloud
47+
config.otp.sms=SmsOtpAuthnYunxin
48+
49+
config.otp.sms.aliyun.accesskeyid=94395d754eb55693043f5d6a2b772ef4
50+
config.otp.sms.aliyun.accesssecret=05d5485357bc
51+
config.otp.sms.aliyun.templatecode=14860095
52+
config.otp.sms.aliyun.signname=maxkey
53+
54+
config.otp.sms.yunxin.appkey=94395d754eb55693043f5d6a2b772ef4
55+
config.otp.sms.yunxin.appsecret=05d5485357bc
56+
config.otp.sms.yunxin.templateid=14860095
57+
58+
config.otp.sms.tencentcloud.secretid=94395d754eb55693043f5d6a2b772ef4
59+
config.otp.sms.tencentcloud.secretkey=05d5485357bc
60+
config.otp.sms.tencentcloud.smssdkappid=1486220095
61+
config.otp.sms.tencentcloud.templateid=14860095
62+
config.otp.sms.tencentcloud.sign=1486009522
63+
64+
config.otp.keyuri.format.type=totp
65+
config.otp.keyuri.format.digits=6
66+
config.otp.keyuri.format.issuer=MaxKey
67+
config.otp.keyuri.format.domain=${config.server.domain}
68+
config.otp.keyuri.format.period=30
69+
70+
############################################################################
71+
# Kerberos Login configuration
72+
############################################################################
73+
#short name of user domain must be in upper case,eg:MAXKEY
74+
config.support.kerberos.default.userdomain=MAXKEY
75+
#short name of user domain must be in upper case,eg:MAXKEY.ORG
76+
config.support.kerberos.default.fulluserdomain=MAXKEY.ORG
77+
#last 8Bit crypto for Kerberos web Authentication
78+
config.support.kerberos.default.crypto=846KZSzYq56M6d5o
79+
#Kerberos Authentication server RUL
80+
config.support.kerberos.default.redirecturi=http://sso.maxkey.top/kerberos/authn/
81+
############################################################################
82+
# HTTPHEADER Login configuration
83+
############################################################################
84+
config.support.httpheader.enable=false
85+
config.support.httpheader.headername=header-user
86+
# iv-user is for IBM Security Access Manager
87+
#config.httpheader.headername=iv-user
88+
89+
############################################################################
90+
# BASIC Login support configuration
91+
############################################################################
92+
93+
config.support.basic.enable=false
94+
95+
#############################################################################
96+
# WsFederation Login support configuration
97+
#identifier: the identifer for the ADFS server
98+
#url: the login url for ADFS
99+
#principal: the name of the attribute/assertion returned by ADFS that contains the principal's username.
100+
#relyingParty: the identifier of the CAS Server as it has been configured in ADFS.
101+
#tolerance: (optional) the amount of drift to allow when validating the timestamp on the token. Default: 10000 (ms)
102+
#attributeMutator: (optional) a class (defined by you) that can modify the attributes/assertions returned by the ADFS server
103+
#signingCertificate: ADFS's signing certificate used to validate the token/assertions issued by ADFS.
104+
############################################################################
105+
106+
config.support.wsfederation.identifier=http://adfs.maxkey.top/adfs/services/trust
107+
config.support.wsfederation.url=https://adfs.maxkey.top/adfs/ls/
108+
config.support.wsfederation.principal=upn
109+
config.support.wsfederation.relyingParty=urn:federation:connsec
110+
config.support.wsfederation.signingCertificate=adfs-signing.crt
111+
config.support.wsfederation.tolerance=10000
112+
config.support.wsfederation.upn.suffix=maxkey.org
113+
config.support.wsfederation.logoutUrl=https://adfs.maxkey.top/adfs/ls/?wa=wsignout1.0
114+
#############################################################################
115+
116+
#############################################################################
117+
# OIDC V1.0 METADATA configuration
118+
config.oidc.metadata.issuer=${config.server.name}/maxkey
119+
config.oidc.metadata.authorizationEndpoint=${config.server.name}/maxkey/oauth/v20/authorize
120+
config.oidc.metadata.tokenEndpoint=${config.server.name}/maxkey/oauth/v20/token
121+
config.oidc.metadata.userinfoEndpoint=${config.server.name}/maxkey/api/connect/userinfo
122+
123+
#############################################################################
124+
# SAML V2.0 configuration
125+
#saml common
126+
config.saml.v20.max.parser.pool.size=2
127+
config.saml.v20.assertion.validity.time.ins.seconds=90
128+
config.saml.v20.replay.cache.life.in.millis=14400000
129+
config.saml.v20.issue.instant.check.clock.skew.in.seconds=90
130+
config.saml.v20.issue.instant.check.validity.time.in.seconds=300
131+
132+
133+
#saml idp keystore
134+
config.saml.v20.idp.keystore.password=maxkey
135+
config.saml.v20.idp.keystore.private.key.password=maxkey
136+
config.saml.v20.idp.keystore=classpath\:config/samlServerKeystore.jks
137+
#keystore id for sec
138+
config.saml.v20.idp.issuing.entity.id=maxkey.top
139+
config.saml.v20.idp.issuer=https://sso.maxkey.top/maxkey/saml
140+
141+
config.saml.v20.idp.receiver.endpoint=https\://sso.maxkey.top/
142+
143+
#saml sp keystore
144+
config.saml.v20.sp.keystore.password=maxkey
145+
config.saml.v20.sp.keystore.private.key.password=maxkey
146+
config.saml.v20.sp.keystore=classpath\:config/samlClientKeystore.jks
147+
config.saml.v20.sp.issuing.entity.id=client.maxkey.org
148+
149+
#Saml v20 METADATA
150+
config.saml.v20.metadata.orgName=maxkey
151+
config.saml.v20.metadata.orgDisplayName=maxkey
152+
config.saml.v20.metadata.orgURL=https://github.com/shimingxy/MaxKey
153+
config.saml.v20.metadata.contactType=technical
154+
config.saml.v20.metadata.company=maxkey
155+
config.saml.v20.metadata.givenName=maxkey
156+
config.saml.v20.metadata.surName=maxkey
157+
config.saml.v20.metadata.emailAddress=[email protected]
158+
config.saml.v20.metadata.telephoneNumber=4008981111
159+
160+
############################################################################
161+
# Social Sign On Configuration #
162+
#you config client.id & client.secret only
163+
############################################################################
164+
165+
############################################################################
166+
#sina weibo
167+
config.socialsignon.sinaweibo.provider=sinaweibo
168+
config.socialsignon.sinaweibo.provider.name=\u65B0\u6D6A\u5FAE\u535A
169+
config.socialsignon.sinaweibo.icon=images/social/sinaweibo.png
170+
config.socialsignon.sinaweibo.client.id=3379757634
171+
config.socialsignon.sinaweibo.client.secret=1adfdf9800299037bcab9d1c238664ba
172+
config.socialsignon.sinaweibo.account.id=id
173+
config.socialsignon.sinaweibo.sortorder=1
174+
175+
#Google
176+
config.socialsignon.google.provider=google
177+
config.socialsignon.google.provider.name=Google
178+
config.socialsignon.google.icon=images/social/google.png
179+
config.socialsignon.google.client.id=519914515488.apps.googleusercontent.com
180+
config.socialsignon.google.client.secret=3aTW3Iw7e11QqMnHxciCaXTt
181+
config.socialsignon.google.account.id=id
182+
config.socialsignon.google.sortorder=2
183+
184+
#QQ
185+
config.socialsignon.qq.provider=qq
186+
config.socialsignon.qq.provider.name=QQ
187+
config.socialsignon.qq.icon=images/social/qq.png
188+
config.socialsignon.qq.client.id=101225363
189+
config.socialsignon.qq.client.secret=8577d75e0eb4a91ac549cc8be3371bfd
190+
config.socialsignon.qq.account.id=openid
191+
config.socialsignon.qq.sortorder=4
192+
193+
#dingtalk
194+
config.socialsignon.dingtalk.provider=dingtalk
195+
config.socialsignon.dingtalk.provider.name=dingtalk
196+
config.socialsignon.dingtalk.icon=images/social/dingtalk.png
197+
config.socialsignon.dingtalk.client.id=dingoawf2jyiwh2uzqnphg
198+
config.socialsignon.dingtalk.client.secret=Crm7YJbMKfRlvG2i1SHpg4GHVpqF_oXiEjhmRQyiSiuzNRWpbFh9i0UjDTfhOoN9
199+
config.socialsignon.dingtalk.account.id=openid
200+
config.socialsignon.dingtalk.sortorder=5
201+
202+
#Microsoft
203+
config.socialsignon.microsoft.provider=microsoft
204+
config.socialsignon.microsoft.provider.name=Microsoft
205+
config.socialsignon.microsoft.icon=images/social/live.png
206+
config.socialsignon.microsoft.client.id=24aa73b6-7928-4e64-bd64-d8682e650f95
207+
config.socialsignon.microsoft.client.secret=PF[_AthtjVrtWVO2mNy@CJxY1@Z8FNf5
208+
config.socialsignon.microsoft.account.id=id
209+
config.socialsignon.microsoft.sortorder=6
210+
211+
#facebook
212+
config.socialsignon.facebook.provider=facebook
213+
config.socialsignon.facebook.provider.name=facebook
214+
config.socialsignon.facebook.icon=images/social/facebook.png
215+
config.socialsignon.facebook.client.id=appKey
216+
config.socialsignon.facebook.client.secret=appSecret
217+
config.socialsignon.facebook.account.id=id
218+
config.socialsignon.facebook.sortorder=7

0 commit comments

Comments
 (0)