From 2a98018752ae8844f1f722c49dc8c53435bdc740 Mon Sep 17 00:00:00 2001
From: linfeng <linfngtech001@163.com>
Date: Wed, 7 Jun 2023 10:02:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linfeng-community-vue/src/views/modules/admin/user.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/user.vue b/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/user.vue
index 1edef3b..09a3935 100644
--- a/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/user.vue
+++ b/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/user.vue
@@ -103,13 +103,6 @@
         label="个性签名"
       >
       </el-table-column>
-      <el-table-column
-        prop="tagStr"
-        header-align="center"
-        align="center"
-        label="用户标签"
-      >
-      </el-table-column>
       <el-table-column
         prop="type"
         header-align="center"

From 11edf443de685f494edf215eb157efdcd6afb397 Mon Sep 17 00:00:00 2001
From: linfeng <linfngtech001@163.com>
Date: Thu, 8 Jun 2023 10:27:16 +0800
Subject: [PATCH 2/3] update admin/user.vue

---
 .../src/views/modules/admin/user.vue           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/user.vue b/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/user.vue
index 09a3935..0168bdb 100644
--- a/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/user.vue
+++ b/src/main/resources/static/linfeng-community-vue/src/views/modules/admin/user.vue
@@ -63,7 +63,7 @@
         prop="city"
         header-align="center"
         align="center"
-        label="城市"
+        label="城市IP"
       >
       </el-table-column>
       <el-table-column
@@ -73,14 +73,6 @@
         label="手机号"
       >
       </el-table-column>
-      <el-table-column
-        prop="openid"
-        header-align="center"
-        align="center"
-        width="150"
-        label="小程序openid"
-      >
-      </el-table-column>
       <el-table-column
         prop="status"
         header-align="center"
@@ -117,6 +109,14 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="openId"
+        header-align="center"
+        align="center"
+        width="150"
+        label="小程序openId"
+      >
+      </el-table-column>
       <el-table-column
         prop="updateTime"
         header-align="center"

From a5d346b6773bb1ffa677be3eaacf151b9c0d30da Mon Sep 17 00:00:00 2001
From: linfeng <linfngtech001@163.com>
Date: Sun, 11 Jun 2023 12:29:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/admin/post-add-or-update.vue      | 201 ---------------
 .../test/src/views/modules/admin/post.vue     | 241 ------------------
 2 files changed, 442 deletions(-)
 delete mode 100644 src/main/resources/static/linfeng-community-vue/test/src/views/modules/admin/post-add-or-update.vue
 delete mode 100644 src/main/resources/static/linfeng-community-vue/test/src/views/modules/admin/post.vue

diff --git a/src/main/resources/static/linfeng-community-vue/test/src/views/modules/admin/post-add-or-update.vue b/src/main/resources/static/linfeng-community-vue/test/src/views/modules/admin/post-add-or-update.vue
deleted file mode 100644
index f10f414..0000000
--- a/src/main/resources/static/linfeng-community-vue/test/src/views/modules/admin/post-add-or-update.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-    <el-form-item label="用户id" prop="uid">
-      <el-input v-model="dataForm.uid" placeholder="用户id"></el-input>
-    </el-form-item>
-    <el-form-item label="圈子id" prop="topicId">
-      <el-input v-model="dataForm.topicId" placeholder="圈子id"></el-input>
-    </el-form-item>
-    <el-form-item label="话题id" prop="discussId">
-      <el-input v-model="dataForm.discussId" placeholder="话题id"></el-input>
-    </el-form-item>
-    <el-form-item label="投票id" prop="voteId">
-      <el-input v-model="dataForm.voteId" placeholder="投票id"></el-input>
-    </el-form-item>
-    <el-form-item label="标题" prop="title">
-      <el-input v-model="dataForm.title" placeholder="标题"></el-input>
-    </el-form-item>
-    <el-form-item label="内容" prop="content">
-      <el-input v-model="dataForm.content" placeholder="内容"></el-input>
-    </el-form-item>
-    <el-form-item label="文件" prop="media">
-      <el-input v-model="dataForm.media" placeholder="文件"></el-input>
-    </el-form-item>
-    <el-form-item label="浏览量" prop="readCount">
-      <el-input v-model="dataForm.readCount" placeholder="浏览量"></el-input>
-    </el-form-item>
-    <el-form-item label="置顶" prop="postTop">
-      <el-input v-model="dataForm.postTop" placeholder="置顶"></el-input>
-    </el-form-item>
-    <el-form-item label="帖子类型：1 图文 ，2视频 ，3文章，4投票" prop="type">
-      <el-input v-model="dataForm.type" placeholder="帖子类型：1 图文 ，2视频 ，3文章，4投票"></el-input>
-    </el-form-item>
-    <el-form-item label="地址名称" prop="address">
-      <el-input v-model="dataForm.address" placeholder="地址名称"></el-input>
-    </el-form-item>
-    <el-form-item label="经度" prop="longitude">
-      <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
-    </el-form-item>
-    <el-form-item label="纬度" prop="latitude">
-      <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
-    </el-form-item>
-    <el-form-item label="创建时间" prop="createTime">
-      <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
-    </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {
-          id: 0,
-          uid: '',
-          topicId: '',
-          discussId: '',
-          voteId: '',
-          title: '',
-          content: '',
-          media: '',
-          readCount: '',
-          postTop: '',
-          type: '',
-          address: '',
-          longitude: '',
-          latitude: '',
-          createTime: ''
-        },
-        dataRule: {
-          uid: [
-            { required: true, message: '用户id不能为空', trigger: 'blur' }
-          ],
-          topicId: [
-            { required: true, message: '圈子id不能为空', trigger: 'blur' }
-          ],
-          discussId: [
-            { required: true, message: '话题id不能为空', trigger: 'blur' }
-          ],
-          voteId: [
-            { required: true, message: '投票id不能为空', trigger: 'blur' }
-          ],
-          title: [
-            { required: true, message: '标题不能为空', trigger: 'blur' }
-          ],
-          content: [
-            { required: true, message: '内容不能为空', trigger: 'blur' }
-          ],
-          media: [
-            { required: true, message: '文件不能为空', trigger: 'blur' }
-          ],
-          readCount: [
-            { required: true, message: '浏览量不能为空', trigger: 'blur' }
-          ],
-          postTop: [
-            { required: true, message: '置顶不能为空', trigger: 'blur' }
-          ],
-          type: [
-            { required: true, message: '帖子类型：1 图文 ，2视频 ，3文章，4投票不能为空', trigger: 'blur' }
-          ],
-          address: [
-            { required: true, message: '地址名称不能为空', trigger: 'blur' }
-          ],
-          longitude: [
-            { required: true, message: '经度不能为空', trigger: 'blur' }
-          ],
-          latitude: [
-            { required: true, message: '纬度不能为空', trigger: 'blur' }
-          ],
-          createTime: [
-            { required: true, message: '创建时间不能为空', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods: {
-      init (id) {
-        this.dataForm.id = id || 0
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
-            this.$http({
-              url: this.$http.adornUrl(`/admin/post/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.uid = data.post.uid
-                this.dataForm.topicId = data.post.topicId
-                this.dataForm.discussId = data.post.discussId
-                this.dataForm.voteId = data.post.voteId
-                this.dataForm.title = data.post.title
-                this.dataForm.content = data.post.content
-                this.dataForm.media = data.post.media
-                this.dataForm.readCount = data.post.readCount
-                this.dataForm.postTop = data.post.postTop
-                this.dataForm.type = data.post.type
-                this.dataForm.address = data.post.address
-                this.dataForm.longitude = data.post.longitude
-                this.dataForm.latitude = data.post.latitude
-                this.dataForm.createTime = data.post.createTime
-              }
-            })
-          }
-        })
-      },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: this.$http.adornUrl(`/admin/post/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: 'post',
-              data: this.$http.adornData({
-                'id': this.dataForm.id || undefined,
-                'uid': this.dataForm.uid,
-                'topicId': this.dataForm.topicId,
-                'discussId': this.dataForm.discussId,
-                'voteId': this.dataForm.voteId,
-                'title': this.dataForm.title,
-                'content': this.dataForm.content,
-                'media': this.dataForm.media,
-                'readCount': this.dataForm.readCount,
-                'postTop': this.dataForm.postTop,
-                'type': this.dataForm.type,
-                'address': this.dataForm.address,
-                'longitude': this.dataForm.longitude,
-                'latitude': this.dataForm.latitude,
-                'createTime': this.dataForm.createTime
-              })
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
-        })
-      }
-    }
-  }
-</script>
diff --git a/src/main/resources/static/linfeng-community-vue/test/src/views/modules/admin/post.vue b/src/main/resources/static/linfeng-community-vue/test/src/views/modules/admin/post.vue
deleted file mode 100644
index 8f93552..0000000
--- a/src/main/resources/static/linfeng-community-vue/test/src/views/modules/admin/post.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <!-- <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
-      </el-form-item> -->
-      <el-form-item>
-        <!-- <el-button @click="getDataList()">查询</el-button> -->
-        <el-button v-if="isAuth('admin:post:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('admin:post:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        prop="id"
-        header-align="center"
-        align="center"
-        label="id">
-      </el-table-column>
-      <el-table-column
-        prop="uid"
-        header-align="center"
-        align="center"
-        label="用户id">
-      </el-table-column>
-      <el-table-column
-        prop="topicId"
-        header-align="center"
-        align="center"
-        label="圈子id">
-      </el-table-column>
-      <el-table-column
-        prop="discussId"
-        header-align="center"
-        align="center"
-        label="话题id">
-      </el-table-column>
-      <el-table-column
-        prop="voteId"
-        header-align="center"
-        align="center"
-        label="投票id">
-      </el-table-column>
-      <el-table-column
-        prop="title"
-        header-align="center"
-        align="center"
-        label="标题">
-      </el-table-column>
-      <el-table-column
-        prop="content"
-        header-align="center"
-        align="center"
-        label="内容">
-      </el-table-column>
-      <el-table-column
-        prop="media"
-        header-align="center"
-        align="center"
-        label="文件">
-      </el-table-column>
-      <el-table-column
-        prop="readCount"
-        header-align="center"
-        align="center"
-        label="浏览量">
-      </el-table-column>
-      <el-table-column
-        prop="postTop"
-        header-align="center"
-        align="center"
-        label="置顶">
-      </el-table-column>
-      <el-table-column
-        prop="type"
-        header-align="center"
-        align="center"
-        label="帖子类型：1 图文 ，2视频 ，3文章，4投票">
-      </el-table-column>
-      <el-table-column
-        prop="address"
-        header-align="center"
-        align="center"
-        label="地址名称">
-      </el-table-column>
-      <el-table-column
-        prop="longitude"
-        header-align="center"
-        align="center"
-        label="经度">
-      </el-table-column>
-      <el-table-column
-        prop="latitude"
-        header-align="center"
-        align="center"
-        label="纬度">
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-  </div>
-</template>
-
-<script>
-  import AddOrUpdate from './post-add-or-update'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          key: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
-      }
-    },
-    components: {
-      AddOrUpdate
-    },
-    activated () {
-      this.getDataList()
-    },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/admin/post/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'key': this.dataForm.key
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.id
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/admin/post/delete'),
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        })
-      }
-    }
-  }
-</script>