Переглянути джерело

添加mobile端的网络请求方法

zhangshuling 1 рік тому
батько
коміт
652dd97d8a

+ 1 - 1
xzl-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>xzl-admin</artifactId>
+    <artifactId>xzl-admin-digital</artifactId>
 
     <description>
         web服务入口

+ 1 - 1
xzl-admin/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://webapplication.mysql.polardb.rds.aliyuncs.com:3306/xtdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+                url: jdbc:mysql://webapplication.mysql.polardb.rds.aliyuncs.com:3306/xtdb_digital?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
 #                url: jdbc:mysql://webapplication.rwlb.rds.aliyuncs.com:3306/xtdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
                 username: jerry
                 password: zjr38zjR@

+ 1 - 1
xzl-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.70.192.124:3306/xtdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+                url: jdbc:mysql://10.70.192.124:3306/xtdb_digital?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
                 username: root
                 password: xtyc@2023@xzl
             #                url: jdbc:mysql://localhost:3306/xtdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false

+ 1 - 1
xzl-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ xzl:
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 8084
+  port: 8086
   servlet:
     # 应用的访问路径
     context-path: /

+ 2 - 2
xzl-ui/.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 用户画像与数据治理
+VUE_APP_TITLE = 卷烟数字化营销
 
 # 开发环境配置
 ENV = 'development'
 
-# 用户画像与数据治理/开发环境
+# 卷烟数字化营销/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

+ 1 - 1
xzl-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 用户画像管理系统
+VUE_APP_TITLE = 卷烟数字化营销
 
 # 生产环境配置
 ENV = 'production'

+ 2 - 2
xzl-ui/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 用户画像与数据治理
+VUE_APP_TITLE = 卷烟数字化营销
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 用户画像与数据治理/测试环境
+# 卷烟数字化营销/测试环境
 VUE_APP_BASE_API = '/stage-api'

+ 1 - 1
xzl-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "xzl",
   "version": "3.8.6",
-  "description": "用户画像管理系统",
+  "description": "卷烟数字化营销",
   "author": "XZL",
   "license": "MIT",
   "scripts": {

BIN
xzl-ui/src/assets/images/login-background.png


+ 3 - 20
xzl-ui/src/views/index.vue

@@ -1,28 +1,20 @@
 <template>
   <div id="screen" >
     <div class="hide_menu"></div>
-    <iframe frameborder="no"  width="100%" height="100%" :src="nlpSrc"></iframe>
+    <iframe frameborder="no"  width="100%" height="100%" src="http://10.70.192.122:9088/"></iframe>
   </div>
 </template>
 
 <script>
-  import {getNLPAuthData} from "@/utils/auth";
   export default {
     name: "Index",
     data() {
       return {
-        nlpAuthData: getNLPAuthData(),
-        nlpSrc: 'http://10.70.192.135:8000/#/'
+
       }
     },
     created() {
-      //带上authData 跳转到 nlp 系统
-      if(this.nlpAuthData && this.nlpAuthData.length > 0) {
-        this.nlpSrc = this.nlpSrc + "?authData=" + encodeURI(this.nlpAuthData)
-      } else {
-        // 提示nlp登录失败,请修改nlp系统密码与本系统一致
-        this.$modal.msgError("智能数据搜索系统登录失败,请修改密码与本系统一致");
-      }
+
     },
   }
 </script>
@@ -38,13 +30,4 @@
     height:100%;
     border:hidden;
   }
-
-  .hide_menu {
-    width:300px;
-    height: 3.375rem !important;
-    position: absolute;
-    top:0;
-    right: 12px;
-    background: #f5f6f7;
-  }
 </style>

+ 3 - 3
xzl-ui/src/views/login.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="login" style="">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <img id="switch" class="switch" ref="switch" :src="getImg()" @click="switchLogin()"  style="cursor: pointer;width: 60px;height: 60px;position: absolute;right: 0;top: 0;">
-      <h3 class="title">用户画像管理系统</h3>
+<!--      <img id="switch" class="switch" ref="switch" :src="getImg()" @click="switchLogin()"  style="cursor: pointer;width: 60px;height: 60px;position: absolute;right: 0;top: 0;">-->
+      <h3 class="title">卷烟数字化营销</h3>
       <div id="passLogin" v-if="isPassLogin">
         <el-form-item prop="username">
           <el-input
@@ -222,7 +222,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/login-background.png");
   background-size: cover;
 }