admin update

source/vue/xzs-admin/.gitignore

@@ -20,3 +20,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+/package-lock.json

source/vue/xzs-admin/package-lock.json

@@ -2119,16 +2119,6 @@
                     "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
                     "dev": true
                 },
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "http://registry.npm.livenono.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
                 "cacache": {
                     "version": "13.0.1",
                     "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -2155,34 +2145,6 @@
                         "unique-filename": "^1.1.1"
                     }
                 },
-                "chalk": {
-                    "version": "4.1.0",
-                    "resolved": "http://registry.npm.livenono.com/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "http://registry.npm.livenono.com/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "http://registry.npm.livenono.com/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true,
-                    "optional": true
-                },
                 "debug": {
                     "version": "4.3.1",
                     "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1605791507452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz",
@@ -2213,25 +2175,6 @@
                         "path-exists": "^4.0.0"
                     }
                 },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "http://registry.npm.livenono.com/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true,
-                    "optional": true
-                },
-                "loader-utils": {
-                    "version": "2.0.0",
-                    "resolved": "http://registry.npm.livenono.com/loader-utils/-/loader-utils-2.0.0.tgz",
-                    "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "big.js": "^5.2.2",
-                        "emojis-list": "^3.0.0",
-                        "json5": "^2.1.2"
-                    }
-                },
                 "locate-path": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz?cache=0&sync_timestamp=1597081764621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz",
@@ -2302,16 +2245,6 @@
                         "minipass": "^3.1.1"
                     }
                 },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "http://registry.npm.livenono.com/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
                 "terser-webpack-plugin": {
                     "version": "2.3.8",
                     "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881694762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -2328,18 +2261,6 @@
                         "terser": "^4.6.12",
                         "webpack-sources": "^1.4.3"
                     }
-                },
-                "vue-loader-v16": {
-                    "version": "npm:vue-loader@16.1.2",
-                    "resolved": "http://registry.npm.livenono.com/vue-loader/-/vue-loader-16.1.2.tgz",
-                    "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "chalk": "^4.1.0",
-                        "hash-sum": "^2.0.0",
-                        "loader-utils": "^2.0.0"
-                    }
                 }
             }
         },
@@ -13014,6 +12935,87 @@
                 }
             }
         },
+        "vue-loader-v16": {
+            "version": "npm:vue-loader@16.1.2",
+            "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz?cache=0&sync_timestamp=1608188009078&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.2.tgz",
+            "integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "chalk": "^4.1.0",
+                "hash-sum": "^2.0.0",
+                "loader-utils": "^2.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
+                    "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+                    "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+                    "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+                    "dev": true,
+                    "optional": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
+                    "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+                    "dev": true,
+                    "optional": true
+                },
+                "loader-utils": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+                    "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^2.1.2"
+                    }
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1608033330722&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+                    "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
         "vue-router": {
             "version": "3.4.9",
             "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1604612037000&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz",

source/vue/xzs-admin/src/store/modules/enumItem.js

@@ -18,7 +18,7 @@ const state = {
       typeEnum: [{ key: 1, value: '单选题' }, { key: 2, value: '多选题' }, { key: 3, value: '判断题' }, { key: 4, value: '填空题' }, { key: 5, value: '简答题' }],
       editUrlEnum: [{ key: 1, value: '/exam/question/edit/singleChoice', name: '单选题' },
         { key: 2, value: '/exam/question/edit/multipleChoice', name: '多选题' },
-        { key: 3, value: '/exam/question/edit/trueFalse', name: '判断题' },
+        { key: 3, value: '/exam/question/edit/trueFaltagsViewse', name: '判断题' },
         { key: 4, value: '/exam/question/edit/gapFilling', name: '填空题' },
         { key: 5, value: '/exam/question/edit/shortAnswer', name: '简答题' }]
     }
@@ -33,7 +33,9 @@ const getters = {
 }
 
 // actions
-const actions = {}
+const actions = {
+
+}
 
 // mutations
 const mutations = {}

source/vue/xzs-admin/src/views/education/industry/edit.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-  
+
       <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading">
         <el-form-item label="industry：" required>
           <el-input v-model="form.name"></el-input>
@@ -17,11 +17,11 @@
       </el-form>
     </div>
   </template>
-  
+
   <script>
   import { mapGetters, mapState, mapActions } from 'vuex'
-  import subjectApi from '@/api/subject'
+  import industryApi from '@/api/industry'
-  
+
   export default {
     data () {
       return {
@@ -39,7 +39,7 @@
       let _this = this
       if (id && parseInt(id) !== 0) {
         _this.formLoading = true
-        subjectApi.select(id).then(re => {
+        industryApi.select(id).then(re => {
           _this.form = re.response
           _this.formLoading = false
         })
@@ -50,7 +50,7 @@
         let _this = this
         this.formLoading = true
         this.form.levelName = this.enumFormat(this.levelEnum, this.form.level)
-        subjectApi.edit(this.form).then(data => {
+        industryApi.edit(this.form).then(data => {
           if (data.code === 1) {
             _this.$message.success(data.message)
             _this.delCurrentView(_this).then(() => {
@@ -85,4 +85,3 @@
     }
   }
   </script>
-  

source/vue/xzs-admin/src/views/education/industry/list.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParam" ref="queryForm" :inline="true">
-        <el-form-item label="年级：">
+        <!--<el-form-item label="年级：">
           <el-select v-model="queryParam.level" placeholder="年级" clearable="">
             <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item>
           <el-button type="primary" @click="submitForm">查询</el-button>
           <router-link :to="{path:'/education/industry/edit'}" class="link-left">
@@ -13,7 +13,7 @@
           </router-link>
         </el-form-item>
       </el-form>
-  
+
       <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
         <el-table-column prop="id" label="Id" />
         <el-table-column prop="name" label="industry"/>
@@ -30,12 +30,12 @@
                   @pagination="search"/>
     </div>
   </template>
-  
+
   <script>
   import { mapGetters, mapState } from 'vuex'
   import Pagination from '@/components/Pagination'
   import industryApi from '@/api/industry'
-  
+
   export default {
     components: { Pagination },
     data () {
@@ -90,4 +90,3 @@
     }
   }
   </script>
-  

source/vue/xzs-admin/src/views/education/subject/list.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParam" ref="queryForm" :inline="true">
-      <el-form-item label="年级：">
+      <!--<el-form-item label="年级：">
         <el-select v-model="queryParam.level" placeholder="年级" clearable="">
           <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" @click="submitForm">查询</el-button>
         <router-link :to="{path:'/education/subject/edit'}" class="link-left">

source/vue/xzs-admin/src/views/exam/question/edit/short-answer.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
-      <el-form-item label="industry：" prop="industry" required>
+      <el-form-item label="industry：" prop="industryId" required>
-        <el-select v-model="form.industry"   placeholder="industry"  @change="levelChange">
+        <el-select v-model="form.industryId"   placeholder="industry"  @change="levelChange">
-          <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
+          <el-option v-for="item in industryFilter" :key="item.id" :value="item.id" :label="item.name"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="skill：" prop="skill" required>
+      <el-form-item label="skill：" prop="skillId" required>
-        <el-select v-model="form.skill" placeholder="skill" >
+        <el-select v-model="form.skillId" placeholder="skill" >
-          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name+' ( '+item.levelName+' )'"></el-option>
+          <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="题干：" prop="title" required>
@@ -50,6 +50,7 @@ import QuestionShow from '../components/Show'
 import Ueditor from '@/components/Ueditor'
 import { mapGetters, mapState, mapActions } from 'vuex'
 import questionApi from '@/api/question'
+import industryApi from '@/api/industry'
 
 export default {
   components: {
@@ -60,16 +61,17 @@ export default {
       form: {
         id: null,
         questionType: 5,
-        industry: null,
+        industryId: null,
-        skill: null,
+        skillId: null,
         title: '',
         items: [],
         analyze: '',
         correct: '',
-        score: '',
+        score: '0',
         difficult: 0
       },
       subjectFilter: null,
+      industryFilter: null,
       formLoading: false,
       rules: {
         gradeLevel: [
@@ -118,6 +120,10 @@ export default {
         _this.formLoading = false
       })
     }
+    industryApi.list().then(re => {
+                this.industryFilter=re.response;
+              })
+
   },
   methods: {
     editorReady (instance) {
@@ -178,6 +184,8 @@ export default {
     levelChange () {
       this.form.subjectId = null
       this.subjectFilter = this.subjects.filter(data => data.level === this.form.gradeLevel)
+      console.log(this.subjectFilter);
+
     },
     showQuestion () {
       this.questionShow.dialog = true

source/vue/xzs-admin/src/views/exam/question/list.vue

@@ -6,7 +6,7 @@
       </el-form-item>
       <el-form-item label="industry：">
         <el-select v-model="queryParam.industry" placeholder="industry"  @change="levelChange" clearable>
-          <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
+          <el-option v-for="item in industryFilter" :key="item.id" :value="item.id" :label="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="skill：">
@@ -59,6 +59,7 @@ import { mapGetters, mapState, mapActions } from 'vuex'
 import Pagination from '@/components/Pagination'
 import QuestionShow from './components/Show'
 import questionApi from '@/api/question'
+import industryApi from '@/api/industry'
 
 export default {
   components: { Pagination, QuestionShow },
@@ -73,6 +74,7 @@ export default {
         pageSize: 10
       },
       subjectFilter: null,
+      industryFilter: null,
       listLoading: false,
       tableData: [],
       total: 0,
@@ -87,6 +89,13 @@ export default {
   created () {
     this.initSubject()
     this.search()
+    let _this = this
+        this.initSubject(function () {
+          _this.subjectFilter = _this.subjects
+        })
+    industryApi.list().then(re => {
+                    this.industryFilter=re.response;
+                  })
   },
   methods: {
     submitForm () {

source/vue/xzs-student/.gitignore

@@ -20,3 +20,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+/package-lock.json

source/vue/xzs-student/package-lock.json

@@ -2119,6 +2119,16 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -2145,6 +2155,34 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
+          "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
         "debug": {
           "version": "4.3.1",
           "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1605791507452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz",
@@ -2175,6 +2213,25 @@
             "path-exists": "^4.0.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz?cache=0&sync_timestamp=1597081764621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz",
@@ -2245,6 +2302,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1608033330722&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1597229611059&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -2261,6 +2328,18 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.1.2",
+          "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz?cache=0&sync_timestamp=1608188009078&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.2.tgz",
+          "integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -12930,87 +13009,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.0.0-rc.2",
-      "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.0.0-rc.2.tgz",
-      "integrity": "sha1-tqfn8w0o81ZZqD3kH0oYMaQjKgQ=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz",
-          "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1606205060845&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.4.9",
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1604612037000&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz",

source/xzs/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
   redis:
     host: localhost
   datasource:
-    url: jdbc:mysql://localhost:3306/xzs?useSSL=false&useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&allowMultiQueries=true
+    url: jdbc:mysql://home.ken123.tk:3306/xzs?useSSL=false&useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&allowMultiQueries=true
     username: root
-    password: lanfoo
+    password: kenjian
     driver-class-name: com.mysql.cj.jdbc.Driver

xzs-mysql.sql

@@ -286,4 +286,23 @@ CREATE TABLE `t_user_token`  (
 -- Records of t_user_token
 -- ----------------------------
 
+-- ----------------------------
+-- Table structure for t_text_content
+-- ----------------------------
+DROP TABLE IF EXISTS `t_skill`;
+CREATE TABLE `t_skill`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Records of t_skill
+-- ----------------------------
+
+INSERT INTO `t_skill` VALUES (3, 'python');
+INSERT INTO `t_skill` VALUES (4, 'vue');
+INSERT INTO `t_skill` VALUES (5, 'angular');
+
+
 SET FOREIGN_KEY_CHECKS = 1;