newsee-cli 1.0.3 → 1.0.4

package/micro_11111/src/views/Login/LoginThirdApp.vue

@@ -0,0 +1,77 @@
+<template>
+  <span></span>
+</template>
+
+<script>
+import mixins from '../../mixins';
+import { Toast } from 'vant';
+import { mapGetters } from 'vuex';
+import { login, decryptUserId } from '../../service/common';
+import { encrypt } from '../../utils/library/aes';
+import { getUrlParam } from '../../utils/library/urlhandle';
+import Cookie from 'js-cookie';
+
+export default {
+  name: 'Login',
+  mixins: [mixins],
+  computed: {
+    ...mapGetters(['token', 'account']),
+  },
+
+  methods: {
+    //获取登录信息
+    login() {
+      decryptUserId({ userInfo: getUrlParam('userId') }).then((newRes) => {
+        login(
+          encrypt(
+            JSON.stringify({
+              Request: {
+                Head: { NWVersion: '1', NWCode: '1SR', NWGUID: '', NWExID: '' },
+                Data: { account: newRes },
+              },
+            })
+          )
+        ).then(async (res) => {
+          this.$store.dispatch('setUserInfo', {
+            ...res,
+            token: res.userToken,
+          });
+          Cookie.set('token', res.userToken, { expires: 3 });
+          Cookie.set('app-id', '4ce19ca8fcd150a4', { expires: 3 });
+          Cookie.set('app-client-type', 'mb', { expires: 3 });
+
+          this.redirect();
+        });
+      });
+    },
+    //重定向
+    redirect() {
+      localStorage.setItem('source', 'fyapp');
+      this.$router.replace({ path: 'home', query: { timestamp: Date.now() } });
+    },
+  },
+
+  created() {
+    //进入页面前先清空一下localStorage
+    localStorage.clear();
+
+    const precinctId = getUrlParam('precinctId');
+    if (precinctId) this.$store.dispatch('setPrecinctId', { precinctId });
+    //在线时
+    if (navigator.onLine) {
+      if (getUrlParam('userId')) {
+        this.login();
+        return;
+      }
+      Toast('登录信息缺失');
+    } else {
+      //缓存登录
+      if (this.token) {
+        this.redirect();
+      } else {
+        Toast.fail('网络状态不佳，请先去有网的地方加载数据');
+      }
+    }
+  },
+};
+</script>

package/micro_11111/src/views/Login/LoginThirdParty.vue

@@ -0,0 +1,59 @@
+<template>
+  <span></span>
+</template>
+
+<script>
+import mixins from '../../mixins';
+import { Toast } from 'vant';
+import { mapGetters } from 'vuex';
+import { login } from '../../service/common';
+import { encrypt } from '../../utils/library/aes';
+import { getUrlParam } from '../../utils/library/urlhandle';
+
+export default {
+  name: 'Login',
+  mixins: [mixins],
+  computed: {
+    ...mapGetters(['token', 'account']),
+  },
+  created() {
+    //进入页面前先清空一下localStorage
+    localStorage.clear();
+
+    //在线时
+    if (navigator.onLine) {
+      this.$store.dispatch('setAccount', getUrlParam('userId'));
+      this.login();
+    } else {
+      //缓存登录
+      if (this.token) {
+        this.$router.replace({ path: 'home', query: { timestamp: Date.now() } });
+      } else {
+        Toast.fail('网络状态不佳，请先去有网的地方加载数据');
+      }
+    }
+  },
+  methods: {
+    //获取登录信息
+    login() {
+      login(
+        encrypt(
+          JSON.stringify({
+            Request: {
+              Head: { NWVersion: '1', NWCode: '1SR', NWGUID: '', NWExID: '' },
+              Data: { account: this.account },
+            },
+          })
+        )
+      ).then(async (res) => {
+        this.$store.dispatch('setUserInfo', {
+          ...res,
+          token: res.userToken,
+        });
+
+        this.$router.replace({ path: 'home', query: { timestamp: Date.now() } });
+      });
+    },
+  },
+};
+</script>

package/micro_11111/src/views/Prelogin/index.vue

@@ -0,0 +1,199 @@
+<template>
+  <div class="prelogin" v-if="needLogin">
+    <div class="center-area">
+      <van-form>
+        <field v-model="account" type="text" placeholder="请输入用户名">
+          <template slot="left-icon">
+            <img src="@/assets/trigger/user.png" alt="" />
+          </template>
+        </field>
+        <field v-model="pwd" type="password" placeholder="请输入密码" autocomplete>
+          <template slot="left-icon">
+            <img src="@/assets/trigger/pwd.png" alt="" />
+          </template>
+        </field>
+        <button @click="login">登 录</button>
+      </van-form>
+    </div>
+    <div class="bottom-area">
+      <div class="bottom-line">
+        <span>第三方账号登录</span>
+      </div>
+      <div class="quick-login" @click="quickLogin">
+        <div><img src="@/assets/trigger/weixin-work.png" alt="" />企业微信快速登录</div>
+      </div>
+    </div>
+    <popup v-model="popupShow" :close-on-click-overlay="false">
+      <loading size="40" />
+    </popup>
+  </div>
+</template>
+
+<script>
+import mixins from '@/mixins';
+import { Form, Field, Toast, Popup, Loading } from 'vant';
+import cryptoPassWord from '@/mixins/extension/cryptoPassWord';
+import { login } from '@/service/preload';
+
+export default {
+  mixins: [mixins, cryptoPassWord],
+  components: {
+    VanForm: Form,
+    Popup,
+    Loading,
+    Field,
+  },
+  data() {
+    return {
+      account: '',
+      pwd: '',
+      needLogin: false,
+      popupShow: false,
+    };
+  },
+  created() {
+    const userInfo = JSON.parse(localStorage.getItem('userInfo'));
+    if (userInfo && userInfo.userId) {
+      this.$router.replace({ name: 'login', query: { userId: userInfo.account } });
+    } else {
+      //进入页面前先清空一下localStorage
+      localStorage.clear();
+
+      this.needLogin = true;
+    }
+  },
+  methods: {
+    login() {
+      if (this.account.trim() === '' || this.pwd.trim() === '') {
+        Toast('账号或密码不能为空');
+        return;
+      }
+      this.popupShow = true;
+      login({
+        username: this.account,
+        userAccount: this.account,
+        password: this.getCryptoBybase64(this.pwd),
+      })
+        .then(async (res) => {
+          this.popupShow = false;
+          if (!res) return;
+          this.$store.dispatch('setUserInfo', {
+            ...res,
+            account: res.userAccount,
+          });
+          this.$store.dispatch('setAccount', res.userAccount);
+
+         this.redirect();
+        })
+        .catch((err) => {
+          this.popupShow = false;
+          Toast(err.toString());
+        });
+    },
+    quickLogin() {
+      this.$router.replace('/login');
+    },
+    redirect() {
+      localStorage.setItem('source', 'wx');
+      this.$router.replace({ path: 'home', query: { timestamp: Date.now() } });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.prelogin {
+  position: relative;
+  height: 100vh;
+  background: #fff url('~@/assets/layout/prelogin-header.png') no-repeat;
+  background-size: 100%;
+  .center-area {
+    position: absolute;
+    top: 50%;
+    width: 100%;
+    padding: 0 36px;
+    transform: translateY(-50%);
+    box-sizing: border-box;
+    /deep/ .van-cell {
+      padding-left: 0;
+      padding-right: 0;
+      &::after {
+        left: 0;
+        right: 0;
+        border-color: #ccc;
+      }
+      input {
+        font-size: 15px;
+      }
+      .van-field__left-icon {
+        display: flex;
+        align-items: flex-start;
+        margin-top: 2px;
+        margin-right: 20px;
+        img {
+          width: 20px;
+        }
+      }
+    }
+    button {
+      width: 100%;
+      height: 50px;
+      margin-top: 30px;
+      font-size: 18px;
+      color: #fff;
+      background: #307dcd;
+      border: none;
+      border-radius: 4px;
+    }
+  }
+  .bottom-area {
+    position: absolute;
+    bottom: 80px;
+    width: 100%;
+    text-align: center;
+    .bottom-line {
+      position: relative;
+      margin: 0 36px;
+      font-size: 10px;
+      color: #999;
+      span {
+        position: relative;
+        z-index: 99;
+        padding: 0 6px;
+        background: #fff;
+      }
+      &::after {
+        content: '';
+        position: absolute;
+        display: block;
+        top: 50%;
+        width: 100%;
+        height: 1px;
+        background: #ddd;
+        transform: translateY(-50%);
+      }
+    }
+    .quick-login {
+      margin: 40px auto 0;
+      display: inline-block;
+      padding: 10px 20px;
+      background: #f1f1f1;
+      border-radius: 39px;
+      > div {
+        display: flex;
+        align-items: center;
+        img {
+          width: 22px;
+          margin-right: 8px;
+        }
+      }
+    }
+  }
+}
+/deep/ .van-popup {
+  background: transparent;
+  .van-loading {
+    overflow: hidden;
+  }
+}
+</style>

package/micro_11111/static/loadBuffer/loadBuffer.js

@@ -0,0 +1,19 @@
+/**
+ * create Loading before loading
+ */
+function createLoading() {
+  var loadingDom = document.createElement('div');
+  loadingDom.setAttribute('id', 'loadingBuffer');
+  loadingDom.style.cssText = `
+    position: fixed;z-index: 99; width: 100%;height: 100%;top: 0;left: 0;
+    background: rgba(0, 0, 0, 0.3) url(static/loadBuffer/loading.gif) center center / 80px 80px no-repeat;
+  `;
+  document.body.appendChild(loadingDom);
+}
+
+//init
+createLoading();
+
+window.onload = function() {
+  document.body.removeChild(document.getElementById('loadingBuffer'));
+};

package/micro_11111/tag.js

@@ -0,0 +1,19 @@
+const fs = require('fs');
+const dayjs = require("dayjs")
+const data = require('./package.json');
+const execSync = require('child_process').execSync;
+
+
+const getGitBranch = () => {
+  let gitBranch = execSync('git name-rev --name-only HEAD');
+  return String(gitBranch).trim()
+}
+
+const nowTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+const  branch = getGitBranch()
+const tag = branch + '__' + nowTime
+
+
+data['tag'] = tag;
+
+fs.writeFileSync(`./package.json`, JSON.stringify(data, null, 2));

package/package.json

@@ -1,46 +1,46 @@
-{
-  "name": "newsee-cli",
-  "version": "1.0.3",
-  "description": "新视窗脚手架工具",
-  "main": "bin/init.js",
-  "bin": {
-    "ns-init": "./bin/init.js"
-  },
-  "scripts": {
-    "init": "node bin/init.js",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "uglifyjs": "uglifyjs ./src/init.js -o ./bin/init.js -c -m",
-    "build": "webpack --mode production"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/zhouxiazxzxzx/zx-cli.git"
-  },
-  "keywords": [
-    "cli",
-    "new-see",
-    "front",
-    "micro"
-  ],
-  "author": "zhouxia",
-  "license": "ISC",
-  "dependencies": {
-    "cli-progress": "^3.12.0",
-    "commander": "^10.0.1",
-    "download-git-repo": "^3.0.2",
-    "ejs": "^3.1.9",
-    "express": "^4.18.2",
-    "figlet": "^1.6.0",
-    "fs-extra": "^11.1.1",
-    "inquirer": "^8.0.0",
-    "javascript-obfuscator": "^4.0.2",
-    "js-beautify": "^1.14.7",
-    "ora": "5.4.1"
-  },
-  "devDependencies": {
-    "uglify-js": "^3.17.4",
-    "webpack": "^5.83.1",
-    "webpack-cli": "^5.1.1",
-    "webpack-obfuscator": "^3.5.1"
-  }
-}
+{
+  "name": "newsee-cli",
+  "version": "1.0.4",
+  "description": "新视窗脚手架工具",
+  "main": "bin/init.js",
+  "bin": {
+    "ns-init": "./bin/init.js"
+  },
+  "scripts": {
+    "init": "node bin/init.js",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "uglifyjs": "uglifyjs ./src/init.js -o ./bin/init.js -c -m",
+    "build": "webpack --mode production"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/zhouxiazxzxzx/zx-cli.git"
+  },
+  "keywords": [
+    "cli",
+    "new-see",
+    "front",
+    "micro"
+  ],
+  "author": "zhouxia",
+  "license": "ISC",
+  "dependencies": {
+    "cli-progress": "^3.12.0",
+    "commander": "^10.0.1",
+    "download-git-repo": "^3.0.2",
+    "ejs": "^3.1.9",
+    "express": "^4.18.2",
+    "figlet": "^1.6.0",
+    "fs-extra": "^11.1.1",
+    "inquirer": "^8.0.0",
+    "js-beautify": "^1.14.7",
+    "ora": "5.4.1",
+    "javascript-obfuscator": "^4.0.2"
+  },
+  "devDependencies": {
+    "webpack": "^5.83.1",
+    "webpack-cli": "^5.1.1",
+    "webpack-obfuscator": "^3.5.1",
+    "uglify-js": "^3.17.4"
+  }
+}