From 4972cc3adb6db60e0ebfcbea5a65d6f5de8378fd Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Sun, 15 Dec 2019 15:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=B7=AF=E5=BE=84=E6=96=B9=E6=B3=95=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=BD=95=E5=85=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=BF=85=E9=A1=BB=E5=88=B7=E6=96=B0=E6=89=8D?=
 =?UTF-8?q?=E8=83=BD=E6=94=B9=E5=8F=98=E8=8F=9C=E5=8D=95=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/exa_fileUploadAndDownload.go          |   5 +-
 QMPlusServer/controller/api/sys_user.go       |   8 +-
 QMPlusServer/model/sysModel/sys_user.go       |   2 +-
 QMPlusVuePage/src/components/HelloWorld.vue   |  58 ----------
 QMPlusVuePage/src/store/module/user.js        |   1 +
 .../src/view/example/excel/excel.vue          |  97 ++++++++++------
 .../src/view/example/upload/upload.vue        |   6 +-
 QMPlusVuePage/src/view/login/regist.vue       |  10 +-
 QMPlusVuePage/src/view/person/person.vue      |   8 +-
 .../src/view/superAdmin/user/user.vue         | 109 +++++++++++++++++-
 10 files changed, 191 insertions(+), 113 deletions(-)
 delete mode 100644 QMPlusVuePage/src/components/HelloWorld.vue

diff --git a/QMPlusServer/controller/api/exa_fileUploadAndDownload.go b/QMPlusServer/controller/api/exa_fileUploadAndDownload.go
index e67ca0d3..747d09d2 100644
--- a/QMPlusServer/controller/api/exa_fileUploadAndDownload.go
+++ b/QMPlusServer/controller/api/exa_fileUploadAndDownload.go
@@ -18,6 +18,7 @@ import (
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"上传成功"}"
 // @Router /fileUploadAndDownload/upload [post]
 func UploadFile(c *gin.Context) {
+	noSave := c.DefaultQuery("noSave","0")
 	_, header, err := c.Request.FormFile("file")
 	if err != nil {
 		servers.ReportFormat(c, false, fmt.Sprintf("上传文件失败，%v", err), gin.H{})
@@ -34,7 +35,9 @@ func UploadFile(c *gin.Context) {
 			s := strings.Split(file.Name, ".")
 			file.Tag = s[len(s)-1]
 			file.Key = key
-			err := file.Upload()
+			if(noSave=="0"){
+				err = file.Upload()
+			}
 			if err != nil {
 				servers.ReportFormat(c, false, fmt.Sprintf("修改数据库链接失败，%v", err), gin.H{})
 			} else {
diff --git a/QMPlusServer/controller/api/sys_user.go b/QMPlusServer/controller/api/sys_user.go
index 752f6162..29f98a37 100644
--- a/QMPlusServer/controller/api/sys_user.go
+++ b/QMPlusServer/controller/api/sys_user.go
@@ -26,15 +26,13 @@ type RegistAndLoginStuct struct {
 // @Tags Base
 // @Summary 用户注册账号
 // @Produce  application/json
-// @Param data body api.RegistAndLoginStuct true "用户注册接口"
+// @Param data body sysModel.SysUser true "用户注册接口"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
 // @Router /base/regist [post]
 func Regist(c *gin.Context) {
-	var R RegistAndLoginStuct
+	var R sysModel.SysUser
 	_ = c.BindJSON(&R)
-
-	U := &sysModel.SysUser{Username: R.Username, Password: R.Password}
-	err, user := U.Regist()
+	err, user := R.Regist()
 	if err != nil {
 		servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{
 			"user": user,
diff --git a/QMPlusServer/model/sysModel/sys_user.go b/QMPlusServer/model/sysModel/sys_user.go
index 7ec8228d..1278e075 100644
--- a/QMPlusServer/model/sysModel/sys_user.go
+++ b/QMPlusServer/model/sysModel/sys_user.go
@@ -18,7 +18,7 @@ type SysUser struct {
 	NickName    string       `json:"nickName" gorm:"default:'QMPlusUser'"`
 	HeaderImg   string       `json:"headerImg" gorm:"default:'http://www.henrongyi.top/avatar/lufu.jpg'"`
 	Authority   SysAuthority `json:"authority" gorm:"ForeignKey:AuthorityId;AssociationForeignKey:AuthorityId"`
-	AuthorityId string       `json:"-" gorm:"default:888"`
+	AuthorityId string       `json:"authorityId" gorm:"default:888"`
 }
 
 //type Propertie struct {
diff --git a/QMPlusVuePage/src/components/HelloWorld.vue b/QMPlusVuePage/src/components/HelloWorld.vue
deleted file mode 100644
index 879051a2..00000000
--- a/QMPlusVuePage/src/components/HelloWorld.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <p>
-      For a guide and recipes on how to configure / customize this project,<br>
-      check out the
-      <a href="https://cli.vuejs.org" target="_blank" rel="noopener">vue-cli documentation</a>.
-    </p>
-    <h3>Installed CLI Plugins</h3>
-    <ul>
-      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel" target="_blank" rel="noopener">babel</a></li>
-      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint" target="_blank" rel="noopener">eslint</a></li>
-    </ul>
-    <h3>Essential Links</h3>
-    <ul>
-      <li><a href="https://vuejs.org" target="_blank" rel="noopener">Core Docs</a></li>
-      <li><a href="https://forum.vuejs.org" target="_blank" rel="noopener">Forum</a></li>
-      <li><a href="https://chat.vuejs.org" target="_blank" rel="noopener">Community Chat</a></li>
-      <li><a href="https://twitter.com/vuejs" target="_blank" rel="noopener">Twitter</a></li>
-      <li><a href="https://news.vuejs.org" target="_blank" rel="noopener">News</a></li>
-    </ul>
-    <h3>Ecosystem</h3>
-    <ul>
-      <li><a href="https://router.vuejs.org" target="_blank" rel="noopener">vue-router</a></li>
-      <li><a href="https://vuex.vuejs.org" target="_blank" rel="noopener">vuex</a></li>
-      <li><a href="https://github.com/vuejs/vue-devtools#vue-devtools" target="_blank" rel="noopener">vue-devtools</a></li>
-      <li><a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener">vue-loader</a></li>
-      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">awesome-vue</a></li>
-    </ul>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'HelloWorld',
-  props: {
-    msg: String
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: #42b983;
-}
-</style>
diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js
index 9cc3395f..e2fe3c1f 100644
--- a/QMPlusVuePage/src/store/module/user.js
+++ b/QMPlusVuePage/src/store/module/user.js
@@ -30,6 +30,7 @@ export const user = {
             state.token = ""
             state.expiresAt = ""
             router.push({ name: 'login', replace: true })
+            window.location.reload()
         },
         ResetUserInfo(state, userInfo = {}) {
             state.userInfo = {...state.userInfo,
diff --git a/QMPlusVuePage/src/view/example/excel/excel.vue b/QMPlusVuePage/src/view/example/excel/excel.vue
index a28da79a..cc8feb43 100644
--- a/QMPlusVuePage/src/view/example/excel/excel.vue
+++ b/QMPlusVuePage/src/view/example/excel/excel.vue
@@ -1,48 +1,69 @@
 <template>
-    <div>
-        <el-upload
-                class="upload-demo"
-                :headers="{'x-token':token}"
-                action="/api/fileUploadAndDownload/upload"
-                :on-preview="handlePreview"
-                :on-remove="handleRemove"
-                :before-remove="beforeRemove"
-                multiple
-                :limit="10"
-                :on-exceed="handleExceed"
-                :file-list="fileList">
-            <el-button size="small" type="primary">点击上传</el-button>
-            <div slot="tip" class="el-upload__tip">未对文件格式及大小做校验</div>
-        </el-upload>
-        </el-upload>
-    </div>
+  <div>
+    <el-upload
+      :action="`${path}/fileUploadAndDownload/upload`"
+      :before-remove="beforeRemove"
+      :file-list="fileList"
+      :headers="{'x-token':token}"
+      :limit="10"
+      :on-exceed="handleExceed"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      class="upload-demo"
+      multiple
+    >
+      <el-button size="small" type="primary">点击上传</el-button>
+      <div class="el-upload__tip" slot="tip">未对文件格式及大小做校验</div>
+    </el-upload>
+  </div>
 </template>
 <script>
-    import { mapGetters } from 'vuex'
+import { mapGetters } from 'vuex'
+const path = process.env.VUE_APP_BASE_API
 export default {
-    name:'Excel',
-    data() {
-        return {
-            fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
-        };
+  name: 'Excel',
+  data() {
+    return {
+      path: path,
 
-    },
-    computed: {
-       ...mapGetters('user', ['userInfo', 'token'])
-    },
-    methods: {
-        handleRemove(file, fileList) {
-            console.log(file, fileList);
-        },
-        handlePreview(file) {
-            console.log(file);
-        },
-        handleExceed(files, fileList) {
-            this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+      fileList: [
+        {
+          name: 'food.jpeg',
+          url:
+            'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
         },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${ file.name }？`);
+        {
+          name: 'food2.jpeg',
+          url:
+            'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
         }
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters('user', ['userInfo', 'token'])
+  },
+  methods: {
+    handleRemove(file, fileList) {
+      this.$message.warning(
+        `共有 ${fileList.length} 个文件，移除了${file.name}`
+      )
+    },
+    handlePreview(file) {
+      this.$message.warning(`${file.name}选择完成`)
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${
+          files.length
+        } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+      )
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(
+        `共有 ${fileList.length} 个文件，确定移除 ${file.name}？`
+      )
     }
+  }
 }
 </script>
\ No newline at end of file
diff --git a/QMPlusVuePage/src/view/example/upload/upload.vue b/QMPlusVuePage/src/view/example/upload/upload.vue
index 10e3421c..e1a85729 100644
--- a/QMPlusVuePage/src/view/example/upload/upload.vue
+++ b/QMPlusVuePage/src/view/example/upload/upload.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-upload
+      :action="`${path}/fileUploadAndDownload/upload`"
       :before-upload="checkFile"
       :headers="{'x-token':token}"
       :on-error="uploadError"
       :on-success="uploadSuccess"
       :show-file-list="false"
-      action="/api/fileUploadAndDownload/upload"
     >
       <el-button size="small" type="primary">点击上传</el-button>
       <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
@@ -53,6 +53,7 @@
 </template>
    
 <script>
+const path = process.env.VUE_APP_BASE_API
 import { mapGetters } from 'vuex'
 import infoList from '@/components/mixins/infoList'
 import { getFileList, deleteFile } from '@/api/fileUploadAndDownload'
@@ -65,6 +66,7 @@ export default {
     return {
       listApi: getFileList,
       listKey: 'list',
+      path: path,
       tableData: [
         {
           UpdatedAt: '2019-10-25',
@@ -96,7 +98,7 @@ export default {
   },
   methods: {
     async deleteFile(row) {
-      this.$confirm('此操作将永久删除所有角色下该菜单, 是否继续?', '提示', {
+      this.$confirm('此操作将永久文件, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/QMPlusVuePage/src/view/login/regist.vue b/QMPlusVuePage/src/view/login/regist.vue
index d29a7623..9c4380f5 100644
--- a/QMPlusVuePage/src/view/login/regist.vue
+++ b/QMPlusVuePage/src/view/login/regist.vue
@@ -2,7 +2,7 @@
   <el-container class="login-regist-box">
     <vue-particle-line></vue-particle-line>
     <el-main class="login-box">
-      <h1 class="title-1">GIN-VUE-ADMIN</h1>by 奇淼
+      <h1 class="title-1">GIN-VUE-ADMIN</h1>
       <el-form :model="registForm" :rules="rules" ref="registForm">
         <el-form-item prop="username">
           <el-input placeholder="请输入用户名" v-model="registForm.username"></el-input>
@@ -16,8 +16,12 @@
             <i :class="'el-input__icon el-icon-' + lock" @click="changeLock" slot="suffix"></i>
           </el-input>
         </el-form-item>
-        <el-form-item label="重复密码" prop="rePassword">
-          <el-input :type="lock==='lock'?'password':'text'" v-model="registForm.rePassword">
+        <el-form-item prop="rePassword">
+          <el-input
+            :type="lock==='lock'?'password':'text'"
+            placeholder="请再次输入密码"
+            v-model="registForm.rePassword"
+          >
             <i :class="'el-input__icon el-icon-' + lock" @click="changeLock" slot="suffix"></i>
           </el-input>
         </el-form-item>
diff --git a/QMPlusVuePage/src/view/person/person.vue b/QMPlusVuePage/src/view/person/person.vue
index 9343906f..9888a66a 100644
--- a/QMPlusVuePage/src/view/person/person.vue
+++ b/QMPlusVuePage/src/view/person/person.vue
@@ -5,7 +5,7 @@
         :headers="{'x-token':token}"
         :on-success="handleAvatarSuccess"
         :show-file-list="false"
-        action="api/user/uploadHeaderImg"
+        :action="`${path}/user/uploadHeaderImg`"
         class="avatar-uploader"
         name="headerImg"
       >
@@ -24,8 +24,14 @@
 </template>
 <script>
 import { mapGetters, mapMutations } from 'vuex'
+const path = process.env.VUE_APP_BASE_API
 export default {
   name: 'Person',
+  data(){
+    return {
+      path:path
+    }
+  },
   computed: {
     ...mapGetters('user', ['userInfo', 'token'])
   },
diff --git a/QMPlusVuePage/src/view/superAdmin/user/user.vue b/QMPlusVuePage/src/view/superAdmin/user/user.vue
index 227e6dd1..0c40200b 100644
--- a/QMPlusVuePage/src/view/superAdmin/user/user.vue
+++ b/QMPlusVuePage/src/view/superAdmin/user/user.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <div class="button-box clearflex"></div>
+    <div class="button-box clearflex">
+      <el-button @click="addUser" type="primary">新增用户</el-button>
+    </div>
     <el-table :data="tableData" border stripe>
       <el-table-column label="头像" min-width="50">
         <template slot-scope="scope">
@@ -39,16 +41,58 @@
       @size-change="handleSizeChange"
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
+
+    <el-dialog :visible.sync="addUserDialog" custom-class="user-dialog" title="新增用户">
+      <el-form :model="userInfo">
+        <el-form-item label="用户名" label-width="80px">
+          <el-input v-model="userInfo.username"></el-input>
+        </el-form-item>
+        <el-form-item label="密码" label-width="80px">
+          <el-input v-model="userInfo.password"></el-input>
+        </el-form-item>
+        <el-form-item label="别名" label-width="80px">
+          <el-input v-model="userInfo.nickName"></el-input>
+        </el-form-item>
+        <el-form-item label="头像" label-width="80px">
+          <el-upload
+            :headers="{'x-token':token}"
+            :on-success="handleAvatarSuccess"
+            :show-file-list="false"
+            :action="`${path}/fileUploadAndDownload/upload?noSave=1`"
+            class="avatar-uploader"
+            name="file"
+          >
+            <img :src="userInfo.headerImg" class="avatar" v-if="userInfo.headerImg" />
+            <i class="el-icon-plus avatar-uploader-icon" v-else></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="用户角色" label-width="80px">
+          <el-select placeholder="请选择" v-model="userInfo.authorityId">
+            <el-option
+              :key="item.authorityId"
+              :label="item.authorityName"
+              :value="item.authorityId"
+              v-for="item in authOptions"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="closeAddUserDialog">取 消</el-button>
+        <el-button @click="enterAddUserDialog" type="primary">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 
 <script>
 // 获取列表内容封装在mixins内部  getTableData方法 初始化已封装完成
-import { getUserList, setUserAuthority } from '@/api/user'
+const path = process.env.VUE_APP_BASE_API
+import { getUserList, setUserAuthority, regist } from '@/api/user'
 import { getAuthorityList } from '@/api/authority'
 import infoList from '@/components/mixins/infoList'
-
+import { mapGetters } from 'vuex'
 export default {
   name: 'Api',
   mixins: [infoList],
@@ -56,10 +100,46 @@ export default {
     return {
       listApi: getUserList,
       listKey: 'userList',
-      authOptions: []
+      path:path,
+      authOptions: [],
+      addUserDialog: false,
+      userInfo: {
+        username: '',
+        password: '',
+        nickName: '',
+        headerImg: '',
+        authorityId: ''
+      }
     }
   },
+  computed: {
+    ...mapGetters('user', ['token'])
+  },
   methods: {
+    async enterAddUserDialog() {
+      const res = await regist(this.userInfo)
+      if (res.success) {
+        this.$message({ type: 'success', message: '创建成功' })
+      }
+      await this.getTableData()
+      this.closeAddUserDialog()
+    },
+    closeAddUserDialog() {
+      this.userInfo = {
+        username: '',
+        password: '',
+        nickName: '',
+        headerImg: '',
+        authorityId: ''
+      }
+      this.addUserDialog = false
+    },
+    handleAvatarSuccess(res) {
+      this.userInfo.headerImg = res.data.file.url
+    },
+    addUser() {
+      this.addUserDialog = true
+    },
     async changeAuthority(row) {
       const res = await setUserAuthority({
         uuid: row.uuid,
@@ -83,4 +163,25 @@ export default {
     float: right;
   }
 }
+
+.user-dialog {
+  .avatar-uploader .el-upload:hover {
+    border-color: #409eff;
+  }
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9 !important;
+    border-radius: 6px;
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+}
 </style>
\ No newline at end of file
-- 
GitLab