.drone-build-image.yml

@@ -1,69 +0,0 @@
-kind: pipeline # 定义对象类型，还有secret和signature两种类型
- 
-type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
- 
-name: filesystem-drone # 定义流水线名称
- 
-clone:
-  disable: true
-steps: # 定义流水线执行步骤，这些步骤将顺序执行
-
-  - name: package-and-push-image
- 
-    image: appleboy/drone-ssh # SSH工具镜像
- 
-    settings:
- 
-      host: 101.43.112.107 # 远程连接地址
- 
-      username: root # 远程连接账号
- 
-      password: 
- 
-        from_secret: ssh_password # 从Secret中读取SSH密码
- 
-      port: 22 # 远程连接端口
- 
-      command_timeout: 10m # 远程执行命令超时时间
- 
-      script:
-        - cd /root/allLikeMall
-        - git fetch origin
-        - git reset --hard origin/master
-        - git clean -fd
-        - /root/apache-maven-3.9.4/bin/mvn package -Dmaven.test.skip=true
-        - cd yudao-server
-        - chmod +x push.sh
-        - ./push.sh
-        - scp run.sh root@1.14.205.126:/zymail/build
-#        - ls
-#        - scp -r /zymail/maven/build root@1.14.205.126:/zymail
-#        - ssh root@1.14.205.126
-#        - ls
- 
-#        - chmod +x run.sh # 更改为可执行脚本
- 
-#        - ./run.sh # 运行脚本打包应用镜像并运行
-  - name: build-start
- 
-    image: appleboy/drone-ssh # SSH工具镜像
- 
-    settings:
- 
-      host: 1.14.205.126 # 远程连接地址
- 
-      username: root # 远程连接账号
- 
-      password: 
- 
-        from_secret: ssh_password # 从Secret中读取SSH密码
- 
-      port: 22 # 远程连接端口
- 
-      command_timeout: 30m # 远程执行命令超时时间
- 
-      script:
-#        - ls
-        - cd /zymail/build
-        - chmod +x run.sh # 更改为可执行脚本
-        - ./run.sh # 运行脚本打包应用镜像并运行

.drone.yml

@@ -8,6 +8,42 @@ clone:
   disable: true
 steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
+  - name: package-and-push-image
+ 
+    image: appleboy/drone-ssh # SSH工具镜像
+ 
+    settings:
+ 
+      host: 101.43.112.107 # 远程连接地址
+ 
+      username: root # 远程连接账号
+ 
+      password: 
+ 
+        from_secret: ssh_password # 从Secret中读取SSH密码
+ 
+      port: 22 # 远程连接端口
+ 
+      command_timeout: 10m # 远程执行命令超时时间
+ 
+      script:
+        - cd /root/allLikeMall
+        - git fetch origin
+        - git reset --hard origin/master
+        - git clean -fd
+        - /root/apache-maven-3.9.4/bin/mvn package -Dmaven.test.skip=true
+        - cd yudao-server
+        - chmod +x push.sh
+        - ./push.sh
+        - scp run.sh root@1.14.205.126:/zymail/build
+#        - ls
+#        - scp -r /zymail/maven/build root@1.14.205.126:/zymail
+#        - ssh root@1.14.205.126
+#        - ls
+ 
+#        - chmod +x run.sh # 更改为可执行脚本
+ 
+#        - ./run.sh # 运行脚本打包应用镜像并运行
   - name: build-start
  
     image: appleboy/drone-ssh # SSH工具镜像
@@ -27,12 +63,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       command_timeout: 30m # 远程执行命令超时时间
  
       script:
-        - cd /root/allLikeMall
+#        - ls
-        - git fetch origin
+        - cd /zymail/build
-        - git reset --hard origin/master
+        - chmod +x run.sh # 更改为可执行脚本
-        - git clean -fd
+        - ./run.sh # 运行脚本打包应用镜像并运行
-        - /root/apache-maven-3.9.4/bin/mvn package -Dmaven.test.skip=true
-        - cd yudao-server
-        - chmod +x all.sh
-        - ./all.sh
-

yudao-admin-vue3/src/views/mall/promotion/point/activity/PointActivityForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="95%">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="65%">
     <Form
       ref="formRef"
       v-loading="formLoading"

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -136,6 +136,6 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
             " inner join trade_order_item b on a.id = b.order_id " +
             " inner join (SELECT sort, label, value, dict_type, css_class FROM system_dict_data WHERE dict_type = 'trade_order_status') d on d.sort = a.status "+
             " inner join product_spu c on b.spu_id = c.id " +
-            " where a.user_id = #{userId} and a.use_point > 0 order by a.create_time ASC ")
+            " where a.user_id = #{userId} and a.use_point > 0 ")
     List<AppPointOrderVO> getPointOrder(Long userId);
 }

yudao-server/all.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-app_name='zymall'
-# 定义应用版本
-app_version='1.0.0'
-# 定义应用环境
-# 打包编译docker镜像
-echo '----build image----'
-docker buildx build -f Dockerfile -t "${app_name}:${app_version}" .
-echo '----stop container----'
-docker stop ${app_name}
-echo '----rm container----'
-docker rm ${app_name}
-echo '----rmi none image----'
-docker rmi $(docker images -f "dangling=true" -q)
-echo '----start container----'
-docker run -d -p 6127:6127 --name ${app_name} -v /home/mallpic:/home/mallpic --restart always ${app_name}:${app_version}

yudao-server/run.sh

@@ -10,7 +10,7 @@ echo '----stop container----'
 docker stop ${app_name}
 echo '----rm container----'
 docker rm ${app_name}
-echo '----rmi none image----'
+#echo '----rm image----'
-docker rmi $(docker images -f "dangling=true" -q)
+#docker rmi -f "${app_name}:${app_version}"
 echo '----start container----'
-docker run -d -p 6127:6127 --name ${app_name} -v /home/mallpic:/home/mallpic --restart always "${app_repository}/${app_name}:${app_version}"
+docker run -d -p 6127:6127 --name ${app_name} --restart always "${app_repository}/${app_name}:${app_version}"