Skip to content

MaxKey
MaxKey

yujianwangzivayy / MaxKey
与 Fork 源项目一致

Fork自 MaxKey单点登录官方(MaxKeyTop) / MaxKey

通知 1
Star 0
Fork 0
MaxKey
MaxKey

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 a22c9f12 编写于 作者: M MaxKey
浏览文件
操作

v3.1.1.GA

上级 7bdf5546
展开全部 隐藏空白更改
内联 并排
Showing with 2701 addition and 196 deletion
build.gradle
浏览文件 @ a22c9f12
......@@ -22,42 +22,11 @@ defaultTasks "clean", "build"
//Version define
ext {
}
def libjarsmapper=[
'maxkey-authentication-otp' :'lib',
'maxkey-authentication-captcha' :'lib',
'maxkey-authentication-core' :'lib',
'maxkey-common' :'lib',
'maxkey-core' :'lib',
'maxkey-persistence' :'lib',
'maxkey-protocol-authorize' :'lib',
'maxkey-protocol-cas' :'lib',
'maxkey-protocol-desktop' :'lib',
'maxkey-protocol-extendapi' :'lib',
'maxkey-protocol-formbased' :'lib',
'maxkey-protocol-jwt' :'lib',
'maxkey-protocol-oauth-2.0' :'lib',
'maxkey-protocol-saml-2.0' :'lib',
'maxkey-protocol-tokenbased' :'lib',
'maxkey-web-resources' :'lib',
'maxkey-authentication-social' :'maxkey',
'maxkey-web-maxkey' :'maxkey',
'maxkey-identity-rest' :'maxkey_mgt',
'maxkey-identity-scim' :'maxkey_mgt',
'maxkey-web-mgt' :'maxkey_mgt',
'maxkey-synchronizers' :'maxkey_mgt',
'maxkey-synchronizers-activedirectory' :'maxkey_mgt',
'maxkey-synchronizers-ldap' :'maxkey_mgt',
'maxkey-synchronizers-dingding' :'maxkey_mgt',
'maxkey-synchronizers-workweixin' :'maxkey_mgt',
'maxkey-synchronizers-reorgdept' :'maxkey_mgt',
'maxkey-boot-monitor' :'maxkey_monitor'
]
configurations.all {
transitive = false// 为本依赖关闭依赖传递特性
transitive = false// 为本依赖关闭依赖传递特性
}
//add support for Java
......@@ -68,37 +37,25 @@ allprojects {
//apply plugin: "pmd"
//apply plugin: "findbugs"
//apply plugin: "jdepend"
/*
plugins {
java {
toolchain {
languageVersion = JavaLanguageVersion.of(16)
}
}
}
*/
configurations.all {
transitive = false// 为本依赖关闭依赖传递特性
}
//java Version
sourceCompatibility = 8
targetCompatibility = 8
//compileJava.options.encoding = 'UTF-8'
compileJava {
//options.release = 15
options.encoding = 'UTF-8'
}
eclipse {
/* 第一次时请注释这段eclipse设置，可能报错，设置工程字符集
jdt {
File f = file('.settings/org.eclipse.core.resources.prefs')
f.write('eclipse.preferences.version=1\n')
f.append('encoding/<project>=UTF-8') //use UTF-8
}*/
}
configurations.all {
transitive = false// 为本依赖关闭依赖传递特性
}
//java Version
sourceCompatibility = 1.8
targetCompatibility = 1.8
compileJava.options.encoding = 'UTF-8'
/*
eclipse {
第一次时请注释这段eclipse设置，可能报错，设置工程字符集
jdt {
File f = file('.settings/org.eclipse.core.resources.prefs')
f.write('eclipse.preferences.version=1\n')
f.append('encoding/<project>=UTF-8') //use UTF-8
}
}
*/
}
......@@ -117,39 +74,34 @@ repositories {
}
// In this section you declare the dependencies for your production and test code
dependencies {
}
subprojects {
/*
eclipse {
第一次时请注释这段eclipse设置，可能报错，设置工程字符集
jdt {
File f = file('.settings/org.eclipse.core.resources.prefs')
f.write('eclipse.preferences.version=1\n')
f.append('encoding/<project>=UTF-8') //use UTF-8
}
}
*/
processResources {
from ('src/main/resources') {
include 'src/main/resources/*.*'
}
}
sourceSets {
main {
java {
srcDir 'src/main/java' // 指定源码目录
}
}
}
repositories {
subprojects {
/*
eclipse {
第一次时请注释这段eclipse设置，可能报错，设置工程字符集
jdt {
File f = file('.settings/org.eclipse.core.resources.prefs')
f.write('eclipse.preferences.version=1\n')
f.append('encoding/<project>=UTF-8') //use UTF-8
}
}
*/
processResources {
from ('src/main/resources') {
include 'src/main/resources/*.*'
}
}
sourceSets {
main {
java {
srcDir 'src/main/java' // 指定源码目录
}
}
}
repositories {
mavenLocal()
maven { url "https://maven.aliyun.com/repository/central/"}
maven { url "https://maven.aliyun.com/repository/public/"}
......@@ -167,11 +119,10 @@ subprojects {
maven { url "https://repository.apache.org/content/repositories/releases/" }
mavenCentral()
}
//all dependencies
dependencies {
//for Test and Compile
//all dependencies
dependencies {
//for Test and Compile
testImplementation group: 'junit', name: 'junit', version: "${junitVersion}"
compileOnly group: 'junit', name: 'junit', version: "${junitVersion}"
testImplementation group: 'org.mockito', name: 'mockito-all', version: "${mockitoallVersion}"
......@@ -370,7 +321,6 @@ subprojects {
//implementation group: 'org.ehcache', name: 'ehcache', version: "${ehcacheVersion}"
//implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.3.5'
implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: "${caffeineVersion}"
//mybatis
implementation group: 'org.mybatis', name: 'mybatis', version: "${mybatisVersion}"
implementation group: 'org.mybatis', name: 'mybatis-spring', version: "${mybatisspringVersion}"
......@@ -457,102 +407,37 @@ subprojects {
jar {
def currentTime = java.time.ZonedDateTime.now()
manifest {
attributes(
"Implementation-Title": project.name,
"Implementation-Vendor": project.vendor,
"Created-By": project.author,
"Implementation-Date": currentTime,
"Implementation-Version": project.version
)
}
}
tasks.register("buildRelease",Copy) {
dependsOn assemble
//项目名 项目所在的group version 版本号
println "subproject " + project.name + ", group " + project.group +" , version " + project.version
//copy
into "$rootDir/build/maxkey-jars/"
from "$buildDir/libs/"
include '*.jar'
}
tasks.register("copyLibJars",Copy) {
if (libjarsmapper["${project.name}"] != null){
into "$rootDir/build/MaxKey-v${project.version}GA/"+libjarsmapper["${project.name}"]
from "$buildDir/libs/"
include '*.jar'
}
}
assemble.configure { finalizedBy buildRelease,copyLibJars }
}
//copy Dep Jars to /build/maxkey-depjars,only maxkey-common deps
project('maxkey-common') {
task createReleaseDir(type: Copy){
def paths = ["$rootDir/build/MaxKey-v${project.version}GA",
"$rootDir/build/MaxKey-v${project.version}GA/maxkey",
"$rootDir/build/MaxKey-v${project.version}GA/maxkey_mgt",
"$rootDir/build/MaxKey-v${project.version}GA/maxkey_monitor",
"$rootDir/build/MaxKey-v${project.version}GA/lib"];
//遍历数组，调用createDir闭包，创建目录
paths.forEach(){path->
File dir=new File(path);
if (!dir.exists()){
print("create "+path+"\n")
dir.mkdirs();
}
};
}
task copyDepJars (type: Copy){
dependsOn assemble
println "copy Dep Jars to $rootDir/build/MaxKey-v${project.version}GA/lib"
//copy runtime
from configurations.runtimeClasspath
into "$rootDir/build/MaxKey-v${project.version}GA/lib";
def currentTime = java.time.ZonedDateTime.now()
manifest {
attributes(
"Implementation-Title": project.name,
"Implementation-Vendor": project.vendor,
"Created-By": project.author,
"Implementation-Date": currentTime,
"Implementation-Version": project.version
)
}
}
build.configure { finalizedBy copyDepJars }
}
//copy Dep Jars to /build/maxkey-depjars,only maxkey-boot-monitor deps
project('maxkey-webs:maxkey-boot-monitor') {
task copyDepJars(type:Copy) {
task buildRelease() {
dependsOn assemble
//项目名 项目所在的group version 版本号
//项目名
println "subproject " + project.name + ", group " + project.group +" , version " + project.version
//copy runtime
from configurations.runtimeClasspath
into "$rootDir/build/MaxKey-v${project.version}GA/maxkey_monitor";
}
build.configure { finalizedBy copyDepJars }
}
assemble.configure { finalizedBy buildRelease }
}
tasks.register("buildRelease") {
dependsOn 'copyShellScript','copyWindowsShellScript'
//项目名 项目所在的group version 版本号
println "Root project " + project.name + ", group " + project.group +" , version " + project.version
//项目的绝对路径 to 项目的build文件绝对路径
println "Root project projectDir " + project.projectDir +" to " + project.buildDir
//项目名 项目所在的group version 版本号
println "Root project " + project.name + ", group " + project.group +" , version " + project.version
//项目的绝对路径 to 项目的build文件绝对路径
println "Root project projectDir " + project.projectDir +" to " + project.buildDir
}
tasks.register("copyShellScript",Copy) {
println "project copyMaxKeyShellScript .";
from "$rootDir/shellscript/"
into "$rootDir/build/MaxKey-v${project.version}GA/shellscript/";
}
build.configure { finalizedBy buildRelease }
tasks.register("copyWindowsShellScript",Copy) {
println "project copyMaxKeyWindowsShellScript .";
from "$rootDir/shellscript/windows"
into "$rootDir/build/MaxKey-v${project.version}GA/";
// In this section you declare the dependencies for your production and test code
dependencies {
}
build.configure { finalizedBy buildRelease }
docker/docker-mysql/sql/init.sql
浏览文件 @ a22c9f12
......@@ -2,6 +2,6 @@ create database if not exists `maxkey` /*!40100 DEFAULT CHARACTER SET utf8mb4 C
use maxkey ;
source /docker-entrypoint-initdb.d/v3.1.0.ga/maxkey_v3.1.0.GA.sql ;
source /docker-entrypoint-initdb.d/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql ;
source /docker-entrypoint-initdb.d/v3.1.1.ga/maxkey_v3.1.1.GA.sql ;
source /docker-entrypoint-initdb.d/v3.1.1.ga/maxkey_v3.1.1.GA_data.sql ;
\ No newline at end of file
docker/docker-mysql/sql/v3.1.0.ga/init.sql 0 → 100644
浏览文件 @ a22c9f12
create database if not exists `maxkey` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */ ;
use maxkey ;
source /docker-entrypoint-initdb.d/v3.1.0.ga/maxkey_v3.1.0.GA.sql ;
source /docker-entrypoint-initdb.d/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql ;
\ No newline at end of file
docker/docker-mysql/sql/v3.1.1.ga/maxkey_v3.1.1.GA.sql 0 → 100644
浏览文件 @ a22c9f12
此差异已折叠。
gradle.properties
浏览文件 @ a22c9f12
......@@ -8,7 +8,7 @@ author =MaxKeyTop
jibFromImage =adoptopenjdk:8-jre
jibToImage =maxkeytop
jibToAuthUsername =maxkeytop
jibToAuthPassword =youpassword
jibToAuthPassword =1qazZXCV
#maxkey used jars version
#Apache
......
maxkey-webs/maxkey-web-maxkey/build.gradle
浏览文件 @ a22c9f12
buildscript {
repositories {
maven { url 'https://maven.aliyun.com/nexus/content/groups/public/'}
}
}
plugins {
id 'java'
id 'com.google.cloud.tools.jib' version "${jibGradlePluginVersion}"
id 'org.springframework.boot' version "${springBootVersion}"
}
apply plugin: 'com.google.cloud.tools.jib'
description = "maxkey-web-maxkey"
//add support for Java
apply plugin: 'java'
//docker
jib {
from {
image = "${jibFromImage}"
}
to {
//https://registry.hub.docker.com/repository/docker/maxkeytop/maxkey
image = "${jibToImage}/maxkey"
tags = ["${project.version}".toString(), 'latest']
auth {
username = "${jibToAuthUsername}"
password = "${jibToAuthPassword}"
}
}
container {
mainClass = "org.maxkey.MaxKeyApplication"
jvmFlags = ['-Dfile.encoding=utf-8', '-Dserver.port=443','-Duser.timezone=Asia/Shanghai']
ports = ['443']
}
}
//build.configure { finalizedBy jib }
dependencies {
implementation project(":maxkey-common")
......@@ -23,4 +58,5 @@ dependencies {
implementation project(":maxkey-protocols:maxkey-protocol-jwt")
implementation project(":maxkey-webs:maxkey-web-resources")
}
maxkey-webs/maxkey-web-mgt/build.gradle
浏览文件 @ a22c9f12
buildscript {
repositories {
maven { url 'https://maven.aliyun.com/nexus/content/groups/public/'}
}
}
//docker
plugins {
id 'java'
id 'com.google.cloud.tools.jib' version "${jibGradlePluginVersion}"
id 'org.springframework.boot' version "${springBootVersion}"
}
apply plugin: 'com.google.cloud.tools.jib'
description = "maxkey-web-mgt"
//add support for Java
apply plugin: 'java'
jib {
from {
image = "${jibFromImage}"
}
to {
//https://registry.hub.docker.com/repository/docker/maxkeytop/maxkey-mgt
image = "${jibToImage}/maxkey-mgt"
tags = ["${project.version}".toString(), 'latest']
auth {
username = "${jibToAuthUsername}"
password = "${jibToAuthPassword}"
}
}
container {
mainClass = "org.maxkey.MaxKeyMgtApplication"
jvmFlags = ['-Dfile.encoding=utf-8', '-Dserver.port=9527','-Duser.timezone=Asia/Shanghai']
ports = ['9527']
}
}
//build.configure { finalizedBy jib }
dependencies {
implementation project(":maxkey-common")
......@@ -19,11 +54,11 @@ dependencies {
implementation project(":maxkey-identitys:maxkey-identity-scim")
implementation project(":maxkey-identitys:maxkey-identity-rest")
implementation project(":maxkey-identitys:maxkey-synchronizers")
implementation project(":maxkey-identitys:maxkey-synchronizers-reorgdept")
implementation project(":maxkey-identitys:maxkey-synchronizers-activedirectory")
implementation project(":maxkey-identitys:maxkey-synchronizers-ldap")
implementation project(":maxkey-identitys:maxkey-synchronizers-workweixin")
implementation project(":maxkey-identitys:maxkey-synchronizers-dingding")
implementation project(":maxkey-webs:maxkey-web-resources")
}
\ No newline at end of file
sql/maxkey_v3.1.1.GA.sql 0 → 100644
浏览文件 @ a22c9f12
此差异已折叠。
sql/maxkey_v3.1.1.GA_data.sql 0 → 100644
浏览文件 @ a22c9f12
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或