72crm_9.0.1_20190522

将java代码覆盖后，执行根目录下docs/update20190522.sql 新增 1.跟进记录增加删除功能 2.联系人、产品导入导出功能优化 1.新建商机、合同时，“总金额”调整为可编辑，可以根据总金额和产品金额自动计算整单折扣 2.最高管理员可删除所有日志 3.商机阶段在未结束之前，可以变更为之前的阶段 4.客户下添加跟进记录关联联系人和商机时，跟进记录也同步到对应的联系人和商机下 5.线索、客户、联系人搜索框增加“手机号、电话”（客户模块搜索基本信息中的手机号） 6.新建合同选择商机之后，商机中的产品数量也能自动填充 7.系统中显示的当前版本号V9.0.0升级后可以自动更新修复： 1.新建线索，添加部门，线索无法保存 2.编辑员工信息点击保存，无法保存，提示服务器响应异常 3.未配置“查看全部”权限，可以查看系统所有数据信息 4.登录的时候提示请输入账号密码问题 5.合同和回款添加报错问题
WuKongOpenSource · May 24, 2019 · bb8dbb3 · bb8dbb3
1 parent 5dbcdc0
commit bb8dbb3
Show file tree

Hide file tree

Showing 146 changed files with 2,064 additions and 584 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+.idea
+target
+*.iml
+src/test/
+README.md
+logs
+docs
diff --git a/README.md b/README.md
@@ -1,3 +1,128 @@
+### Wukong CRM9.0 (JAVA version)
+Wukong Software has long provided enterprises with information services such as R&D, implementation, marketing, consulting, training and service of enterprise management software (CRM/HRM/OA/ERP, etc.). We have taken high technology as its starting point, technology as the core, and perfect after-sales service as its backing. With the spirit of stability and development, factualism and innovation, it has provided services for thousands of enterprises at home and abroad.
+
+
+The development of Wukong benefits from open source and vice versa. In 2019, Wukong CRM will continue to adhere to the concept of “embracing openness, cooperation and win-win, creating value”, move forward on the road of open source, and make positive contributions to open source at home and abroad with more community developers.
+
+
+Official website：[http://www.5kcrm.com](http://www.5kcrm.com/)
+
+Official website：[http://www.72crm.com](http://www.72crm.com/)
+
+
+DEMO：[demo9java.5kcrm.net](http://demo9java.5kcrm.net/)(account：18888888888   password：123456)
+
+
+Wukong CRM adopts a new mode separating front-end from back-end. The front-end vue packaged files have been integrated into the warehouse code, eliminating the need for packaging operations.
+
+If you need to adjust the front-end code, please download the front-end code separately. The front-end code is in the ux folder of the root directory.
+
+
+## Main technology stack
+
+Core framework：jfinal3.8
+
+Cache：redis
+
+Database connection pool：Druid
+
+Tools：hutool,fastjson,poi-ooxml
+
+Timed task：jfinal-cron
+
+Project build tool：maven
+
+Web container：tomcat,jetty,undertow(默认)
+
+Front-end MVVM framework：Vue.JS 2.5.x 
+
+Routing：Vue-Router 3.x 
+
+Data interaction：Axios 
+
+UI framework：Element-UI 2.6.3 
+
+
+
+## Installation Instructions
+
+
+Configure java runtime environment, redis environment and mysql  environment, import 72crm.sql in directory doc to the database, modify the database in `resources/config/erpsnow-config.txt` and redis configuration file, modify undertow startup port number in `resources/config/undertow.txt`.
+
+
+
+
+
+## Deployment Instructions
+
+This project JDK requires JDK8 and above.
+
+### 一、Tomcat deployment
+
+
+```
+<dependency>
+    <groupId>javax.servlet</groupId>
+    <artifactId>javax.servlet-api</artifactId>
+    <version>4.0.1</version>
+    <scope>provided</scope>
+</dependency>
+```
+
+Uncomment the above code, comment undertow references, change  package method to war, run the maven package command, and place the war package in the `tomcat/webapps directory`.
+
+### 二、Jetty部署
+
+         
+```
+<dependency>
+    <groupId>com.jfinal</groupId>
+    <artifactId>jetty-server</artifactId>
+    <version>2019.3</version>
+    <scope>provided</scope>
+</dependency>
+```
+
+Uncomment the above code, comment tomcat and undertow references, change packaging to jar and the rest of steps are the same as Undertow.
+
+### 三、Undertow (default)
+
+
+```
+<dependency>
+    <groupId>com.jfinal</groupId>
+    <artifactId>jfinal-undertow</artifactId>
+    <version>1.5</version>
+</dependency>
+```
+
+
+
+Uncomment the above code, comment jetty and undertow references, change  packaging to jar and run maven package. Upload the zip file generated by the above package command to the server and extract it. Put 72crm.sh/72crm.bat in the decompressed directory and run it.
+When you change the startup mode jetty and undertow, you need to change the startup file in Application.java.
+
+
+
+
+
+### Front-end deployment
+
+The front-end part of installing node.js is based on node.js, so you must first install node.js with a version number of 6.0 or higher.
+
+Use npm to install dependencies, download the Wukong CRM9.0 front-end code; place the code in the backend peer directory frontend, execute the command to install dependencies:
+
+    npm install
+
+Modify the internal configuration and request address or domain name: modify BASE_API (development environment server address, default localhost) in config / dev.env.js. Modify the custom port: the dev object port parameter (default 8080, not recommend to modify) in config / index.js.
+
+### Running front end
+
+     npm run dev
+
+Note: The front-end service starts, it will occupy port 8080 by default. Before starting the front-end service, please make sure that port 8080 is not occupied. The Server port needs to be set up before the program runs.
+
+---
+
 ### 悟空CRM9.0（JAVA版）
 悟空软件长期为企业提供企业管理软件(CRM/HRM/OA/ERP等)的研发、实施、营销、咨询、培训、服务于一体的信息化服务。悟空软件以高科技为起点，以技术为核心、以完善的售后服务为后盾，秉承稳固与发展、求实与创新的精神，已为国内外上千家企业提供服务。
 
@@ -14,11 +139,6 @@
 JAVA版QQ群交流群①群：[1026560336](https://shang.qq.com/wpa/qunwpa?idkey=13d5e5809eb9feb350336e55c8b7a00b9cb472078b09b4441222a52dd76b278e)
 
 
-微信交流群
-
-
-<img src="https://images.gitee.com/uploads/images/2019/0512/111430_209d1823_345098.png" width="300">
-
 
 
 悟空CRM采用全新的前后端分离模式，本仓库代码中已集成前端vue打包后文件，可免去打包操作
@@ -30,7 +150,7 @@ JAVA版QQ群交流群①群：[1026560336](https://shang.qq.com/wpa/qunwpa?idkey
 
 核心框架：jfinal3.8
 
-缓存：redis
+缓存：redis caffeine
 
 数据库连接池：Druid
 
@@ -40,7 +160,7 @@ JAVA版QQ群交流群①群：[1026560336](https://shang.qq.com/wpa/qunwpa?idkey
 
 项目构建工具：maven
 
-Web容器：tomcat,jetty,undertow(默认)
+Web容器：tomcat,undertow(默认)
 
 前端MVVM框架：Vue.JS 2.5.x 
 
@@ -54,7 +174,10 @@ UI框架：Element-UI 2.6.3
 
 ## 安装说明
 
-配置java运行环境，redis环境，mysql环境将目录doc下的72crm.sql导入到数据库，修改`resources/config/erpsnow-config.txt`下的数据库以及redis的配置文件undertow启动端口号在`resources/config/undertow.txt`下修改jetty启动端口号在`Application.java`中修改
+配置java运行环境，redis环境，mysql环境，
+然后将目录doc下的72crm.sql导入到数据库，修改`resources/config/crm9-config.txt`下的数据库以及redis的配置文件，
+undertow启动端口号在`resources/config/undertow.txt`下修改,
+默认账号 admin 默认密码 123456
 
 
 
@@ -76,61 +199,47 @@ UI框架：Element-UI 2.6.3
 </dependency>
 ```
 
-取消以上代码的注释，将jetty和undertow的引用注释掉，将packaging从jar改为war然后运行maven package命令，将war包放在`tomcat/webapps`目录下
+取消以上代码的注释，将undertow的引用注释掉，打包方式改为war，运行maven package命令，将war包放在`tomcat/webapps`目录下
 
-### 二、Jetty部署
-
-         
-```
-<dependency>
-    <groupId>com.jfinal</groupId>
-    <artifactId>jetty-server</artifactId>
-    <version>2019.3</version>
-    <scope>provided</scope>
-</dependency>
-```
-
-取消以上代码的注释，将tomcat和undertow的引用注释掉，将packaging改为jar其他同Undertow
-
-### 三、Undertow（默认）
+### 二、Undertow（默认）
 
 
 ```
 <dependency>
     <groupId>com.jfinal</groupId>
     <artifactId>jfinal-undertow</artifactId>
-    <version>1.5</version>
+    <version>1.6</version>
 </dependency>
 ```
 
 
-
-取消以上代码的注释，将jetty和undertow的引用注释掉，将packaging改为jar运行 maven package。将上述打包命令生成的 zip 文件上传到服务器并解压,将目录下的
+取消以上代码的注释，将tomcat的引用注释掉，打包方式改为jar 运行maven package。将上述打包命令生成的 zip 文件上传到服务器并解压,将目录下的
 `
 72crm.sh/72crm.bat
 `
 放到解压后的目录下，运行即可
 
-更换启动方式jetty和undertow时，需要更改`Application.java`中的启动文件
-
+项目webapp下自带打包后的前端代码，如果不需要对前端代码更改，直接访问即可
+如果更改了前端代码，将打包后的dist下static文件夹和index.html替换到webapp下   
+ps:可以使用`nginx`代理静态文件，后台只做接口响应，项目本身设计是前后端完全分离的
 
 
 
 ### 前端部署
 
 安装node.js 前端部分是基于node.js上运行的，所以必须先安装`node.js`，版本要求为6.0以上
 
-使用npm安装依赖 下载悟空CRM9.0前端代码； 可将代码放置在后端同级目录frontend，执行命令安装依赖：
+使用npm安装依赖 下载悟空CRM9.0前端代码； 可将代码放置在后端同级目录ux，执行命令安装依赖：
 
     npm install
 
-修改内部配置 修改请求地址或域名：config/dev.env.js里修改BASE_API（开发环境服务端地址，默认localhost） 修改自定义端口：config/index.js里面的dev对象的port参数（默认8080，不建议修改）
+修改内部配置 修改请求地址或域名：config/dev.env.js里修改BASE_API（开发环境服务端地址，默认localhost） 修改自定义端口：config/index.js里面的dev对象的port参数（默认8090，不建议修改）
 
 ### 运行前端
 
      npm run dev
 
-注意：前端服务启动，默认会占用8080端口，所以在启动前端服务之前，请确认8080端口没有被占用。
+注意：前端服务启动，默认会占用8090端口，所以在启动前端服务之前，请确认8090端口没有被占用。
 程序运行之前需搭建好Server端
 
 
@@ -139,10 +248,15 @@ UI框架：Element-UI 2.6.3
 
 以下为悟空CRM9.0 JAVA版部分功能系统截图
 
-![](https://images.gitee.com/uploads/images/2019/0512/111600_4001673d_345098.png "g1.png")
-![](https://images.gitee.com/uploads/images/2019/0512/111608_7e86ecb1_345098.png "g2.png")
-![](https://images.gitee.com/uploads/images/2019/0512/111615_7aea7564_345098.png "g3.png")
-![](https://images.gitee.com/uploads/images/2019/0512/111622_1f47546e_345098.png "g4.png")
-![](https://images.gitee.com/uploads/images/2019/0512/111629_02b69eed_345098.png "g5.png")
-![](https://images.gitee.com/uploads/images/2019/0512/111636_7323ef3a_345098.png "g6.png")
-![](https://images.gitee.com/uploads/images/2019/0512/111643_8516cff1_345098.png "g7.png")
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g1.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g2.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g3.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g4.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g5.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g6.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g7.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g8.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g9.png)
+![](https://github.com/72crm/72crm/blob/master/ux/intro_img/g10.png)
+
+
diff --git a/docs/crm9.sql b/docs/crm9.sql
@@ -471,7 +471,10 @@ INSERT INTO `72crm_admin_menu` VALUES ('103', '98', '查看', 'read', '3', '0',
 INSERT INTO `72crm_admin_menu` VALUES ('104', '99', '查看', 'read', '3', '0', '1', null);
 INSERT INTO `72crm_admin_menu` VALUES ('105', '100', '查看', 'read', '3', '0', '1', null);
 INSERT INTO `72crm_admin_menu` VALUES ('106', '101', '查看', 'read', '3', '0', '1', null);
-
+INSERT INTO `72crm_admin_menu` (`parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ('11', '联系人导出', 'excelexport', '3', '1', '1', NULL);
+INSERT INTO `72crm_admin_menu` (`parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ('11', '联系人导入', 'excelimport', '3', '1', '1', NULL);
+INSERT INTO `72crm_admin_menu` (`parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ('15', '产品导入', 'excelimport', '3', '1', '1', NULL);
+INSERT INTO `72crm_admin_menu` (`parent_id`, `menu_name`, `realm`, `menu_type`, `sort`, `status`, `remarks`) VALUES ('15', '产品导出', 'excelexport', '3', '1', '1', NULL);
 -- ----------------------------
 -- Table structure for 72crm_admin_record
 -- ----------------------------
@@ -493,6 +496,14 @@ CREATE TABLE `72crm_admin_record` (
   UNIQUE KEY `record_id` (`record_id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=152 DEFAULT CHARSET=utf8 COMMENT='跟进记录';
 
+DROP TABLE IF EXISTS `72crm_crm_contacts_business`;
+CREATE TABLE `72crm_crm_contacts_business` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `business_id` int(11) NOT NULL,
+  `contacts_id` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='商机联系人关联表';
+
 -- ----------------------------
 -- Records of 72crm_admin_record
 -- ----------------------------