diff --git a/.gitea/workflows/mvn-deploy.yaml b/.gitea/workflows/mvn-deploy.yaml new file mode 100644 index 0000000..010d419 --- /dev/null +++ b/.gitea/workflows/mvn-deploy.yaml @@ -0,0 +1,25 @@ +## 工作流触发时机 +on: + push: + tags: + - '*' + +jobs: + + ## 任务名称 + local-deploy: + + ## 任务执行的服务器 + runs-on: tiesheng-local + + ## 任务步骤 + steps: + + ## 检出代码(固定配置) + - name: Check out repository code + uses: https://git.tieshengkeji.com/actions/checkout@v4 + + ## maven打包 + - name: Maven deploy + run: | + mvn deploy diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 589a39d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,17 +0,0 @@ -stages: - - deploy - -deploy-jar: - stage: deploy - tags: - - zengos - rules: - - if: $CI_COMMIT_TAG - script: - - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:$TAG_REPO_FOLDER - - cd $TAG_REPO_FOLDER - - git checkout master - - git pull - - git add . - - git commit -m "deploy $CI_PROJECT_NAME $CI_COMMIT_TAG" - - git push origin master diff --git a/pom.xml b/pom.xml index cd9d497..3b24073 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 pom springboot-parent 杭州铁晟科技有限公司基础依赖 @@ -57,55 +57,55 @@ com.tiesheng.springboot-parent springboot-database - 1.1.5 + 1.1.6 com.tiesheng.springboot-parent springboot-login - 1.1.5 + 1.1.6 com.tiesheng.springboot-parent springboot-web - 1.1.5 + 1.1.6 com.tiesheng.springboot-parent springboot-util - 1.1.5 + 1.1.6 com.tiesheng.springboot-parent springboot-platform - 1.1.5 + 1.1.6 com.tiesheng.springboot-parent springboot-message - 1.1.5 + 1.1.6 com.tiesheng.springboot-parent springboot-encrypt - 1.1.5 + 1.1.6 com.tiesheng.springboot-parent springboot-annotation - 1.1.5 + 1.1.6 com.tiesheng.springboot-parent springboot-poi - 1.1.5 + 1.1.6 @@ -125,11 +125,18 @@ - kepai-repo-plugin - http://git.kepai365.com/tiesheng/repository/raw/master + gitea + https://git.tieshengkeji.com/api/packages/tieshengkeji/maven + + + gitea + https://git.tieshengkeji.com/api/packages/tieshengkeji/maven + + + diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml index 1309ad1..2ca8f8a 100644 --- a/springboot-ademo/pom.xml +++ b/springboot-ademo/pom.xml @@ -6,11 +6,11 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-ademo - 1.1.5 + 1.1.6 8 diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml index b7ad7b4..2a204c8 100644 --- a/springboot-annotation/pom.xml +++ b/springboot-annotation/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-annotation diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml index 6fedabd..63aaaed 100644 --- a/springboot-database/pom.xml +++ b/springboot-database/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-database diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml index 17550e5..47d8b87 100644 --- a/springboot-encrypt/pom.xml +++ b/springboot-encrypt/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-encrypt diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml index 81c4b10..23e90bb 100644 --- a/springboot-login/pom.xml +++ b/springboot-login/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-login diff --git a/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java b/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java index e441773..7a10400 100644 --- a/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java +++ b/springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java @@ -27,7 +27,7 @@ public class TsTokenConfig { private String encryptKey = "%kIp9frQCu"; private Integer expireHours = 48; private String[] ignorePaths; - private boolean validLoginSign = false; + private boolean validLoginSign = true; /** diff --git a/springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java b/springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java index 354794b..8c0fbd6 100644 --- a/springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java +++ b/springboot-login/src/main/java/com/tiesheng/login/pojos/UniqueIndexDTO.java @@ -23,7 +23,7 @@ public class UniqueIndexDTO extends LoginToInfo { if (StrUtil.isEmpty(getNo()) || getTimestamp() == null) { return false; } - if ((DateUtil.currentSeconds() - getTimestamp()) > 60) { + if ((DateUtil.currentSeconds() - getTimestamp()) > 10) { return false; } String mySign = getNo() + getTimestamp(); diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml index c239a07..ae62279 100644 --- a/springboot-message/pom.xml +++ b/springboot-message/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-message diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml index 8cce221..5fd27b4 100644 --- a/springboot-platform/pom.xml +++ b/springboot-platform/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-platform diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml index cc6b63e..60f7e72 100644 --- a/springboot-poi/pom.xml +++ b/springboot-poi/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-poi diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml index de5e6ef..51b80bf 100644 --- a/springboot-util/pom.xml +++ b/springboot-util/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-util diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml index f90f6ac..ee42805 100644 --- a/springboot-web/pom.xml +++ b/springboot-web/pom.xml @@ -6,7 +6,7 @@ com.tiesheng.springboot-parent springboot-parent - 1.1.5 + 1.1.6 springboot-web