diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..181653f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +trigger_build_doc: + stage: deploy + only: + - develop + script: + - curl -X POST http://192.168.180.192/jenkins/job/bxs-apidoc/buildWithParameters --user dongxuanliang252:110e0732fde118c802cb616637fd47278d -d 'projectName=spring-biz-module' + - curl -X POST http://192.168.180.192/jenkins/job/bxs-servicedoc/buildWithParameters --user dongxuanliang252:110e0732fde118c802cb616637fd47278d -d 'projectName=spring-biz-module' diff --git a/apidoc.json b/apidoc.json new file mode 100644 index 0000000..50a6827 --- /dev/null +++ b/apidoc.json @@ -0,0 +1,7 @@ +{ + "name": "spring-biz-module接口文档", + "version": "1.0.0", + "description": "", + "title": "spring-biz-module", + "url" : "https://demo.test.com" +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3acbd39..02da10f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,38 +1,55 @@ -buildscript { - ext { - springBootVersion = '1.5.17.RELEASE' - } +allprojects { + apply plugin: 'maven' + group = 'com.winbaoxian' + version = '1.0.0' +} + +subprojects { + + apply plugin: 'java' + apply plugin: 'idea' + sourceCompatibility = 1.8 + repositories { + mavenLocal() + maven { url "http://192.168.180.191:8081/nexus/content/repositories/public" } + maven { url "http://192.168.180.191:8081/nexus/content/repositories/snapshots/" } mavenCentral() } + dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + compile('com.winbaoxian:bxs-service-model:1.0a-SNAPSHOT') + compileOnly('org.projectlombok:lombok') } -} -apply plugin: 'java' -apply plugin: 'idea' -apply plugin: 'maven' -apply plugin: 'org.springframework.boot' -apply plugin: 'war' + task "create-dirs" << { + sourceSets*.java.srcDirs*.each { it.mkdirs() } + sourceSets*.resources.srcDirs*.each { it.mkdirs() } + } +} +def isWindows() { + return org.gradle.internal.os.OperatingSystem.current().isWindows() +} -group = 'com.winbaoxian' -version = '0.0.1-SNAPSHOT' -sourceCompatibility = 1.8 +String apidocCmd = isWindows() ? 'apidoc.cmd' : 'apidoc' +task apidocs(type: Exec, description: '执行生成apidoc文档操作') { + workingDir './' + def docCommand = [apidocCmd, '-o', './build/apidocs', '-f', 'java', '--debug', 'true'] + commandLine docCommand +} -repositories { - mavenLocal() - maven { url "http://192.168.180.191:8081/nexus/content/repositories/public" } - maven { url "http://192.168.180.191:8081/nexus/content/repositories/snapshots/" } - mavenCentral() +String servicedocCmd = isWindows() ? 'servicedoc.cmd' : 'servicedoc' +task servicedocs(type: Exec, description: '执行生成servicedoc文档操作') { + workingDir './' + def serviceCommand = [servicedocCmd, '-o', './build/servicedocs', '-f', 'java', '--debug', 'true'] + commandLine serviceCommand } -dependencies { - compile('org.springframework.boot:spring-boot-starter-data-jpa') - compile('org.springframework.boot:spring-boot-starter-web') - compile('com.winbaoxian:bxs-service-model:1.0a-SNAPSHOT') - runtime('mysql:mysql-connector-java') - compileOnly('org.projectlombok:lombok') - testCompile('org.springframework.boot:spring-boot-starter-test') +task wrapper(type: Wrapper) { + gradleVersion = '3.4' + distributionType = 'all' } + + + diff --git a/src/main/java/com/winbaoxian/module/Application.java b/example/src/main/java/com/winbaoxian/module/Application.java similarity index 100% rename from src/main/java/com/winbaoxian/module/Application.java rename to example/src/main/java/com/winbaoxian/module/Application.java diff --git a/src/main/java/com/winbaoxian/module/component/exception/GlobalExceptionHandler.java b/example/src/main/java/com/winbaoxian/module/component/exception/GlobalExceptionHandler.java similarity index 100% rename from src/main/java/com/winbaoxian/module/component/exception/GlobalExceptionHandler.java rename to example/src/main/java/com/winbaoxian/module/component/exception/GlobalExceptionHandler.java diff --git a/src/main/java/com/winbaoxian/module/component/filter/CrossOriginFilter.java b/example/src/main/java/com/winbaoxian/module/component/filter/CrossOriginFilter.java similarity index 100% rename from src/main/java/com/winbaoxian/module/component/filter/CrossOriginFilter.java rename to example/src/main/java/com/winbaoxian/module/component/filter/CrossOriginFilter.java diff --git a/src/main/java/com/winbaoxian/module/component/listener/SpringContextListener.java b/example/src/main/java/com/winbaoxian/module/component/listener/SpringContextListener.java similarity index 100% rename from src/main/java/com/winbaoxian/module/component/listener/SpringContextListener.java rename to example/src/main/java/com/winbaoxian/module/component/listener/SpringContextListener.java diff --git a/src/main/java/com/winbaoxian/module/component/log/LogAspect.java b/example/src/main/java/com/winbaoxian/module/component/log/LogAspect.java similarity index 100% rename from src/main/java/com/winbaoxian/module/component/log/LogAspect.java rename to example/src/main/java/com/winbaoxian/module/component/log/LogAspect.java diff --git a/src/main/java/com/winbaoxian/module/component/multids/CityManagerDataSourceConfiguration.java b/example/src/main/java/com/winbaoxian/module/component/multids/CityManagerDataSourceConfiguration.java similarity index 100% rename from src/main/java/com/winbaoxian/module/component/multids/CityManagerDataSourceConfiguration.java rename to example/src/main/java/com/winbaoxian/module/component/multids/CityManagerDataSourceConfiguration.java diff --git a/src/main/java/com/winbaoxian/module/model/constant/SpringBizModuleConstant.java b/example/src/main/java/com/winbaoxian/module/model/constant/SpringBizModuleConstant.java similarity index 100% rename from src/main/java/com/winbaoxian/module/model/constant/SpringBizModuleConstant.java rename to example/src/main/java/com/winbaoxian/module/model/constant/SpringBizModuleConstant.java diff --git a/src/main/java/com/winbaoxian/module/model/enums/BusinessErrorEnum.java b/example/src/main/java/com/winbaoxian/module/model/enums/BusinessErrorEnum.java similarity index 100% rename from src/main/java/com/winbaoxian/module/model/enums/BusinessErrorEnum.java rename to example/src/main/java/com/winbaoxian/module/model/enums/BusinessErrorEnum.java diff --git a/src/main/java/com/winbaoxian/module/model/exceptions/BusinessException.java b/example/src/main/java/com/winbaoxian/module/model/exceptions/BusinessException.java similarity index 100% rename from src/main/java/com/winbaoxian/module/model/exceptions/BusinessException.java rename to example/src/main/java/com/winbaoxian/module/model/exceptions/BusinessException.java diff --git a/src/main/java/com/winbaoxian/module/utils/CookieUtils.java b/example/src/main/java/com/winbaoxian/module/utils/CookieUtils.java similarity index 100% rename from src/main/java/com/winbaoxian/module/utils/CookieUtils.java rename to example/src/main/java/com/winbaoxian/module/utils/CookieUtils.java diff --git a/src/main/java/com/winbaoxian/module/utils/DateUtils.java b/example/src/main/java/com/winbaoxian/module/utils/DateUtils.java similarity index 100% rename from src/main/java/com/winbaoxian/module/utils/DateUtils.java rename to example/src/main/java/com/winbaoxian/module/utils/DateUtils.java diff --git a/src/main/java/com/winbaoxian/module/utils/NumberUtils.java b/example/src/main/java/com/winbaoxian/module/utils/NumberUtils.java similarity index 100% rename from src/main/java/com/winbaoxian/module/utils/NumberUtils.java rename to example/src/main/java/com/winbaoxian/module/utils/NumberUtils.java diff --git a/src/main/java/com/winbaoxian/module/utils/SnowflakeUtil.java b/example/src/main/java/com/winbaoxian/module/utils/SnowflakeUtil.java similarity index 100% rename from src/main/java/com/winbaoxian/module/utils/SnowflakeUtil.java rename to example/src/main/java/com/winbaoxian/module/utils/SnowflakeUtil.java diff --git a/src/main/java/com/winbaoxian/module/utils/SpringContextHolder.java b/example/src/main/java/com/winbaoxian/module/utils/SpringContextHolder.java similarity index 100% rename from src/main/java/com/winbaoxian/module/utils/SpringContextHolder.java rename to example/src/main/java/com/winbaoxian/module/utils/SpringContextHolder.java diff --git a/src/main/java/com/winbaoxian/module/utils/TransformerUtils.java b/example/src/main/java/com/winbaoxian/module/utils/TransformerUtils.java similarity index 100% rename from src/main/java/com/winbaoxian/module/utils/TransformerUtils.java rename to example/src/main/java/com/winbaoxian/module/utils/TransformerUtils.java diff --git a/src/main/resources/application.yml b/example/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to example/src/main/resources/application.yml diff --git a/src/main/resources/banner.txt b/example/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to example/src/main/resources/banner.txt diff --git a/src/test/java/com/winbaoxian/module/ApplicationTests.java b/example/src/test/java/com/winbaoxian/module/ApplicationTests.java similarity index 100% rename from src/test/java/com/winbaoxian/module/ApplicationTests.java rename to example/src/test/java/com/winbaoxian/module/ApplicationTests.java diff --git a/servicedoc.json b/servicedoc.json new file mode 100644 index 0000000..7cfecf2 --- /dev/null +++ b/servicedoc.json @@ -0,0 +1,7 @@ +{ + "name": "spring-biz-module接口文档", + "version": "1.0.0", + "description": "", + "title": "spring-biz-module", + "url" : "https://demo.test.com" +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 5a259f3..362f11a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,5 @@ rootProject.name = 'spring-biz-module' include 'win-security' +include 'example' + diff --git a/win-security/build.gradle b/win-security/build.gradle index 8b13789..9b02015 100644 --- a/win-security/build.gradle +++ b/win-security/build.gradle @@ -1 +1,6 @@ +description = 'win-security' +// +//apply plugin: 'war' +//apply plugin: 'org.springframework.boot' +//