Skip to content

Commit 0268661

Browse files
GspiriTerGspiriTer
committed
20190820更新日志
1 parent f6370c5 commit 0268661

File tree

161 files changed

+12869
-1968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+12869
-1968
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ target
44
src/test/
55
README.md
66
logs
7-
docs

‎README.md‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,12 @@ UI框架：Element-UI 2.6.3
164164

165165
## 安装说明
166166

167-
配置java运行环境，redis环境，mysql环境，
168-
然后将目录doc下的72crm.sql导入到数据库，修改`resources/config/crm9-config.txt`下的数据库以及redis的配置文件，
169-
undertow启动端口号在`resources/config/undertow.txt`下修改,
170-
默认账号 admin 默认密码 123456
167+
1、配置java运行环境，redis环境，mysql环境。
168+
2、将目录doc下的crm9.sql导入到数据库( `初始化安装只需要导入crm9.sql就好了，更新代码导入对应日期的sql文件`)。
169+
3、修改`resources/config/crm9-config.txt`下的数据库配置文件。
170+
4、修改`resources/config/redis.json`下的redis连接文件
171+
5、undertow启动端口号在`resources/config/undertow.txt`下修改。
172+
默认账号 admin 默认密码 123456
171173

172174

173175

@@ -177,41 +179,42 @@ undertow启动端口号在`resources/config/undertow.txt`下修改,
177179

178180
本项目JDK要求JDK8及以上
179181

180-
### 一、Tomcat部署
182+
183+
### 一、Undertow（默认）
181184

182185

183186
```
184187
<dependency>
185-
<groupId>javax.servlet</groupId>
186-
<artifactId>javax.servlet-api</artifactId>
187-
<version>4.0.1</version>
188-
<scope>provided</scope>
188+
<groupId>com.jfinal</groupId>
189+
<artifactId>jfinal-undertow</artifactId>
190+
<version>1.6</version>
189191
</dependency>
190192
```
191193

192-
取消以上代码的注释，将undertow的引用注释掉，打包方式改为war，运行maven package命令，将war包放在`tomcat/webapps`目录下
194+
取消以上代码的注释，将tomcat的pom依赖javax.servlet.javax.servlet-api注释掉，打包方式改为jar 运行maven package，打包完成后
195+
将上述打包命令生成的 crm9-release.zip 文件上传到服务器并解压,运行对应的72crm.sh/72crm.bat即可
193196

194-
### 二、Undertow（默认）
197+
### 二、Tomcat部署
195198

196199

197200
```
198201
<dependency>
199-
<groupId>com.jfinal</groupId>
200-
<artifactId>jfinal-undertow</artifactId>
201-
<version>1.6</version>
202+
<groupId>javax.servlet</groupId>
203+
<artifactId>javax.servlet-api</artifactId>
204+
<version>4.0.1</version>
205+
<scope>provided</scope>
202206
</dependency>
203207
```
204208

209+
取消以上代码的注释，将undertow的pom依赖com.jfinal.jfinal-undertow注释掉，并将com.kakarote.crm9.Application的main方法注释掉，打包方式改为war，
210+
运行maven package命令，将war包放在`tomcat/webapps`目录下
211+
212+
项目默认是ROOT.war，若需要携带项目名，需要修改 ux/config/prod.env.js的BASE_API为'"/项目名/"'，改动完成后需要重新打包替换到webapp下
205213

206-
取消以上代码的注释，将tomcat的引用注释掉，打包方式改为jar 运行maven package。将上述打包命令生成的 zip 文件上传到服务器并解压,将目录下的
207-
`
208-
72crm.sh/72crm.bat
209-
`
210-
放到解压后的目录下，运行即可
211214

212-
项目webapp下自带打包后的前端代码，如果不需要对前端代码更改，直接访问即可
213-
如果更改了前端代码，将打包后的dist下static文件夹和index.html替换到webapp下
214-
ps:可以使用`nginx`代理静态文件，后台只做接口响应，项目本身设计是前后端完全分离的
215+
项目webapp下自带打包后的前端代码，如果不需要对前端代码更改，直接访问即可
216+
如果更改了前端代码，需要将打包后的dist下static文件夹和index.html替换到webapp下
217+
ps:可以使用`nginx`代理静态文件，后台只做接口响应，项目本身设计是前后端完全分离的
215218

216219

217220

‎docs/crm9.sql‎

Lines changed: 160 additions & 160 deletions
Large diffs are not rendered by default.

‎docs/update20190619.sql‎

Lines changed: 3574 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/update20190702.sql‎

Lines changed: 129 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/update20190715.sql‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
2+
SET FOREIGN_KEY_CHECKS=0;
3+
4+
-- ----------------------------
5+
-- Table structure for 72crm_work_user
6+
-- ----------------------------
7+
DROP TABLE IF EXISTS `72crm_work_user`;
8+
CREATE TABLE `72crm_work_user` (
9+
`id` int(11) NOT NULL AUTO_INCREMENT,
10+
`work_id` int(11) NOT NULL COMMENT '项目ID',
11+
`user_id` int(11) NOT NULL COMMENT '成员ID',
12+
`role_id` int(11) NOT NULL COMMENT '角色ID',
13+
PRIMARY KEY (`id`)
14+
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='项目成员表';
15+
16+
ALTER TABLE 72crm_work_task_lable RENAME TO 72crm_work_task_label;
17+
18+
ALTER TABLE `72crm_work_task_label`
19+
CHANGE COLUMN `lable_id` `label_id` int(11) NOT NULL AUTO_INCREMENT FIRST ;
20+
21+
ALTER TABLE `72crm_admin_role`
22+
ADD COLUMN `is_hidden` int(1) NULL DEFAULT 1 COMMENT '0 隐藏 1 不隐藏' AFTER `data_type`;
23+
24+
DROP TABLE IF EXISTS `72crm_work_relation`;
25+
26+
ALTER TABLE `72crm_task`
27+
CHANGE COLUMN `lable_id` `label_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '标签 ,号拼接' AFTER `class_id`;
28+
29+
ALTER TABLE `72crm_task`
30+
ADD COLUMN `is_archive` int(1) NULL DEFAULT 0 COMMENT '是否归档 0 否 1 是' AFTER `batch_id`;
31+
32+
ALTER TABLE `72crm_admin_role`
33+
ADD COLUMN `label` int(2) NULL COMMENT '1 系统项目管理员角色 2 项目管理角色 3 项目编辑角色 4 项目只读角色' AFTER `is_hidden`;
34+
35+
DELETE FROM `72crm_admin_role` WHERE (`role_type`='5')
36+
37+
INSERT INTO `72crm_admin_role` (`role_name`, `role_type`, `is_hidden`, `label`) VALUES ('项目管理员', '1', '1','1');
38+
INSERT INTO `72crm_admin_role` (`role_name`, `role_type`, `is_hidden`, `label`) VALUES ('管理', '5', '0','2');
39+
INSERT INTO `72crm_admin_role` (`role_name`, `role_type`, `is_hidden`, `label`) VALUES ('编辑', '5', '1','3');
40+
set @rid = last_insert_id();
41+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( '0', '项目管理', 'work', '0', '0', '1', NULL);
42+
set @workId = last_insert_id();
43+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @workId, '任务', 'task', '1', '0', '1', NULL);
44+
set @taskId = last_insert_id();
45+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @taskId, '创建', 'save', '3', '0', '1', NULL);
46+
INSERT INTO`72crm_admin_role_menu` (`role_id`, `menu_id`) VALUES (@rid, last_insert_id());
47+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @workId, '任务列表', 'taskClass', '1', '0', '1', NULL);
48+
set @classId = last_insert_id();
49+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @classId, '新建任务列表', 'save', '3', '0', '1', NULL);
50+
INSERT INTO`72crm_admin_role_menu` (`role_id`, `menu_id`) VALUES (@rid, last_insert_id());
51+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @classId, '编辑任务列表', 'update', '3', '0', '1', NULL);
52+
INSERT INTO`72crm_admin_role_menu` (`role_id`, `menu_id`) VALUES (@rid, last_insert_id());
53+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @classId, '删除任务列表', 'delete', '3', '0', '1', NULL);
54+
INSERT INTO`72crm_admin_role_menu` (`role_id`, `menu_id`) VALUES (@rid, last_insert_id());
55+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @workId, '项目', 'work', '1', '0', '1', NULL);
56+
set @wId = last_insert_id();
57+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @wId, '项目设置', 'update', '3', '0', '1', NULL);
58+
INSERT INTO `72crm_admin_role` (`role_name`, `role_type`, `is_hidden`, `label`) VALUES ('只读', '5', '1','4');
59+
60+
ALTER TABLE `72crm_task`
61+
MODIFY COLUMN `order_num` int(4) NULL DEFAULT 999 COMMENT '排序ID' AFTER `is_open`,
62+
MODIFY COLUMN `top_order_num` int(4) NULL DEFAULT 999 COMMENT '我的任务排序ID' AFTER `order_num`;

‎docs/update20190719.sql‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
2+
SET FOREIGN_KEY_CHECKS=0;
3+
4+
-- ----------------------------
5+
-- Table structure for 72crm_work_user
6+
-- ----------------------------
7+
DROP TABLE IF EXISTS `72crm_work_user`;
8+
CREATE TABLE `72crm_work_user` (
9+
`id` int(11) NOT NULL AUTO_INCREMENT,
10+
`work_id` int(11) NOT NULL COMMENT '项目ID',
11+
`user_id` int(11) NOT NULL COMMENT '成员ID',
12+
`role_id` int(11) NOT NULL COMMENT '角色ID',
13+
PRIMARY KEY (`id`)
14+
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='项目成员表';
15+
16+
ALTER TABLE 72crm_work_task_lable RENAME TO 72crm_work_task_label;
17+
18+
ALTER TABLE `72crm_work_task_label`
19+
CHANGE COLUMN `lable_id` `label_id` int(11) NOT NULL AUTO_INCREMENT FIRST ;
20+
21+
ALTER TABLE `72crm_admin_role`
22+
ADD COLUMN `is_hidden` int(1) NULL DEFAULT 1 COMMENT '0 隐藏 1 不隐藏' AFTER `data_type`;
23+
24+
DROP TABLE IF EXISTS `72crm_work_relation`;
25+
26+
ALTER TABLE `72crm_task`
27+
CHANGE COLUMN `lable_id` `label_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '标签 ,号拼接' AFTER `class_id`;
28+
29+
ALTER TABLE `72crm_task`
30+
ADD COLUMN `is_archive` int(1) NULL DEFAULT 0 COMMENT '是否归档 0 否 1 是' AFTER `batch_id`;
31+
32+
ALTER TABLE `72crm_admin_role`
33+
ADD COLUMN `label` int(2) NULL COMMENT '1 系统项目管理员角色 2 项目管理角色 3 项目编辑角色 4 项目只读角色' AFTER `is_hidden`;
34+
35+
DELETE FROM `72crm_admin_role` WHERE (`role_type`='5')
36+
37+
INSERT INTO `72crm_admin_role` (`role_name`, `role_type`, `is_hidden`, `label`) VALUES ('项目管理员', '1', '1','1');
38+
INSERT INTO `72crm_admin_role` (`role_name`, `role_type`, `is_hidden`, `label`) VALUES ('管理', '5', '0','2');
39+
INSERT INTO `72crm_admin_role` (`role_name`, `role_type`, `is_hidden`, `label`) VALUES ('编辑', '5', '1','3');
40+
set @rid = last_insert_id();
41+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( '0', '项目管理', 'work', '0', '0', '1', NULL);
42+
set @workId = last_insert_id();
43+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @workId, '任务', 'task', '1', '0', '1', NULL);
44+
set @taskId = last_insert_id();
45+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @taskId, '创建', 'save', '3', '0', '1', NULL);
46+
INSERT INTO`72crm_admin_role_menu` (`role_id`, `menu_id`) VALUES (@rid, last_insert_id());
47+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @workId, '任务列表', 'taskClass', '1', '0', '1', NULL);
48+
set @classId = last_insert_id();
49+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @classId, '新建任务列表', 'save', '3', '0', '1', NULL);
50+
INSERT INTO`72crm_admin_role_menu` (`role_id`, `menu_id`) VALUES (@rid, last_insert_id());
51+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @classId, '编辑任务列表', 'update', '3', '0', '1', NULL);
52+
INSERT INTO`72crm_admin_role_menu` (`role_id`, `menu_id`) VALUES (@rid, last_insert_id());
53+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @classId, '删除任务列表', 'delete', '3', '0', '1', NULL);
54+
INSERT INTO`72crm_admin_role_menu` (`role_id`, `menu_id`) VALUES (@rid, last_insert_id());
55+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @workId, '项目', 'work', '1', '0', '1', NULL);
56+
set @wId = last_insert_id();
57+
INSERT INTO `72crm_admin_menu` ( `parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ( @wId, '项目设置', 'update', '3', '0', '1', NULL);
58+
INSERT INTO `72crm_admin_role` (`role_name`, `role_type`, `is_hidden`, `label`) VALUES ('只读', '5', '1','4');
59+
60+
ALTER TABLE `72crm_task`
61+
MODIFY COLUMN `order_num` int(4) NULL DEFAULT 999 COMMENT '排序ID' AFTER `is_open`,
62+
MODIFY COLUMN `top_order_num` int(4) NULL DEFAULT 999 COMMENT '我的任务排序ID' AFTER `order_num`;

‎docs/update20190820.sql‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ALTER TABLE `72crm_admin_field`
2+
ADD COLUMN `relevant` int(11) NULL COMMENT '只有线索需要，装换客户的自定义字段ID' AFTER `field_type`;
3+
4+
ALTER TABLE `72crm_crm_contract`
5+
ADD COLUMN `total_price` decimal(10,2) NULL COMMENT '产品总金额' AFTER `discount_rate`;
6+
7+
ALTER TABLE `72crm_crm_business`
8+
ADD COLUMN `total_price` decimal(10,2) NULL COMMENT '产品总金额' AFTER `discount_rate`;
9+
10+
INSERT INTO `72crm_admin_menu` VALUES ('146', '2', '办公分析', 'oa', '1', '10', '1', null);
11+
INSERT INTO `72crm_admin_menu` VALUES ('147', '146', '查看', 'read', '3', '1', '1', null);

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.kakarote</groupId>
55
<artifactId>crm9</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.3.0</version>
7+
<version>1.3.2</version>
88
<name>crm9-master</name>
99

1010
<properties>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.jfinal</groupId>
5656
<artifactId>cos</artifactId>
57-
<version>2017.5</version>
57+
<version>2019.8</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>it.sauronsoftware.cron4j</groupId>

‎src/main/java/com/kakarote/crm9/common/annotation/LoginFormCookie.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.kakarote.crm9.common.annotation;
2+
3+
import java.lang.annotation.*;
4+
5+
/**
6+
* 有此注解的方法会尝试从cookie获取登录状态
7+
*/
8+
@Retention(RetentionPolicy.RUNTIME)
9+
@Target(ElementType.METHOD)
10+
@Inherited
11+
@Documented
12+
public @interface LoginFormCookie {
13+
}

0 commit comments

Comments
 (0)