部署优化

lab-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetBorrowRecordServiceImpl.java

@@ -332,8 +332,7 @@ public class TbAssetBorrowRecordServiceImpl extends ServiceImpl<TbAssetBorrowRec
             }
             String html = start + content + end2;
 
-            // TODO 邮箱记得更换回来
-            emailUtils.sendHtmlMail("2786794141@qq.com", "待归还设备提醒", html);
+            emailUtils.sendHtmlMail(email, "待归还设备提醒", html);
         }
     }
 }

lab-admin/src/main/java/com/ruoyi/asset/service/impl/TbFaultReportServiceImpl.java

@@ -212,10 +212,7 @@ public class TbFaultReportServiceImpl extends ServiceImpl<TbFaultReportMapper, T
 
             SysUser sysUser = userMapper.selectUserById(1L);
             String format = String.format("报备设备条形码：%s，报备设备名称：%s，故障原因：%s", assetBarCode, tbAsset.getName(), tbFaultReport.getFaultPhenomenon());
-            // emailUtils.sendSimpleEmail(sysUser.getEmail(), "设备报备通知", format);
-
-            // TODO 记得改回注释代码
-            emailUtils.sendSimpleEmail("1248708657@qq.com", "设备报备通知", format);
+            emailUtils.sendSimpleEmail(sysUser.getEmail(), "设备报备通知", format);
         }
 
         return result ? AjaxResult.success("故障上报成功", tbFaultReport) : AjaxResult.error("故障上报失败");

lab-admin/src/main/resources/application-druid.yml

@@ -7,9 +7,9 @@ spring:
             # 主库数据源
             master:
                 username: root
-                # 腾讯云
-                url: jdbc:mysql://43.139.55.209:3306/lab_equipment_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                password: syLwt@123456
+                # 本地
+                url: jdbc:mysql://127.0.0.1:3306/lab_equipment_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                password: Gzpj$100
                 # 远程
                 # url: jdbc:mysql://114.116.114.108:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 # password: ydl@123456

lab-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: E:/ruoyi/uploadPath #  --ruoyi.profile=/root/ydl/lab-manage-GZYKD/ruoyi/uploadPath
+  profile: /home/test/lab_manage/uploadPath  # E:/ruoyi/uploadPath #  --ruoyi.profile=/root/ydl/lab-manage-GZYKD/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -32,11 +32,11 @@ server:
       max: 800
       # Tomcat启动初始化的线程数，默认值10
       min-spare: 100
-  ssl: # 配置SSL
-    key-store: classpath:sylwt.top.jks
-    key-store-password: 8470678b3qon7x2
-    key-store-type: JKS
-    enabled: true
+#  ssl: # 配置SSL
+#    key-store: classpath:sylwt.top.jks
+#    key-store-password: 8470678b3qon7x2
+#    key-store-type: JKS
+#    enabled: true
 
 # 日志配置
 logging:
@@ -75,14 +75,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    # host: 114.116.114.108
+    host: 127.0.0.1
     # 密码
-    # password: foobared
-
-    # 地址
-    host: 43.139.55.209
-    # 密码
-    password: syLwt@123456
+    password:
     # 端口，默认为6379
     port: 6379
     # 数据库索引

lab-ui/src/views/asset/asset/index.vue

@@ -379,7 +379,7 @@
             :options="deptList"
             :show-all-levels="false"
             filterable
-            clearable 
+            clearable
             :props="{value: 'id', emitPath: false}"
             placeholder="请选择使用部门"
           ></el-cascader>
@@ -446,7 +446,7 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
-    
+
     <!-- 批量添加设备视频对话框 -->
     <el-dialog :title="title" :visible.sync="openBanding" width="700px" append-to-body>
       <AssetVideoAdd v-if="openBanding" :assetData="assetData"/>
@@ -560,7 +560,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/asset/asset/importData" // todo
+        url: process.env.VUE_APP_BASE_API + "/asset/asset/importData" // todo 记得服务器新增该路径
       },
       tempValueOptions:[],
       // 选中的设备

lab-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://sylwt.top:8080/`,
+        target: `http://127.0.0.1:8080`, // https://sylwt.top:8080/
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''