From 20721aeb026c1022f9494b956378cc1a35c2ae37 Mon Sep 17 00:00:00 2001
From: zhxlight <y389200311@163.com>
Date: Tue, 7 Dec 2021 21:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E7=BD=B2=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E7=9A=84=E8=8B=A5=E5=B9=B2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/chat/ab/entity/ChatFileData.java    | 4 +++-
 ruoyi-admin/src/main/resources/application.yml              | 2 +-
 .../main/{resource => resources}/mapper/DataappMapper.xml   | 0
 ruoyi-ui/.env.production                                    | 4 ++--
 ruoyi-ui/package.json                                       | 4 ++--
 ruoyi-ui/src/layout/components/Navbar.vue                   | 2 +-
 ruoyi-ui/src/layout/components/Sidebar/Logo.vue             | 2 +-
 ruoyi-ui/src/views/login.vue                                | 6 +++---
 ruoyi-ui/vue.config.js                                      | 2 +-
 9 files changed, 14 insertions(+), 12 deletions(-)
 rename ruoyi-framework/src/main/{resource => resources}/mapper/DataappMapper.xml (100%)
 mode change 100755 => 100644

diff --git a/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatFileData.java b/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatFileData.java
index 88a2bad..f75e50d 100644
--- a/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatFileData.java
+++ b/mobile-app/src/main/java/com/ruoyi/chat/ab/entity/ChatFileData.java
@@ -8,12 +8,14 @@ import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.sun.istack.internal.NotNull;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.apache.ibatis.annotations.Delete;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 文件与请求地址
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 83b3768..b29a300 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -105,7 +105,7 @@ accessToken:
   accessExcludes: /login,/register,/captchaImage
   # 匹配连接
 #  accessUrlPatterns:
-  accessUrlPatterns: /chat/*,/app/*,/file/*,/log/*
+  accessUrlPatterns: /chat/*,/app/user/api/*,/file/api/*,/classes/api/*
 
 
 # MyBatis配置
diff --git a/ruoyi-framework/src/main/resource/mapper/DataappMapper.xml b/ruoyi-framework/src/main/resources/mapper/DataappMapper.xml
old mode 100755
new mode 100644
similarity index 100%
rename from ruoyi-framework/src/main/resource/mapper/DataappMapper.xml
rename to ruoyi-framework/src/main/resources/mapper/DataappMapper.xml
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index b4893b0..2c4f1fa 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 移动应用开发平台
 
 # 生产环境配置
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '//152.136.255.110:8080'
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 341a144..ed2c1f1 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.7.0",
-  "description": "若依管理系统",
-  "author": "若依",
+  "description": "移动应用开发平台",
+  "author": "内蒙古大学",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 39b3dad..c3eb46a 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -102,7 +102,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          location.href = '/';
         })
       }).catch(() => {});
     }
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
index 0c9243c..e600c9b 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '若依管理系统',
+      title: '移动应用开发平台',
       logo: logoImg
     }
   }
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 7b8f91f..09917e8 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-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">若依后台管理系统</h3>
+      <h3 class="title">移动应用开发平台</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" />
@@ -68,8 +68,8 @@ export default {
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         //code: "",
         //uuid: ""
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 3f99d28..54bdc60 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -5,7 +5,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '移动应用开发平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-- 
Gitee