system-clients 1.6.40 → 1.6.41-ezhou

package/build.gradle

@@ -1,4 +1,4 @@
-version = '1.6.19'
+version = '1.6.18'
 
 task release(type:Exec) {
 	workingDir '.'

package/package.json

@@ -1,102 +1,103 @@
-{
-  "name": "system-clients",
-  "version": "1.6.40",
-  "description": "系统基础框架",
-  "main": "src/index.js",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
-  },
-  "dependencies": {
-    "base64-js": "^1.3.0",
-    "js-base64": "^2.4.9",
-    "jsencrypt": "^3.0.0-rc.1",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "src": "^1.1.2",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "manage-client": "^1.4.20",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-client": "^1.18.5",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "^3.0.0-alpha.2",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aotu/System"
-  },
-  "keywords": [
-    "system_clients"
-  ],
-  "author": "杨文宇",
-  "license": "ISC"
-}
+{
+  "name": "system-clients",
+  "version": "1.6.41-ezhou",
+  "description": "系统基础框架",
+  "main": "src/index.js",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
+  },
+  "dependencies": {
+    "base64-js": "^1.3.0",
+    "js-base64": "^2.4.9",
+    "jsencrypt": "^3.0.0-rc.1",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "src": "^1.1.2",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "jsencrypt": "3.0.0-rc.1",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "manage-client": "^1.4.20",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.22.26-ezhou",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "^3.0.0-alpha.2",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aotu/System"
+  },
+  "keywords": [
+    "system_clients"
+  ],
+  "author": "杨文宇",
+  "license": "ISC"
+}

package/src/components/server/LeftTree.vue

@@ -2,53 +2,49 @@
   <div class='over'>
     <tree :model='functions' :is-click="false" v-ref:tree @toggle="toggled">
       <span partial :class="{ 'tree-img': isFolder(row), 'tree-span': !isFolder(row) }">
-        <img v-if="isFolder(row)" :src="row.data.icon" alt="">{{row.data.name}}
+        <img v-if="isFolder(row)" :src="row.data.icon" alt="">{{ row.data.name }}
       </span>
     </tree>
   </div>
 </template>
 <script>
-  import Vue from 'vue'
+import Vue from 'vue'
 
 export default {
-  props: ['functions', 'userid','tabs'],
+  props: ['functions', 'userid', 'tabs'],
   title: '左侧树菜单',
-  data () {
+  data() {
     return {
       index: -1,
       name: null,
-      tbcg:[]
+      tbcg: []
     }
   },
   methods: {
-    open (row) {
+    open(row) {
       if (row.data.name === '资源管理') {
         this.$parent.changeMain(row.data.id)
         return
       }
       if (row.data.navigate) {
-        let isExist = false
-        this.tbcg.forEach((tab) => {
-            if(tab.comp.name == row.data.link) {
-            isExist = true
-          }
-        })
-        if (!isExist){
-          this.$goto('embbed-page', {domainName: row.data.navigate, title: row.data.name, compName: row.data.link, login: Vue.$login, param: Vue.$appdata}, 'main')
-        }else {
-          this.$emit('isnodo',row.data.link)
-        }
+        this.$goto('embbed-page', {
+          domainName: row.data.navigate,
+          title: row.data.name,
+          compName: row.data.link,
+          login: Vue.$login,
+          param: Vue.$appdata
+        }, 'main')
       } else if (row.data.link) {
         let isExist = false
         this.tbcg.forEach((tab) => {
-          if(tab.comp.name == row.data.link) {
+          if (tab.comp.name == row.data.link) {
             isExist = true
           }
         })
-        if (!isExist){
+        if (!isExist) {
           this.$goto(row.data.link, {f: this.functions}, 'main')
-        }else {
-          this.$emit('isnodo',row.data.link)
+        } else {
+          this.$emit('isnodo', row.data.link)
         }
       }
     },
@@ -63,19 +59,19 @@ export default {
       // 当前激活页签有，index为-1，说明菜单收缩
       this.changeSelected(index)
     },
-    selfFindIndex (name) {
+    selfFindIndex(name) {
       return this.$refs.tree.toNode.findIndex((item) => {
         return item.data.link === name
       })
     },
-    changeSelected (index) {
+    changeSelected(index) {
       if (index === -1) {
         this.$refs.tree.selectStore.select(null)
-      }else {
+      } else {
         this.$refs.tree.selectStore.select(this.$refs.tree.toNode[index])
       }
     },
-    toggled () {
+    toggled() {
       if (this.name && this.index === -1) {
         let index = this.selfFindIndex(this.name)
         if (index !== -1) {
@@ -90,8 +86,8 @@ export default {
       this.open(data.val)
     }
   },
-  watch:{
-    'tabs'(val){
+  watch: {
+    'tabs'(val) {
       this.tbcg = val
     }
   }

package/src/components/server/Login.vue

@@ -77,6 +77,8 @@
     <modal> -->
     <!-- 注册模态框结束 -->
     <!--<load-data @ready="onReady"></load-data>-->
+    <!-- 修改密码组件 -->
+    <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow"></modify-pw>
   </div>
 </template>
 
@@ -121,8 +123,15 @@
           throw new Error('Mac地址验证失败, 请联系管理员！！')
         }
       }
-
-      self.$goto('home-page', {functions: self.$login.f})
+      // 弱口令验证
+      //跳转过来的不进行验证
+      if (self.config.weakPassword && !(/^(?:(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).{8,16}$/.test(self.model.password))) {
+        self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
+          self.modifyPwShow = true
+        })
+      } else {
+        self.$goto('home-page', {functions: self.$login.f})
+      }
     } catch (ret) {
       console.error('登录失败', ret)
       let msg
@@ -162,8 +171,10 @@
     data () {
       return {
         config: {
-          isMac: false
+          isMac: false,
+          weakPassword:true
         },
+        modifyPwShow :false,
         login: false,
         model: {},
         show: false,

package/src/components/server/RightTree.vue

@@ -1,159 +1,159 @@
-<template>
-  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist">
-    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-      <span>{{ resname }}</span>
-      <span class="caret"></span>
-    </button>
-    <tree :model='model' :is-click="false" slot="dropdown-menu" class="dropdown-menu auto" role="menu">
-        <span partial>
-          <span class="glyphicon glyphicon-chevron-up" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
-          <span class="glyphicon glyphicon-chevron-down" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
-          <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
-          <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
-          <span class="glyphicon glyphicon-ok " v-show="$parent.$parent.$parent.isSelect(row.data.name)" style="color:balck;"></span>
-        </span>
-    </tree>
-  </dropdown>
-  <v-select v-if="islist"
-            placeholder='请选择'
-            :options='childrenOptions'
-            @change="selectclick"
-            :value-single="true"
-            close-on-select clear-button></v-select>
-</template>
-<script>
-  import co from 'co'
-  import { PagedList, HttpResetClass } from 'vue-client'
-  import * as ldapHelper from '../../util/LdapHelper'
-
-  let saveGen = function * (self) {
-    //获取分公司树
-    let data = {
-      source: self.source,
-      userid: self.userid
-    }
-    let http = new HttpResetClass()
-    let ret = yield http.load('POST', `${self.Url}/rs/search`, data, {resolveMsg: null, rejectMsg: null})
-    // 去掉前面的两层节点
-    ret.data[0].children[0].children.forEach((item) => {
-      self.model.push(item)
-    })
-    // 给资源添加父关系
-    ldapHelper.procParent(self.model)
-    if (self.islist) {
-      self.treetoList(self.model)
-    }
-    self.selectRes()
-  }
-
-  export default {
-    title: '资源树',
-    props: {
-      userid: {
-        type: String,
-        require: true
-      },
-      source: {
-        type: String,
-        require: true
-      },
-      resname: {
-        default: '请选择组织'
-      },
-      resid: {
-      },
-      resobj:{
-        type: Object,
-      },
-      islist: {
-        type: Boolean,
-        default: false
-      },
-      //是否有查看上级的权限
-      Url:{
-        type: String,
-        default:''
-      }
-    },
-    data () {
-      return {
-        model: [
-
-        ],
-        childrenOptions: []
-      }
-    },
-    methods: {
-      // 当外面传入的选中对象发生变化时调用
-      selectRes () {
-        if (this.resid) {
-          // 当外面传入了新的选中数据后，根据外面传入的数据进行选择
-          let str = this.resid
-          let res = ldapHelper.find(this.model, str.substring(0, str.length - 1))
-          this.selectclick(res)
-        }
-      },
-      //点击资源的方法
-      selectclick (row) {
-        this.resname = row.name
-        let newobj={
-          "res": ldapHelper.getFullName(row, 'name'),
-          "resids": ldapHelper.getFullName(row, 'id') + '.',
-        }
-        this.$emit('re-res', newobj)
-      },
-      //检查是否显示对勾
-      isSelect(val) {
-        if(this.resname==val){
-          return true
-        }else{
-          return false
-        }
-      },
-      //树形结构变成list
-      treetoList(val) {
-        for (let value of val) {
-          this.ergodicList(value)
-        }
-      },
-      //找到跟节点
-      ergodicList (val) {
-        val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
-      },
-      //处理显示默认值
-      dealResObj (val) {
-        try{
-          var arr=val.res.split(".")
-          //截取最后一个分公司名字
-          this.resname=arr[arr.length-1].toString()
-          this.resid = val.resids
-        }catch (e){
-          this.resname='请选择组织'
-        }
-      }
-    },
-    events: {
-
-    },
-    ready () {
-      this.dealResObj (this.resobj)
-      let gen = saveGen(this)
-      return co(gen)
-    },
-    watch: {
-    }
-  }
-</script>
-<style lang="less">
-  #res-tree {
-    .list-group-item {
-      background-color: #FFF;
-      color: #000;
-      padding: 5px;
-      border:0px;
-    }
-  }
-  #res-tree .list-group {
-    width: 250px;
-  }
-</style>
+<template>
+  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist">
+    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+      <span>{{ resname }}</span>
+      <span class="caret"></span>
+    </button>
+    <tree :model='model' :is-click="false" slot="dropdown-menu" class="dropdown-menu auto" role="menu">
+        <span partial>
+          <span class="glyphicon glyphicon-chevron-up" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
+          <span class="glyphicon glyphicon-chevron-down" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
+          <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
+          <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
+          <span class="glyphicon glyphicon-ok " v-show="$parent.$parent.$parent.isSelect(row.data.name)" style="color:balck;"></span>
+        </span>
+    </tree>
+  </dropdown>
+  <v-select v-if="islist"
+            placeholder='请选择'
+            :options='childrenOptions'
+            @change="selectclick"
+            :value-single="true"
+            close-on-select clear-button></v-select>
+</template>
+<script>
+  import co from 'co'
+  import { PagedList, HttpResetClass } from 'vue-client'
+  import * as ldapHelper from '../../util/LdapHelper'
+
+  let saveGen = function * (self) {
+    //获取分公司树
+    let data = {
+      source: self.source,
+      userid: self.userid
+    }
+    let http = new HttpResetClass()
+    let ret = yield http.load('POST', `${self.Url}/rs/search`, data, {resolveMsg: null, rejectMsg: null})
+    // 去掉前面的两层节点
+    ret.data[0].children[0].children.forEach((item) => {
+      self.model.push(item)
+    })
+    // 给资源添加父关系
+    ldapHelper.procParent(self.model)
+    if (self.islist) {
+      self.treetoList(self.model)
+    }
+    self.selectRes()
+  }
+
+  export default {
+    title: '资源树',
+    props: {
+      userid: {
+        type: String,
+        require: true
+      },
+      source: {
+        type: String,
+        require: true
+      },
+      resname: {
+        default: '请选择组织'
+      },
+      resid: {
+      },
+      resobj:{
+        type: Object,
+      },
+      islist: {
+        type: Boolean,
+        default: false
+      },
+      //是否有查看上级的权限
+      Url:{
+        type: String,
+        default:''
+      }
+    },
+    data () {
+      return {
+        model: [
+
+        ],
+        childrenOptions: []
+      }
+    },
+    methods: {
+      // 当外面传入的选中对象发生变化时调用
+      selectRes () {
+        if (this.resid) {
+          // 当外面传入了新的选中数据后，根据外面传入的数据进行选择
+          let str = this.resid
+          let res = ldapHelper.find(this.model, str.substring(0, str.length - 1))
+          this.selectclick(res)
+        }
+      },
+      //点击资源的方法
+      selectclick (row) {
+        this.resname = row.name
+        let newobj={
+          "res": ldapHelper.getFullName(row, 'name'),
+          "resids": ldapHelper.getFullName(row, 'id') + '.',
+        }
+        this.$emit('re-res', newobj)
+      },
+      //检查是否显示对勾
+      isSelect(val) {
+        if(this.resname==val){
+          return true
+        }else{
+          return false
+        }
+      },
+      //树形结构变成list
+      treetoList(val) {
+        for (let value of val) {
+          this.ergodicList(value)
+        }
+      },
+      //找到跟节点
+      ergodicList (val) {
+        val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
+      },
+      //处理显示默认值
+      dealResObj (val) {
+        try{
+          var arr=val.res.split(".")
+          //截取最后一个分公司名字
+          this.resname=arr[arr.length-1].toString()
+          this.resid = val.resids
+        }catch (e){
+          this.resname='请选择组织'
+        }
+      }
+    },
+    events: {
+
+    },
+    ready () {
+      this.dealResObj (this.resobj)
+      let gen = saveGen(this)
+      return co(gen)
+    },
+    watch: {
+    }
+  }
+</script>
+<style lang="less">
+  #res-tree {
+    .list-group-item {
+      background-color: #FFF;
+      color: #000;
+      padding: 5px;
+      border:0px;
+    }
+  }
+  #res-tree .list-group {
+    width: 250px;
+  }
+</style>

package/src/components/server/TestRightTree.vue

@@ -1,42 +1,42 @@
-<template>
-  <div class="col-sm-3 form-group form-input-group" style="width: 20%">
-    <label class="control-label">组织机构</label>
-    <right-tree :userid.sync='obj.userid'
-                :source.sync='obj.source'
-                :resobj='obj'
-                @re-res="getRes"></right-tree>
-  </div>
-</template>
-<script>
-  import { PagedList, HttpResetClass } from 'vue-client'
-
-  export default {
-    title: '资源树菜单',
-    props: {
-    },
-    data () {
-      return {
-        obj: {
-          userid: this.$login.f.id,
-          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-          res: this.$login.f.f_fengongsi,
-          resids: this.$login.f.f_orgids
-        },
-      }
-    },
-    ready () {
-      //this.getRes1()
-    },
-    methods:{
-      getRes (obj) {
-        this.obj.res = obj.res
-        this.obj.resids = obj.resids
-      },
-    },
-    watch: {
-
-    },
-  }
-</script>
-<style media="screen">
-</style>
+<template>
+  <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+    <label class="control-label">组织机构</label>
+    <right-tree :userid.sync='obj.userid'
+                :source.sync='obj.source'
+                :resobj='obj'
+                @re-res="getRes"></right-tree>
+  </div>
+</template>
+<script>
+  import { PagedList, HttpResetClass } from 'vue-client'
+
+  export default {
+    title: '资源树菜单',
+    props: {
+    },
+    data () {
+      return {
+        obj: {
+          userid: this.$login.f.id,
+          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+          res: this.$login.f.f_fengongsi,
+          resids: this.$login.f.f_orgids
+        },
+      }
+    },
+    ready () {
+      //this.getRes1()
+    },
+    methods:{
+      getRes (obj) {
+        this.obj.res = obj.res
+        this.obj.resids = obj.resids
+      },
+    },
+    watch: {
+
+    },
+  }
+</script>
+<style media="screen">
+</style>

package/src/plugins/EncryptUtil.js

@@ -0,0 +1,30 @@
+import AesEncryptJS from "crypto-js"
+
+export default {
+  /**
+   * AES加密
+   * @param word
+   * @returns {*}
+   */
+  AESEncrypt(word, encryKey){
+    var key = AesEncryptJS.enc.Utf8.parse(encryKey);
+    var srcs = AesEncryptJS.enc.Utf8.parse(word);
+    var encrypted = AesEncryptJS.AES.encrypt(srcs, key, {mode:AesEncryptJS.mode.ECB,padding: AesEncryptJS.pad.Pkcs7});
+    return encrypted.toString();
+  },
+  /**
+   * AES解密
+   * @param word
+   * @returns {*}
+   */
+  AESDecrypt(word, encryKey){
+    var key = AesEncryptJS.enc.Utf8.parse(encryKey);
+    var decrypt = AesEncryptJS.AES.decrypt(word, key, {mode:AesEncryptJS.mode.ECB,padding: AesEncryptJS.pad.Pkcs7});
+    var ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString();
+    try{
+      return JSON.parse(ret) ;
+    }catch (e){
+      return ret
+    }
+  },
+}

package/src/plugins/GetLoginInfoService.js

@@ -1,15 +1,17 @@
 import Vue from 'vue'
 import JSEncrypt from 'jsencrypt'
 import {HttpResetClass} from 'vue-client'
+import cryptJS from './EncryptUtil'
 
 let loginGen = async function (name, password) {
   let data = {name: name, password: password}
   // rsa加密
   let encrypt = new JSEncrypt();
   encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
+  data = '$' + encrypt.encrypt(JSON.stringify(data));
   console.log(data)
 
-  let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null}, 'RSA')
+  let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
   if (getLogin.data.states === '登录成功') {
     // 调用远程登录服务，获取所有有权访问的功能
     data = {username: name, password: password}
@@ -191,6 +193,7 @@ let loginGen = async function (name, password) {
 }
 
 let GetLoginInfoService = {
+  SinglePageToken: {},
   // 登录后要处理的异步对象
   afterLogin: [],
   //验证码开关
@@ -210,6 +213,7 @@ let GetLoginInfoService = {
    * @param password
    */
   login (name, password) {
+    Vue.$login.SinglePageToken = cryptJS.AESEncrypt(JSON.stringify({name: name, password: password}), "3KMKqvgwR8ULbR8Z")
     return loginGen(name, password)
   },
 

package/src/plugins/validation.js

@@ -3,5 +3,5 @@ import Validator from 'vue-validator'
 Vue.use(Validator)
 //密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
 Vue.validator('strongpassword', function (val) {
-  return /^(?:(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
+  return /^(?:(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).{8,16}$/.test(val)
 });

package/src/system.js

@@ -16,9 +16,9 @@ import TestResourceTree from './components/server/TestResourceTree'
 import RightTree from './components/server/RightTree'
 import TestRightTree from './components/server/TestRightTree'
 export default function (val) {
-  //验证码开关赋值
-  if(val!=null){
-    GetLoginInfoService.Verification=val
+  // 验证码开关赋值
+  if (val != null) {
+    GetLoginInfoService.Verification = val
   }
   Vue.use(GetLoginInfoService)
   Vue.use(GetAppDataService)
@@ -35,8 +35,6 @@ export default function (val) {
   Vue.component('right-tree', RightTree)
   Vue.component('test-right-tree', TestRightTree)
 
-
-
   // 参数管理(新)
   Vue.component('param-manage', (resolve) => { require(['./components/parammanage/ParamManage'], resolve) })
   // 参数管理

package/.npmignore

@@ -1,9 +0,0 @@
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-/dev-server.js

package/src/.npmignore

@@ -1 +0,0 @@
-/main.js