tj

RuoYi-App/App.vue

@@ -54,6 +54,7 @@ export default {
     this.initTheme(); // 确保正确调用
     this.initStoreState();
     this.safeUpdateMenuVisibility();
+	
   },
   beforeDestroy() {
     this.isMounted = false;
@@ -67,7 +68,16 @@ export default {
           this.safeUpdateMenuVisibility();
         }
       }
-    }
+    },
+	  '$store.state.token': {
+	    handler(newToken) {
+	      if (newToken) {
+	        console.log('检测到新token，重新加载数据');
+	        this.reloadData();
+	      }
+	    },
+	    immediate: true
+	  }
   },
   methods: {
     // 确保 initTheme 方法正确定义
@@ -75,8 +85,8 @@ export default {
       console.log('主题初始化开始');
       
       // 设置默认主题
-      const themeName = uni.getStorageSync('selectedTheme') || 'aydzBlue';
-      
+      //const themeName = uni.getStorageSync('selectedTheme') || 'aydzBlue';
+        const themeName = localStorage.getItem('selectedTheme') || 'aydzBlue';
       // 应用主题变量
       const themes = {
         aydzBlue: {
@@ -157,7 +167,13 @@ export default {
           this.$router.push('/pages/login');
         }
       }
-    }
+    },
+	  reloadData() {
+	    // 在需要的地方调用此方法重新加载数据
+	    if (this.$route.path === '/pages/novel/list') {
+	      this.$refs.novelList?.initData?.();
+	    }
+	  }
   }
 }
 </script>

RuoYi-App/api/urls.js

@@ -0,0 +1,7 @@
+// 修正重复的/api路径
+export default {
+  NOVEL_LIST: '/novel/list', // 从 /api/novel/list 改为 /novel/list
+  CATEGORY_TREE: '/category/tree',
+  HOT_NOVELS: '/novel/hot',
+  ADS: '/ad/position'
+}

RuoYi-App/components/AdBanner.vue

@@ -22,7 +22,7 @@ export default {
   methods: {
     handleAdClick(ad) {
       // 广告点击统计
-      this.$http.post('/java-api/ad/click', { adId: ad.id });
+      this.$http.post('/ad/click', { adId: ad.id });
       
       // 处理跳转
       if (ad.linkType === 'NOVEL') {

RuoYi-App/config.js

@@ -2,7 +2,7 @@
 module.exports = {
   //baseUrl: 'https://vue.ruoyi.vip/prod-api',
    //baseUrl: 'http://localhost:8080',
-   baseUrl: process.env.VUE_APP_BASE_API || '/',
+   baseUrl: process.env.VUE_APP_BASE_API || 'http://localhost:8080',
   // 应用信息
   appInfo: {
     // 应用名称

RuoYi-App/pages/login.vue

@@ -45,8 +45,8 @@
 </template>
 
 <script>
-  import { getCodeImg } from '@/api/login'
-  import { getToken } from '@/utils/auth'
+  //import { getCodeImg } from '@/api/login'
+  //import { getToken } from '@/utils/auth'
 
   export default {
     data() {

RuoYi-App/pages/novel/detail.vue

@@ -64,7 +64,7 @@ export default {
       }
       
       // 加载章节广告
-      const adRes = await this.$http.get('/java-api/ad/position?code=CHAPTER_FOOTER');
+      const adRes = await this.$http.get('/ad/position?code=CHAPTER_FOOTER');
       this.chapterAds = adRes.data;
     },
     
@@ -87,7 +87,7 @@ export default {
     // 定时显示中间广告
     scheduleMidAd() {
       setTimeout(async () => {
-        const res = await this.$http.get('/java-api/ad/position?code=MID_CHAPTER');
+        const res = await this.$http.get('/ad/position?code=MID_CHAPTER');
         this.midAds = res.data;
         this.showMidAd = true;
         

RuoYi-App/pages/novel/list.vue

@@ -28,7 +28,7 @@
       <view v-if="novels.length === 0 && !error" class="empty-container">
         <image src="/static/empty-book.png" class="empty-img" />
         <text class="empty-text">暂无小说数据</text>
-        <button class="btn-refresh" @click="loadNovels">重新加载</button>
+		<button class="btn-refresh" @click="reloadData">重新加载</button>
       </view>
       
       <!-- 错误状态 -->
@@ -96,6 +96,7 @@
 <script>
 // 确保路径正确
 import AdBanner from '@/components/AdBanner';
+import urls from '@/api/urls';
 
 export default {
   components: { AdBanner },
@@ -166,7 +167,10 @@ export default {
         // 加载分类
     async loadCategories() {
       try {
-        const res = await this.$http.get('/java-api/category/tree');
+        // 公开API，不需要认证
+              const res = await this.$http.get('/category/tree', {}, {
+                header: { isToken: false } // 明确不携带token
+              });
         this.categories = res?.data ? [{ id: 0, name: '全部' }, ...res.data] : [];
       } catch (e) {
         console.error('加载分类失败', e);
@@ -176,8 +180,10 @@ export default {
     // 加载热门小说
     async loadHotNovels() {
       try {
-        const res = await this.$http.get('/novel/hot');
-        
+      // 公开API，不需要认证
+      const res = await this.$http.get('/novel/hot', {}, {
+        header: { isToken: false } // 明确不携带token
+      });
         // 处理响应
         if (res?.data?.rows) {
           this.hotNovels = res.data.rows;
@@ -197,8 +203,9 @@ export default {
       this.loading = true;
       this.error = null;
       try {
-        const res = await this.$http.get('/novel/list');
-        
+        // 使用正确的请求方式
+        //const res = await this.$http.get('/novel/list');
+         const res = await this.$http.get('/novel/list', {}, { header: { isToken: false } });
         // 处理响应
         if (res?.data?.rows) {
           this.novels = res.data.rows;
@@ -206,12 +213,12 @@ export default {
           this.novels = res.data;
         } else {
           console.warn('小说列表API返回格式未知', res);
-          this.novels = this.mockNovels; // 使用模拟数据
+          this.novels = this.mockNovels;
         }
       } catch (e) {
         console.error('加载小说失败', e);
         this.error = '加载失败，请重试';
-        this.novels = this.mockNovels; // 使用模拟数据
+        this.novels = this.mockNovels;
       } finally {
         this.loading = false;
       }
@@ -221,10 +228,9 @@ export default {
     async loadAds() {
       try {
         const [topRes, bottomRes] = await Promise.all([
-          this.$http.get('/java-api/ad/position?code=TOP_BANNER'),
-          this.$http.get('/java-api/ad/position?code=BOTTOM_BANNER')
+          this.$http.get('/ad/position?code=TOP_BANNER', {}, { header: { isToken: false } }),
+          this.$http.get('/ad/position?code=BOTTOM_BANNER', {}, { header: { isToken: false } })
         ]);
-        
         this.topAds = topRes?.data || topRes || [];
         this.bottomAds = bottomRes?.data || bottomRes || [];
       } catch (e) {
@@ -267,11 +273,15 @@ export default {
       }
       uni.navigateTo({ url: '/pages/author/apply' });
     },
-    
+
     goMore() {
       uni.navigateTo({
         url: '/pages/novel/more'
       });
+    },
+        // 确保重新加载按钮绑定到正确的方法
+    reloadData() {
+      this.initData();
     }
   }
 }

RuoYi-App/router/index.js

@@ -7,7 +7,7 @@ Vue.use(Router)
 const routes = [
   {
     path: '/',
-    redirect: '/pages/novel/list'
+    redirect: '/pages/index/index'
   },
   {
     path: '/pages/novel/list',
@@ -74,4 +74,4 @@ router.onReady(() => {
   console.log('Router is ready');
 })
 
-export default router
+export default router

RuoYi-App/services/api.js

@@ -2,11 +2,11 @@ import request from '@/utils/request'
 // Java 后台接口
 const javaApi = {
   // 小说相关接口
-  getNovelList: (params) => request({ url: '/java-api/novel/list', params }),
-  getChapterContent: (chapterId) => request({ url: `/java-api/novel/chapter/${chapterId}` }),
+  getNovelList: (params) => request({ url: '/novel/list', params }),
+  getChapterContent: (chapterId) => request({ url: `/novel/chapter/${chapterId}` }),
   
   // 作家申请
-  applyAuthor: (data) => request({ url: '/java-api/author/apply', method: 'post', data })
+  applyAuthor: (data) => request({ url: '/author/apply', method: 'post', data })
 }
 
 // PHP 后台接口 (预留)
@@ -84,7 +84,7 @@ export default {
   // 保存阅读进度
   saveReadingProgress(chapter) {
     return request({
-      url: '/java-api/reading/progress',
+      url: '/reading/progress',
       method: 'post',
       data: { chapter }
     })
@@ -93,7 +93,7 @@ export default {
   // 获取阅读进度
   getReadingProgress() {
     return request({
-      url: '/java-api/reading/progress',
+      url: '/reading/progress',
       method: 'get'
     })
   }

RuoYi-App/utils/auth.js

@@ -1,11 +1,16 @@
 const TokenKey = 'App-Token'
 
 export function getToken() {
-  return uni.getStorageSync(TokenKey)
+  //return uni.getStorageSync(TokenKey)
+    // 确保使用正确的存储方式
+    return uni.getStorageSync('token') || localStorage.getItem('token') || '';
 }
 
 export function setToken(token) {
-  return uni.setStorageSync(TokenKey, token)
+	  // 同时设置到uni和localStorage确保兼容性
+	  uni.setStorageSync('token', token);
+	  localStorage.setItem('token', token);
+  return uni.setStorageSync('token', token)
 }
 
 export function removeToken() {

RuoYi-App/utils/request.js

@@ -1,91 +1,93 @@
 // src/utils/request.js
 import config from '@/config'
+import { getToken } from '@/utils/auth'
+import { toast, showConfirm, tansParams } from '@/utils/common'
+
 const baseUrl = config.baseUrl
-// 使用直接导出的函数，避免 this 上下文问题
-export function get(url, params = {}, options = {}) {
-  return request('GET', url, params, options)
-}
+let timeout = 10000
 
-export function post(url, data = {}, options = {}) {
-  return request('POST', url, data, options)
-}
+const request = (configObj) => {  // 重命名参数为 configObj
+  // 确保传入的配置对象有效
+  configObj = configObj || {}
+  configObj.header = configObj.header || {}
+  
+  // 处理 token
+  const token = getToken()
+  // 只有存在token且未明确禁止携带token时才添加
+  if (token && configObj.header.isToken !== false) {
+    configObj.header['Authorization'] = 'Bearer ' + token
+  } else if (!token) {
+    console.warn('请求未携带Token:', configObj.url)
+  }
 
-function request(method, url, data = {}, options = {}) {
+  
+  // GET 请求参数处理
+  if (configObj.params) {
+    let url = configObj.url + '?' + tansParams(configObj.params)
+    url = url.slice(0, -1)
+    configObj.url = url
+  }
+  
   return new Promise((resolve, reject) => {
-    // 处理路径
-    let finalUrl = url;
-    
-    // 特殊处理 Java API
-    if (url.startsWith('/java-api')) {
-        finalUrl = url
-      }
-    // 普通 API 处理
-    else if (!url.startsWith('http')) {
-      // 确保只有一个 /api 前缀
-      if (!url.startsWith('/api')) {
-        finalUrl = '/api' + (url.startsWith('/') ? url : `/${url}`);
-      }
-    }
-    
-    const baseUrl = process.env.VUE_APP_BASE_API || '/';
-    const fullUrl = baseUrl + finalUrl;
-    
-    console.log('请求URL:', fullUrl, '方法:', method);
-    
     uni.request({
-      url: fullUrl,
-      method,
-      data,
-      header: {
-        'Content-Type': 'application/json',
-        ...(options.headers || {})
-      },
+      method: configObj.method || 'get',
+      timeout: configObj.timeout || timeout,
+      url: (configObj.baseUrl || baseUrl) + configObj.url,
+      data: configObj.data,
+      header: configObj.header,
+      dataType: 'json',
       success: (res) => {
-        console.log('API响应:', res);
-        
-        // 处理未授权情况
+        // 处理401认证失败
         if (res.statusCode === 401) {
-          uni.showToast({
-            title: '请先登录',
-            icon: 'none'
-          });
-          uni.navigateTo({
-            url: '/pages/login'
-          });
-          reject(new Error('未授权访问'));
-          return;
-        }
-        
-        // 统一处理成功响应
-        if (res.statusCode >= 200 && res.statusCode < 300) {
-          resolve(res.data)
+          // 更友好的错误处理
+          const errorMsg = res.data?.msg || '认证失败，请重新登录';
+          console.warn('认证失败:', configObj.url, errorMsg);
+          
+          // 显示提示但不强制跳转
+          toast(errorMsg);
+          
+          // 清除无效token
+          if (token) {
+            uni.removeStorageSync('token');
+            localStorage.removeItem('token');
+          }
+          
+          reject(new Error(errorMsg));
+        } else if (res.statusCode === 200) {
+          resolve(res.data);
         } else {
-          // 尝试提取错误消息
-          const errorMsg = res.data?.msg || res.data?.message || '请求失败';
-          reject(new Error(errorMsg))
+          reject(res.data);
         }
       },
       fail: (err) => {
-        console.error('请求失败:', err);
+        let message = '后端接口连接异常'
+        if (err.errMsg.includes('timeout')) {
+          message = '请求超时'
+        }
+        toast(message)
         reject(err)
       }
     })
   })
 }
-service.interceptors.request.use(config => {
-  // 从Vuex或localStorage获取token
-  const token = store.state.token || localStorage.getItem('token');
-  
-  if (token) {
-    config.headers['Authorization'] = `Bearer ${token}`;
-  }
-  return config;
-}, error => {
-  return Promise.reject(error);
-});
-// 导出对象以兼容旧代码
-export default {
-  get,
-  post,
-  request
+
+// 添加便捷方法
+request.get = (url, params, config = {}) => {
+  return request({
+    url,
+    params,
+    method: 'get',
+    ...config
+  })
 }
+
+request.post = (url, data, config = {}) => {
+  return request({
+    url,
+    data,
+    method: 'post',
+    ...config
+  })
+}
+
+export default request

RuoYi-App/vue.config.js

@@ -1,19 +1,16 @@
 // vue.config.js
+const path = require('path');
+
 module.exports = {
   devServer: {
     proxy: {
-      '/java-api': {
+      // 统一代理配置
+      '/': {
         target: 'http://localhost:8080',
         changeOrigin: true,
-        pathRewrite: { 
-          '^/java-api': '/java-api' // 保持原始路径
-        }
-      },
-      '/api': {
-        target: 'http://localhost:8080',
-        changeOrigin: true,
-        pathRewrite: { 
-          '^/api': '/api' // 修正路径重写规则
+        pathRewrite: {
+          '^/api': '', // 移除多余的/api前缀
+          '^/': '' 
         }
       }
     }

RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -129,12 +129,16 @@ public class SecurityConfig
     }
     // SecurityConfig.java
 
+
     protected void configure(HttpSecurity http) throws Exception {
         http
                 .authorizeRequests()
-                .antMatchers("/api/novel/list").permitAll() // 放行小说列表
-                .antMatchers("/java-api/category/tree").permitAll() // 放行分类
-                .antMatchers("/api/novel/hot").permitAll() // 放行热门小说
+                // 放行公共API
+                .antMatchers("/novel/list").permitAll()
+                .antMatchers("/category/tree").permitAll()
+                .antMatchers("/novel/hot").permitAll()
+                .antMatchers("/ad/position").permitAll()
+                // 其他请求需要认证
                 .anyRequest().authenticated()
                 .and()
                 .csrf().disable();

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/controller/NovelController.java

@@ -29,7 +29,7 @@ import java.util.concurrent.CompletableFuture;
 
 // NovelController.java
 @RestController
-@RequestMapping("/api/novel")
+@RequestMapping("/novel")
 public class NovelController extends BaseController {