feat: 删除不需要内容

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)

common/common-generator/src/main/resources/vms/web/columns.vm

@@ -12,13 +12,14 @@ 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.createUser'), prop: 'createUser', slot: 'createUser', width: 130 },
-{ label: $t('table.updateUser'), prop: 'updateUser', slot: 'updateUser', width: 90 },
+{ 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>({
+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' }],

common/common-generator/src/main/resources/vms/web/index.vm

@@ -1,17 +1,6 @@
 <script lang="ts" setup>
     import {onMounted, ref} from 'vue';
-    import { columns } from '${columnsPath}';
+    import {deleteIds, onSearch} from '';
-    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";
 
     const tableRef = ref();
@@ -54,11 +43,14 @@ onMounted(() => {
 
                 <!-- $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-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>
@@ -96,16 +88,23 @@ onMounted(() => {
                 >
 
                     <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(EditPen)" :size="size" class="reset-margin" link type="primary" @click="onUpdate(row)"> {{ $t('modify')
-                        <el-button :icon="useRenderIcon(AddFill)" :size="size" class="reset-margin" link type="primary" @click="onAdd"> {{ $t('addNew') }} </el-button>
+                            }}
+                        </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)">
                             <template #reference>

service/pom.xml

@@ -72,10 +72,10 @@
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
         <!-- 多数据库源插件 -->
-        <dependency>
+        <!-- <dependency> -->
-            <groupId>com.baomidou</groupId>
+        <!--     <groupId>com.baomidou</groupId> -->
-            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+        <!--     <artifactId>dynamic-datasource-spring-boot3-starter</artifactId> -->
-        </dependency>
+        <!-- </dependency> -->
         <!-- quartz定时任务 -->
         <dependency>
             <groupId>org.quartz-scheduler</groupId>

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:
+  #    dynamic:
-        enabled: true
+  #      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: