Merge pull request 'cxw' (#18) from cxw into master

Reviewed-on: #18

.drone.yml

@@ -7,36 +7,7 @@ name: filesystem-drone # 定义流水线名称
  
 steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
-  - name: package # 流水线名称
+  - name: package-and-push-image
- 
-    image: maven:3-jdk-8 # 定义创建容器的Docker镜像
- 
-    volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
- 
-      - name: maven-cache
- 
-        path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载
- 
-      - name: maven-build
- 
-        path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
- 
-    commands: # 定义在Docker容器中执行的shell命令
- 
-      - mvn package -Dmaven.test.skip=true # 应用打包命令
-      
-#      - cd yudao-server/target/
-#      - ls
- 
-      - cp yudao-server/target/yudao-server.jar /app/build/yudao-server.jar
- 
-      - cp yudao-server/Dockerfile /app/build/Dockerfile
- 
-      - cp yudao-server/run.sh /app/build/run.sh
- 
- 
- 
-  - name: copy package
  
     image: appleboy/drone-ssh # SSH工具镜像
  
@@ -55,8 +26,17 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       command_timeout: 5m # 远程执行命令超时时间
  
       script:
+        - cd /root/allLikeMall
+        - git fetch origin
+        - git reset --hard origin/main
+        - git clean -fd
+        - mvn package -Dmaven.test.skip=true
+        - cd yudao-server
+        - chmod +x push.sh
+        - ./push.sh
+        - scp ./run.sh root@1.14.205.126:/zymail
 #        - ls
-        - scp -r /zymail/maven/build root@1.14.205.126:/zymail
+#        - scp -r /zymail/maven/build root@1.14.205.126:/zymail
 #        - ssh root@1.14.205.126
 #        - ls
  
@@ -86,13 +66,3 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         - cd /zymail/build
         - chmod +x run.sh # 更改为可执行脚本
         - ./run.sh # 运行脚本打包应用镜像并运行
- 
-volumes: # 定义流水线挂载目录，用于共享数据
-
-  - name: maven-build
-    host:
-      path: /zymail/maven/build # 从宿主机中挂载的目录
- 
-  - name: maven-cache
-    host:
-      path: /zymail/maven/cache # 从宿主机中挂载的目录

yudao-admin-vue3/src/views/member/user/UserBalanceUpdateForm.vue

@@ -0,0 +1,134 @@
+<template>
+  <Dialog title="修改用户余额" v-model="dialogVisible" width="600">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="用户编号" prop="userId">
+        <el-input v-model="formData.userId" class="!w-240px" disabled />
+      </el-form-item>
+      <el-form-item label="用户昵称" prop="nickname">
+        <el-input v-model="formData.nickname" class="!w-240px" disabled />
+      </el-form-item>
+      <el-form-item label="变动前余额" prop="balance">
+        <el-input-number v-model="formData.balance" class="!w-240px" :precision="2" disabled />
+      </el-form-item>
+      <el-form-item label="变动类型" prop="changeType">
+        <el-radio-group v-model="formData.changeType">
+          <el-radio :label="1">增加</el-radio>
+          <el-radio :label="-1">减少</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="变动余额" prop="changePoint">
+        <el-input-number v-model="formData.changePoint" class="!w-240px" :min="0" :precision="2" />
+      </el-form-item>
+      <el-form-item label="变动后余额">
+        <el-input-number v-model="pointResult" class="!w-240px" :precision="2" disabled />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as UserApi from '@/api/pay/wallet/balance'
+import * as UserApi2 from '@/api/member/user'
+/** 修改用户余额表单 */
+defineOptions({ name: 'UpdatePointForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  userId: undefined,
+  nickname: undefined,
+  balance: 0,
+  changePoint: 0,
+  changeType: 1
+})
+const formRules = reactive({
+  changePoint: [{ required: true, message: '变动余额不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (id?: number) => {
+  dialogVisible.value = true
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const param = { userId: id }
+      const wallet = await UserApi.getWallet(param)
+      formData.value = wallet
+      formData.value.balance = wallet.balance / 100.0;
+      const user = await UserApi2.getUser(id); 
+      formData.value.nickname = user.nickname;      
+      formData.value.changeType = 1 // 默认增加余额
+      formData.value.changePoint = 0 // 变动余额默认0
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  if (formData.value.changePoint < 1) {
+    message.error('变动余额不能小于 1')
+    return
+  }
+  if (pointResult.value < 0) {
+    message.error('变动后的余额不能小于 0')
+    return
+  }
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    await UserApi.updateWalletBalance({
+      id: formData.value.id,
+      balance: formData.value.changePoint * formData.value.changeType
+    })
+
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    nickname: undefined,
+    balance: undefined,
+    reason: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+/** 变动后的余额 */
+const pointResult = computed(
+  () => formData.value.balance + formData.value.changePoint * formData.value.changeType
+)
+</script>

yudao-server/Dockerfile

@@ -4,13 +4,13 @@ FROM openjdk:8-jre
 RUN mkdir -p /yudao-server
 WORKDIR /yudao-server
 ## 将后端项目的 Jar 文件，复制到镜像中
-ADD yudao-server.jar app.jar
+ADD ./target/yudao-server.jar app.jar
 
 ## 设置 TZ 时区
 ENV TZ=Asia/Shanghai
 ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖
 ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom"
-
+Duser.timezone=Asia/Shanghai"
 ## 应用参数
 ENV ARGS=""
 

yudao-server/push.sh

@@ -0,0 +1,11 @@
+app_name='zymall'
+# 定义应用版本
+app_version='1.0.0'
+app_repository='mt.ptzykjgs.com:8080/serve'
+# 打包编译docker镜像
+echo '----build image----'
+docker buildx build -f Dockerfile -t "${app_name}:${app_version}" .
+echo '----tag image----'
+docker tag "${app_name}:${app_version}" "${app_repository}/${app_name}:${app_version}"
+echo '----push image----'
+docker push "${app_repository}/${app_name}:${app_version}"

yudao-server/run.sh

@@ -1,6 +1,7 @@
 app_name='zymall'
 # 定义应用版本
 app_version='1.0.0'
+app_repository='mt.ptzykjgs.com:8080/serve'
 # 定义应用环境
 #profile_active='prod'
 echo '----stop container----'
@@ -8,9 +9,8 @@ docker stop ${app_name}
 echo '----rm container----'
 docker rm ${app_name}
 echo '----rm image----'
-docker rmi ${app_name}:${app_version}
+docker rmi -f "${app_name}:${app_version}"
-# 打包编译docker镜像
+echo '----pull image----'
-echo '----build image----'
+docker pull "${app_repository}/${app_name}:${app_version}"
-docker buildx build -f Dockerfile -t ${app_name}:${app_version} .
 echo '----start container----'
-docker run -d -p 6127:6127 --name ${app_name} --restart always ${app_name}:${app_version}
+docker run -d -p 6127:6127 --name ${app_name} --restart always "${app_repository}/${app_name}:${app_version}"