feat: 删除不需要内容

2024-11-12 18:29:59 +08:00 · 2024-11-12 18:29:59 +08:00 · aa06cb08d6
parent f16e46ff33
commit aa06cb08d6
5 changed files with 83 additions and 80 deletions
--- a/ReadMe.md
+++ b/ReadMe.md
@ -8,16 +8,19 @@ Pure-admin文档：https://pure-admin.github.io/pure-admin-doc

 # 项目预览

-不知道为什么，图床用的使自己的，Gitee就是不显示其它GitHub和Gitea都能显示就Gitee显示不出来，如果想用Gitee就把ReadMe文件下载下来也行；或者把项目clone下来看也可以
-
 **线上地址**

 - 正式线上预览地址：http://bunny-web.site/#/welcome
+
  - 线上地址目前使用的是90天的SSL证书，可能会提示链接不安全，忽略就好了

 - 测试预览地址：http://106.15.251.123/#/welcome
  - 服务器到期时间：12月30日

+**打包视频**
+
+https://www.bilibili.com/video/BV1AYm8YSEKY/
+
 **Github地址**

 - [前端地址](https://github.com/BunnyMaster/bunny-admin-web.git)
@ -47,7 +50,7 @@ sudo yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/cen
 yum list docker-ce --showduplicates | sort -r

 # 安装docker
-yum -y install docker-ce.x86_64 
+yum -y install docker-ce.x86_64

 # 开机启动docker
 systemctl enable docker
@ -78,7 +81,7 @@ tcp-keepalive 300 #防止出现远程主机强迫关闭了一个现有的连接
 **删除注释**

 ```
-daemonize no 
+daemonize no
 requirepass 123456
 appendonly yes
 tcp-keepalive 300
@ -162,20 +165,20 @@ FLUSH PRIVILEGES;
 > skip-name-resolve
 > secure-file-priv=/var/lib/mysql-files
 > user=mysql
-> 
+>
 > # 设置字符集
 > character-set-server=utf8mb4
 > collation-server=utf8mb4_unicode_ci
-> 
+>
 > # 设置服务器ID（如果是复制集群，确保每个节点的ID唯一）
 > server-id=1
-> 
+>
 > # 启用二进制日志
 > log-bin=mysql-bin
-> 
+>
 > # 设置表名不区分大小写
 > lower_case_table_names = 1
-> 
+>
 > ```

 ### 数据库文件
@ -1059,7 +1062,7 @@ server {
 > 命令预览
 >
 > ```sh
-> docker build -f Dockerfile -t bunny_auth_web:1.0.0 . && docker run -p 80:443 -p 443:443 --name bunny_auth_web --restart always bunny_auth_web:1.0.0 
+> docker build -f Dockerfile -t bunny_auth_web:1.0.0 . && docker run -p 80:443 -p 443:443 --name bunny_auth_web --restart always bunny_auth_web:1.0.0
 > ```

 ## 后端部署
--- a/common/common-generator/src/main/resources/vms/web/columns.vm
+++ b/common/common-generator/src/main/resources/vms/web/columns.vm
@ -12,15 +12,16 @@ export const columns: TableColumnList = [
 #end
 { label: $t('table.updateTime'), prop: 'updateTime', sortable: true, width: 160 },
 { label: $t('table.createTime'), prop: 'createTime', sortable: true, width: 160 },
-{ label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 90 },
-{ label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+{ label: $t('table.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
+{ label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 130 },
 { label: $t('table.operation'), fixed: 'right', width: 210, slot: 'operation' },
 ];

 // 添加规则
-export const rules = reactive<FormRules>({
-#foreach($field in $baseFieldList)
-// $field.annotation
-    $field.name: [{ required: true, message: `$leftBrace$t('input')}$leftBrace$t('${field.name}')}`, trigger: 'blur' }],
-#end
-});
+export const rules = reactive
+<FormRules>({
+    #foreach($field in $baseFieldList)
+        // $field.annotation
+        $field.name: [{ required: true, message: `$leftBrace$t('input')}$leftBrace$t('${field.name}')}`, trigger: 'blur' }],
+    #end
+    });
--- a/common/common-generator/src/main/resources/vms/web/index.vm
+++ b/common/common-generator/src/main/resources/vms/web/index.vm
@ -1,18 +1,7 @@
 <script lang="ts" setup>
-    import { onMounted, ref } from 'vue';
-    import { columns } from '${columnsPath}';
-    import PureTableBar from '@/components/TableBar/src/bar';
-    import AddFill from '@iconify-icons/ri/add-circle-line';
-    import PureTable from '@pureadmin/table';
-    import { deleteIds, onAdd, onDelete, onDeleteBatch, onSearch, onUpdate } from '${hookPath}';
-    import Delete from '@iconify-icons/ep/delete';
-    import EditPen from '@iconify-icons/ep/edit-pen';
-    import Refresh from '@iconify-icons/ep/refresh';
-    import { selectUserinfo } from '@/components/Table/Userinfo/columns';
-    import { $t } from '@/plugins/i18n';
-    import { use${originalName}Store } from '${storePath}';
-    import { useRenderIcon } from '@/components/CommonIcon/src/hooks';
-    import { FormInstance } from "element-plus";
+    import {onMounted, ref} from 'vue';
+    import {deleteIds, onSearch} from '';
+    import {FormInstance} from "element-plus";

    const tableRef = ref();
    const formRef = ref();
@ -20,57 +9,60 @@

    /** 当前页改变时 */
    const onCurrentPageChange = async (value: number) => {
-        ${lowercaseName}Store.pagination.currentPage = value;
+            ${lowercaseName}Store.pagination.currentPage = value;
        await onSearch();
    };

    /** 当分页发生变化 */
    const onPageSizeChange = async (value: number) => {
-        ${lowercaseName}Store.pagination.pageSize = value;
+            ${lowercaseName}Store.pagination.pageSize = value;
        await onSearch();
    };

-/** 选择多行 */
-const onSelectionChange = (rows: Array<any>) => {
-    deleteIds.value = rows.map((row: any) => row.id);
-};
+    /** 选择多行 */
+    const onSelectionChange = (rows: Array<any>) => {
+        deleteIds.value = rows.map((row: any) => row.id);
+    };

-/** 重置表单 */
-const resetForm = async (formEl: FormInstance | undefined) => {
+    /** 重置表单 */
+    const resetForm = async (formEl: FormInstance | undefined) => {
        if (!formEl) return;
        formEl.resetFields();
        await onSearch();
-};
+    };

-onMounted(() => {
+    onMounted(() => {
        onSearch();
-});
+    });
 </script>

 <template>
    <div class="main">
        <el-form ref="formRef" :inline="true" :model="${lowercaseName}Store.form" class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto">
-#foreach($item in $formList)
+            #foreach($item in $formList)

                <!-- $item.annotation -->
                <el-form-item :label="$t('${item.name}')" prop="${item.name}">
-                <el-input v-model="${lowercaseName}Store.form.${item.name}" :placeholder="`$leftBrace$t('input')}$leftBrace$t('${item.name}')}`" class="!w-[180px]" clearable />
-            </el-form-item>
-#end
+                    <el-input v-model="${lowercaseName}Store.form.${item.name}" :placeholder="`$leftBrace$t('input')}$leftBrace$t('${item.name}')}`"
+                              class="!w-[180px]" clearable/>
+                </el-form-item>
+            #end
            <el-form-item>
-                <el-button :icon="useRenderIcon('ri:search-line')" :loading="${lowercaseName}Store.loading" type="primary" @click="onSearch"> {{ $t('search') }} </el-button>
+                <el-button :icon="useRenderIcon('ri:search-line')" :loading="${lowercaseName}Store.loading" type="primary" @click="onSearch"> {{ $t('search')
+                    }}
+                </el-button>
                <el-button :icon="useRenderIcon(Refresh)" @click="resetForm(formRef)"> {{ $t('buttons.reset') }}</el-button>
            </el-form-item>
        </el-form>

        <PureTableBar :columns="columns" title="${classDescription}" @fullscreen="tableRef.setAdaptive()" @refresh="onSearch">
            <template #buttons>
-                <el-button :icon="useRenderIcon(AddFill)" type="primary" @click="onAdd">  {{ $t('addNew') }} </el-button>
+                <el-button :icon="useRenderIcon(AddFill)" type="primary" @click="onAdd"> {{ $t('addNew') }}</el-button>

                <!-- 批量删除按钮 -->
-				<el-button v-show="deleteIds.length > 0" :icon="useRenderIcon(Delete)" type="danger" @click="onDeleteBatch">
-					{{ $t('delete_batches') }}
-				</el-button>
+                <el-button v-show="deleteIds.length > 0" :icon="useRenderIcon(Delete)" type="danger" @click="onDeleteBatch">
+                    {{ $t('delete_batches') }}
+                </el-button>
            </template>

            <template v-slot="{ size, dynamicColumns }">
@ -92,22 +84,29 @@ onMounted(() => {
                        :pagination="${lowercaseName}Store.pagination"
                        @page-size-change="onPageSizeChange"
                        @selection-change="onSelectionChange"
-					    @page-current-change="onCurrentPageChange"
+                        @page-current-change="onCurrentPageChange"
                >

                    <template #createUser="{ row }">
-                        <el-button link type="primary" @click="selectUserinfo(row.createUser)">{{ $t('table.createUser') }} </el-button>
+                        <el-button v-show="row.createUser" link type="primary" @click="selectUserinfo(row.createUser)">
+                            {{ row.createUsername }}
+                        </el-button>
                    </template>

                    <template #updateUser="{ row }">
-                        <el-button link type="primary" @click="selectUserinfo(row.updateUser)">{{ $t('table.updateUser') }} </el-button>
+                        <el-button v-show="row.updateUser" link type="primary" @click="selectUserinfo(row.updateUser)">
+                            {{ row.updateUsername }}
+                        </el-button>
                    </template>

                    <template #operation="{ row }">
-                        <el-button :icon="useRenderIcon(EditPen)" :size="size" class="reset-margin" link type="primary" @click="onUpdate(row)"> {{ $t('modify') }} </el-button>
-                        <el-button :icon="useRenderIcon(AddFill)" :size="size" class="reset-margin" link type="primary" @click="onAdd"> {{ $t('addNew') }} </el-button>
+                        <el-button :icon="useRenderIcon(EditPen)" :size="size" class="reset-margin" link type="primary" @click="onUpdate(row)"> {{ $t('modify')
+                            }}
+                        </el-button>
+                        <el-button :icon="useRenderIcon(AddFill)" :size="size" class="reset-margin" link type="primary" @click="onAdd"> {{ $t('addNew') }}
+                        </el-button>
                        <!-- TODO 待完成 -->
-      			        <el-popconfirm :title="`${leftBrace}$t('delete')}${row.email}?`" @confirm="onDelete(row)">
+                        <el-popconfirm :title="`${leftBrace}$t('delete')}${row.email}?`" @confirm="onDelete(row)">
                            <template #reference>
                                <el-button :icon="useRenderIcon(Delete)" :size="size" class="reset-margin" link type="primary">
                                    {{ $t('delete') }}
--- a/service/pom.xml
+++ b/service/pom.xml
@ -72,10 +72,10 @@
            <artifactId>spring-boot-starter-websocket</artifactId>
        </dependency>
        <!-- 多数据库源插件 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>com.baomidou</groupId> -->
+        <!--     <artifactId>dynamic-datasource-spring-boot3-starter</artifactId> -->
+        <!-- </dependency> -->
        <!-- quartz定时任务 -->
        <dependency>
            <groupId>org.quartz-scheduler</groupId>
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@ -8,24 +8,24 @@ spring:
      max-file-size: 6MB

  datasource:
-    #    type: com.zaxxer.hikari.HikariDataSource
-    #    driver-class-name: com.mysql.cj.jdbc.Driver
-    #    url: jdbc:mysql://${bunny.datasource.host}:${bunny.datasource.port}/${bunny.datasource.sqlData}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
-    #    username: ${bunny.datasource.username}
-    #    password: ${bunny.datasource.password}
-    dynamic:
-      primary: master #设置默认的数据源或者数据源组,默认值即为master
-      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
-      grace-destroy: false #是否优雅关闭数据源，默认为false，设置为true时，关闭数据源时如果数据源中还存在活跃连接，至多等待10s后强制关闭
-      datasource:
-        master:
-          type: com.zaxxer.hikari.HikariDataSource
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://${bunny.master.host}:${bunny.master.port}/${bunny.master.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
-          username: ${bunny.master.username}
-          password: ${bunny.master.password}
-      aop:
-        enabled: true
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://${bunny.master.host}:${bunny.master.port}/${bunny.master.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+    username: ${bunny.master.username}
+    password: ${bunny.master.password}
+  #    dynamic:
+  #      primary: master #设置默认的数据源或者数据源组,默认值即为master
+  #      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+  #      grace-destroy: false #是否优雅关闭数据源，默认为false，设置为true时，关闭数据源时如果数据源中还存在活跃连接，至多等待10s后强制关闭
+  #      datasource:
+  #        master:
+  #          type: com.zaxxer.hikari.HikariDataSource
+  #          driver-class-name: com.mysql.cj.jdbc.Driver
+  #          url: jdbc:mysql://${bunny.master.host}:${bunny.master.port}/${bunny.master.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true
+  #          username: ${bunny.master.username}
+  #          password: ${bunny.master.password}
+  #      aop:
+  #        enabled: true

  data:
    redis: