1、微信支付回调地址修改

2、补充VIP充值相关接口
3、添加全年收支收入/支出金额查询接口
4、替换mysql、redis、oss开发参数

han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java

@@ -98,14 +98,12 @@ public class MpWxPayService {
         request.setDetail(productName);       //商品详情
         request.setTotalFee(price);           //总金额|分计
         request.setSpbillCreateIp(clientIp);  //终端IP
-//        request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径
-        request.setNotifyUrl("https://tai-testapi.sanhemovie.com/massage-api/post/notify");//设置回调路径
+        request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径
         request.setProductId(productId);      //商品id
         request.setOpenid(openId);            //JSAPI OPENID
         if (dev){
             request.setTotalFee(price);
-//            request.setNotifyUrl(wxPay.notifyUrlDev);
-            request.setNotifyUrl("https://tai-testapi.sanhemovie.com/massage-api/post/notify");//设置回调路径
+            request.setNotifyUrl(wxPay.notifyUrlDev);
         }
         try {
             Object order = wxPayService.createOrder(request);

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/controller/EmployVipRecordController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.employVipRecord.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.employVipRecord.entity.EmployVipRecord;
+import org.jeecg.modules.employVipRecord.service.IEmployVipRecordService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 会员订单记录表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-23
+ * @Version: V1.0
+ */
+@Api(tags="会员订单记录表")
+@RestController
+@RequestMapping("/employVipRecord/employVipRecord")
+@Slf4j
+public class EmployVipRecordController extends JeecgController<EmployVipRecord, IEmployVipRecordService> {
+	@Autowired
+	private IEmployVipRecordService employVipRecordService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param employVipRecord
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "会员订单记录表-分页列表查询")
+	@ApiOperation(value="会员订单记录表-分页列表查询", notes="会员订单记录表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<EmployVipRecord>> queryPageList(EmployVipRecord employVipRecord,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EmployVipRecord> queryWrapper = QueryGenerator.initQueryWrapper(employVipRecord, req.getParameterMap());
+		Page<EmployVipRecord> page = new Page<EmployVipRecord>(pageNo, pageSize);
+		IPage<EmployVipRecord> pageList = employVipRecordService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param employVipRecord
+	 * @return
+	 */
+	@AutoLog(value = "会员订单记录表-添加")
+	@ApiOperation(value="会员订单记录表-添加", notes="会员订单记录表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EmployVipRecord employVipRecord) {
+		employVipRecordService.save(employVipRecord);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param employVipRecord
+	 * @return
+	 */
+	@AutoLog(value = "会员订单记录表-编辑")
+	@ApiOperation(value="会员订单记录表-编辑", notes="会员订单记录表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EmployVipRecord employVipRecord) {
+		employVipRecordService.updateById(employVipRecord);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "会员订单记录表-通过id删除")
+	@ApiOperation(value="会员订单记录表-通过id删除", notes="会员订单记录表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		employVipRecordService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "会员订单记录表-批量删除")
+	@ApiOperation(value="会员订单记录表-批量删除", notes="会员订单记录表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.employVipRecordService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "会员订单记录表-通过id查询")
+	@ApiOperation(value="会员订单记录表-通过id查询", notes="会员订单记录表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<EmployVipRecord> queryById(@RequestParam(name="id",required=true) String id) {
+		EmployVipRecord employVipRecord = employVipRecordService.getById(id);
+		if(employVipRecord==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(employVipRecord);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param employVipRecord
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EmployVipRecord employVipRecord) {
+        return super.exportXls(request, employVipRecord, EmployVipRecord.class, "会员订单记录表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, EmployVipRecord.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/entity/EmployVipRecord.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.employVipRecord.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 会员订单记录表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-23
+ * @Version: V1.0
+ */
+@Data
+@TableName("employ_vip_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="employ_vip_record对象", description="会员订单记录表")
+public class EmployVipRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**订单号*/
+	@Excel(name = "订单号", width = 15)
+    @ApiModelProperty(value = "订单号")
+    private java.lang.String payNo;
+	/**订单状态*/
+	@Excel(name = "订单状态", width = 15)
+    @ApiModelProperty(value = "订单状态")
+    private java.lang.String status;
+	/**关联用户id*/
+	@Excel(name = "关联用户id", width = 15)
+    @ApiModelProperty(value = "关联用户id")
+    private java.lang.String userId;
+	/**关联会员类型*/
+	@Excel(name = "关联会员类型", width = 15)
+    @ApiModelProperty(value = "关联会员类型")
+    private java.lang.String vipTypeId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/EmployVipRecordMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.employVipRecord.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.employVipRecord.entity.EmployVipRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 会员订单记录表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-23
+ * @Version: V1.0
+ */
+public interface EmployVipRecordMapper extends BaseMapper<EmployVipRecord> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/xml/EmployVipRecordMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.employVipRecord.mapper.EmployVipRecordMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/IEmployVipRecordService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.employVipRecord.service;
+
+import org.jeecg.modules.employVipRecord.entity.EmployVipRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 会员订单记录表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-23
+ * @Version: V1.0
+ */
+public interface IEmployVipRecordService extends IService<EmployVipRecord> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/impl/EmployVipRecordServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.employVipRecord.service.impl;
+
+import org.jeecg.modules.employVipRecord.entity.EmployVipRecord;
+import org.jeecg.modules.employVipRecord.mapper.EmployVipRecordMapper;
+import org.jeecg.modules.employVipRecord.service.IEmployVipRecordService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 会员订单记录表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-23
+ * @Version: V1.0
+ */
+@Service
+public class EmployVipRecordServiceImpl extends ServiceImpl<EmployVipRecordMapper, EmployVipRecord> implements IEmployVipRecordService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/EmployVipRecordList.vue

@@ -0,0 +1,190 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('会员订单记录表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <employ-vip-record-modal ref="modalForm" @ok="modalFormOk"></employ-vip-record-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EmployVipRecordModal from './modules/EmployVipRecordModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'EmployVipRecordList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      EmployVipRecordModal
+    },
+    data () {
+      return {
+        description: '会员订单记录表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'订单号',
+            align:"center",
+            dataIndex: 'payNo'
+          },
+          {
+            title:'订单状态',
+            align:"center",
+            dataIndex: 'status'
+          },
+          {
+            title:'关联用户id',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'关联会员类型',
+            align:"center",
+            dataIndex: 'vipTypeId'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/employVipRecord/employVipRecord/list",
+          delete: "/employVipRecord/employVipRecord/delete",
+          deleteBatch: "/employVipRecord/employVipRecord/deleteBatch",
+          exportXlsUrl: "/employVipRecord/employVipRecord/exportXls",
+          importExcelUrl: "employVipRecord/employVipRecord/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'payNo',text:'订单号',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'订单状态',dictCode:'	vip_record_status'})
+        fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'vipTypeId',text:'关联会员类型',dictCode:"employ_vip_type,name,id"})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordForm.vue

@@ -0,0 +1,119 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="订单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payNo">
+              <a-input v-model="model.payNo" placeholder="请输入订单号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <a-input v-model="model.status" placeholder="请输入订单状态"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入关联用户id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联会员类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vipTypeId">
+              <a-input v-model="model.vipTypeId" placeholder="请输入关联会员类型"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'EmployVipRecordForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/employVipRecord/employVipRecord/add",
+          edit: "/employVipRecord/employVipRecord/edit",
+          queryById: "/employVipRecord/employVipRecord/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <employ-vip-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></employ-vip-record-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import EmployVipRecordForm from './EmployVipRecordForm'
+
+  export default {
+    name: 'EmployVipRecordModal',
+    components: {
+      EmployVipRecordForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <employ-vip-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-vip-record-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import EmployVipRecordForm from './EmployVipRecordForm'
+  export default {
+    name: 'EmployVipRecordModal',
+    components: {
+      EmployVipRecordForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecord.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/employVipRecord/employVipRecord/list',
+  save='/employVipRecord/employVipRecord/add',
+  edit='/employVipRecord/employVipRecord/edit',
+  deleteOne = '/employVipRecord/employVipRecord/delete',
+  deleteBatch = '/employVipRecord/employVipRecord/deleteBatch',
+  importExcel = '/employVipRecord/employVipRecord/importExcel',
+  exportXls = '/employVipRecord/employVipRecord/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecord.data.ts

@@ -0,0 +1,53 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '订单号',
+    align:"center",
+    dataIndex: 'payNo'
+   },
+   {
+    title: '订单状态',
+    align:"center",
+    dataIndex: 'status'
+   },
+   {
+    title: '关联用户id',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '关联会员类型',
+    align:"center",
+    dataIndex: 'vipTypeId'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '订单号',
+    field: 'payNo',
+    component: 'Input',
+  },
+  {
+    label: '订单状态',
+    field: 'status',
+    component: 'Input',
+  },
+  {
+    label: '关联用户id',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '关联会员类型',
+    field: 'vipTypeId',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecordList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <EmployVipRecordModal @register="registerModal" @success="handleSuccess"></EmployVipRecordModal>
+  </div>
+</template>
+
+<script lang="ts" name="employVipRecord-employVipRecord" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import EmployVipRecordModal from './components/EmployVipRecordModal.vue'
+  import {columns, searchFormSchema} from './employVipRecord.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employVipRecord.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '会员订单记录表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"会员订单记录表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/components/EmployVipRecordModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../employVipRecord.data';
+    import {saveOrUpdate} from '../employVipRecord.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java

@@ -56,6 +56,13 @@ public class NotebookController {
         return notebookService.queryBill(token, employNoteBookId, pageBean);
     }
 
+    //个人记工-全年收支金额
+    @ApiOperation(value="记工记账-全年收支金额", notes="记工记账-全年收支金额")
+    @RequestMapping(value = "/queryBillAmount", method = {RequestMethod.GET})
+    public Result<?> queryBillAmount(@RequestHeader("X-Access-Token") String token, String employNoteBookId){
+        return notebookService.queryBillAmount(token, employNoteBookId);
+    }
+
     //个人记工-技工问题
     @ApiOperation(value="记工记账-技工问题", notes="记工记账-技工问题")
     @RequestMapping(value = "/addQuestion", method = {RequestMethod.POST})

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java

@@ -28,8 +28,8 @@ public class VipController {
     //开通VIP
     @ApiOperation(value="开通VIP", notes="开通VIP")
     @RequestMapping(value = "/addVIP", method = {RequestMethod.POST})
-    public Result<?> addVIP(@RequestHeader("X-Access-Token") String token){
-        return vipService.addVIP(token);
+    public Result<?> addVIP(@RequestHeader("X-Access-Token") String token, String vipTypeId){
+        return vipService.addVIP(token, vipTypeId);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java

@@ -18,6 +18,9 @@ public interface NotebookService {
     //个人记工-全年收支
     public Result<?> queryBill(String token, String employNoteBookId, PageBean pageBean);
 
+    //个人记工-全年收支金额
+    public Result<?> queryBillAmount(String token, String employNoteBookId);
+
     //个人记工-技工问题
     public Result<?> addQuestion(String toke, EmployFeedback employFeedback);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java

@@ -5,6 +5,6 @@ import org.jeecg.common.api.vo.Result;
 public interface VipService {
 
     //开通VIP
-    public Result<?> addVIP(String token);
+    public Result<?> addVIP(String token, String vipTypeId);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java

@@ -109,8 +109,6 @@ public class NotebookServiceImpl implements NotebookService {
     //记工记账-全年收支
     @Override
     public Result<?> queryBill(String token, String employNoteBookId, PageBean pageBean) {
-        //返回信息
-        Map<String, Object> map = new HashMap<>();
 
         try{
             //权限验证
@@ -158,22 +156,81 @@ public class NotebookServiceImpl implements NotebookService {
                     .lambdaQuery()
                     .in(EmployBillInfo::getNotebookId, notebooIds)
                     .page(page);
-            map.put("BillInfo", pageList);
+
+
+            return Result.OK("收支记录", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("收支记录获取失败");
+        }
+    }
+
+    //记工记账-全年收支金额
+    public Result<?> queryBillAmount(String token, String employNoteBookId){
+        //返回信息
+        Map<String, Object> map = new HashMap<>();
+        map.put("incomeCount", 0);
+        map.put("expenditureCount", 0);
+
+        try{
+            //权限验证
+            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+            //获取账本id列表
+            Object[] notebooIds = null;
+            if(null == employNoteBookId){
+                //根据用户id查询用户账本列表
+                List<EmployNotebook> notebookList = employNotebookService
+                        .lambdaQuery()
+                        .eq(EmployNotebook::getUserId, hanHaiMember.getId())
+                        .list();
+
+                //获取账本id列表
+                int size = (int)notebookList.size();
+                notebooIds = new Object[size];
+                int index = 0;
+                for (EmployNotebook employNotebook : notebookList) {
+                    notebooIds[index] = employNotebook.getId();
+                    index++;
+                }
+
+                if(size == 0){
+                    return Result.OK("没有收支记录", map);
+                }
+
+            }else {
+                notebooIds = new Object[]{employNoteBookId};
+
+                //判断用户输入账本id是否为自己所有
+                EmployNotebook employNotebook = employNotebookService
+                        .lambdaQuery()
+                        .eq(EmployNotebook::getUserId, hanHaiMember.getId())
+                        .eq(EmployNotebook::getId, employNoteBookId)
+                        .one();
+                if(null == employNotebook){
+                    return Result.OK("该用户没有此账本的收支记录，请检查账本id输入是否错误", employNotebook);
+                }
+            }
+
+            //根据账本id列表查询收支记录
+            List<EmployBillInfo> pageList = employBillInfoService
+                    .lambdaQuery()
+                    .in(EmployBillInfo::getNotebookId, notebooIds)
+                    .list();
 
             BigDecimal incomeCount = BigDecimal.valueOf(0);//总收入
             BigDecimal expenditureCount = BigDecimal.valueOf(0);//总支出
-            for (EmployBillInfo record : pageList.getRecords()) {
-                if(0 == record.getType()){
-                    incomeCount = incomeCount.add(record.getAmount());
-                }else if(1 == record.getType()){
-                    expenditureCount = expenditureCount.add(record.getAmount());
+            for (EmployBillInfo employBillInfo : pageList) {
+                if(0 == employBillInfo.getType()){
+                    incomeCount = incomeCount.add(employBillInfo.getAmount());
+                }else if(1 == employBillInfo.getType()){
+                    expenditureCount = expenditureCount.add(employBillInfo.getAmount());
                 }
-
             }
             map.put("incomeCount", incomeCount);
             map.put("expenditureCount", expenditureCount);
 
-            return Result.OK("收支记录", map);
+            return Result.OK("收支/支出金额", map);
         }catch (Exception e){
             e.printStackTrace();
             return Result.error("收支记录获取失败");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java

@@ -1,8 +1,13 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiService.VipService;
+import org.jeecg.modules.employVip.entity.EmployVip;
+import org.jeecg.modules.employVipRecord.entity.EmployVipRecord;
+import org.jeecg.modules.employVipType.entity.EmployVipType;
+import org.jeecg.modules.employVipType.service.IEmployVipTypeService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.pay.MpWxPayService;
@@ -23,27 +28,44 @@ public class VipServiceImpl implements VipService {
     @Resource
     private ShiroRealm shiroRealm;
 
+    //权限验证
+    @Resource
+    private IEmployVipTypeService employVipTypeService;
+    /******************************************************************************************************************/
+
     @Override
-    public Result<?> addVIP(String token) {
+    public Result<?> addVIP(String token, String vipTypeId) {
 
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
+        //生成订单信息
+        String payNo = IdWorker.getIdStr();//生成订单号
+        EmployVipRecord vipRecord = new EmployVipRecord();
+        vipRecord.setPayNo(payNo);//订单号
+        vipRecord.setUserId(hanHaiMember.getId());//关联用户id
+        vipRecord.setVipTypeId(vipTypeId);//会员类型
+
+        //根据会员类型查询会员名称
+        EmployVipType vipType = employVipTypeService
+                .lambdaQuery()
+                .eq(EmployVipType::getType, vipTypeId)
+                .one();
+
         //吊起微信支付
-        BigDecimal price = BigDecimal.valueOf(0.01);//价格
-        String productName = "VIP";
-        String orderId = System.currentTimeMillis()+"";
+        BigDecimal price = vipType.getPrice();//价格
+        String productName = vipType.getName();//vip类型
 
         String s = price.multiply(new BigDecimal(100)).toString();
         int i1 = Double.valueOf(s).intValue();
         Object appOrder = mpWxPayService.createOrder(
                 "购买"+ productName ,
                 "127.0.0.1",
-                orderId,
+                payNo,
                 i1,
-                orderId,
+                payNo,
                 hanHaiMember.getAppletOpenid(),
-                "{}");
+                vipRecord.toString());
 
         return Result.OK("支付成功",appOrder);
     }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -134,9 +134,9 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://8.138.162.67:3306/employ?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://110.40.186.41:3306/employ?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
-          password: Fk4q*h@V
+          password: Qy8D3Cne
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -147,7 +147,7 @@ spring:
   #redis 配置
   redis:
     database: 1
-    host: 8.138.162.67
+    host: 110.40.186.41
     lettuce:
       pool:
         max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
@@ -155,7 +155,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 1000ms
-    password: 'gmmGMM@2024'
+    password: 'tyz.888888'
     port: 6379
 #mybatis plus 设置
 mybatis-plus:
@@ -192,11 +192,11 @@ jeecg :
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
-    accessKey: LTAI5tPfZo39q2r9Sr5mW84u
-    secretKey: XxExGallsV4O9nERHpVsQg2XtPCU7r
-    endpoint: oss-cn-guangzhou.aliyuncs.com
-    bucketName: augcl
-    staticDomain: https://img.augcl.com
+    accessKey: LTAI5t5nV2Pw67wVC9ZvtFSb
+    secretKey: perarQgbRK9TPNNb2G97EojoJ6kb9H
+    endpoint: oss-cn-beijing.aliyuncs.com
+    bucketName: teyizhaoimg
+    staticDomain:  https://img.teyizhao.com
   # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES