ccjgmwz 3 năm trước cách đây
mục cha
commit
92b16fca39

+ 0 - 9
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserServiceImpl.java

@@ -111,7 +111,6 @@ public class AdminUserServiceImpl implements AdminUserService {
             }
             UserDO userDO = userMapper.selectById(user.getId());
             BeanUtils.copyProperties(user,userDO);
-            userDO.setRoleIds(JSONObject.toJSONString(user.getRoleIds()));
             Wrapper wrapper = new EntityWrapper();
             wrapper.eq("user_id", user.getId());
             dataSourceTransactionManager.commit(transactionStatus);
@@ -122,9 +121,6 @@ public class AdminUserServiceImpl implements AdminUserService {
                 userDO.setPassword(MD5Util.md5(userDO.getPassword(), userDOExist.getUserName()));
             }
             userDO.setUserName(user.getUserName());
-            if (!CollectionUtils.isEmpty(user.getRoleIds())) {
-                userDO.setRoleIds(JSONObject.toJSONString(user.getRoleIds()));
-            }
             userDO.setCompanyId(companyId);
             if (userMapper.updateById(userDO) > 0) {
                 return true;
@@ -188,12 +184,7 @@ public class AdminUserServiceImpl implements AdminUserService {
             UserDTO userDTO = new UserDTO();
             BeanUtils.copyProperties(userDO, userDTO);
             userDTO.setPassword(null);
-            if(userDO.getRoleIds() == null){
-                userDTOS.add(userDTO);
-                continue;
-            }
 
-            userDTO.setRoleIds(JSONObject.parseArray(userDO.getRoleIds(), Long.class));
             userDTOS.add(userDTO);
         }
         return new Page<UserDTO>(userDTOS, pageNo, limit, count);

+ 0 - 11
unimall-admin/src/api/storage.js

@@ -1,11 +0,0 @@
-import request from '@/utils/request'
-const uploadPath = process.env.HOST + '/upload/admin'
-export { uploadPath }
-
-export function createStorage(data) {
-  return request({
-    url: uploadPath,
-    method: 'post',
-    data
-  })
-}

+ 0 - 57
unimall-admin/src/api/store.js

@@ -1,57 +0,0 @@
-import request from '@/utils/request'
-import Qs from 'qs'
-
-export function listStore(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.store',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-export function createStore(data) {
-  return request({
-    method: 'post',
-    data: Qs.stringify({
-      _gp: 'admin.store',
-      _mt: 'create',
-      ...data
-    })
-  })
-}
-
-export function updateStore(data) {
-  return request({
-    method: 'post',
-    data: Qs.stringify({
-      _gp: 'admin.store',
-      _mt: 'edit',
-      ...data
-    })
-  })
-}
-
-export function deleteStore(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.store',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}
-
-export function getStoreList(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.store',
-      _mt: 'getStoreList'
-    }
-  })
-}
-

+ 0 - 46
unimall-admin/src/api/storeUser.js

@@ -1,46 +0,0 @@
-import request from '@/utils/request'
-import Qs from 'qs'
-
-export function listStoreUser(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.storeuser',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-export function createStoreUser(data) {
-  return request({
-    method: 'post',
-    data: Qs.stringify({
-      _gp: 'admin.storeuser',
-      _mt: 'create',
-      ...data
-    })
-  })
-}
-
-export function updateStoreUser(data) {
-  return request({
-    method: 'post',
-    data: Qs.stringify({
-      _gp: 'admin.storeuser',
-      _mt: 'edit',
-      ...data
-    })
-  })
-}
-
-export function deleteStoreUser(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.storeuser',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}

+ 0 - 46
unimall-admin/src/api/task.js

@@ -1,46 +0,0 @@
-import request from '@/utils/request'
-import Qs from 'qs'
-
-export function listTask(query) {
-  return request({
-    method: 'get',
-    params: {
-      _gp: 'admin.task',
-      _mt: 'list',
-      ...query
-    }
-  })
-}
-
-export function createTask(data) {
-  return request({
-    method: 'post',
-    data: Qs.stringify({
-      _gp: 'admin.task',
-      _mt: 'create',
-      ...data
-    })
-  })
-}
-
-export function updateTask(data) {
-  return request({
-    method: 'post',
-    data: Qs.stringify({
-      _gp: 'admin.task',
-      _mt: 'edit',
-      ...data
-    })
-  })
-}
-
-export function deleteTask(id) {
-  return request({
-    method: 'post',
-    params: {
-      _gp: 'admin.task',
-      _mt: 'delete',
-      id: id
-    }
-  })
-}

+ 0 - 502
unimall-admin/src/views/news/news.vue

@@ -1,502 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 查询和其他操作 -->
-    <div class="filter-container">
-      <el-select
-        v-model="listQuery.category"
-        clearable
-        placeholder="请选择类别"
-        class="filter-item"
-        size="small"
-      >
-        <el-option
-          v-for="dict in categoryMap"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
-      <el-input
-        v-model="listQuery.title"
-        clearable
-        class="filter-item"
-        style="width: 200px;"
-        placeholder="请输入标题"
-        size="small"
-      />
-      <el-input
-        v-model="listQuery.from"
-        clearable
-        class="filter-item"
-        style="width: 200px;"
-        placeholder="请输入来源"
-        size="small"
-      />
-      <el-button
-        v-permission="['news:news:list']"
-        class="filter-item"
-        type="primary"
-        size="mini"
-        icon="el-icon-search"
-        @click="handleFilter"
-      >查找</el-button
-      >
-      <el-button
-        v-permission="['news:news:create']"
-        class="filter-item"
-        type="primary"
-        size="mini"
-        icon="el-icon-edit"
-        @click="handleCreate"
-      >添加</el-button
-      >
-    </div>
-
-    <!-- 查询结果 -->
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      size="small"
-      element-loading-text="正在查询中。。。"
-      border
-      fit
-      highlight-current-row
-    >
-      <el-table-column
-        :formatter="typeFormat"
-        align="center"
-        label="类别"
-        prop="category"
-      />
-      <el-table-column align="center" label="标题" prop="title" />
-      <el-table-column
-        align="center"
-        label="标题图片"
-        prop="titleImg"
-        width="120px"
-      >
-        <template slot-scope="scope">
-          <img
-            v-if="scope.row.titleImg"
-            :src="scope.row.titleImg"
-            width="100px"
-            height="100px"
-          >
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="来源" prop="from" />
-      <el-table-column align="center" label="更新时间" prop="gmtUpdate">
-        <template slot-scope="scope">{{
-          scope.row.gmtUpdate | formatTime
-        }}</template>
-      </el-table-column>
-      <el-table-column
-        align="center"
-        label="操作"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            v-permission="['news:news:edit']"
-            type="primary"
-            size="mini"
-            @click="handleUpdate(scope.row)"
-          >编辑</el-button
-          >
-          <el-button
-            v-permission="['news:news:delete']"
-            type="danger"
-            size="mini"
-            @click="handleDelete(scope.row)"
-          >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.page"
-      :limit.sync="listQuery.limit"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
-      <el-form
-        ref="dataForm"
-        :rules="rules"
-        :model="dataForm"
-        status-icon
-        label-position="left"
-        label-width="100px"
-        style="width: 800px; margin-left:10px;"
-      >
-        <el-form-item label="id" prop="id" hidden>
-          <el-input v-model="dataForm.id" />
-        </el-form-item>
-        <el-form-item label="类别" prop="category">
-          <el-select v-model="dataForm.category" placeholder="请选择类别">
-            <el-option
-              v-for="(dict, index) in options"
-              :key="index"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="dataForm.title" />
-        </el-form-item>
-        <el-form-item label="标题图片" prop="titleImg">
-          <el-upload
-            :headers="headers"
-            :action="uploadPath"
-            :show-file-list="false"
-            :on-success="uploadSuccessHandle"
-            :before-upload="onBeforeUpload"
-            class="avatar-uploader"
-            accept=".jpg, .jpeg, .png, .gif"
-          >
-            <img
-              v-if="dataForm.titleImg"
-              ref="adImg"
-              :src="dataForm.titleImg"
-              class="avatar"
-            >
-            <i v-else class="el-icon-plus avatar-uploader-icon" />
-          </el-upload>
-        </el-form-item>
-        <el-form-item label="简介" prop="abstractContent">
-          <textarea v-model="dataForm.abstractContent" cols="100" rows="10" />
-        </el-form-item>
-        <el-form-item label="来源" prop="from">
-          <el-input v-model="dataForm.from" />
-        </el-form-item>
-        <el-form-item label="内容" prop="content">
-          <editor :init="editorInit" v-model="dataForm.content" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取消</el-button>
-        <el-button
-          v-if="dialogStatus == 'create'"
-          :loading="submiting"
-          type="primary"
-          @click="createData"
-        >确定</el-button
-        >
-        <el-button
-          v-else
-          :loading="submiting"
-          type="primary"
-          @click="updateData"
-        >确定</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listNews, createNews, updateNews, deleteNews } from '@/api/news'
-import Pagination from '@/components/Pagination'
-import { uploadPath, createStorage } from '@/api/storage'
-import { getToken } from '@/utils/auth'
-import Editor from '@tinymce/tinymce-vue'
-const categoryMap = []
-export default {
-  name: 'News',
-  components: { Pagination, Editor },
-  data() {
-    return {
-      categoryMap,
-      uploadPath,
-      config: {
-        // 初始容器高度
-        initialFrameHeight: 550,
-        // 初始容器宽度
-        initialFrameWidth: 750,
-        // 关闭自动保存
-        enableAutoSave: true
-      },
-      content: '请输入内容',
-      list: null,
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        page: 1,
-        limit: 20
-      },
-      dataForm: {
-        id: undefined
-      },
-      category: '',
-      dialogFormVisible: false,
-      submiting: false,
-      dialogStatus: '',
-      textMap: {
-        update: '编辑',
-        create: '创建'
-      },
-      rules: {
-        category: [
-          { required: true, message: '类别名称不能为空', trigger: 'blur' }
-        ],
-        title: [
-          { required: true, message: '请输入标题', trigger: 'blur' },
-          { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
-        ],
-        titleImg: [
-          { required: true, message: '标题图片不能为空', trigger: 'blur' }
-        ],
-        content: [
-          { required: true, message: '内容不能为空', trigger: 'blur' }
-        ],
-        from: [
-          { required: true, message: '来源不能为空', trigger: 'blur' }
-        ],
-        gmtUpdate: [
-          { required: true, message: '更新时间不能为空', trigger: 'blur' }
-        ],
-        abstractContent: [
-          { required: true, message: '简介不能为空', trigger: 'blur' }
-        ]
-      },
-      editorInit: {
-        language: 'zh_CN',
-        convert_urls: false,
-        height: 550,
-        width: 750,
-        plugins: [
-          'lineheight',
-          'advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools importcss insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount '
-        ],
-        toolbar: [
-          'lineheight searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat subscript superscript code codesample',
-          'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen '
-        ],
-        images_upload_handler: function(blobInfo, success, failure) {
-          const formData = new FormData()
-          formData.append('file', blobInfo.blob())
-          createStorage(formData)
-            .then(res => {
-              success(res.data.url)
-            })
-            .catch(() => {
-              failure('上传失败,请重新上传')
-            })
-        }
-      },
-      options: [{
-        value: '2',
-        label: '行业新闻'
-      }],
-      value: ''
-    }
-  },
-  computed: {
-    headers() {
-      return {
-        accessToken: getToken()
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.getDicts('news_type').then(response => {
-      response.data.data.forEach((item, index) => {
-        response.data.data[index].value = parseInt(
-          response.data.data[index].value
-        )
-      })
-      this.categoryMap = response.data.data
-    })
-  },
-  methods: {
-    getList() {
-      this.listLoading = true
-      listNews(this.listQuery)
-        .then(response => {
-          this.list = response.data.data.items
-          this.total = response.data.data.total
-          this.listLoading = false
-        })
-        .catch(() => {
-          this.list = []
-          this.total = 0
-          this.listLoading = false
-        })
-    },
-    typeFormat(row, column) {
-      return this.selectDictLabel(this.categoryMap, row.category)
-    },
-    handleFilter() {
-      this.listQuery.page = 1
-      this.getList()
-    },
-    resetForm() {
-      this.dataForm = {
-        id: undefined
-      }
-    },
-    handleCreate() {
-      this.resetForm()
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    createData() {
-      this.$refs['dataForm'].validate(valid => {
-        if (valid) {
-          this.submiting = true
-          createNews(this.dataForm)
-            .then(response => {
-              this.list.unshift(response.data.data)
-              this.dialogFormVisible = false
-              this.$notify.success({
-                title: '成功',
-                message: '添加成功'
-              })
-              this.submiting = false
-            })
-            .catch(response => {
-              this.$notify.error({
-                title: '失败',
-                message: response.data.errmsg
-              })
-              this.submiting = false
-            })
-        }
-      })
-    },
-    handleUpdate(row) {
-      this.dataForm = Object.assign({}, row)
-      this.category = Number(this.dataForm.category)
-      this.dialogStatus = 'update'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    updateData() {
-      this.$refs['dataForm'].validate(valid => {
-        if (valid) {
-          this.submiting = true
-          updateNews(this.dataForm)
-            .then(() => {
-              for (const v of this.list) {
-                if (v.id === this.dataForm.id) {
-                  const index = this.list.indexOf(v)
-                  this.list.splice(index, 1, this.dataForm)
-                  break
-                }
-              }
-              this.dialogFormVisible = false
-              this.submiting = false
-              this.$notify.success({
-                title: '成功',
-                message: '更新成功'
-              })
-            })
-            .catch(response => {
-              this.$notify.error({
-                title: '失败',
-                message: response.data.errmsg
-              })
-              this.submiting = false
-            })
-        }
-      })
-    },
-    handleDelete(row) {
-      this.$confirm(
-        '此操作将永久删除该记录---' + row.id + '---, 是否继续?',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      )
-        .then(() => {
-          deleteNews(row.id)
-            .then(response => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功'
-              })
-              const index = this.list.indexOf(row)
-              this.list.splice(index, 1)
-            })
-            .catch(response => {
-              this.$notify.error({
-                title: '失败',
-                message: response.data.errmsg
-              })
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    // 上传图片了处理图片
-    uploadSuccessHandle(e, file) {
-      const that = this
-      this.dataForm.titleImg = e.url
-      this.dialogFormVisible = false
-      this.dialogFormVisible = true
-    },
-    onBeforeUpload(file) {
-      const isIMAGE =
-        file.type === 'image/jpeg' || 'image/gif' || 'image/png' || 'image/jpg'
-      const isLt1M = file.size / 1024 / 1024 < 1
-
-      if (!isIMAGE) {
-        this.$message.error('上传文件只能是图片格式!')
-      }
-      if (!isLt1M) {
-        this.$message.error('上传文件大小不能超过 1MB!')
-      }
-      return isIMAGE && isLt1M
-    }
-  }
-}
-</script>
-<style lang="scss" scop>
-.show-content {
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  padding: 9px;
-  min-height: 614px;
-  p {
-    margin: 5px 0;
-  }
-}
-.tox.tox-silver-sink.tox-tinymce-aux {
-  z-index: 9999;
-}
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #20a0ff;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 120px;
-  height: 120px;
-  line-height: 120px;
-  text-align: center;
-}
-</style>

+ 0 - 14
unimall-admin/src/views/sys/admin.vue

@@ -144,16 +144,13 @@ import {
   deleteAdmin
 } from '@/api/admin'
 import { roleOptions } from '@/api/role'
-import { uploadPath } from '@/api/storage'
 import { getToken } from '@/utils/auth'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import { getStoreList } from '@/api/store'
 export default {
   name: 'Admin',
   components: { Pagination },
   data() {
     return {
-      uploadPath,
       list: null,
       total: 0,
       roleOptions: null,
@@ -208,9 +205,6 @@ export default {
     roleOptions().then(response => {
       this.roleOptions = response.data.data
     })
-    getStoreList().then(response => {
-      this.storeOptions = response.data.data
-    })
   },
   methods: {
     formatRole(roleId) {
@@ -221,14 +215,6 @@ export default {
       }
       return ''
     },
-    formatStore(storeId) {
-      for (let i = 0; i < this.storeOptions.length; i++) {
-        if (storeId === this.storeOptions[i].value) {
-          return this.storeOptions[i].label
-        }
-      }
-      return ''
-    },
     getList() {
       this.listLoading = true
       listAdmin(this.listQuery)

+ 3 - 2
unimall-admin/src/views/tools/generator.vue

@@ -77,11 +77,11 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" label="钱?" hidden prop="chinese" >
+        <!-- <el-table-column align="center" label="钱?" hidden prop="chinese" >
           <template slot-scope="scope">
             <el-checkbox v-model="scope.row.money"/>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column align="center" label="列表展示" prop="showInList" >
           <template slot-scope="scope">
@@ -141,6 +141,7 @@ export default {
       list: null,
       total: 0,
       listLoading: true,
+      submiting: false,
       columns: [],
       columnsLoading: true,
       listQuery: {

+ 0 - 12
unimall-admin/src/views/user/user.vue

@@ -216,7 +216,6 @@ import { fetchList, activeUser, createUser, updateUser, deleteUser } from '@/api
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import { roleOptions } from '@/api/role'
 import { getToken } from '@/utils/auth'
-import { getStoreList } from '@/api/store'
 const genderDic = [{ value: 1, name: '女' }, { value: 2, name: '男' }, { value: '', name: '全部' }]
 const levelDic = [{ value: 0, name: '普通会员' }, { value: 1, name: 'VIP会员' }, { value: '', name: '全部' }]
 const statusDic = [{ value: 0, name: '冻结' }, { value: 1, name: '激活' }, { value: '', name: '全部' }]
@@ -297,9 +296,6 @@ export default {
     roleOptions().then(response => {
       this.roleOptions = response.data.data
     })
-    getStoreList().then(response => {
-      this.storeOptions = response.data.data
-    })
   },
   methods: {
     getList() {
@@ -324,14 +320,6 @@ export default {
       }
       return ''
     },
-    formatStore(storeId) {
-      for (let i = 0; i < this.storeOptions.length; i++) {
-        if (storeId === this.storeOptions[i].value) {
-          return this.storeOptions[i].label
-        }
-      }
-      return ''
-    },
     resetForm() {
       this.dataForm = {
         id: undefined,

+ 0 - 6
unimall-data/src/main/java/com/iotechn/unimall/data/domain/UserDO.java

@@ -50,9 +50,6 @@ public class UserDO extends SuperDO {
     private String lastLoginIp;
     /* 状态 */
     private Integer status;
-    /* 角色ids */
-    @TableField("role_ids")
-    private String roleIds;
     /* 签名图片 */
     @TableField("sign_img")
     private String signImg;
@@ -65,9 +62,6 @@ public class UserDO extends SuperDO {
     /* Token */
     @TableField("access_token")
     private String accessToken;
-    /* liangxinId */
-    @TableField("liangxin_id")
-    private String liangxinId;
     @TableField("cid")
     private String cid;