publish zjut-1.1.6

.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          

.gitlab-ci.yml

@@ -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

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.1.5</version>
+    <version>zjut-1.1.6</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -57,55 +57,55 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-encrypt</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-poi</artifactId>
-                <version>1.1.5</version>
+                <version>zjut-1.1.6</version>
             </dependency>
 
             <dependency>
@@ -125,11 +125,18 @@
 
     <pluginRepositories>
         <pluginRepository>
-            <id>kepai-repo-plugin</id>
+            <id>gitea</id>
-            <url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
         </pluginRepository>
     </pluginRepositories>
 
+    <distributionManagement>
+        <repository>
+            <id>gitea</id>
+            <url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
+        </repository>
+    </distributionManagement>
+
     <build>
         <pluginManagement>
             <plugins>

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>1.1.5</version>
+    <version>zjut-1.1.6</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-encrypt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-encrypt</artifactId>

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

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;
 
 
     /**

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();

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-poi/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-poi</artifactId>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-util/src/main/java/com/tiesheng/util/config/EncryptConfig.java

@@ -23,17 +23,26 @@ public class EncryptConfig {
     /**
      * 加解密对象
      */
-    private final SM4 sm4;
+    private static SM4 sm4;
 
     /**
      * 加密密钥
      */
-    private String key = "WmdUzPJXbngVNiaSsQrihg==";
+    private String key = "Z1mn6fKe6ubnm5762KR3Cg==";
     private Integer saltSize = 8;
     private boolean body = false;
 
-    public EncryptConfig() {
+
-        sm4 = SmUtil.sm4(Base64.decode(getKey()));
+    /**
+     * 获取SM4对象
+     *
+     * @return
+     */
+    private SM4 getSm4() {
+        if (sm4 == null) {
+            sm4 = SmUtil.sm4(Base64.decode(getKey()));
+        }
+        return sm4;
     }
 
     /**
@@ -46,7 +55,7 @@ public class EncryptConfig {
         if (StrUtil.isEmpty(content)) {
             return "";
         }
-        return sm4.encryptBase64(content);
+        return getSm4().encryptBase64(content);
     }
 
 
@@ -58,7 +67,7 @@ public class EncryptConfig {
      */
     public String decrypt(String base64) {
         try {
-            return sm4.decryptStr(base64);
+            return getSm4().decryptStr(base64);
         } catch (Exception ignore) {
         }
         return base64;
@@ -117,7 +126,8 @@ public class EncryptConfig {
 
     ///////////////////////////////////////////////////////////////////////////
     // setter\getter
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     public String getKey() {
         return key;

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>zjut-1.1.6</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>