Browse Source

修改前端基础项目相关配置

张启 4 năm trước cách đây
mục cha
commit
fa529e6c56
2 tập tin đã thay đổi với 25 bổ sung15 xóa
  1. 23 14
      future-ui/src/views/login.vue
  2. 2 1
      future-ui/vue.config.js

+ 23 - 14
future-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">Future WEb系统</h3>
+      <h3 class="title">{{ loginTitle }}</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -48,7 +48,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2021 Future All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -56,17 +56,19 @@
 <script>
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { encrypt, decrypt } from '@/utils/jsencrypt';
+const loginAppProjectKey = process.env.VUE_APP_PROJECT_KEY + '-';
 
 export default {
   name: "Login",
   data() {
     return {
+      loginTitle: this.$store.getters.projectName,
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
@@ -93,6 +95,13 @@ export default {
     }
   },
   created() {
+    if (process.env.VUE_APP_BASE_API === '/dev-api') {
+      this.loginForm.username = 'admin';
+      this.loginForm.password = 'admin123';
+    } else {
+      this.loginForm.username = '';
+      this.loginForm.password = '';
+    }
     this.getCode();
     this.getCookie();
   },
@@ -104,9 +113,9 @@ export default {
       });
     },
     getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
+      const username = Cookies.get(loginAppProjectKey + "username");
+      const password = Cookies.get(loginAppProjectKey + "password");
+      const rememberMe = Cookies.get(loginAppProjectKey + 'rememberMe')
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password: password === undefined ? this.loginForm.password : decrypt(password),
@@ -118,13 +127,13 @@ export default {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set(loginAppProjectKey + "username", this.loginForm.username, { expires: 30 });
+            Cookies.set(loginAppProjectKey + "password", encrypt(this.loginForm.password), { expires: 30 });
+            Cookies.set(loginAppProjectKey + 'rememberMe', this.loginForm.rememberMe, { expires: 30 });
           } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
+            Cookies.remove(loginAppProjectKey + "username");
+            Cookies.remove(loginAppProjectKey + "password");
+            Cookies.remove(loginAppProjectKey + 'rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
             this.$router.push({ path: this.redirect || "/" }).catch(() => { });

+ 2 - 1
future-ui/vue.config.js

@@ -16,7 +16,7 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
+  // 例如 https://www.test.com/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.test.com/admin/,则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
   outputDir: 'dist',
@@ -35,6 +35,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://localhost:8080`,
+        // target: `http://172.16.90.64:18080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''