publish🚀 v1.3.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-admin",
-  "version": "1.3.0-rc.0",
+  "version": "1.3.0",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "https://github.com/wenjianzhang",
   "license": "MIT",
@@ -39,10 +39,10 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/wenjianzhang/go-admin.git"
+    "url": "git+https://github.com/go-admin-team/go-admin.git"
   },
   "bugs": {
-    "url": "https://github.com/wenjianzhang/go-admin/issues"
+    "url": "https://github.com/go-admin-team/go-admin/issues"
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",

src/api/login.js

@@ -8,19 +8,19 @@ export function getCodeImg() {
   })
 }
 
-// 查询
+// 查询 此接口不在验证数据权限
 export function getSetting() {
   return request({
-    url: '/api/v1/setting',
+    url: '/api/v1/app-config',
     method: 'get'
   })
 }
 
-// 修改
-export function updateSetting(data) {
-  return request({
-    url: '/api/v1/setting',
-    method: 'post',
-    data: data
-  })
-}
+// // 修改
+// export function updateSetting(data) {
+//   return request({
+//     url: '/api/v1/setting',
+//     method: 'post',
+//     data: data
+//   })
+// }

src/layout/components/Sidebar/Logo.vue

@@ -2,12 +2,12 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: $store.state.settings.themeStyle === 'dark' ? variables.menuBg : variables.menuLightBg }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="appInfo.logo" :src="appInfo.logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title" :style="{ color: $store.state.settings.themeStyle === 'dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ appInfo.name }} </h1>
+        <img v-if="appInfo.sys_app_logo" :src="appInfo.sys_app_logo" class="sidebar-logo">
+        <h1 v-else class="sidebar-title" :style="{ color: $store.state.settings.themeStyle === 'dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ appInfo.sys_app_name }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="appInfo.logo" :src="appInfo.logo" class="sidebar-logo">
-        <h1 class="sidebar-title" :style="{ color: $store.state.settings.themeStyle === 'dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ appInfo.name }} </h1>
+        <img v-if="appInfo.sys_app_logo" :src="appInfo.sys_app_logo" class="sidebar-logo">
+        <h1 class="sidebar-title" :style="{ color: $store.state.settings.themeStyle === 'dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ appInfo.sys_app_name }} </h1>
       </router-link>
     </transition>
   </div>

src/store/modules/system.js

@@ -1,4 +1,5 @@
 import { getSetting, updateSetting } from '@/api/login'
+// import { logout } from '@/api/user'
 import storage from '@/utils/storage'
 const state = {
   info: storage.get('app_info')
@@ -15,6 +16,7 @@ const actions = {
   settingDetail({ commit }) {
     return new Promise((resolve, reject) => {
       getSetting().then(response => {
+        debugger
         const { data } = response
         commit('SET_INFO', data)
         resolve(data)

src/utils/get-page-title.js

@@ -2,7 +2,7 @@ import storage from '@/utils/storage'
 
 export default function getPageTitle(pageTitle) {
   const app_info = storage.get('app_info')
-  const title = app_info ? app_info.name : 'go-admin 后台管理系统'
+  const title = app_info ? app_info.sys_app_name : 'go-admin 后台管理系统'
   if (pageTitle) {
     return `${pageTitle} - ${title}`
   }

src/views/config/index.vue

@@ -142,6 +142,12 @@
                 >{{ dict.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
+            <el-form-item label="是否前台显示" prop="isFrontend">
+              <el-select v-model="form.isFrontend" placeholder="是否前台显示" clearable size="small">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="2" />
+              </el-select>
+            </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
@@ -197,15 +203,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        configName: [
-          { required: true, message: '参数名称不能为空', trigger: 'blur' }
-        ],
-        configKey: [
-          { required: true, message: '参数键名不能为空', trigger: 'blur' }
-        ],
-        configValue: [
-          { required: true, message: '参数键值不能为空', trigger: 'blur' }
-        ]
+        configName: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
+        configKey: [{ required: true, message: '参数键名不能为空', trigger: 'blur' }],
+        configValue: [{ required: true, message: '参数键值不能为空', trigger: 'blur' }],
+        isFrontend: [{ required: true, message: '是否前台显示不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -243,6 +244,7 @@ export default {
         configKey: undefined,
         configValue: undefined,
         configType: 'Y',
+        isFrontend: 1,
         remark: undefined
       }
       this.resetForm('form')
@@ -277,6 +279,7 @@ export default {
       const ID = row.id || this.ids
       getConfig(ID).then(response => {
         this.form = response.data
+        this.form.isFrontend = String(this.form.isFrontend)
         this.open = true
         this.title = '修改参数'
         this.isEdit = true
@@ -286,6 +289,7 @@ export default {
     submitForm: function() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          this.form.isFrontend = parseInt(this.form.isFrontend)
           if (this.form.id !== undefined) {
             updateConfig(this.form).then(response => {
               if (response.code === 200) {

src/views/login/index.vue

@@ -24,8 +24,8 @@
     <div class="login-weaper animated bounceInDown">
       <div class="login-left">
         <div class="login-time" v-text="currentTime" />
-        <img :src="sysInfo.logo" alt="" class="img">
-        <p class="title" v-text="sysInfo.name" />
+        <img :src="sysInfo.sys_app_logo" alt="" class="img">
+        <p class="title" v-text="sysInfo.sys_app_name" />
       </div>
       <div class="login-border">
         <div class="login-main">
@@ -228,7 +228,7 @@ export default {
     getSystemSetting() {
       this.$store.dispatch('system/settingDetail').then((ret) => {
         this.sysInfo = ret
-        document.title = ret.name
+        document.title = ret.sys_app_name
       })
     },
     getCurrentTime() {

src/views/system/settings.vue

@@ -15,9 +15,9 @@
             <!-- <el-button type="primary" @click="fileShowlogo">选择文件</el-button> -->
           </el-form-item>
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button v-permisaction="['system:system:edit']" type="primary" @click="submitForm('ruleForm')">确定</el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <FileChoose ref="fileChoose" :dialog-form-visible="fileOpen" @confirm="getImgList" @close="fileClose" />
       </div>