修复一些bug

2025-12-30 12:02:26 +00:00 · 2024-12-31 09:48:01 +08:00
parent 15f887838e
commit 7ffba7707b
24 changed files with 336 additions and 107 deletions
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@

 - admin/admin123  

-演示地址：
+演示地址：http://ry.orangepromax.asia/index

 ## 联系方式

--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@

    <name>ruoyi</name>
    <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
+    <description>Flowable工作流管理</description>

    <properties>
        <ruoyi.version>3.8.8</ruoyi.version>
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -73,11 +73,11 @@
            <artifactId>ruoyi-work</artifactId>
        </dependency>

-        <!-- api模块-->
-<!--        <dependency>-->
-<!--            <groupId>com.ruoyi</groupId>-->
-<!--            <artifactId>ruoyi-api</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
+        </dependency>
    </dependencies>

    <build>
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -113,7 +113,7 @@ public class SwaggerConfig
        // 用ApiInfoBuilder进行定制
        return new ApiInfoBuilder()
                // 设置标题
-                .title("标题：若依管理系统_接口文档")
+                .title("标题：Flowable工作流管理_接口文档")
                // 描述
                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                // 作者信息
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -9,6 +9,10 @@ spring:
                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                username: root
                password: haoxin
+#            master:
+#                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: ry-vue
+#                password: Y8cTTmrLh8D3F6sE
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,6 +7,7 @@ ruoyi:
  # 版权年份
  copyrightYear: 2024
  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+#  profile: /home/ruoyi/uploadPath
  profile: D:/ruoyi/uploadPath
  # 获取ip地址开关
  addressEnabled: false
@@ -72,8 +73,9 @@ spring:
    # 端口，默认为6379
    port: 6379
    # 数据库索引
-    database: 0
+    database: 5
    # 密码
+#    password: ruoyi123
    password:
    # 连接超时时间
    timeout: 10s
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -23,7 +23,7 @@ import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;

 /**
 * spring security配置
- * 
+ *
 * @author ruoyi
 */
@EnableMethodSecurity(prePostEnabled = true, securedEnabled = true)
@@ -35,7 +35,7 @@ public class SecurityConfig
     */
    @Autowired
    private UserDetailsService userDetailsService;
-    
+
    /**
     * 认证失败处理类
     */
@@ -53,7 +53,7 @@ public class SecurityConfig
     */
    @Autowired
    private JwtAuthenticationTokenFilter authenticationTokenFilter;
-    
+
    /**
     * 跨域过滤器
     */
@@ -114,7 +114,7 @@ public class SecurityConfig
                requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
                    // 静态资源，可匿名访问
                    .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                    .antMatchers("/doc.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                    // 除上面外的所有请求全部需要鉴权认证
                    .anyRequest().authenticated();
            })
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = Flowable工作流管理

 # 开发环境配置
 ENV = 'development'

-# 若依管理系统/开发环境
+# Flowable工作流管理/开发环境
 VUE_APP_BASE_API = '/dev-api'

 # 路由懒加载
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = Flowable工作流管理

 # 生产环境配置
 ENV = 'production'

-# 若依管理系统/生产环境
+# Flowable工作流管理/生产环境
 VUE_APP_BASE_API = '/prod-api'
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = Flowable工作流管理

 BABEL_ENV = production

@@ -8,5 +8,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'

-# 若依管理系统/测试环境
+# Flowable工作流管理/测试环境
 VUE_APP_BASE_API = '/stage-api'
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,7 +1,7 @@
 {
  "name": "ruoyi",
  "version": "3.8.8",
-  "description": "若依管理系统",
+  "description": "Flowable工作流管理",
  "author": "若依",
  "license": "MIT",
  "scripts": {
--- a/ruoyi-ui/src/assets/images/login-background.jpg
+++ b/ruoyi-ui/src/assets/images/login-background.jpg
--- a/ruoyi-ui/src/assets/images/pay.png
+++ b/ruoyi-ui/src/assets/images/pay.png
--- a/ruoyi-ui/src/assets/images/profile.jpg
+++ b/ruoyi-ui/src/assets/images/profile.jpg
--- a/ruoyi-ui/src/assets/images/wx.jpg
+++ b/ruoyi-ui/src/assets/images/wx.jpg
--- a/ruoyi-ui/src/assets/images/zfb.jpg
+++ b/ruoyi-ui/src/assets/images/zfb.jpg
--- a/ruoyi-ui/src/components/RuoYi/Git/index.vue
+++ b/ruoyi-ui/src/components/RuoYi/Git/index.vue
@@ -9,7 +9,7 @@ export default {
  name: 'RuoYiGit',
  data() {
    return {
-      url: 'https://gitee.com/y_project/RuoYi-Vue'
+      url: 'https://gitee.com/tangwenzhaoaini/RuoYi-Vue-flowable'
    }
  },
  methods: {
@@ -18,4 +18,4 @@ export default {
    }
  }
 }
-</script>
+</script>
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -13,9 +13,9 @@
          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
        </el-tooltip>

-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
+<!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->

        <screenfull id="screenfull" class="right-menu-item hover-effect" />

--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -1,98 +1,223 @@
 <template>
-  <div class="dashboard-editor-container">
-
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
-
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
-
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
-        </div>
+  <div class="app-container home">
+    <el-row :gutter="20">
+      <el-col :sm="24" :lg="12" style="padding-left: 20px">
+        <h2>基于RuoYi-Vue+Flowable的工作流管理平台</h2>
+        <p>
+          我看咯蛮多工作流开源项目的，发现不合适我们公司产品，所有我直接仿照别人做咯一个，新增咯模型模板，流程菜单等功能，希望对大家有帮助，谢谢！
+        </p>
+        <p>
+          <b>当前版本:</b> <span>v{{ version }}</span>
+        </p>
+        <p>
+          <el-tag type="danger">&yen;免费开源</el-tag>
+        </p>
+        <p>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="el-icon-cloudy"
+            plain
+            @click="goTarget('https://gitee.com/tangwenzhaoaini/RuoYi-Vue-flowable')"
+          >访问码云
+          </el-button
+          >
+        </p>
      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
-        </div>
+
+      <el-col :sm="24" :lg="12" style="padding-left: 50px">
+        <el-row>
+          <el-col :span="12">
+            <h2>技术选型:感谢Ruoyi-Vue</h2>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <h4>后端技术</h4>
+            <ul>
+              <li>SpringBoot</li>
+              <li>Spring Security</li>
+              <li>MyBatis-Plus</li>
+              <li>Flowable</li>
+              <li>JWT</li>
+              <li>...</li>
+            </ul>
+          </el-col>
+          <el-col :span="6">
+            <h4>前端技术</h4>
+            <ul>
+              <li>Vue</li>
+              <li>Vuex</li>
+              <li>Element-ui</li>
+              <li>Axios</li>
+              <li>Sass</li>
+              <li>...</li>
+            </ul>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <el-divider/>
+    <el-row :gutter="20">
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <el-card class="update-log">
+          <div slot="header" class="clearfix">
+            <span>联系信息</span>
+          </div>
+          <div class="body">
+            <p>
+              <i class="el-icon-s-promotion"></i> 演示地址：
+              <el-link
+                href="http://www.ruoyi.vip"
+                target="_blank"
+              >http://ry.orangepromax.asia/index
+              </el-link
+              >
+            </p>
+            <p>
+              <i class="el-icon-chat-dot-round"></i> 微信：<a
+              href="javascript:;"
+            >NYHHDWGZL 添加备注来意</a
+            >
+            </p>
+            <p>
+              <i class="el-icon-money"></i> QQ：<a
+              href="javascript:;"
+              class="QQ"
+            >2929004360 添加备注来意</a
+            >
+            </p>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <el-card class="update-log">
+          <div slot="header" class="clearfix">
+            <span>更新日志</span>
+          </div>
+          <el-collapse accordion v-model="activeNames">
+            <el-collapse-item title="v1.0.0 - 2024-12-31" name="1">
+              <ol>
+                <li>RuoYi-Vue+Flowable的工作流管理平台系统正式发布</li>
+              </ol>
+            </el-collapse-item>
+          </el-collapse>
+        </el-card>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="12" :lg="8">
+        <el-card class="update-log">
+          <div slot="header" class="clearfix">
+            <span>捐赠支持</span>
+          </div>
+          <div class="body">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="24" :md="24" :lg="12">
+                <img
+                  src="@/assets/images/wx.jpg"
+                  alt="donate"
+                  width="250px"
+                  height="320px"
+                />
+              </el-col>
+              <el-col :xs="24" :sm="24" :md="12" :lg="12">
+                <img
+                  src="@/assets/images/zfb.jpg"
+                  alt="donate"
+                  width="250px"
+                  height="320px"
+                />
+              </el-col>
+            </el-row>
+          </div>
+          <span style="display: inline-block; height: 30px; line-height: 30px"
+          >你可以请作者喝杯咖啡表示鼓励</span>
+        </el-card>
      </el-col>
    </el-row>
-
-    
  </div>
 </template>

 <script>
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
-
-const lineChartData = {
-  newVisitis: {
-    expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
-
 export default {
-  name: 'Index',
-  components: {
-    PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart
-  },
+  name: "Index",
  data() {
    return {
-      lineChartData: lineChartData.newVisitis
-    }
+      // 版本号
+      version: "1.0.0",
+      activeNames: '1'
+    };
  },
  methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
+    goTarget(href) {
+      window.open(href, "_blank");
    }
  }
-}
+};
 </script>

-<style lang="scss" scoped>
-.dashboard-editor-container {
-  padding: 32px;
-  background-color: rgb(240, 242, 245);
-  position: relative;
-
-  .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
+<style scoped lang="scss">
+.home {
+  blockquote {
+    padding: 10px 20px;
+    margin: 0 0 20px;
+    font-size: 17.5px;
+    border-left: 5px solid #eee;
  }
-}

-@media (max-width:1024px) {
-  .chart-wrapper {
-    padding: 8px;
+  hr {
+    margin-top: 20px;
+    margin-bottom: 20px;
+    border: 0;
+    border-top: 1px solid #eee;
+  }
+
+  .col-item {
+    margin-bottom: 20px;
+  }
+
+  ul {
+    padding: 0;
+    margin: 0;
+  }
+
+  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  color: #676a6c;
+  overflow-x: hidden;
+
+  ul {
+    list-style-type: none;
+  }
+
+  h4 {
+    margin-top: 0px;
+  }
+
+  h2 {
+    margin-top: 10px;
+    font-size: 26px;
+    font-weight: 100;
+  }
+
+  p {
+    margin-top: 10px;
+
+    b {
+      font-weight: 700;
+    }
+  }
+
+  .update-log {
+    ol {
+      display: block;
+      list-style-type: decimal;
+      margin-block-start: 1em;
+      margin-block-end: 1em;
+      margin-inline-start: 0;
+      margin-inline-end: 0;
+      padding-inline-start: 40px;
+    }
  }
 }
 </style>
+
--- a/ruoyi-ui/src/views/index1.vue
+++ b/ruoyi-ui/src/views/index1.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="dashboard-editor-container">
+
+    <panel-group @handleSetLineChartData="handleSetLineChartData" />
+
+    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+      <line-chart :chart-data="lineChartData" />
+    </el-row>
+
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <raddar-chart />
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <pie-chart />
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <bar-chart />
+        </div>
+      </el-col>
+    </el-row>
+
+    
+  </div>
+</template>
+
+<script>
+import PanelGroup from './dashboard/PanelGroup'
+import LineChart from './dashboard/LineChart'
+import RaddarChart from './dashboard/RaddarChart'
+import PieChart from './dashboard/PieChart'
+import BarChart from './dashboard/BarChart'
+
+const lineChartData = {
+  newVisitis: {
+    expectedData: [100, 120, 161, 134, 105, 160, 165],
+    actualData: [120, 82, 91, 154, 162, 140, 145]
+  },
+  messages: {
+    expectedData: [200, 192, 120, 144, 160, 130, 140],
+    actualData: [180, 160, 151, 106, 145, 150, 130]
+  },
+  purchases: {
+    expectedData: [80, 100, 121, 104, 105, 90, 100],
+    actualData: [120, 90, 100, 138, 142, 130, 130]
+  },
+  shoppings: {
+    expectedData: [130, 140, 141, 142, 145, 150, 160],
+    actualData: [120, 82, 91, 154, 162, 140, 130]
+  }
+}
+
+export default {
+  name: 'Index',
+  components: {
+    PanelGroup,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart
+  },
+  data() {
+    return {
+      lineChartData: lineChartData.newVisitis
+    }
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.lineChartData = lineChartData[type]
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
+
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
+  }
+}
+
+@media (max-width:1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}
+</style>
--- 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">Flowable工作流管理平台</h3>
      <el-form-item prop="username">
        <el-input
          v-model="loginForm.username"
@@ -72,8 +72,8 @@ export default {
    return {
      codeUrl: "",
      loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
        rememberMe: false,
        code: "",
        uuid: ""
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="register">
    <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">Flowable工作流管理平台</h3>
      <el-form-item prop="username">
        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
--- a/ruoyi-ui/src/views/tool/swagger/index.vue
+++ b/ruoyi-ui/src/views/tool/swagger/index.vue
@@ -8,7 +8,7 @@ export default {
  components: { iFrame },
  data() {
    return {
-      url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
+      url: process.env.VUE_APP_BASE_API + "/doc.html"
    };
  },
 };
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {

 const CompressionPlugin = require('compression-webpack-plugin')

-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || 'Flowable工作流管理' // 网页标题

 const port = process.env.port || process.env.npm_config_port || 80 // 端口