fp / fp_scm · Commits

Go to a project

Authored by meijiajie
Commit 41f4ae5f59777578c696daf0b05d70dc7c397f37 1 parent 6b3cb470

前端修改

Inline Side-by-side
Showing 100 changed files with 34 additions and 26 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 100+ files are displayed.

@@ -80,4 +80,14 @@ fCVkbmMlPSclMzQwJXo%3D @@ -80,4 +80,14 @@ fCVkbmMlPSclMzQwJXo%3D
80 80
81 81
82 LFV2A1151L6029426 82 LFV2A1151L6029426
83 -LFV2A2151G3063539  
  83 +LFV2A2151G3063539
  84 +
  85 +
  86 +
  87 +Aliyun Oss:
  88 +
  89 +AccessKey ID
  90 +LTAI5t6jsmACRpMLA2tSk557
  91 +
  92 +AccessKey Secret
  93 +LEm2vL2QIamV4m5GCop7aCMZZ23z8s
@@ -14,7 +14,7 @@ spring: @@ -14,7 +14,7 @@ spring:
14 datasource: 14 datasource:
15 type: com.zaxxer.hikari.HikariDataSource 15 type: com.zaxxer.hikari.HikariDataSource
16 driver-class-name: com.mysql.cj.jdbc.Driver 16 driver-class-name: com.mysql.cj.jdbc.Driver
17 - url: jdbc:mysql://192.168.3.117:3306/fp_scm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai 17 + url: jdbc:mysql://192.168.3.118:3306/fp_scm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
18 username: root 18 username: root
19 password: root 19 password: root
20 hikari: 20 hikari:
@@ -64,7 +64,7 @@ spring: @@ -64,7 +64,7 @@ spring:
64 driver-class-name: com.mysql.cj.jdbc.Driver 64 driver-class-name: com.mysql.cj.jdbc.Driver
65 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 65 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
66 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) 66 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
67 - url: jdbc:mysql://192.168.3.117:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 67 + url: jdbc:mysql://192.168.3.118:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
68 username: root 68 username: root
69 password: root 69 password: root
70 # 从库数据源 70 # 从库数据源
@@ -72,7 +72,7 @@ spring: @@ -72,7 +72,7 @@ spring:
72 lazy: true 72 lazy: true
73 type: com.zaxxer.hikari.HikariDataSource 73 type: com.zaxxer.hikari.HikariDataSource
74 driver-class-name: com.mysql.cj.jdbc.Driver 74 driver-class-name: com.mysql.cj.jdbc.Driver
75 - url: jdbc:mysql://192.168.3.117:3306/fp_scm2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 75 + url: jdbc:mysql://192.168.3.118:3306/fp_scm2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
76 username: root 76 username: root
77 password: root 77 password: root
78 shardingsphere: 78 shardingsphere:
@@ -81,7 +81,7 @@ spring: @@ -81,7 +81,7 @@ spring:
81 ds0: 81 ds0:
82 type: com.zaxxer.hikari.HikariDataSource 82 type: com.zaxxer.hikari.HikariDataSource
83 driver-class-name: com.mysql.cj.jdbc.Driver 83 driver-class-name: com.mysql.cj.jdbc.Driver
84 - url: jdbc:mysql://192.168.3.117:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 84 + url: jdbc:mysql://192.168.3.118:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
85 username: root 85 username: root
86 password: root 86 password: root
87 87
@@ -120,7 +120,7 @@ spring: @@ -120,7 +120,7 @@ spring:
120 spring: 120 spring:
121 redis: 121 redis:
122 # 地址 122 # 地址
123 - host: 192.168.3.117 123 + host: 192.168.3.118
124 # 端口，默认为6379 124 # 端口，默认为6379
125 port: 6379 125 port: 6379
126 # 数据库索引 126 # 数据库索引
@@ -64,7 +64,7 @@ spring: @@ -64,7 +64,7 @@ spring:
64 driver-class-name: com.mysql.cj.jdbc.Driver 64 driver-class-name: com.mysql.cj.jdbc.Driver
65 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 65 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
66 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) 66 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
67 - url: jdbc:mysql://192.168.3.117:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 67 + url: jdbc:mysql://192.168.3.118:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
68 username: root 68 username: root
69 password: root 69 password: root
70 # 从库数据源 70 # 从库数据源
@@ -72,7 +72,7 @@ spring: @@ -72,7 +72,7 @@ spring:
72 lazy: true 72 lazy: true
73 type: com.zaxxer.hikari.HikariDataSource 73 type: com.zaxxer.hikari.HikariDataSource
74 driver-class-name: com.mysql.cj.jdbc.Driver 74 driver-class-name: com.mysql.cj.jdbc.Driver
75 - url: jdbc:mysql://192.168.3.117:3306/fp_scm2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 75 + url: jdbc:mysql://192.168.3.118:3306/fp_scm2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
76 username: root 76 username: root
77 password: root 77 password: root
78 shardingsphere: 78 shardingsphere:
@@ -81,7 +81,7 @@ spring: @@ -81,7 +81,7 @@ spring:
81 ds0: 81 ds0:
82 type: com.zaxxer.hikari.HikariDataSource 82 type: com.zaxxer.hikari.HikariDataSource
83 driver-class-name: com.mysql.cj.jdbc.Driver 83 driver-class-name: com.mysql.cj.jdbc.Driver
84 - url: jdbc:mysql://192.168.3.117:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 84 + url: jdbc:mysql://192.168.3.118:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
85 username: root 85 username: root
86 password: root 86 password: root
87 87
@@ -120,7 +120,7 @@ spring: @@ -120,7 +120,7 @@ spring:
120 spring: 120 spring:
121 redis: 121 redis:
122 # 地址 122 # 地址
123 - host: 192.168.3.117 123 + host: 192.168.3.118
124 # 端口，默认为6379 124 # 端口，默认为6379
125 port: 6379 125 port: 6379
126 # 数据库索引 126 # 数据库索引
@@ -6,7 +6,7 @@ dataSources: @@ -6,7 +6,7 @@ dataSources:
6 coupon_user_db_0: 6 coupon_user_db_0:
7 dataSourceClassName: com.zaxxer.hikari.HikariDataSource 7 dataSourceClassName: com.zaxxer.hikari.HikariDataSource
8 driverClassName: com.mysql.jdbc.Driver 8 driverClassName: com.mysql.jdbc.Driver
9 - jdbcUrl: jdbc:mysql://192.168.3.117:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 9 + jdbcUrl: jdbc:mysql://192.168.3.118:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
10 username: root 10 username: root
11 password: root 11 password: root
12 12
@@ -64,7 +64,7 @@ spring: @@ -64,7 +64,7 @@ spring:
64 driver-class-name: com.mysql.cj.jdbc.Driver 64 driver-class-name: com.mysql.cj.jdbc.Driver
65 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 65 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
66 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) 66 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
67 - url: jdbc:mysql://192.168.3.117:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 67 + url: jdbc:mysql://192.168.3.118:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
68 username: root 68 username: root
69 password: root 69 password: root
70 # 从库数据源 70 # 从库数据源
@@ -72,7 +72,7 @@ spring: @@ -72,7 +72,7 @@ spring:
72 lazy: true 72 lazy: true
73 type: com.zaxxer.hikari.HikariDataSource 73 type: com.zaxxer.hikari.HikariDataSource
74 driver-class-name: com.mysql.cj.jdbc.Driver 74 driver-class-name: com.mysql.cj.jdbc.Driver
75 - url: jdbc:mysql://192.168.3.117:3306/fp_scm2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 75 + url: jdbc:mysql://192.168.3.118:3306/fp_scm2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
76 username: root 76 username: root
77 password: root 77 password: root
78 shardingsphere: 78 shardingsphere:
@@ -81,7 +81,7 @@ spring: @@ -81,7 +81,7 @@ spring:
81 ds0: 81 ds0:
82 type: com.zaxxer.hikari.HikariDataSource 82 type: com.zaxxer.hikari.HikariDataSource
83 driver-class-name: com.mysql.cj.jdbc.Driver 83 driver-class-name: com.mysql.cj.jdbc.Driver
84 - url: jdbc:mysql://192.168.3.117:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 84 + url: jdbc:mysql://192.168.3.118:3306/fp_scm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
85 username: root 85 username: root
86 password: root 86 password: root
87 87
@@ -120,7 +120,7 @@ spring: @@ -120,7 +120,7 @@ spring:
120 spring: 120 spring:
121 redis: 121 redis:
122 # 地址 122 # 地址
123 - host: 192.168.3.117 123 + host: 192.168.3.118
124 # 端口，默认为6379 124 # 端口，默认为6379
125 port: 6379 125 port: 6379
126 # 数据库索引 126 # 数据库索引
@@ -2,6 +2,7 @@ package com.ruoyi.system.domain; @@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
2 2
3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; 3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4 import com.alibaba.excel.annotation.ExcelProperty; 4 import com.alibaba.excel.annotation.ExcelProperty;
  5 +import com.baomidou.mybatisplus.annotation.IdType;
5 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
7 import com.ruoyi.common.annotation.ExcelDictFormat; 8 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -30,7 +31,7 @@ public class SysDictData extends BaseEntity { @@ -30,7 +31,7 @@ public class SysDictData extends BaseEntity {
30 * 字典编码 31 * 字典编码
31 */ 32 */
32 @ExcelProperty(value = "字典编码") 33 @ExcelProperty(value = "字典编码")
33 - @TableId(value = "dict_code") 34 + @TableId(value = "dict_code", type = IdType.AUTO)
34 private Long dictCode; 35 private Long dictCode;
35 36
36 /** 37 /**
@@ -2,6 +2,7 @@ package com.ruoyi.system.domain; @@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
2 2
3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; 3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4 import com.alibaba.excel.annotation.ExcelProperty; 4 import com.alibaba.excel.annotation.ExcelProperty;
  5 +import com.baomidou.mybatisplus.annotation.IdType;
5 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
7 import com.ruoyi.common.annotation.ExcelDictFormat; 8 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -30,7 +31,7 @@ public class SysDictType extends BaseEntity { @@ -30,7 +31,7 @@ public class SysDictType extends BaseEntity {
30 * 字典主键 31 * 字典主键
31 */ 32 */
32 @ExcelProperty(value = "字典主键") 33 @ExcelProperty(value = "字典主键")
33 - @TableId(value = "dict_id") 34 + @TableId(value = "dict_id", type = IdType.AUTO)
34 private Long dictId; 35 private Long dictId;
35 36
36 /** 37 /**
1 # 页面标题 1 # 页面标题
2 -VITE_APP_TITLE = RuoYi-Vue-Plus后台管理系统 2 +VITE_APP_TITLE = 凡配汽配运营平台
3 3
4 # 开发环境配置 4 # 开发环境配置
5 VITE_APP_ENV = 'development' 5 VITE_APP_ENV = 'development'
1 # 页面标题 1 # 页面标题
2 -VITE_APP_TITLE = RuoYi-Vue-Plus后台管理系统 2 +VITE_APP_TITLE = 凡配汽配运营平台
3 3
4 # 生产环境配置 4 # 生产环境配置
5 VITE_APP_ENV = 'production' 5 VITE_APP_ENV = 'production'
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <meta name="renderer" content="webkit"> 7 <meta name="renderer" content="webkit">
8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> 8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
9 <link rel="icon" href="/favicon.ico"> 9 <link rel="icon" href="/favicon.ico">
10 - <title>RuoYi-Vue-Plus管理系统</title> 10 + <title>凡配汽配运营平台</title>
11 <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--> 11 <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
12 <style> 12 <style>
13 html, 13 html,
@@ -212,4 +212,4 @@ @@ -212,4 +212,4 @@
212 <script type="module" src="/src/main.js"></script> 212 <script type="module" src="/src/main.js"></script>
213 </body> 213 </body>
214 214
215 -</html>  
  215 +</html>
1 { 1 {
2 "name": "ruoyi-vue-plus", 2 "name": "ruoyi-vue-plus",
3 "version": "4.8.2", 3 "version": "4.8.2",
4 - "description": "RuoYi-Vue-Plus后台管理系统", 4 + "description": "凡配运营管平台",
5 "author": "LionLi", 5 "author": "LionLi",
6 "license": "MIT", 6 "license": "MIT",
7 "scripts": { 7 "scripts": {
@@ -9,10 +9,6 @@ @@ -9,10 +9,6 @@
9 "build:prod": "vite build", 9 "build:prod": "vite build",
10 "preview": "vite preview" 10 "preview": "vite preview"
11 }, 11 },
12 - "repository": {  
13 - "type": "git",  
14 - "url": "https://gitee.com/JavaLionLi/RuoYi-Vue-Plus-UI.git"  
15 - },  
16 "dependencies": { 12 "dependencies": {
17 "@element-plus/icons-vue": "2.0.10", 13 "@element-plus/icons-vue": "2.0.10",
18 "@vueup/vue-quill": "1.2.0", 14 "@vueup/vue-quill": "1.2.0",