Просмотр исходного кода

修复自动部署删除文件后还有缓存文件的问题

mac 2 лет назад
Родитель
Сommit
461ff4a26b

+ 13 - 0
.drone.yml

@@ -31,6 +31,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P test
       - cp /drone/src/kxs-gateway/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-gateway/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-gateway/target/config /drone/src/dist/ # 复制文件
     when:
@@ -127,6 +128,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P test
       - cp /drone/src/kxs-quartz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-quartz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-quartz/target/config /drone/src/dist/ # 复制文件
     when:
@@ -223,6 +225,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P test
       - cp /drone/src/kxs-transfer/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-transfer/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-transfer/target/config /drone/src/dist/ # 复制文件
     when:
@@ -318,6 +321,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P test
       - cp /drone/src/kxs-system/kxs-system-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-system/kxs-system-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-system/kxs-system-biz/target/config /drone/src/dist/ # 复制文件
     when:
@@ -414,6 +418,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P test
       - cp /drone/src/kxs-user/kxs-user-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-user/kxs-user-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-user/kxs-user-biz/target/config /drone/src/dist/ # 复制文件
     when:
@@ -509,6 +514,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P test
       - cp /drone/src/kxs-product/kxs-product-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-product/kxs-product-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-product/kxs-product-biz/target/config /drone/src/dist/ # 复制文件
     when:
@@ -606,6 +612,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P test
       - cp /drone/src/kxs-store/kxs-store-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/config /drone/src/dist/ # 复制文件
     when:
@@ -705,6 +712,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-gateway/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-gateway/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-gateway/target/config /drone/src/dist/ # 复制文件
     when:
@@ -848,6 +856,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-transfer/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-transfer/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-transfer/target/config /drone/src/dist/ # 复制文件
     when:
@@ -942,6 +951,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-system/kxs-system-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-system/kxs-system-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-system/kxs-system-biz/target/config /drone/src/dist/ # 复制文件
     when:
@@ -1093,6 +1103,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-user/kxs-user-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-user/kxs-user-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-user/kxs-user-biz/target/config /drone/src/dist/ # 复制文件
     when:
@@ -1245,6 +1256,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-product/kxs-product-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-product/kxs-product-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-product/kxs-product-biz/target/config /drone/src/dist/ # 复制文件
     when:
@@ -1397,6 +1409,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
+      - rm -rf /drone/src/dist/*
       - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-store/kxs-store-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/config /drone/src/dist/ # 复制文件
     when:

+ 41 - 0
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/util/AssertUtil.java

@@ -0,0 +1,41 @@
+package com.kxs.common.core.util;
+
+
+
+
+
+import com.kxs.common.core.exception.GlobalCustomerException;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 断言参数异常 util
+ *
+ * @author 没秃顶的码农
+ * @date 2024-04-10
+ */
+public class AssertUtil {
+
+     //手机的正则表达式
+     private static final Pattern CHINA_PATTERN_PHONE = Pattern.compile("^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$");
+
+    public static final String CHINA_PATTERN_PHONE_STR =  "^((13[0-9])|(14[014-9])|(15[0-35-9])|(16[2567])|(17[0-8])|(18[0-9])|(19[0-35-9]))\\d{8}$";
+
+     /**--------------------------------------------------------
+     手机号断言
+     --------------------------------------------------------**/
+    public static void isPhone(String phone){
+
+        //格式校验
+        Matcher m = CHINA_PATTERN_PHONE.matcher(phone);
+        if(!m.matches()){
+            throw new GlobalCustomerException("手机号格式错误");
+        }
+    }
+
+
+
+
+}

+ 9 - 1
kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.kxs.common.core.constant.enums.ErrorTypeEnum;
 import com.kxs.common.core.constant.enums.UserStatusEnum;
 import com.kxs.common.core.exception.GlobalCustomerException;
 import com.kxs.common.core.exception.ValidateCodeException;
+import com.kxs.common.core.util.AssertUtil;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.SpringContextHolder;
 import com.kxs.common.security.util.SecurityUtils;
@@ -99,7 +100,9 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     @GlobalTransactional
     @Transactional(rollbackFor = Exception.class)
     public R register(RegisterDTO registerDTO) {
-        
+
+        AssertUtil.isPhone(registerDTO.getPhone());
+
         //验证码校验
         checkValidateCode(registerDTO.getPhone(), registerDTO.getCode());
 
@@ -173,6 +176,8 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     @Override
     public Boolean sendCode(String mobile) {
 
+        AssertUtil.isPhone(mobile);
+
         String key = CacheConstants.DEFAULT_CODE_KEY + mobile;
 
         Object codeObj = redisTemplate.opsForValue().get(key);
@@ -362,6 +367,9 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     @Override
     public R updateLoginPhone(UserUpdateLoginPhoneDTO param) {
 
+        AssertUtil.isPhone(param.getPhone());
+        AssertUtil.isPhone(param.getNewPhone());
+
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
         //判断手机号
         if (!Objects.equals(user.getPhone(), param.getPhone())){