mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2025-12-08 17:12:28 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 51bf9a7c14 | |||
| 8278041aeb | |||
| 39bb7a46fd | |||
| 1c234fbaff | |||
| ca1f5872be | |||
| 2ae3844d5e |
@ -111,7 +111,7 @@ Docker 镜像使用
|
||||
|
||||
```
|
||||
# 1.修改前端项目的后台域名
|
||||
public/index.html
|
||||
.env.development
|
||||
域名改成： http://jeecg-boot-system:8080/jeecg-boot
|
||||
|
||||
# 2.先进入打包前端项目
|
||||
|
||||
@ -39,9 +39,9 @@ Jeecg-Boot 低代码开发平台
|
||||
|
||||
- 在线演示 ： [http://boot.jeecg.com](http://boot.jeecg.com)
|
||||
|
||||
- 在线文档： [http://doc.jeecg.com/1273753](http://doc.jeecg.com/1273753)
|
||||
- 在线文档： [http://doc.jeecg.com](http://doc.jeecg.com)
|
||||
|
||||
- 常见问题： [入门常见问题大全](http://bbs.jeecg.com/forum.php?mod=viewthread&tid=7816&extra=page%3D1)
|
||||
- 常见问题： [http://jeecg.com/doc/qa](http://jeecg.com/doc/qa)
|
||||
|
||||
- QQ交流群 ： ③816531124、①284271917、②769925425
|
||||
|
||||
@ -100,7 +100,7 @@ QueryWrapper<?> queryWrapper = QueryGenerator.initQueryWrapper(?, req.getParamet
|
||||
> 功能说明： 一键生成的代码（包括：controller、service、dao、mapper、entity、vue）
|
||||
|
||||
- 模板位置： src/main/resources/jeecg/code-template
|
||||
- 技术文档： http://doc.jeecg.com/1273927
|
||||
- 技术文档： http://doc.jeecg.com/2043916
|
||||
|
||||
|
||||
|
||||
|
||||
@ -21,6 +21,7 @@ create database `jeecg-boot` default character set utf8mb4 collate utf8mb4_gener
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
SET FOREIGN_KEY_CHECKS = 0;
|
||||
USE `jeecg-boot`;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for ces_field_kongj
|
||||
@ -5040,8 +5041,8 @@ CREATE TABLE `sys_user` (
|
||||
-- ----------------------------
|
||||
INSERT INTO `sys_user` VALUES ('3d464b4ea0d2491aab8a7bde74c57e95', 'zhangsan', '张三', '02ea098224c7d0d2077c14b9a3a1ed16', 'x5xRdeKB', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', NULL, NULL, NULL, NULL, '财务部', 1, 0, NULL, NULL, 1, '0005', '总经理', NULL, 'admin', '2020-05-14 21:26:24', 'admin', '2020-09-09 14:42:51', 1, '', '', NULL);
|
||||
INSERT INTO `sys_user` VALUES ('a75d45a015c44384a04449ee80dc3503', 'jeecg', 'jeecg', '58a714412072f0b9', 'mIgiYJow', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', NULL, 1, NULL, NULL, 'A02A01', 1, 0, NULL, NULL, 1, '00002', 'devleader', NULL, 'admin', '2019-02-13 16:02:36', 'admin', '2020-11-26 15:16:05', 1, '', NULL, NULL);
|
||||
INSERT INTO `sys_user` VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', '2018-12-05 00:00:00', 1, 'jeecg@163.com', '18611111111', 'A01', 1, 0, NULL, NULL, 1, '00001', '总经理', NULL, NULL, '2038-06-21 17:54:10', 'admin', '2020-07-10 15:27:10', 2, 'c6d7cb4deeac411cb3384b1b31278596', '', NULL);
|
||||
INSERT INTO `sys_user` VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', '2019-04-01 00:00:00', NULL, NULL, NULL, '研发部,财务部', 2, 0, NULL, NULL, 1, '00003', '', NULL, 'admin', '2023-10-01 19:34:10', 'admin', '2020-11-26 15:24:59', 1, '', '', NULL);
|
||||
INSERT INTO `sys_user` VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', '2018-12-05 00:00:00', 1, 'jeecg@163.com', '18611111111', 'A01', 1, 0, NULL, NULL, 1, '00001', '总经理', NULL, NULL, '2020-06-21 17:54:10', 'admin', '2020-07-10 15:27:10', 2, 'c6d7cb4deeac411cb3384b1b31278596', '', NULL);
|
||||
INSERT INTO `sys_user` VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', '2019-04-01 00:00:00', NULL, NULL, NULL, '研发部,财务部', 2, 0, NULL, NULL, 1, '00003', '', NULL, 'admin', '2020-10-01 19:34:10', 'admin', '2020-11-26 15:24:59', 1, '', '', NULL);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_user_agent
|
||||
|
||||
@ -6767,8 +6767,8 @@ COMMENT ON TABLE "JEECGBOOT"."SYS_USER" IS '用户表';
|
||||
-- ----------------------------
|
||||
INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('3d464b4ea0d2491aab8a7bde74c57e95', 'zhangsan', '张三', '02ea098224c7d0d2077c14b9a3a1ed16', 'x5xRdeKB', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', NULL, NULL, NULL, NULL, '财务部', '1', '0', NULL, NULL, '1', '0005', '总经理', NULL, 'admin', TO_DATE('2020-05-14 21:26:24', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-09-09 14:42:51', 'SYYYY-MM-DD HH24:MI:SS'), '1', NULL, NULL, NULL);
|
||||
INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('a75d45a015c44384a04449ee80dc3503', 'jeecg', 'jeecg', '58a714412072f0b9', 'mIgiYJow', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', NULL, '1', NULL, NULL, 'A02A01', '1', '0', NULL, NULL, '1', '00002', 'devleader', NULL, 'admin', TO_DATE('2019-02-13 16:02:36', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-11-26 15:16:05', 'SYYYY-MM-DD HH24:MI:SS'), '1', NULL, NULL, NULL);
|
||||
INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', TO_DATE('2018-12-05 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), '1', 'jeecg@163.com', '18611111111', 'A01', '1', '0', NULL, NULL, '1', '00001', '总经理', NULL, NULL, TO_DATE('2038-06-21 17:54:10', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-07-10 15:27:10', 'SYYYY-MM-DD HH24:MI:SS'), '2', 'c6d7cb4deeac411cb3384b1b31278596', NULL, NULL);
|
||||
INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', TO_DATE('2019-04-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), NULL, NULL, NULL, '研发部,财务部', '2', '0', NULL, NULL, '1', '00003', NULL, NULL, 'admin', TO_DATE('2023-10-01 19:34:10', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-11-26 15:24:59', 'SYYYY-MM-DD HH24:MI:SS'), '1', NULL, NULL, NULL);
|
||||
INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('e9ca23d68d884d4ebb19d07889727dae', 'admin', '管理员', 'cb362cfeefbf3d8d', 'RCGTeGiH', 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', TO_DATE('2018-12-05 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), '1', 'jeecg@163.com', '18611111111', 'A01', '1', '0', NULL, NULL, '1', '00001', '总经理', NULL, NULL, TO_DATE('2020-06-21 17:54:10', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-07-10 15:27:10', 'SYYYY-MM-DD HH24:MI:SS'), '2', 'c6d7cb4deeac411cb3384b1b31278596', NULL, NULL);
|
||||
INSERT INTO "JEECGBOOT"."SYS_USER" VALUES ('f0019fdebedb443c98dcb17d88222c38', 'zhagnxiao', '张小红', 'f898134e5e52ae11a2ffb2c3b57a4e90', 'go3jJ4zX', 'https://static.jeecg.com/temp/jmlogo_1606575041993.png', TO_DATE('2019-04-01 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), NULL, NULL, NULL, '研发部,财务部', '2', '0', NULL, NULL, '1', '00003', NULL, NULL, 'admin', TO_DATE('2020-10-01 19:34:10', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-11-26 15:24:59', 'SYYYY-MM-DD HH24:MI:SS'), '1', NULL, NULL, NULL);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for SYS_USER_AGENT
|
||||
|
||||
@ -17004,10 +17004,10 @@ GO
|
||||
INSERT INTO [dbo].[sys_user] VALUES (N'a75d45a015c44384a04449ee80dc3503', N'jeecg', N'jeecg', N'58a714412072f0b9', N'mIgiYJow', N'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', NULL, N'1', NULL, NULL, N'A02A01', N'1', N'0', NULL, NULL, N'1', N'00002', N'devleader', NULL, N'admin', N'2019-02-13 16:02:36.0000000', N'admin', N'2020-11-26 15:16:05.0000000', N'1', N'', NULL, NULL)
|
||||
GO
|
||||
|
||||
INSERT INTO [dbo].[sys_user] VALUES (N'e9ca23d68d884d4ebb19d07889727dae', N'admin', N'管理员', N'cb362cfeefbf3d8d', N'RCGTeGiH', N'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', N'2018-12-05 00:00:00.0000000', N'1', N'jeecg@163.com', N'18611111111', N'A01', N'1', N'0', NULL, NULL, N'1', N'00001', N'总经理', NULL, NULL, N'2038-06-21 17:54:10.0000000', N'admin', N'2020-07-10 15:27:10.0000000', N'2', N'c6d7cb4deeac411cb3384b1b31278596', N'', NULL)
|
||||
INSERT INTO [dbo].[sys_user] VALUES (N'e9ca23d68d884d4ebb19d07889727dae', N'admin', N'管理员', N'cb362cfeefbf3d8d', N'RCGTeGiH', N'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png', N'2018-12-05 00:00:00.0000000', N'1', N'jeecg@163.com', N'18611111111', N'A01', N'1', N'0', NULL, NULL, N'1', N'00001', N'总经理', NULL, NULL, N'2020-06-21 17:54:10.0000000', N'admin', N'2020-07-10 15:27:10.0000000', N'2', N'c6d7cb4deeac411cb3384b1b31278596', N'', NULL)
|
||||
GO
|
||||
|
||||
INSERT INTO [dbo].[sys_user] VALUES (N'f0019fdebedb443c98dcb17d88222c38', N'zhagnxiao', N'张小红', N'f898134e5e52ae11a2ffb2c3b57a4e90', N'go3jJ4zX', N'https://static.jeecg.com/temp/jmlogo_1606575041993.png', N'2019-04-01 00:00:00.0000000', NULL, NULL, NULL, N'研发部,财务部', N'2', N'0', NULL, NULL, N'1', N'00003', N'', NULL, N'admin', N'2023-10-01 19:34:10.0000000', N'admin', N'2020-11-26 15:24:59.0000000', N'1', N'', N'', NULL)
|
||||
INSERT INTO [dbo].[sys_user] VALUES (N'f0019fdebedb443c98dcb17d88222c38', N'zhagnxiao', N'张小红', N'f898134e5e52ae11a2ffb2c3b57a4e90', N'go3jJ4zX', N'https://static.jeecg.com/temp/jmlogo_1606575041993.png', N'2019-04-01 00:00:00.0000000', NULL, NULL, NULL, N'研发部,财务部', N'2', N'0', NULL, NULL, N'1', N'00003', N'', NULL, N'admin', N'2020-10-01 19:34:10.0000000', N'admin', N'2020-11-26 15:24:59.0000000', N'1', N'', N'', NULL)
|
||||
GO
|
||||
|
||||
|
||||
|
||||
@ -153,7 +153,7 @@
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-re</artifactId>
|
||||
<version>2.3.06</version>
|
||||
<version>2.3.07</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
<#else>
|
||||
<#if po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
|
||||
<#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictTable},${po.dictText},${po.dictField}'}">
|
||||
<#elseif po.dictField?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
|
||||
<#elseif po.dictField?? && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
|
||||
<#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictField}'}">
|
||||
<#elseif po.fieldDbType=="Text">
|
||||
<#return "{type:'string',value:'${po.fieldName}',text:'${po.filedComment}'}">
|
||||
|
||||
@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.boot.starter.redis.prop.JeecgRedisProperties;
|
||||
import org.jeecg.boot.starter.redis.service.RedisReceiver;
|
||||
import org.jeecg.common.constant.GlobalConstants;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
@ -41,7 +40,6 @@ public class RedisConfiguration {
|
||||
* @return
|
||||
*/
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(RedisTemplate.class)
|
||||
public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) {
|
||||
log.info(" --- redis config init --- ");
|
||||
// 设置序列化
|
||||
|
||||
Reference in New Issue
Block a user