diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 7ba56c9..7416da8 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@ ruoyi:
# 版权年份
copyrightYear: 2024
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
- profile: D:/ruoyi/uploadPath
+ profile: /home/ruoyi/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
diff --git a/ruoyi-admin/src/main/resources/config/ueditor/config.json b/ruoyi-admin/src/main/resources/config/ueditor/config.json
index 039c071..f009d07 100644
--- a/ruoyi-admin/src/main/resources/config/ueditor/config.json
+++ b/ruoyi-admin/src/main/resources/config/ueditor/config.json
@@ -7,7 +7,7 @@
"imageCompressEnable": true, /* 是否压缩图片,默认是true */
"imageCompressBorder": 1600, /* 图片压缩最长边限制 */
"imageInsertAlign": "none", /* 插入的图片浮动方式 */
- "imageUrlPrefix": "https://f382b38516.zicp.fun", /* 图片访问路径前缀 */
+ "imageUrlPrefix": "http://122.51.230.86:8001", /* 图片访问路径前缀 */
"imagePathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
/* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
/* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
@@ -43,27 +43,27 @@
"videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
"videoFieldName": "upfile", /* 提交的视频表单名称 */
"videoPathFormat": "video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "videoUrlPrefix": "https://f382b38516.zicp.fun", /* 视频访问路径前缀 */
+ "videoUrlPrefix": "http://122.51.230.86:8001", /* 视频访问路径前缀 */
"videoMaxSize": 102400000, /* 上传大小限制,单位B,默认100MB */
"videoAllowFiles": [ ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
/* 上传文件配置 */
"fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
"fileFieldName": "upfile", /* 提交的文件表单名称 */
"filePathFormat": "file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "fileUrlPrefix": "https://f382b38516.zicp.fun", /* 文件访问路径前缀 */
+ "fileUrlPrefix": "http://122.51.230.86:8001", /* 文件访问路径前缀 */
"fileMaxSize": 51200000, /* 上传大小限制,单位B,默认50MB */
"fileAllowFiles": [ ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" ], /* 上传文件格式显示 */
/* 列出指定目录下的图片 */
"imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
"imageManagerListPath": "image/", /* 指定要列出图片的目录 */
"imageManagerListSize": 20, /* 每次列出文件数量 */
- "imageManagerUrlPrefix": "https://f382b38516.zicp.fun", /* 图片访问路径前缀 */
+ "imageManagerUrlPrefix": "http://122.51.230.86:8001", /* 图片访问路径前缀 */
"imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
"imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
/* 列出指定目录下的文件 */
"fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
"fileManagerListPath": "file/", /* 指定要列出文件的目录 */
- "fileManagerUrlPrefix": "https://f382b38516.zicp.fun", /* 文件访问路径前缀 */
+ "fileManagerUrlPrefix": "http://122.51.230.86:8001", /* 文件访问路径前缀 */
"fileManagerListSize": 20, /* 每次列出文件数量 */
"fileManagerAllowFiles": [ ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" ] /* 列出的文件类型 */
}
diff --git a/ruoyi-admin/target/classes/application.yml b/ruoyi-admin/target/classes/application.yml
index 7ba56c9..7416da8 100644
--- a/ruoyi-admin/target/classes/application.yml
+++ b/ruoyi-admin/target/classes/application.yml
@@ -7,7 +7,7 @@ ruoyi:
# 版权年份
copyrightYear: 2024
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
- profile: D:/ruoyi/uploadPath
+ profile: /home/ruoyi/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
diff --git a/ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml b/ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml
index 58d1c7e..928600b 100644
--- a/ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml
+++ b/ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml
@@ -101,6 +101,61 @@
where id = #{id}
+
+ select id,
+ category_id,
+ content_type,
+ image_url,
+ video_url,
+ content_title,
+ content_img,
+ source,
+ source_url,
+ original,
+ author,
+ editor,
+ summary,
+ status,
+ publish_date,
+ offline_date,
+ is_accessory,
+ accessory_url,
+ remark,
+ del_flag,
+ create_time,
+ create_by,
+ update_time,
+ update_by,
+ link_type,
+ link,
+ count
+ from cms_content
+
+
+
insert into cms_content
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 09ba6d0..38e21be 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -115,7 +115,7 @@ public class SecurityConfig
// 静态资源,可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
- .antMatchers("/api/**", "/ueditor/**").permitAll()
+ .antMatchers("/api/**", "/ueditor/**","/system/dict/data/type/sys_user_sex").permitAll()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated();
})
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 534d120..ca013fb 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心
ENV = 'development'
# 若依管理系统/开发环境
-# VUE_APP_BASE_API = 'https://f382b38516.zicp.fun'
-VUE_APP_BASE_API = 'http://localhost:8080'
+# VUE_APP_BASE_API = 'http://122.51.230.86:8001'
+VUE_APP_BASE_API = 'http://127.0.0.1:8080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index b4893b0..3209854 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 = 'http://122.51.230.86:8001'
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 946fa75..9886fd5 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -54,6 +54,7 @@
"less": "^4.2.0",
"less-loader": "^12.2.0",
"nprogress": "0.2.0",
+ "or": "^0.2.0",
"quill": "1.3.7",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index ae03a7e..e30200b 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -8,7 +8,10 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register', '/virtually', '/sb','/about','/platform','/teaching','/team','/committee','/competition','/contact','/details','/about' ]
+const whiteList = ['/login', '/register',
+ '/virtually', '/sb','/about','/platform','/teaching','/team','/committee'
+ ,'/competition','/contact','/details','/about','/xufang','/list','/details'
+,'/news','/cases','/practice']
router.beforeEach((to, from, next) => {
NProgress.start()
@@ -47,7 +50,7 @@ router.beforeEach((to, from, next) => {
// 在免登录白名单,直接进入
next()
} else {
- next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
+ next(`/virtually?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
NProgress.done()
}
}
diff --git a/ruoyi-ui/src/views/officialWebsite/xufang.vue b/ruoyi-ui/src/views/officialWebsite/xufang.vue
index 93d1983..a5601db 100644
--- a/ruoyi-ui/src/views/officialWebsite/xufang.vue
+++ b/ruoyi-ui/src/views/officialWebsite/xufang.vue
@@ -124,6 +124,7 @@ export default {
}
},
created() {
+ console.log("128xufang")
// 页面加载完毕调用
this.initPageData();
this.getWebBaseInfo()