From bd214436d8cab22a4a35959e98a6abed3609c452 Mon Sep 17 00:00:00 2001
From: tangzh <tangzh@3721zh.com>
Date: Fri, 11 Jul 2025 21:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eladmin-web/.env.production                           |  4 ++--
 eladmin-web/src/router/routers.js                     |  4 ++--
 eladmin-web/src/store/modules/api.js                  |  2 +-
 eladmin-web/src/views/bus/busDevice/index.vue         | 11 +++++------
 eladmin-web/src/views/login.vue                       |  4 ++--
 .../src/main/resources/config/application-dev.yml     |  8 ++++----
 .../src/main/resources/config/application.yml         |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/eladmin-web/.env.production b/eladmin-web/.env.production
index 46ad91f..c734a30 100644
--- a/eladmin-web/.env.production
+++ b/eladmin-web/.env.production
@@ -2,6 +2,6 @@ ENV = 'production'
 
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
-VUE_APP_BASE_API  = 'http://121.37.139.13:8080'
+VUE_APP_BASE_API  = 'https://online.totustec.com/api'
 # 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'ws://121.37.139.13:8080'
+VUE_APP_WS_API = 'wss://online.totustec.com/api'
diff --git a/eladmin-web/src/router/routers.js b/eladmin-web/src/router/routers.js
index 8a4cf6c..bbbc87d 100644
--- a/eladmin-web/src/router/routers.js
+++ b/eladmin-web/src/router/routers.js
@@ -61,8 +61,8 @@ export const constantRouterMap = [
 ]
 
 export default new Router({
-  // mode: 'hash',
-  mode: 'history',
+  mode: 'hash',
+  // mode: 'history',
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap
 })
diff --git a/eladmin-web/src/store/modules/api.js b/eladmin-web/src/store/modules/api.js
index 563c578..a78999c 100644
--- a/eladmin-web/src/store/modules/api.js
+++ b/eladmin-web/src/store/modules/api.js
@@ -19,7 +19,7 @@ const api = {
     // 文件上传
     fileUploadApi: baseUrl + '/api/localStorage',
     // baseUrl，
-    baseApi: baseUrl
+    baseApi: baseUrl.replace('api', 'upload')
   }
 }
 
diff --git a/eladmin-web/src/views/bus/busDevice/index.vue b/eladmin-web/src/views/bus/busDevice/index.vue
index 7234afa..c23b5e3 100644
--- a/eladmin-web/src/views/bus/busDevice/index.vue
+++ b/eladmin-web/src/views/bus/busDevice/index.vue
@@ -99,7 +99,6 @@
 
 <script>
 import crudBusDevice, { getQrCode } from '@/api/bus/busDevice/busDevice'
-import commandPage from '@/views/bus/busDeviceCommand/index'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -110,7 +109,7 @@ import {mapGetters} from "vuex";
 const defaultForm = { id: null, deviceSn: null, model: null, brand: null, firmwareVersion: null, location: null, status: null, onlineTime: null, offlineTime: null, totalPrintTime: null, remark: null, type: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
 export default {
   name: 'BusDevice',
-  components: { pagination, crudOperation, rrOperation, udOperation, commandPage },
+  components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({ title: '', url: 'api/busDevice', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBusDevice }})
@@ -156,10 +155,10 @@ export default {
         this.qrCodeUrl = res
       })
     },
-    openCommandData(id) {
-      this.showCommandData = true
-      this.deviceId = id
-    },
+    // openCommandData(id) {
+    //   this.showCommandData = true
+    //   this.deviceId = id
+    // },
     closeCommandPage() {
       this.showCommandData = false
     },
diff --git a/eladmin-web/src/views/login.vue b/eladmin-web/src/views/login.vue
index 2c30654..ce085b8 100644
--- a/eladmin-web/src/views/login.vue
+++ b/eladmin-web/src/views/login.vue
@@ -56,8 +56,8 @@ export default {
       codeUrl: '',
       cookiePass: '',
       loginForm: {
-        username: 'admin',
-        password: '123456',
+        username: '',
+        password: '',
         rememberMe: false,
         code: '',
         uuid: ''
diff --git a/eladmin/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin/eladmin-system/src/main/resources/config/application-dev.yml
index bc983ce..5830c04 100644
--- a/eladmin/eladmin-system/src/main/resources/config/application-dev.yml
+++ b/eladmin/eladmin-system/src/main/resources/config/application-dev.yml
@@ -7,9 +7,9 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: com.p6spy.engine.spy.P6SpyDriver
-      url: jdbc:p6spy:mysql://121.37.139.13:3306/totus-online?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      url: jdbc:p6spy:mysql://localhost:3306/totus_online?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: root
-      password: minxianrui
+      password: Totusonline+++
       # 初始连接数，建议设置为与最小空闲连接数相同
       initial-size: 20
       # 最小空闲连接数，保持足够的空闲连接以应对请求
@@ -123,8 +123,8 @@ file:
     path: ~/file/
     avatar: ~/avatar/
   linux:
-    path: /www/wwwroot/online/upload/file/
-    avatar: /www/wwwroot/online/upload/avatar/
+    path: /www/wwwroot/online/115.29.224.107/upload/file/
+    avatar: /www/wwwroot/online/115.29.224.107/upload/avatar/
   windows:
     path: /eladmin/eladmin-upload/file/
     avatar: /eladmin/eladmin-upload/avatar/
diff --git a/eladmin/eladmin-system/src/main/resources/config/application.yml b/eladmin/eladmin-system/src/main/resources/config/application.yml
index 622b138..34c5494 100644
--- a/eladmin/eladmin-system/src/main/resources/config/application.yml
+++ b/eladmin/eladmin-system/src/main/resources/config/application.yml
@@ -68,4 +68,4 @@ logging:
     org.springframework.boot.autoconfigure: ERROR
   config: classpath:logback-spring.xml
   file:
-    path: ./online_log
\ No newline at end of file
+    path: ./logs
\ No newline at end of file