hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 20:28:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,728 Commits 20 Branches 0 Tags
e757d172029e33f48caf699350c498fc6682c5aa
Commit Graph

2728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
emaisi
12ede349fa ftp的在操作之前添加一个判断超时的重试。 2022-05-05 07:31:56 +00:00
YunaiV
e6893db1c3 uniapp：code review 商品分类、商品品牌 2022-05-05 00:52:25 +08:00
芋道源码
247b893131 !156 解决在windows下ftp上传和ftp下载的 
Merge pull request !156 from emaisi/feature/1.6.2
 2022-05-04 15:56:47 +00:00
YunaiV
a233ab1395 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
 2022-05-04 23:44:11 +08:00
emaisi
b5f97f69d3 注释标点符号和汉字空格 2022-05-04 22:56:27 +08:00
emaisi
bddd193185 调整注释 2022-05-04 22:47:39 +08:00
emaisi
472da026de 调整注释 2022-05-04 22:46:29 +08:00
emaisi
735228fcb1 修复ftp上传和下载的 2022-05-04 13:20:34 +08:00
芋道源码
4b90792bf1 !155 增加手机验证码登录 
Merge pull request !155 from 酱包/feature/1.6.2-smsLogin
 2022-05-03 09:12:21 +00:00
YunaiV
04f9f97162 调整社交登录界面，和登录界面保持统一 2022-05-03 17:04:20 +08:00
YunaiV
d0cd440380 压缩登录时的图片大小 2022-05-03 16:57:44 +08:00
酱包
4c4e37fd42 登录面板增加钉钉、企业微信支付按钮 2022-05-03 14:31:37 +08:00
芋道源码
4b09dfe855 !154 修复代码生成UpdateReqVO时import多一个括号问题 
Merge pull request !154 from 岁月无声/feat_chow5945
 2022-05-03 04:43:25 +00:00
zhoulei@xsyxsc.com
da2426c80d 修复代码生成VO多一个括号问题 
(cherry picked from commit 974cef3a534ae575422c75ab5a04b272d18a6b14)
 2022-05-03 12:30:21 +08:00
YunaiV
9848a95eb0 【升级】mysql-connector-java from 5.1.46 to 8.0.28 ：提升 MySQL 客户端的性能 2022-05-02 23:36:49 +08:00
芋道源码
3c2de45067 update yudao-server/src/main/resources/application-local.yaml. 
修改默认使用 MySQL 连接的示例
 2022-05-02 15:06:47 +00:00
YunaiV
7753bd4c44 1. code review 后台的短信验证码登陆 
2. 解决 SQL Server LIMIT 1 存在报错的问题
 2022-05-02 22:57:45 +08:00
YunaiV
4453ac27ff Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-smsLogin 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
	yudao-ui-admin/src/api/login.js
	yudao-ui-admin/src/store/modules/user.js
 2022-05-02 21:36:51 +08:00
sfmind
c533f5e5e8 优化精简vuex存储 2022-05-02 19:37:17 +08:00
YunaiV
ccdf0e4151 增加多数据库的适配说明 2022-05-02 18:17:44 +08:00
YunaiV
4c2e8c92d1 增加多数据库的适配说明 2022-05-02 18:11:26 +08:00
YunaiV
272e7dd206 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2022-05-02 18:07:12 +08:00
芋道源码
e750e15b96 !153 增加 SQLServer 的适配~ 
Merge pull request !153 from 芋道源码/feature/1.6.2
 2022-05-02 10:05:29 +00:00
YunaiV
60f918da84 增加 SQLServer 的适配~ 2022-05-02 18:04:34 +08:00
sfmind
73f53861b2 vuex统一命名风格:补充提交 2022-05-02 17:58:48 +08:00
sfmind
a3defee272 可变参数/app-api应配置到baseUrl 2022-05-02 17:46:45 +08:00
sfmind
5efd621f21 vuex统一命名风格 2022-05-02 16:53:56 +08:00
YunaiV
1f5e168e79 默认注释 Redis 的账号密码 2022-05-02 16:03:06 +08:00
YunaiV
fd0c07c1f8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql 2022-05-02 16:01:48 +08:00
芋道源码
6f312f9466 !147 增加redis密码 
Merge pull request !147 from Hermit/fork
 2022-05-02 08:01:34 +00:00
YunaiV
cf3cfdd2d6 补全用户与岗位的关联的单元测试，简化相关的实现代码 2022-05-02 15:59:38 +08:00
YunaiV
c845f3f012 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql 2022-05-02 15:24:24 +08:00
芋道源码
7d87be8b7d !113 新建一个关联表，维护用户和岗位的关系 
Merge pull request !113 from anzhen-tech/master
 2022-05-02 07:20:53 +00:00
芋道源码
1ebfb20d08 !135 【修复】代码生成对话框的日期选择器，在编辑情况下不能回显 
Merge pull request !135 from dearliuliu0522/dev
 2022-05-02 04:35:34 +00:00
YunaiV
8606f5c605 优化 UserSession 的实现，将 id 变成自增，额外增加 token 字段 2022-05-02 12:33:37 +08:00
芋道源码
501aea226a Merge pull request #137 from KLSOBIG/修复代码生成器biz路径问题 
修复代码生成器biz路径问题
 2022-05-02 11:57:36 +08:00
芋道源码
1a3e0b08c4 !108 update yudao-ui-admin/src/views/bpm/model/modelEditor.vue. 
Merge pull request !108 from 四叶草/N/A
 2022-05-02 03:55:47 +00:00
anzhen
18a3f4d3eb Merge branch 'upstream/master' 
# Conflicts:
#	sql/ruoyi-vue-pro.sql
 2022-05-02 11:50:35 +08:00
芋道源码
256405761b !152 对 Oracle 数据库的支持 
Merge pull request !152 from 芋道源码/feature/1.6.2
 2022-05-01 15:20:06 +00:00
YunaiV
0f21b55e6d 解决 Oracle 关键字冲突的问题 
导出最新的 SQL 脚本
 2022-05-01 23:18:50 +08:00
sfmind
a54298bf25 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-05-01 22:42:19 +08:00
sfmind
aa22ef8339 会员地址管理CRUD 2022-05-01 22:39:54 +08:00
sfmind
f7d384e55d api按模块单独配置文件 2022-05-01 22:39:16 +08:00
sfmind
083daa657d 用户登录token过期处理 2022-05-01 22:38:00 +08:00
YunaiV
2bd2313434 适配 Oracle 数据库 
1. 适配表名是大写的情况
2. 优化代码生成器的校验逻辑
 2022-05-01 19:47:30 +08:00
YunaiV
6f18adb54a 适配 Oracle 数据库 
1. 修复配置中心的 DAO 查询报错
2. 适配 LIMIT 1 的查询
 2022-05-01 17:55:13 +08:00
sfmind
83bc6fac65 引入级联选择插件w-picker 2022-05-01 17:51:44 +08:00
YunaiV
7db1a58bfc 适配 Oracle 数据库 
1. 去除关键字，避免数据库的查询冲突
 2022-05-01 13:33:02 +08:00
cuicui
3a4b0f4f75 合并bpm-base和bpm-flowable 为bpm-biz 2022-05-01 09:31:24 +08:00
YunaiV
1bd86d6ffd 适配 Oracle 数据库 
1. 解决 Menu 的 permission 为空，导致缓存初始化报错
2. 多租户拦截时，过滤掉 DUAL 表，避免 TENANT_ID 字段不存在的报错
3. BaseDO 增加 creator、updator 字段的 jdbcType，避免解析 null 值报错
 2022-05-01 01:12:27 +08:00