Commit Graph

80 Commits

Author SHA1 Message Date
caixiang
23b5ce90c9 Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/SPC 2022-07-20 15:33:46 +08:00
caixiang
2b34011129 mark for pull 2022-07-20 15:33:30 +08:00
3a77498965 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
 Conflicts:
	ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java
2022-07-20 15:30:30 +08:00
3bd383a347 mark 2022-07-20 15:29:54 +08:00
718ad8a8c2 product_features表 2022-07-20 15:14:39 +08:00
caixiang
13020d05c9 新增判读方案 2022-07-15 17:15:42 +08:00
caixiang
970359823b 新增判读方案 2022-07-13 16:41:43 +08:00
1830bb64ea test 2022-07-05 11:17:35 +08:00
0dc10a669f test 2022-07-05 09:52:58 +08:00
caixiang
facfe5c7a2 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2022-07-04 14:49:53 +08:00
caixiang
d3500d195b mark for influx 2022-07-04 14:49:49 +08:00
weihongyang
8159ffc509 feat: 🔧 新增swagger配置让swagger和actuator无冲突 2022-07-04 09:54:08 +08:00
caixiang
e5def9fb33 mark 2022-07-04 08:32:21 +08:00
caixiang
4c2e20bf0d 删掉了 ,spc不需要的模块 2022-06-30 15:28:19 +08:00
caixiang
c15c0e1f1c Merge branch 'master' of http://git.picaiba.com/why/ym
 Conflicts:
	pom.xml
	ym-gateway/src/main/java/com/cnbm/config/SwaggerConfig.java
	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
2022-06-30 11:49:31 +08:00
weihongyang
e4bfce9df3 fix: 🔧 2022-06-30 08:40:59 +08:00
weihongyang
3a090fb584 feat: 添加websocket模块之后maven必要添加 2022-06-29 16:33:10 +08:00
weihongyang
e277f2a32e feat: 给websocket的请求放行 2022-06-29 16:32:20 +08:00
weihongyang
6d792317dd feat: init websocket模块 2022-06-29 16:29:25 +08:00
weihongyang
8d6cda8f90 feat: 新增maven依赖 2022-06-29 16:28:20 +08:00
weihongyang
fdf870c779 fix: 修改定时任务的log日志 2022-06-29 16:27:40 +08:00
weihongyang
4712d0300a fix: 修改redis的数据库 2022-06-29 16:27:00 +08:00
weihongyang
58c998afb0 feat: 增加定时定任务功能的xml文件 2022-06-24 16:07:31 +08:00
weihongyang
26fee6ac1c feat: 增加定时定任务模块pom配置 2022-06-24 10:27:11 +08:00
weihongyang
92a8e17f6e feat: 增加test的yaml文件 2022-06-24 10:25:36 +08:00
weihongyang
645bafc280 feat: init定时任务 2022-06-24 10:25:17 +08:00
weihongyang
1ac94e3d4c fix: 修改全局异常处理 2022-06-23 16:00:43 +08:00
weihongyang
093d6ee362 feat: sercurity的配置文件新增加LogoutHandler的实现类 在LogoutFilter之前加入jwtAuthenticationTokenFilter 2022-06-23 15:39:49 +08:00
weihongyang
aab0ea4479 fix: 修改验证码uuid参数默认是string 2022-06-23 15:31:55 +08:00
weihongyang
d3322639de fix: 修改swagger配置增加了新的组 2022-06-23 14:21:44 +08:00
weihongyang
036cc1ac25 fix: 修改登录接口实现验证码功能 2022-06-23 14:02:00 +08:00
weihongyang
6be4ac7a62 feat: 新增验证码接口 2022-06-23 13:57:30 +08:00
weihongyang
c7c397e92d feat: 新增sercurity对于验证码接口的放行 2022-06-23 13:56:43 +08:00
weihongyang
6ba316299d feat: 新增easy captcha的maven依赖 2022-06-23 13:55:43 +08:00
weihongyang
204d758fcc feat: 新增CaptchaService实现类的方法 2022-06-23 13:55:17 +08:00
weihongyang
35812df81d fix: 把redis开关配置删除 2022-06-23 13:54:49 +08:00
weihongyang
04f1bb339e feat: 新增CaptchaService实现类 2022-06-23 13:54:11 +08:00
weihongyang
42de3bd79c fix: 修改退出账号功能 2022-06-23 12:09:55 +08:00
weihongyang
3b6496773d feat: 新增账号密码在swagger有默认值 2022-06-23 11:56:20 +08:00
weihongyang
40c7df817b feat: 新增退出账号功能 2022-06-23 11:55:44 +08:00
weihongyang
681b5fbe63 feat: 新增jackson有关配置 2022-06-23 11:55:08 +08:00
weihongyang
01863b5344 feat: 新增jackson-datatype-jsr310的maven 2022-06-23 11:54:46 +08:00
weihongyang
45435f1cb4 feat: 新增sercurity的退出账号的配置 2022-06-23 11:52:54 +08:00
weihongyang
4d57b45a02 feat: 新增sercurity的LogoutSuccessHandler的实现类 2022-06-23 11:51:36 +08:00
weihongyang
47409787a4 feat: 新增sercurity的LogoutHandler的实现类 2022-06-23 11:51:19 +08:00
weihongyang
7fe617df56 fix: 修改jackson对日期的序列化支持格式 2022-06-23 09:47:51 +08:00
weihongyang
3c4cd948d4 fix: 修改jackson对日期的序列化支持格式 2022-06-22 14:03:01 +08:00
weihongyang
89bf5bf10a feat: 新增一个swagger自动生成代码的模板引擎 2022-06-22 14:02:11 +08:00
weihongyang
e01cd0f7fd feat: 新增一个swagger自动生成代码的模板引擎 2022-06-22 14:00:18 +08:00
caixiang
5d631e77c2 mark 2022-06-22 10:23:56 +08:00