1

pom.xml

@@ -8,10 +8,6 @@
     <artifactId>ruoyi</artifactId>
     <version>3.4</version>
     
-    <name>ruoyi</name>
-	<url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
-    
     <properties>
 	    <ruoyi.version>3.4</ruoyi.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -203,6 +199,13 @@
 	            <version>${ruoyi.version}</version>
 	        </dependency>
 
+			<!-- 系统模块-->
+			<dependency>
+				<groupId>com.ruoyi</groupId>
+				<artifactId>ruoyi-wish</artifactId>
+				<version>${ruoyi.version}</version>
+			</dependency>
+	        
         </dependencies>
     </dependencyManagement>
 
@@ -213,6 +216,7 @@
 		<module>ruoyi-quartz</module>
 		<module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+		<module>ruoyi-wish</module>
     </modules>
     <packaging>pom</packaging>
 

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
+                url: jdbc:mysql://localhost:3306/testdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
+                username: testuser
-                password: password
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ ruoyi:
   # 版权年份
   copyrightYear: 2019
   # 实例演示开关
-  demoEnabled: true
+  demoEnabled: false
   # 文件路径
   profile: D:/profile/
   # 获取ip地址开关

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/Users/jyking/project/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-admin/src/main/resources/templates/index.html

@@ -4,9 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>若依管理系统首页</title>
+    <title>后台管理系统首页</title>
-    <meta name="keywords" content="若依管理系统首页">
-    <meta name="description" content="若依管理系统首页">
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html"/>
     <![endif]-->
@@ -48,10 +46,7 @@
 				    </div>
             	</li>
                  <li class="active">
-                    <a href="index.html"><i class="fa fa-home"></i> <span class="nav-label">主页</span> <span class="fa arrow"></span></a>
+                    <a class="menuItem" th:href="@{/system/main}"><i class="fa fa-home"></i> <span class="nav-label">主页</span> </a>
-                    <ul class="nav nav-second-level">
-                        <li class="active"><a class="menuItem" th:href="@{/system/main}">了解若依</a></li>
-                    </ul>
                 </li>
                 <li th:each="menu : ${menus}">
                 	<a href="#">
@@ -168,8 +163,6 @@
                     </a>
                 </div>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-				    <li><a title="视频教程" href="http://doc.ruoyi.vip/#/standard/spjc" target="_blank"><i class="fa fa-video-camera"></i> 视频教程</a></li>
-                    <li><a title="开发文档" href="http://doc.ruoyi.vip" target="_blank"><i class="fa fa-question-circle"></i> 开发文档</a></li>
 	                <li><a title="全屏显示" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li>
                     <li class="dropdown user-menu">
 						<a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
@@ -217,7 +210,7 @@
                     th:src="@{/system/main}" frameborder="0" seamless></iframe>
         </div>
         <div class="footer">
-            <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
+            <div class="pull-right">© [[${copyrightYear}]] Copyright </div>
         </div>
     </div>
     <!--右侧部分结束-->

ruoyi-admin/src/main/resources/templates/login.html

@@ -4,9 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     
-    <title>若依管理系统</title>
+    <title>后台管理系统</title>
-    <meta name="keywords" content="若依,若依开源,若依框架,若依系统,ruoyi">
-    <meta name="description" content="若依基于SpringBoot2.0的权限管理系统 易读易懂、界面简洁美观。 核心技术采用Spring、MyBatis、Shiro没有任何其它重度依赖">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
@@ -28,11 +26,8 @@
         <div class="row">
             <div class="col-sm-7">
                 <div class="signin-info">
-                    <div class="logopanel m-b">
-                        <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
-                    </div>
                     <div class="m-b"></div>
-                    <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>
+                    <h4>欢迎使用 <strong> 后台管理系统</strong></h4>
                     <ul class="m-b">
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>
@@ -40,15 +35,13 @@
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>
                     </ul>
-                    <strong>还没有账号？ <a href="#">立即注册&raquo;</a></strong>
                 </div>
             </div>
             <div class="col-sm-5">
                 <form id="signupForm">
                     <h4 class="no-margins">登录：</h4>
-                    <p class="m-t-md">你若不离不弃，我必生死相依</p>
                     <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
-                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
+                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="123456" />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
 						<div class="col-xs-6">
 						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" autocomplete="off">
@@ -68,8 +61,7 @@
         </div>
         <div class="signup-footer">
             <div class="pull-left">
-                &copy; 2019 All Rights Reserved. RuoYi <br>
+                &copy; 2019 All Rights Reserved. <br>
-                <a href="http://www.miitbeian.gov.cn/" target="_blank" rel="nofollow">粤ICP备18046899号</a><br>
             </div>
         </div>
     </div>

ruoyi-generator/src/main/resources/generator.yml

@@ -2,7 +2,7 @@
 # 代码生成
 gen: 
   # 作者
-  author: ruoyi
+  author: jyking
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
   packageName: com.ruoyi.system
   # 自动去除表前缀，默认是true

ruoyi-generator/src/main/resources/vm/html/add.html.vm

@@ -20,9 +20,6 @@
 			<div class="form-group">	
 				<label class="col-sm-3 control-label">${column.columnComment}：</label>
 				<div class="col-sm-8">
-					<select name="${column.attrname}" class="form-control m-b" th:with="type=${@dict.getType('${column.configInfo.value}')}">
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-					</select>
 				</div>
 			</div>
 #elseif(${column.configInfo.type} == "date")

ruoyi-wish/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.4</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <artifactId>ruoyi-wish</artifactId>
+    
+    <description>
+	    wish模块
+	</description>
+	
+    <dependencies>
+    
+    	 <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+    
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+        
+    </dependencies>
+	
+</project>

sql/wishdb(2).sql

@@ -0,0 +1,124 @@
+
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for dict_info
+-- ----------------------------
+DROP TABLE IF EXISTS `dict_info`;
+CREATE TABLE `dict_info` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT 'PK',
+  `DICT_ID` varchar(32) NOT NULL COMMENT '字典编号',
+  `DICT_TYPE` varchar(100) NOT NULL COMMENT '字典类型',
+  `DICT_VALUE` varchar(100) NOT NULL COMMENT '字典值',
+  `DICT_DESC` varchar(100) NOT NULL COMMENT '字典描述',
+  `DICT_SORT` int(11) NOT NULL COMMENT '字典排序（升序）',
+  `DICT_REMARKS` varchar(255) DEFAULT NULL COMMENT '字典备注',
+  `STATUS` char(2) NOT NULL COMMENT '状态 01.正常 02.失效',
+  `GMT_CREATE` datetime(6) NOT NULL COMMENT '创建日期(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `CREATE_OPER_ID` varchar(20) NOT NULL COMMENT '创建操作员',
+  `GMT_MODIFIED` datetime(6) NOT NULL COMMENT '修改日期(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `MODIFIED_OPER_ID` varchar(20) NOT NULL COMMENT '修改操作员',
+  `GMT_AUDIT` datetime(6) DEFAULT NULL COMMENT '审核时间(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `AUDIT_OPER_ID` varchar(20) DEFAULT NULL COMMENT '审核操作员',
+  PRIMARY KEY (`ID`),
+  UNIQUE KEY `UK_T_PTL_DICT_INFO_ID` (`DICT_ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=74 DEFAULT CHARSET=utf8 COMMENT='字典信息表';
+
+-- ----------------------------
+-- Table structure for exp_trans_info
+-- ----------------------------
+DROP TABLE IF EXISTS `exp_trans_info`;
+CREATE TABLE `exp_trans_info` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT 'PK',
+  `EXP_ID` varchar(32) NOT NULL COMMENT '异常ID',
+  `TRANS_CODE` varchar(100) NOT NULL COMMENT '交易代码(公共交易-common)',
+  `EXP_CODE` varchar(32) NOT NULL COMMENT '异常代码',
+  `EXP_MSG` varchar(100) NOT NULL COMMENT '异常信息',
+  `TRANS_EXP_MSG` varchar(100) NOT NULL COMMENT '转译后异常信息',
+  `STATUS` char(2) NOT NULL COMMENT '状态 01.正常 02.失效',
+  `GMT_CREATE` datetime(6) NOT NULL COMMENT '创建日期',
+  `CREATE_OPER_ID` varchar(20) NOT NULL COMMENT '创建操作员',
+  `GMT_MODIFIED` datetime(6) NOT NULL COMMENT '修改日期',
+  `MODIFIED_OPER_ID` varchar(20) NOT NULL COMMENT '修改操作员',
+  `GMT_AUDIT` datetime(6) DEFAULT NULL COMMENT '审核日期',
+  `AUDIT_OPER_ID` varchar(20) DEFAULT NULL COMMENT '审核操作员',
+  PRIMARY KEY (`ID`),
+  UNIQUE KEY `T_PTL_EXP_TRANS_INFO_CODE` (`TRANS_CODE`,`EXP_CODE`),
+  UNIQUE KEY `T_PTL_EXP_TRANS_INFO_ID` (`EXP_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='异常信息转译表';
+
+-- ----------------------------
+-- Table structure for wish_applyer_info
+-- ----------------------------
+DROP TABLE IF EXISTS `wish_applyer_info`;
+CREATE TABLE `wish_applyer_info` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `OPENID` varchar(20) NOT NULL COMMENT '微信OPENID',
+  `NICKNAME` varchar(20) NOT NULL COMMENT '微信昵称',
+  `ICON_URL` varchar(1000) NOT NULL COMMENT '微信头像路径',
+  `WISH_ID` varchar(32) NOT NULL COMMENT '微心愿ID',
+  `WISH_ORG` varchar(20) NOT NULL COMMENT '微心愿归属地区',
+  `WISH_GET_STATUS` char(2) NOT NULL COMMENT '微心愿认领状态01.待审核02.认领成功03.认领失败',
+  `GETTER_NAME` varchar(32) NOT NULL COMMENT '申请人认领人名称',
+  `GETTER_PHONE` varchar(13) NOT NULL COMMENT '申请人认领人联系方式',
+  `GETTER_DEPT` varchar(100) NOT NULL COMMENT '申请人认领人所在党组织',
+  `GET_PLAN` varchar(2000) NOT NULL COMMENT '认领方案',
+  `GMT_CREATE` datetime(6) NOT NULL COMMENT '创建日期(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `CREATE_OPER_ID` varchar(20) NOT NULL COMMENT '创建操作员',
+  `GMT_MODIFIED` datetime(6) NOT NULL COMMENT '修改日期(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `MODIFIED_OPER_ID` varchar(20) NOT NULL COMMENT '修改操作员',
+  `GMT_AUDIT` datetime(6) DEFAULT NULL COMMENT '审核时间(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `AUDIT_OPER_ID` varchar(20) DEFAULT NULL COMMENT '审核操作员',
+  `IS_RECOMMEND` char(2) NOT NULL COMMENT '是否是推荐心愿0.是1.不是',
+  PRIMARY KEY (`ID`),
+  UNIQUE KEY `WISH_ID` (`WISH_ID`,`OPENID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='认领人的相关信息';
+
+-- ----------------------------
+-- Table structure for wish_info
+-- ----------------------------
+DROP TABLE IF EXISTS `wish_info`;
+CREATE TABLE `wish_info` (
+  `WISH_ID` int(20) NOT NULL COMMENT '微心愿ID',
+  `WISH_NAME` varchar(100) NOT NULL COMMENT '微心愿名称',
+  `WISH_ORG` varchar(10) NOT NULL COMMENT '微心愿归属地区',
+  `WISH_STATUS` char(2) NOT NULL COMMENT '微心愿状态',
+  `WISH_TARGET` char(2) NOT NULL COMMENT '微心愿对象',
+  `WISH_TYPE` char(2) NOT NULL COMMENT '微心愿类型',
+  `WISH_COUNT` int(2) DEFAULT NULL COMMENT '申请认领次数',
+  `WISH_PROGRESS` varchar(1000) DEFAULT NULL COMMENT '微心愿项目进展',
+  `WISH_DESC` varchar(1000) NOT NULL COMMENT '微心愿详细描述',
+  `APPLYER_NAME` varchar(10) NOT NULL COMMENT '申请人姓名',
+  `APPLYER__PHONE` varchar(13) NOT NULL COMMENT '申请人联系方式',
+  `APPLYER_COMP` varchar(50) NOT NULL COMMENT '申请人所在党组织',
+  `EXPIRE_DATE` datetime(6) NOT NULL COMMENT '失效日期',
+  `EFFECT_DATE` datetime(6) NOT NULL COMMENT '生效日期',
+  `CLAIM_DATE` datetime(6) DEFAULT NULL COMMENT '认领日期',
+  `COMPLETE_DATE` datetime(6) DEFAULT NULL COMMENT '完成日期',
+  `SAVE_PATH` varchar(100) NOT NULL COMMENT '图片存储路径',
+  `GMT_CREATE` datetime(6) NOT NULL COMMENT '创建日期(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `CREATE_OPER_ID` varchar(20) NOT NULL COMMENT '创建操作员',
+  `GMT_MODIFIED` datetime(6) NOT NULL COMMENT '修改日期(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `MODIFIED_OPER_ID` varchar(20) NOT NULL COMMENT '修改操作员',
+  `GMT_AUDIT` datetime(6) DEFAULT NULL COMMENT '审核时间(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `AUDIT_OPER_ID` varchar(20) DEFAULT NULL COMMENT '审核操作员',
+  PRIMARY KEY (`WISH_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='记录微心愿的信息';
+
+-- ----------------------------
+-- Table structure for zhejiang_city_info
+-- ----------------------------
+DROP TABLE IF EXISTS `zhejiang_city_info`;
+CREATE TABLE `zhejiang_city_info` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT COMMENT 'PK',
+  `CITY_CODE` varchar(10) NOT NULL COMMENT '城市代码',
+  `CITY_NAME` varchar(10) NOT NULL COMMENT '城市名称',
+  `GMT_CREATE` datetime(6) NOT NULL COMMENT '创建日期(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `CREATE_OPER_ID` varchar(20) NOT NULL COMMENT '创建操作员',
+  `GMT_MODIFIED` datetime(6) NOT NULL COMMENT '修改日期(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `MODIFIED_OPER_ID` varchar(20) NOT NULL COMMENT '修改操作员',
+  `GMT_AUDIT` datetime(6) DEFAULT NULL COMMENT '审核时间(YYYY-MM-DD hh:mm:ss UUUUUU)',
+  `AUDIT_OPER_ID` varchar(20) DEFAULT NULL COMMENT '审核操作员',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='浙江省城市信息表';