diff --git a/pom.xml b/pom.xml index 5f81e13e3..4ce7c8339 100644 --- a/pom.xml +++ b/pom.xml @@ -228,13 +228,11 @@ ruoyi-quartz ruoyi-generator ruoyi-common + zklz-crm pom - - - @@ -251,29 +249,12 @@ - + - public - aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ - - true - + wendu-release + wendu-release + http://repo.wd.cn/repository/maven-releases/ - - - - - public - aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - false - - - + \ No newline at end of file diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index e29eeaf3c..38e808e29 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -67,6 +67,12 @@ ruoyi-generator + + com.ruoyi + zklz-crm + 4.6.1 + + @@ -94,39 +100,7 @@ false ${project.artifactId} - - + ${project.artifactId} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index a0e726bd4..26aa83be7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -3,15 +3,16 @@ package com.ruoyi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * 启动程序 - * - * @author ruoyi */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication -{ +public class RuoYiApplication extends SpringBootServletInitializer { + + public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); @@ -27,4 +28,9 @@ public class RuoYiApplication " | | \\ / \\ / \n" + " ''-' `'-' `-..-' "); } + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(RuoYiApplication.class); + } + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java deleted file mode 100644 index 9d82a2378..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -/** - * web容器中进行部署 - * - * @author ruoyi - */ -public class RuoYiServletInitializer extends SpringBootServletInitializer -{ - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) - { - return application.sources(RuoYiApplication.class); - } -} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 3c46fd50b..7124e29b7 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: password + url: jdbc:mysql://47.111.160.177:6321/zklz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: zklz + password: zKlz_2021! # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -43,8 +43,8 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 + login-username: root + login-password: jacobKing filter: stat: enabled: true diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index cf8cb187b..b927f8f04 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,14 +9,14 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: /Volumes/T/oss/zklz/upload # 获取ip地址开关 addressEnabled: false # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 6030 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index 94662592f..80e8b0841 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -20,5 +20,5 @@ Spring Boot Version: ${spring-boot.version} // ========`-.____`-.___\_____/___.-`____.-'======== // // `=---=' // // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 佛祖保佑 永不宕机 永无BUG // +// 佛祖保佑 永不宕机 永无BUG // //////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index d69a57207..d1432cd18 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/crm/agent/add.html b/ruoyi-admin/src/main/resources/templates/crm/agent/add.html new file mode 100644 index 000000000..e4e462870 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/crm/agent/add.html @@ -0,0 +1,172 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/crm/agent/agent.html b/ruoyi-admin/src/main/resources/templates/crm/agent/agent.html new file mode 100644 index 000000000..b98e97b97 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/crm/agent/agent.html @@ -0,0 +1,232 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/crm/agent/edit.html b/ruoyi-admin/src/main/resources/templates/crm/agent/edit.html new file mode 100644 index 000000000..a7ceac4b3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/crm/agent/edit.html @@ -0,0 +1,167 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index fd7b8bfe1..7ed654483 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -102,5 +102,20 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wd.cn/repository/maven-releases/ + + \ No newline at end of file diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 4785ff9eb..73094f54c 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -2,81 +2,96 @@ - - ruoyi - com.ruoyi - 4.6.1 - - 4.0.0 + + ruoyi + com.ruoyi + 4.6.1 + + 4.0.0 - ruoyi-framework + ruoyi-framework - - framework框架核心 - + + framework框架核心 + - + - - - org.springframework.boot - spring-boot-starter-web - + + + org.springframework.boot + spring-boot-starter-web + - - - org.springframework.boot - spring-boot-starter-aop - + + + org.springframework.boot + spring-boot-starter-aop + - - - com.alibaba - druid-spring-boot-starter - + + + com.alibaba + druid-spring-boot-starter + - - - com.github.penggle - kaptcha - - - javax.servlet-api - javax.servlet - - - + + + com.github.penggle + kaptcha + + + javax.servlet-api + javax.servlet + + + - - - org.apache.shiro - shiro-spring - + + + org.apache.shiro + shiro-spring + - - - com.github.theborakompanioni - thymeleaf-extras-shiro - + + + com.github.theborakompanioni + thymeleaf-extras-shiro + - - - eu.bitwalker - UserAgentUtils - + + + eu.bitwalker + UserAgentUtils + - - - com.github.oshi - oshi-core - + + + com.github.oshi + oshi-core + - - - com.ruoyi - ruoyi-system - + + + com.ruoyi + ruoyi-system + - + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wd.cn/repository/maven-releases/ + + \ No newline at end of file diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 233c57822..8139bf0c4 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -30,5 +30,20 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wd.cn/repository/maven-releases/ + + \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java index b809d6a37..05949b0b5 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java @@ -257,8 +257,8 @@ public class GenTableServiceImpl implements IGenTableService List templates = VelocityUtils.getTemplateList(table.getTplCategory()); for (String template : templates) { - if (!StringUtils.contains(template, "sql.vm")) - { +// if (!StringUtils.contains(template, "sql.vm")) +// { // 渲染模板 StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, Constants.UTF8); @@ -272,7 +272,7 @@ public class GenTableServiceImpl implements IGenTableService { throw new BusinessException("渲染模板失败，表名：" + table.getTableName()); } - } +// } } } diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml index f3792cdc6..989f2d7d4 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/ruoyi-generator/src/main/resources/generator.yml @@ -2,7 +2,7 @@ # 代码生成 gen: # 作者 - author: ruoyi + author: wendukeji # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool packageName: com.ruoyi.system # 自动去除表前缀，默认是false diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index 24448704a..c64a413e4 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -36,5 +36,19 @@ - + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wd.cn/repository/maven-releases/ + + \ No newline at end of file diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 71018fea1..f318a372d 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -24,5 +24,20 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wd.cn/repository/maven-releases/ + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index e7035fc8d..3f7204bcc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -60,7 +60,7 @@ public class SysDeptServiceImpl implements ISysDeptService /** * 查询部门管理树（排除下级） * - * @param deptId 部门ID + * @param dept 部门 * @return 所有部门信息 */ @Override @@ -243,8 +243,10 @@ public class SysDeptServiceImpl implements ISysDeptService private void updateParentDeptStatusNormal(SysDept dept) { String ancestors = dept.getAncestors(); - Long[] deptIds = Convert.toLongArray(ancestors); - deptMapper.updateDeptStatusNormal(deptIds); + if(org.apache.commons.lang3.StringUtils.isNotBlank(ancestors)) { + Long[] deptIds = Convert.toLongArray(ancestors); + deptMapper.updateDeptStatusNormal(deptIds); + } } /** diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 0ea5f81b1..1254725c9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + and agent_name like concat('%', #{agentName}, '%') + and agent_type = #{agentType} + and agent_level = #{agentLevel} + and sale_addr = #{saleAddr} + and auth_start_time = #{authStartTime} + and auth_end_time = #{authEndTime} + and auth_status = #{authStatus} + and first_sale = #{firstSale} + and agent_code = #{agentCode} + and tyc_uri = #{tycUri} + and create_date = #{createDate} + and capital = #{capital} + and member_num = #{memberNum} + and legal_person = #{legalPerson} + and contact_name like concat('%', #{contactName}, '%') + and contact_tel = #{contactTel} + and contact_name2 = #{contactName2} + and contact_tel2 = #{contactTel2} + + + + + + + insert into crm_agent + + id, + agent_name, + agent_type, + agent_level, + sale_addr, + auth_start_time, + auth_end_time, + auth_status, + first_sale, + agent_code, + tyc_uri, + create_date, + capital, + member_num, + legal_person, + contact_name, + contact_tel, + contact_name2, + contact_tel2, + del_flag, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{agentName}, + #{agentType}, + #{agentLevel}, + #{saleAddr}, + #{authStartTime}, + #{authEndTime}, + #{authStatus}, + #{firstSale}, + #{agentCode}, + #{tycUri}, + #{createDate}, + #{capital}, + #{memberNum}, + #{legalPerson}, + #{contactName}, + #{contactTel}, + #{contactName2}, + #{contactTel2}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update crm_agent + + agent_name = #{agentName}, + agent_type = #{agentType}, + agent_level = #{agentLevel}, + sale_addr = #{saleAddr}, + auth_start_time = #{authStartTime}, + auth_end_time = #{authEndTime}, + auth_status = #{authStatus}, + first_sale = #{firstSale}, + agent_code = #{agentCode}, + tyc_uri = #{tycUri}, + create_date = #{createDate}, + capital = #{capital}, + member_num = #{memberNum}, + legal_person = #{legalPerson}, + contact_name = #{contactName}, + contact_tel = #{contactTel}, + contact_name2 = #{contactName2}, + contact_tel2 = #{contactTel2}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from crm_agent where id = #{id} + + + + delete from crm_agent where id in + + #{id} + + + + \ No newline at end of file