Prechádzať zdrojové kódy

Merge branch 'test-store' into develop

* test-store:
  优化本地删除文件后重新打包导致文件还存在的问题final
  优化本地删除文件后重新打包导致文件还存在的问题
  优化本地删除文件后重新打包导致文件还存在的问题
  no message
  优化本地删除文件后重新打包导致文件还存在的问题
  优化本地删除文件后重新打包导致文件还存在的问题
  优化本地删除文件后重新打包导致文件还存在的问题
  优化本地删除文件后重新打包导致文件还存在的问题
  优化本地删除文件后重新打包导致文件还存在的问题
  优化本地删除文件后重新打包导致文件还存在的问题	6e6481d	lixueqiang <609827073@qq.com>	2024年4月16日 下午11:29
  优化本地删除文件后重新打包导致文件还存在的问题
  kxsWarehouseLimitSmallLogService
mac 2 rokov pred
rodič
commit
8ce54dc222

+ 35 - 10
.drone.yml

@@ -419,8 +419,10 @@ steps:
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-system-biz&ip=172.27.251.56&port=8060&weight=0'
         - sleep 25s
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-system/*
         - cp -r /home/ABServer/deploy-ready/kxs-system /home/ABServer/webroot/
-        - docker stop kxs-system && docker rm kxs-system && docker-compose up -d kxs-system
+        - docker restart kxs-system
+        - rm -rf /home/ABServer/deploy-ready/kxs-system/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
   - name: scp-project-b
@@ -471,8 +473,10 @@ steps:
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-system-biz&ip=172.26.230.195&port=8060&weight=0'
         - sleep 25s
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-system/*
         - cp -r /home/ABServer/deploy-ready/kxs-system /home/ABServer/webroot/
-        - docker stop kxs-system && docker rm kxs-system && docker-compose up -d kxs-system
+        - docker restart kxs-system
+        - rm -rf /home/ABServer/deploy-ready/kxs-system/*
         # - docker restart nodeServer1
         - sleep 60s
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-system-biz&ip=172.26.230.195&port=8060&weight=1'
@@ -571,8 +575,10 @@ steps:
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-user-biz&ip=172.27.251.56&port=8888&weight=0'
         - sleep 25s
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-user/*
         - cp -r /home/ABServer/deploy-ready/kxs-user /home/ABServer/webroot/
-        - docker stop kxs-user && docker rm kxs-user && docker-compose up -d kxs-user
+        - docker restart kxs-user
+        - rm -rf /home/ABServer/deploy-ready/kxs-user/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
   - name: scp-project-b
@@ -623,8 +629,10 @@ steps:
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-user-biz&ip=172.26.230.195&port=8888&weight=0'
         - sleep 25s
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-user/*
         - cp -r /home/ABServer/deploy-ready/kxs-user /home/ABServer/webroot/
-        - docker stop kxs-user && docker rm kxs-user && docker-compose up -d kxs-user
+        - docker restart kxs-user
+        - rm -rf /home/ABServer/deploy-ready/kxs-user/*
         - sleep 60s
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-user-biz&ip=172.26.230.195&port=8888&weight=1'
         # - docker restart nodeServer1
@@ -724,8 +732,10 @@ steps:
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.27.251.56&port=8050&weight=0'
         - sleep 25s
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-product/*
         - cp -r /home/ABServer/deploy-ready/kxs-product /home/ABServer/webroot/
-        - docker stop kxs-product && docker rm kxs-product && docker-compose up -d kxs-product
+        - docker restart kxs-product
+        - rm -rf /home/ABServer/deploy-ready/kxs-product/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
   - name: scp-project-b
@@ -776,8 +786,10 @@ steps:
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.26.230.195&port=8050&weight=0'
         - sleep 25s
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-product/*
         - cp -r /home/ABServer/deploy-ready/kxs-product /home/ABServer/webroot/
-        - docker stop kxs-product && docker rm kxs-product && docker-compose up -d kxs-product
+        - docker restart kxs-product
+        - rm -rf /home/ABServer/deploy-ready/kxs-product/*
         - sleep 60s
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-product-biz&ip=172.26.230.195&port=8050&weight=1'
         # - docker restart nodeServer1
@@ -877,8 +889,10 @@ steps:
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.27.251.56&port=8070&weight=0'
         - sleep 25s
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-store/*
         - cp -r /home/ABServer/deploy-ready/kxs-store /home/ABServer/webroot/
-        - docker stop kxs-store && docker rm kxs-store && docker-compose up -d kxs-store
+        - docker restart kxs-store
+        - rm -rf /home/ABServer/deploy-ready/kxs-store/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
   - name: scp-project-b
@@ -929,8 +943,10 @@ steps:
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.26.230.195&port=8070&weight=0'
         - sleep 25s
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-store/*
         - cp -r /home/ABServer/deploy-ready/kxs-store /home/ABServer/webroot/
-        - docker stop kxs-store && docker rm kxs-store && docker-compose up -d kxs-store
+        - docker restart kxs-store
+        - rm -rf /home/ABServer/deploy-ready/kxs-store/*
         - sleep 60s
         - curl -X PUT 'http://mse-78d0edb13-nacos-ans.mse.aliyuncs.com:8848/nacos/v1/ns/instance?serviceName=kxs-store-biz&ip=172.26.230.195&port=8070&weight=1'
 
@@ -1130,8 +1146,10 @@ steps:
       script:
         - echo ====开始部署=======
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-quartz/*
         - cp -r /home/ABServer/deploy-ready/kxs-quartz /home/ABServer/webroot/
         - docker restart kxs-quartz
+        - rm -rf /home/ABServer/deploy-ready/kxs-quartz/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
 
@@ -1227,8 +1245,10 @@ steps:
       script:
         - echo ====开始部署=======
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-transfer/*
         - cp -r /home/ABServer/deploy-ready/kxs-transfer /home/ABServer/webroot/
         - docker stop kxs-transfer && docker rm kxs-transfer && docker-compose up -d kxs-transfer
+        - rm -rf /home/ABServer/deploy-ready/kxs-transfer/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
 
@@ -1323,8 +1343,10 @@ steps:
       script:
         - echo ====开始部署=======
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-system/*
         - cp -r /home/ABServer/deploy-ready/kxs-system /home/ABServer/webroot/
         - docker stop kxs-system && docker rm kxs-system && docker-compose up -d kxs-system
+        - rm -rf/home/ABServer/deploy-ready/kxs-system/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
 
@@ -1420,8 +1442,10 @@ steps:
       script:
         - echo ====开始部署=======
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-user/*
         - cp -r /home/ABServer/deploy-ready/kxs-user /home/ABServer/webroot/
         - docker stop kxs-user && docker rm kxs-user && docker-compose up -d kxs-user
+        - rm -rf /home/ABServer/deploy-ready/kxs-user/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
 
@@ -1516,8 +1540,10 @@ steps:
       script:
         - echo ====开始部署=======
         - cd /home/ABServer/
+        - rm -rf /home/ABServer/webroot/kxs-product/*
         - cp -r /home/ABServer/deploy-ready/kxs-product /home/ABServer/webroot/
         - docker stop kxs-product && docker rm kxs-product && docker-compose up -d kxs-product
+        - rm -rf /home/ABServer/deploy-ready/kxs-product/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
 
@@ -1588,8 +1614,6 @@ steps:
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
-      commands: # 执行命令
-        - rm -rf /home/ABServer/deploy-ready/*
       source:
         - echo ====开始拷贝=======
         - /kxs-store/*.jar
@@ -1619,6 +1643,7 @@ steps:
         - rm -rf /home/ABServer/webroot/kxs-store/*
         - cp -r /home/ABServer/deploy-ready/kxs-store /home/ABServer/webroot/
         - docker stop kxs-store && docker rm kxs-store && docker-compose up -d kxs-store
+        - rm -rf /home/ABServer/deploy-ready/kxs-store/*
         # - docker restart nodeServer1
         - echo ====部署成功=======
 

+ 1 - 1
kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsWarehouseLimitSmallLogServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.Objects;
  * @author 系统
  * @since 2024-04-16 14:50:16
  */
-@Service("kxsWarehouseLimitLogService")
+@Service("kxsWarehouseLimitSmallLogService")
 public class KxsWarehouseLimitSmallLogServiceImpl extends ServiceImpl<KxsWarehouseLimitLogMapper, KxsWarehouseLimitLog> implements KxsWarehouseLimitLogService {
 
     @Override