소스 검색

1、更改代码编码
2、修复bug

rayson 1 년 전
부모
커밋
c6bcf1c2b6

+ 10 - 0
src/main/java/com/thinkgem/jeesite/modules/recruitment/dto/OrderDto.java

@@ -13,6 +13,8 @@ public class OrderDto extends MdeOrdersReq{
 
     private String price;		// 套餐售价
 
+    private String fairTitle;		// 标题(区分使用)
+
     public Date getFinishTime() {
         return finishTime;
     }
@@ -28,4 +30,12 @@ public class OrderDto extends MdeOrdersReq{
     public void setPrice(String price) {
         this.price = price;
     }
+
+    public String getFairTitle() {
+        return fairTitle;
+    }
+
+    public void setFairTitle(String fairTitle) {
+        this.fairTitle = fairTitle;
+    }
 }

+ 5 - 3
src/main/java/com/thinkgem/jeesite/modules/recruitment/service/MdeJobFairService.java

@@ -103,6 +103,7 @@ public class MdeJobFairService extends CrudService<MdeJobFairDao, MdeJobFair> {
         }
         // 构建创建订单类
         OrderDto orderDto = new OrderDto();
+        orderDto.setFairTitle(mdeJobFair.getFairTitle());
         orderDto.setUserCode(userCode);
         orderDto.setType(Constant.ORDER_TYPE_VIP);
         orderDto.setPkgType(Constant.PKG_TYPE_ENTERPRISE);
@@ -119,13 +120,14 @@ public class MdeJobFairService extends CrudService<MdeJobFairDao, MdeJobFair> {
 
         orderDto.setOrderTime(new Date());
 
-        // 过期时间+2天
+
+        // 过期时间-2天
         // 创建 Calendar 对象,并设置为当前时间
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(mdeJobFair.getStopDate());
 
-        // 将日期上两天
-        calendar.add(Calendar.DAY_OF_MONTH, 2);
+        // 将日期上两天
+        calendar.add(Calendar.DAY_OF_MONTH, -2);
         orderDto.setFinishTime(calendar.getTime());
 
         ordersService.systemGeneratedOrder(orderDto);

+ 5 - 3
src/main/java/com/thinkgem/jeesite/modules/recruitment/service/MdeOrdersService.java

@@ -232,14 +232,16 @@ public class MdeOrdersService extends CrudService<MdeOrdersDao, MdeOrders> {
 
 		// 完成支付
 		// 第三方单号
-		order.setThirdPartyOrd(String.valueOf(IdGenarator.nextId()));
-		// 支付金额
+		order.setThirdPartyOrd(orderDto.getFairTitle());
+		// 套餐售价
 		order.setPrice(order.getPrice());
-		order.setPayPrice(order.getPrice());
+		// 实际支付金额
+		order.setPayPrice("0.00");
 		// 退款金额
 		order.setRefundNo("0.00");
 		// 支付时间
 		order.setPayTime(new Date());
+		// 切换已支付
 		order.setOrdStatus("2");
 		order.setUpdateBy(UserUtils.getUser());
 		order.setUpdateDate(new Date());

+ 9 - 2
src/main/java/com/thinkgem/jeesite/modules/recruitment/web/MdeJobFairController.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 主子表生成Controller
@@ -114,8 +113,16 @@ public class MdeJobFairController extends BaseController {
         if (!beanValidator(model, mdeJobFair)) {
             return form(mdeJobFair, model);
         }
+        //TODO 判断时间是否过期,过期则提示
+        if ("1".equals(mdeJobFair.getFairType()) && (System.currentTimeMillis() > mdeJobFair.getStopDate().getTime())) {
+            // 当前时间 超过 停止日期
+            addMessage(redirectAttributes, "招聘会结束时间已过期,不会对参会企业进行授权");
+            return "redirect:" + Global.getAdminPath() + "/recruitment/mdeJobFair/form?id=" + mdeJobFair.getFairId();
+
+        }
         mdeJobFairService.save(mdeJobFair);
-        addMessage(redirectAttributes, "保存主子表成功");
+        addMessage(redirectAttributes, "保存招聘会成功");
+
         return "redirect:" + Global.getAdminPath() + "/recruitment/mdeJobFair/?repage";
     }
 

+ 5 - 4
src/main/resources/errors.properties

@@ -1,4 +1,5 @@
-#系统错误
-SYS-0001=系统登录超时,请重新登录。
-SYS-0002=该页面,没有操作权限。
-SYS-0003=未知错误,请联系系统管理员。
+
+#\u7cfb\u7edf\u9519\u8bef
+SYS-0001=\u7cfb\u7edf\u767b\u5f55\u8d85\u65f6\uff0c\u8bf7\u91cd\u65b0\u767b\u5f55\u3002
+SYS-0002=\u8be5\u9875\u9762\uff0c\u6ca1\u6709\u64cd\u4f5c\u6743\u9650\u3002
+SYS-0003=\u672a\u77e5\u9519\u8bef\uff0c\u8bf7\u8054\u7cfb\u7cfb\u7edf\u7ba1\u7406\u5458\u3002

+ 41 - 40
src/main/resources/jeesite.local.properties

@@ -37,99 +37,99 @@ redis.timeout=10000
 #===== System settings ======#
 #============================#
 
-#产品信息设置
-productName=识喜识谊高端招聘管理系统
+#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
+productName=\u8bc6\u559c\u8bc6\u8c0a\u9ad8\u7aef\u62db\u8058\u7ba1\u7406\u7cfb\u7edf
 copyrightYear=2016
 version=V1.2.7
 
-#腾讯云Api
+#\u817e\u8baf\u4e91Api
 tx.cloud.api.secretId=AKIDwhCSSCgtwiEUTCepjMiodAQQ9akdGdjZ
 tx.cloud.api.secretKey=bvykFTP4TbS1JL7XhbEaeRyEDuLVNyKQ
 
-#演示模式: 不能操作和保存的模块: sys: area/office/user/role/menu/dict, cms: site/category
+#\u6f14\u793a\u6a21\u5f0f: \u4e0d\u80fd\u64cd\u4f5c\u548c\u4fdd\u5b58\u7684\u6a21\u5757\uff1a sys: area/office/user/role/menu/dict, cms: site/category
 demoMode=false
 
-#管理基础路径, 需同步修改:web.xml
+#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
 adminPath=/a
 
-#前端基础路径
+#\u524d\u7aef\u57fa\u7840\u8def\u5f84
 frontPath=/f
 
-#网站URL后缀
+#\u7f51\u7ad9URL\u540e\u7f00
 urlSuffix=.html
 
-#是否不允许刷新主页,不允许情况下,刷新主页会导致重新登录
+#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55
 notAllowRefreshIndex=false
 
-#是否允许多账号同时登录
+#\u662f\u5426\u5141\u8bb8\u591a\u8d26\u53f7\u540c\u65f6\u767b\u5f55
 user.multiAccountLogin=true
 
-#分页配置
+#\u5206\u9875\u914d\u7f6e
 page.pageSize=20
 
-#硕正组件是否使用缓存
+#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58
 supcan.useCache=false
 
-#通知间隔时间设置, 单位:毫秒, 30s=30000ms, 60s=60000ms
+#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms
 oa.notify.remind.interval=60000
 
 #============================#
 #==== Framework settings ====#
 #============================#
 
-#会话超时, 单位:毫秒, 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
+#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
 session.sessionTimeout=1800000
-#会话清理间隔时间, 单位:毫秒,2m=120000ms。
+#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
 session.sessionTimeoutClean=120000
 
-#缓存设置
+#\u7f13\u5b58\u8bbe\u7f6e
 ehcache.configFile=cache/ehcache-local.xml
 #ehcache.configFile=cache/ehcache-rmi.xml
 
-#索引页路径
+#\u7d22\u5f15\u9875\u8def\u5f84
 web.view.index=/a
 
-#视图文件存放路径
+#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84
 web.view.prefix=/WEB-INF/views/
 web.view.suffix=.jsp
 
-#最大文件上传限制,单位字节. 10M=10*1024*1024(B)=10485760 bytes,需同步修改:ckfinder.xml
+#\u6700\u5927\u6587\u4ef6\u4e0a\u4f20\u9650\u5236\uff0c\u5355\u4f4d\u5b57\u8282. 10M=10*1024*1024(B)=10485760 bytes\uff0c\u9700\u540c\u6b65\u4fee\u6539\uff1ackfinder.xml
 web.maxUploadSize=10485760
 
-#日志拦截设置,排除的URI;包含 @RequestMapping注解的value。(已作废)
+#\u65e5\u5fd7\u62e6\u622a\u8bbe\u7f6e\uff0c\u6392\u9664\u7684URI\uff1b\u5305\u542b @RequestMapping\u6ce8\u89e3\u7684value\u3002\uff08\u5df2\u4f5c\u5e9f\uff09
 #web.logInterceptExcludeUri=/, /login, /sys/menu/tree, /sys/menu/treeData, /oa/oaNotify/self/count
 #web.logInterceptIncludeRequestMapping=save, delete, import, updateSort
 
-#静态文件后缀
+#\u9759\u6001\u6587\u4ef6\u540e\u7f00
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
-#单点登录CAS设置
+#\u5355\u70b9\u767b\u5f55CAS\u8bbe\u7f6e
 cas.server.url=http://127.0.0.1:8180/cas
 cas.project.url=http://127.0.0.1:8080/jeesite
 
-#职位详情访问地址
+#\u804c\u4f4d\u8be6\u60c5\u8bbf\u95ee\u5730\u5740
 position.visit.url=http://RecruitmentService:8080/#/job/
 
-#图片大小限制
+#\u56fe\u7247\u5927\u5c0f\u9650\u5236
 image.size_limit=1=833*544,2=1200*400,3=896*869,4=1200*400,5=1200*400,6=1200*400,7=1200*400,8=1200*400,9=1200*400,10=1920*1080,11=750*1334
 
-#工作流设置
+#\u5de5\u4f5c\u6d41\u8bbe\u7f6e
 activiti.isSynActivitiIndetity=false
 activiti.export.diagram.path=c:/activiti_diagram
-#activiti font (windows font: 宋体  linux font: simsun)
-activiti.diagram.activityFontName=宋体
-activiti.diagram.labelFontName=宋体
-#5.21.0 新增参数 ,2016.06.23 车树炎 add
-activiti.diagram.annotationFontName=宋体
-#activiti外部表单根地址配置
+#activiti font (windows font: \u5b8b\u4f53  linux font: simsun)
+activiti.diagram.activityFontName=\u5b8b\u4f53
+activiti.diagram.labelFontName=\u5b8b\u4f53
+#5.21.0 \u65b0\u589e\u53c2\u6570 ,2016.06.23 \u8f66\u6811\u708e add
+activiti.diagram.annotationFontName=\u5b8b\u4f53
+#activiti\u5916\u90e8\u8868\u5355\u6839\u5730\u5740\u914d\u7f6e
 activiti.form.server.url=
 
-#上传文件绝对路径, 路径中不允许包含“userfiles”
+#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d
 
-#工程路径,在代码生成时获取不到工程路径时,可再此指定绝对路径。
+#\u5de5\u7a0b\u8def\u5f84\uff0c\u5728\u4ee3\u7801\u751f\u6210\u65f6\u83b7\u53d6\u4e0d\u5230\u5de5\u7a0b\u8def\u5f84\u65f6\uff0c\u53ef\u518d\u6b64\u6307\u5b9a\u7edd\u5bf9\u8def\u5f84\u3002
 #projectPath=D\:\\workspace\\jeesite
 
-#上传文件绝对路径, 路径中不允许包含“userfiles” 和api端 upload.base.path配置一致
+#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d \u548capi\u7aef upload.base.path\u914d\u7f6e\u4e00\u81f4
 #userfiles.basedir=/data/uploadfiles/
 userfiles.basedir=D:/workspace/.metadata/.plugins/org.eclipse.wst.server.core/tmp1/wtpwebapps/upload/
 upload.path.image=images/
@@ -140,18 +140,19 @@ upload.path.file=files/
 imgbaseurl=http://localhost:8080/upload
 
 import.size=5M
-#发件人邮箱地址
+#\u53d1\u4ef6\u4eba\u90ae\u7bb1\u5730\u5740
 send_email_address=services@menduner.com
 send_email_password=I2x6hZzeWHOXptpR
-#系统发件人邮箱地址
-email.addr.sys.send=门墩儿 Menduner <invitations@system-mail.menduner.com>
+#\u7cfb\u7edf\u53d1\u4ef6\u4eba\u90ae\u7bb1\u5730\u5740
+email.addr.sys.send=\u95e8\u58a9\u513f Menduner <invitations@system-mail.menduner.com>
 
-#发送审核邮件
+#\u53d1\u9001\u5ba1\u6838\u90ae\u4ef6
 send_verify_email_address=services@menduner.com
 send_verify_email_password=I2x6hZzeWHOXptpR
 
-#主域名
+#\u4e3b\u57df\u540d
 url.base=https://test.menduner.com/
 
-#广告轮播图配置(上传图片不做数量限制-最后的 , 一定要加)
-ad_img_broadcast=2,3,22,23,24,
+#\u5e7f\u544a\u8f6e\u64ad\u56fe\u914d\u7f6e(\u4e0a\u4f20\u56fe\u7247\u4e0d\u505a\u6570\u91cf\u9650\u5236-\u6700\u540e\u7684 , \u4e00\u5b9a\u8981\u52a0)
+ad_img_broadcast=2,3,22,23,24,
+

+ 37 - 37
src/main/resources/jeesite.prod.properties

@@ -29,93 +29,93 @@ redis.timeout=10000
 #===== System settings ======#
 #============================#
 
-#产品信息设置
-productName=识喜识谊高端招聘管理系统
+#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
+productName=\u8bc6\u559c\u8bc6\u8c0a\u9ad8\u7aef\u62db\u8058\u7ba1\u7406\u7cfb\u7edf
 copyrightYear=2018
 version=V1.0.0
 
-#腾讯云Api
+#\u817e\u8baf\u4e91Api
 tx.cloud.api.secretId=AKIDwhCSSCgtwiEUTCepjMiodAQQ9akdGdjZ
 tx.cloud.api.secretKey=bvykFTP4TbS1JL7XhbEaeRyEDuLVNyKQ
 
-#演示模式: 不能操作和保存的模块: sys: area/office/user/role/menu/dict, cms: site/category
+#\u6f14\u793a\u6a21\u5f0f: \u4e0d\u80fd\u64cd\u4f5c\u548c\u4fdd\u5b58\u7684\u6a21\u5757\uff1a sys: area/office/user/role/menu/dict, cms: site/category
 demoMode=false
 
-#管理基础路径, 需同步修改:web.xml
+#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
 adminPath=/a
 
-#前端基础路径
+#\u524d\u7aef\u57fa\u7840\u8def\u5f84
 frontPath=/f
 
-#网站URL后缀
+#\u7f51\u7ad9URL\u540e\u7f00
 urlSuffix=.html
 
-#是否不允许刷新主页,不允许情况下,刷新主页会导致重新登录
+#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55
 notAllowRefreshIndex=false
 
-#是否允许多账号同时登录
+#\u662f\u5426\u5141\u8bb8\u591a\u8d26\u53f7\u540c\u65f6\u767b\u5f55
 user.multiAccountLogin=true
 
-#分页配置
+#\u5206\u9875\u914d\u7f6e
 page.pageSize=30
 
-#硕正组件是否使用缓存
+#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58
 supcan.useCache=false
 
-#通知间隔时间设置, 单位:毫秒, 30s=30000ms, 60s=60000ms
+#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms
 oa.notify.remind.interval=60000
 
 #============================#
 #==== Framework settings ====#
 #============================#
 
-#会话超时, 单位:毫秒, 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
+#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
 session.sessionTimeout=1800000
-#会话清理间隔时间, 单位:毫秒,2m=120000ms。
+#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
 session.sessionTimeoutClean=120000
 
-#缓存设置
+#\u7f13\u5b58\u8bbe\u7f6e
 ehcache.configFile=cache/ehcache-local.xml
 #ehcache.configFile=cache/ehcache-rmi.xml
 
-#索引页路径
+#\u7d22\u5f15\u9875\u8def\u5f84
 web.view.index=/a
 
-#视图文件存放路径
+#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84
 web.view.prefix=/WEB-INF/views/
 web.view.suffix=.jsp
 
-#最大文件上传限制,单位字节. 10M=10*1024*1024(B)=10485760 bytes,需同步修改:ckfinder.xml
+#\u6700\u5927\u6587\u4ef6\u4e0a\u4f20\u9650\u5236\uff0c\u5355\u4f4d\u5b57\u8282. 10M=10*1024*1024(B)=10485760 bytes\uff0c\u9700\u540c\u6b65\u4fee\u6539\uff1ackfinder.xml
 web.maxUploadSize=10485760
 
-#日志拦截设置,排除的URI;包含 @RequestMapping注解的value。(已作废)
+#\u65e5\u5fd7\u62e6\u622a\u8bbe\u7f6e\uff0c\u6392\u9664\u7684URI\uff1b\u5305\u542b @RequestMapping\u6ce8\u89e3\u7684value\u3002\uff08\u5df2\u4f5c\u5e9f\uff09
 #web.logInterceptExcludeUri=/, /login, /sys/menu/tree, /sys/menu/treeData, /oa/oaNotify/self/count
 #web.logInterceptIncludeRequestMapping=save, delete, import, updateSort
 
-#静态文件后缀
+#\u9759\u6001\u6587\u4ef6\u540e\u7f00
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
-#主域名
+#\u4e3b\u57df\u540d
 url.base=https://www.menduner.com/
 
-#职位详情访问地址
+#\u804c\u4f4d\u8be6\u60c5\u8bbf\u95ee\u5730\u5740
 position.visit.url=https://www.menduner.com/#/job/
 
-#图片大小限制
+#\u56fe\u7247\u5927\u5c0f\u9650\u5236
 image.size_limit=1=833*544,2=1200*400,3=896*869,4=1200*400,5=1200*400,6=1200*400,7=1200*400,8=1200*400,9=1200*400,10=1920*1080,11=750*1334
 
-#工作流设置
+#\u5de5\u4f5c\u6d41\u8bbe\u7f6e
 activiti.isSynActivitiIndetity=false
 activiti.export.diagram.path=c:/activiti_diagram
-#activiti font (windows font: 宋体  linux font: simsun)
-activiti.diagram.activityFontName=宋体
-activiti.diagram.labelFontName=宋体
-#5.21.0 新增参数 ,2016.06.23 车树炎 add
-activiti.diagram.annotationFontName=宋体
-#activiti外部表单根地址配置
+#activiti font (windows font: \u5b8b\u4f53  linux font: simsun)
+activiti.diagram.activityFontName=\u5b8b\u4f53
+activiti.diagram.labelFontName=\u5b8b\u4f53
+#5.21.0 \u65b0\u589e\u53c2\u6570 ,2016.06.23 \u8f66\u6811\u708e add
+activiti.diagram.annotationFontName=\u5b8b\u4f53
+#activiti\u5916\u90e8\u8868\u5355\u6839\u5730\u5740\u914d\u7f6e
 activiti.form.server.url=
 
-#上传文件绝对路径, 路径中不允许包含“userfiles” 和api端 upload.base.path配置一致
+#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d \u548capi\u7aef upload.base.path\u914d\u7f6e\u4e00\u81f4
 userfiles.basedir=/data/uploadfiles/
 upload.path.image=images/
 upload.path.html=htmls/
@@ -124,14 +124,14 @@ upload.path.file=files/
 imgbaseurl=https://www.menduner.com/
 
 import.size=5M
-#发件人邮箱地址
+#\u53d1\u4ef6\u4eba\u90ae\u7bb1\u5730\u5740
 send_email_address=services@menduner.com
 send_email_password=I2x6hZzeWHOXptpR
-#系统发件人邮箱地址
-email.addr.sys.send=门墩儿 Menduner <services@system-mail.menduner.com>
+#\u7cfb\u7edf\u53d1\u4ef6\u4eba\u90ae\u7bb1\u5730\u5740
+email.addr.sys.send=\u95e8\u58a9\u513f Menduner <services@system-mail.menduner.com>
 
-#发送审核邮件
+#\u53d1\u9001\u5ba1\u6838\u90ae\u4ef6
 send_verify_email_address=services@menduner.com
 send_verify_email_password=I2x6hZzeWHOXptpR
-#广告轮播图配置(上传图片不做数量限制-最后的 , 一定要加)
-ad_img_broadcast=2,3,22,23,24,
+#\u5e7f\u544a\u8f6e\u64ad\u56fe\u914d\u7f6e(\u4e0a\u4f20\u56fe\u7247\u4e0d\u505a\u6570\u91cf\u9650\u5236-\u6700\u540e\u7684 , \u4e00\u5b9a\u8981\u52a0)
+ad_img_broadcast=2,3,22,23,24,

+ 42 - 41
src/main/resources/jeesite.properties

@@ -11,7 +11,7 @@ jdbc.url=jdbc:mysql://192.168.3.180:3306/recruitments?useUnicode=true&characterE
 jdbc.username=root
 jdbc.password=123456
 
-#mssql database settings@
+#mssql database settings
 #jdbc.type=mssql
 #jdbc.driver=net.sourceforge.jtds.jdbc.Driver
 #jdbc.url=jdbc:jtds:sqlserver://localhost:1433/jeesite
@@ -38,99 +38,99 @@ redis.timeout=10000
 #===== System settings ======#
 #============================#
 
-#产品信息设置
-productName=识喜识谊高端招聘管理系统
+#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
+productName=\u8bc6\u559c\u8bc6\u8c0a\u9ad8\u7aef\u62db\u8058\u7ba1\u7406\u7cfb\u7edf
 copyrightYear=2016
 version=V1.2.7
 
-#腾讯云Api
+#\u817e\u8baf\u4e91Api
 tx.cloud.api.secretId=AKIDwhCSSCgtwiEUTCepjMiodAQQ9akdGdjZ
 tx.cloud.api.secretKey=bvykFTP4TbS1JL7XhbEaeRyEDuLVNyKQ
 
-#演示模式: 不能操作和保存的模块: sys: area/office/user/role/menu/dict, cms: site/category
+#\u6f14\u793a\u6a21\u5f0f: \u4e0d\u80fd\u64cd\u4f5c\u548c\u4fdd\u5b58\u7684\u6a21\u5757\uff1a sys: area/office/user/role/menu/dict, cms: site/category
 demoMode=false
 
-#管理基础路径, 需同步修改:web.xml
+#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
 adminPath=/a
 
-#前端基础路径
+#\u524d\u7aef\u57fa\u7840\u8def\u5f84
 frontPath=/f
 
-#网站URL后缀
+#\u7f51\u7ad9URL\u540e\u7f00
 urlSuffix=.html
 
-#是否不允许刷新主页,不允许情况下,刷新主页会导致重新登录
+#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55
 notAllowRefreshIndex=false
 
-#是否允许多账号同时登录
+#\u662f\u5426\u5141\u8bb8\u591a\u8d26\u53f7\u540c\u65f6\u767b\u5f55
 user.multiAccountLogin=true
 
-#分页配置
+#\u5206\u9875\u914d\u7f6e
 page.pageSize=20
 
-#硕正组件是否使用缓存
+#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58
 supcan.useCache=false
 
-#通知间隔时间设置, 单位:毫秒, 30s=30000ms, 60s=60000ms
+#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms
 oa.notify.remind.interval=60000
 
 #============================#
 #==== Framework settings ====#
 #============================#
 
-#会话超时, 单位:毫秒, 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
+#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
 session.sessionTimeout=1800000
-#会话清理间隔时间, 单位:毫秒,2m=120000ms。
+#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
 session.sessionTimeoutClean=120000
 
-#缓存设置
+#\u7f13\u5b58\u8bbe\u7f6e
 ehcache.configFile=cache/ehcache-local.xml
 #ehcache.configFile=cache/ehcache-rmi.xml
 
-#索引页路径
+#\u7d22\u5f15\u9875\u8def\u5f84
 web.view.index=/a
 
-#视图文件存放路径
+#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84
 web.view.prefix=/WEB-INF/views/
 web.view.suffix=.jsp
 
-#最大文件上传限制,单位字节. 10M=10*1024*1024(B)=10485760 bytes,需同步修改:ckfinder.xml
+#\u6700\u5927\u6587\u4ef6\u4e0a\u4f20\u9650\u5236\uff0c\u5355\u4f4d\u5b57\u8282. 10M=10*1024*1024(B)=10485760 bytes\uff0c\u9700\u540c\u6b65\u4fee\u6539\uff1ackfinder.xml
 web.maxUploadSize=10485760
 
-#日志拦截设置,排除的URI;包含 @RequestMapping注解的value。(已作废)
+#\u65e5\u5fd7\u62e6\u622a\u8bbe\u7f6e\uff0c\u6392\u9664\u7684URI\uff1b\u5305\u542b @RequestMapping\u6ce8\u89e3\u7684value\u3002\uff08\u5df2\u4f5c\u5e9f\uff09
 #web.logInterceptExcludeUri=/, /login, /sys/menu/tree, /sys/menu/treeData, /oa/oaNotify/self/count
 #web.logInterceptIncludeRequestMapping=save, delete, import, updateSort
 
-#静态文件后缀
+#\u9759\u6001\u6587\u4ef6\u540e\u7f00
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
-#单点登录CAS设置
+#\u5355\u70b9\u767b\u5f55CAS\u8bbe\u7f6e
 cas.server.url=http://127.0.0.1:8180/cas
 cas.project.url=http://127.0.0.1:8080/jeesite
 
-#职位详情访问地址
+#\u804c\u4f4d\u8be6\u60c5\u8bbf\u95ee\u5730\u5740
 position.visit.url=http://RecruitmentService:8080/#/job/
 
-#图片大小限制
+#\u56fe\u7247\u5927\u5c0f\u9650\u5236
 image.size_limit=1=833*544,2=1200*400,3=896*869,4=1200*400,5=1200*400,6=1200*400,7=1200*400,8=1200*400,9=1200*400,10=1920*1080,11=750*1334
 
-#工作流设置
+#\u5de5\u4f5c\u6d41\u8bbe\u7f6e
 activiti.isSynActivitiIndetity=false
 activiti.export.diagram.path=c:/activiti_diagram
-#activiti font (windows font: 宋体  linux font: simsun)
-activiti.diagram.activityFontName=宋体
-activiti.diagram.labelFontName=宋体
-#5.21.0 新增参数 ,2016.06.23 车树炎 add
-activiti.diagram.annotationFontName=宋体
-#activiti外部表单根地址配置
+#activiti font (windows font: \u5b8b\u4f53  linux font: simsun)
+activiti.diagram.activityFontName=\u5b8b\u4f53
+activiti.diagram.labelFontName=\u5b8b\u4f53
+#5.21.0 \u65b0\u589e\u53c2\u6570 ,2016.06.23 \u8f66\u6811\u708e add
+activiti.diagram.annotationFontName=\u5b8b\u4f53
+#activiti\u5916\u90e8\u8868\u5355\u6839\u5730\u5740\u914d\u7f6e
 activiti.form.server.url=
 
-#上传文件绝对路径, 路径中不允许包含“userfiles”
+#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d
 
-#工程路径,在代码生成时获取不到工程路径时,可再此指定绝对路径。
+#\u5de5\u7a0b\u8def\u5f84\uff0c\u5728\u4ee3\u7801\u751f\u6210\u65f6\u83b7\u53d6\u4e0d\u5230\u5de5\u7a0b\u8def\u5f84\u65f6\uff0c\u53ef\u518d\u6b64\u6307\u5b9a\u7edd\u5bf9\u8def\u5f84\u3002
 #projectPath=D\:\\workspace\\jeesite
 
-#上传文件绝对路径, 路径中不允许包含“userfiles” 和api端 upload.base.path配置一致
+#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d \u548capi\u7aef upload.base.path\u914d\u7f6e\u4e00\u81f4
 #userfiles.basedir=/data/uploadfiles/
 userfiles.basedir=D:/workspace/.metadata/.plugins/org.eclipse.wst.server.core/tmp1/wtpwebapps/upload/
 upload.path.image=images/
@@ -141,18 +141,19 @@ upload.path.file=files/
 imgbaseurl=http://localhost:8080/upload
 
 import.size=5M
-#发件人邮箱地址
+#\u53d1\u4ef6\u4eba\u90ae\u7bb1\u5730\u5740
 send_email_address=services@menduner.com
 send_email_password=Dickson789
-#系统发件人邮箱地址
-email.addr.sys.send=门墩儿 Menduner <invitations@system-mail.menduner.com>
+#\u7cfb\u7edf\u53d1\u4ef6\u4eba\u90ae\u7bb1\u5730\u5740
+email.addr.sys.send=\u95e8\u58a9\u513f Menduner <invitations@system-mail.menduner.com>
 
-#发送审核邮件
+#\u53d1\u9001\u5ba1\u6838\u90ae\u4ef6
 send_verify_email_address=services@menduner.com
 send_verify_email_password=Dickson789
 
-#主域名
+#\u4e3b\u57df\u540d
 url.base=https://test.menduner.com/
 
-#广告轮播图配置(上传图片不做数量限制-最后的 , 一定要加)
-ad_img_broadcast=2,3,22,23,24,
+#\u5e7f\u544a\u8f6e\u64ad\u56fe\u914d\u7f6e(\u4e0a\u4f20\u56fe\u7247\u4e0d\u505a\u6570\u91cf\u9650\u5236-\u6700\u540e\u7684 , \u4e00\u5b9a\u8981\u52a0)
+ad_img_broadcast=2,3,22,23,24,
+

+ 41 - 40
src/main/resources/jeesite.test.properties

@@ -36,102 +36,102 @@ redis.timeout=10000
 #===== System settings ======#
 #============================#
 
-#产品信息设置
-productName=测试环境管理系统
+#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
+productName=\u6d4b\u8bd5\u73af\u5883\u7ba1\u7406\u7cfb\u7edf
 copyrightYear=2016
 version=V1.2.7
 
-#腾讯云Api
+#\u817e\u8baf\u4e91Api
 tx.cloud.api.secretId=AKIDwhCSSCgtwiEUTCepjMiodAQQ9akdGdjZ
 tx.cloud.api.secretKey=bvykFTP4TbS1JL7XhbEaeRyEDuLVNyKQ
 
-#演示模式: 不能操作和保存的模块: sys: area/office/user/role/menu/dict, cms: site/category
+#\u6f14\u793a\u6a21\u5f0f: \u4e0d\u80fd\u64cd\u4f5c\u548c\u4fdd\u5b58\u7684\u6a21\u5757\uff1a sys: area/office/user/role/menu/dict, cms: site/category
 demoMode=false
 
-#管理基础路径, 需同步修改:web.xml
+#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
 adminPath=/a
 
-#前端基础路径
+#\u524d\u7aef\u57fa\u7840\u8def\u5f84
 frontPath=/f
 
-#网站URL后缀
+#\u7f51\u7ad9URL\u540e\u7f00
 urlSuffix=.html
 
-#是否不允许刷新主页,不允许情况下,刷新主页会导致重新登录
+#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55
 notAllowRefreshIndex=false
 
-#是否允许多账号同时登录
+#\u662f\u5426\u5141\u8bb8\u591a\u8d26\u53f7\u540c\u65f6\u767b\u5f55
 user.multiAccountLogin=true
 
-#分页配置
+#\u5206\u9875\u914d\u7f6e
 page.pageSize=30
 
-#硕正组件是否使用缓存
+#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58
 supcan.useCache=false
 
-#通知间隔时间设置, 单位:毫秒, 30s=30000ms, 60s=60000ms
+#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms
 oa.notify.remind.interval=60000
 
 #============================#
 #==== Framework settings ====#
 #============================#
 
-#会话超时, 单位:毫秒, 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
+#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
 session.sessionTimeout=1800000
-#会话清理间隔时间, 单位:毫秒,2m=120000ms。
+#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
 session.sessionTimeoutClean=120000
 
-#缓存设置
+#\u7f13\u5b58\u8bbe\u7f6e
 ehcache.configFile=cache/ehcache-local.xml
 #ehcache.configFile=cache/ehcache-rmi.xml
 
-#索引页路径
+#\u7d22\u5f15\u9875\u8def\u5f84
 web.view.index=/a
 
-#视图文件存放路径
+#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84
 web.view.prefix=/WEB-INF/views/
 web.view.suffix=.jsp
 
-#最大文件上传限制,单位字节. 10M=10*1024*1024(B)=10485760 bytes,需同步修改:ckfinder.xml
+#\u6700\u5927\u6587\u4ef6\u4e0a\u4f20\u9650\u5236\uff0c\u5355\u4f4d\u5b57\u8282. 10M=10*1024*1024(B)=10485760 bytes\uff0c\u9700\u540c\u6b65\u4fee\u6539\uff1ackfinder.xml
 web.maxUploadSize=10485760
 
-#日志拦截设置,排除的URI;包含 @RequestMapping注解的value。(已作废)
+#\u65e5\u5fd7\u62e6\u622a\u8bbe\u7f6e\uff0c\u6392\u9664\u7684URI\uff1b\u5305\u542b @RequestMapping\u6ce8\u89e3\u7684value\u3002\uff08\u5df2\u4f5c\u5e9f\uff09
 #web.logInterceptExcludeUri=/, /login, /sys/menu/tree, /sys/menu/treeData, /oa/oaNotify/self/count
 #web.logInterceptIncludeRequestMapping=save, delete, import, updateSort
 
-#静态文件后缀
+#\u9759\u6001\u6587\u4ef6\u540e\u7f00
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
-#主域名
+#\u4e3b\u57df\u540d
 url.base=https://test.menduner.com/
 
-#单点登录CAS设置
+#\u5355\u70b9\u767b\u5f55CAS\u8bbe\u7f6e
 cas.server.url=http://127.0.0.1:8180/cas
 cas.project.url=http://127.0.0.1:8080/jeesite
 
-#职位详情访问地址
+#\u804c\u4f4d\u8be6\u60c5\u8bbf\u95ee\u5730\u5740
 position.visit.url=http://RecruitmentService:8080/#/job/
 
-#图片大小限制
+#\u56fe\u7247\u5927\u5c0f\u9650\u5236
 image.size_limit=1=833*544,2=1200*400,3=896*869,4=1200*400,5=1200*400,6=1200*400,7=1200*400,8=1200*400,9=1200*400,10=1920*1080,11=750*1334
 
-#工作流设置
+#\u5de5\u4f5c\u6d41\u8bbe\u7f6e
 activiti.isSynActivitiIndetity=false
 activiti.export.diagram.path=c:/activiti_diagram
-#activiti font (windows font: 宋体  linux font: simsun)
-activiti.diagram.activityFontName=宋体
-activiti.diagram.labelFontName=宋体
-#5.21.0 新增参数 ,2016.06.23 车树炎 add
-activiti.diagram.annotationFontName=宋体
-#activiti外部表单根地址配置
+#activiti font (windows font: \u5b8b\u4f53  linux font: simsun)
+activiti.diagram.activityFontName=\u5b8b\u4f53
+activiti.diagram.labelFontName=\u5b8b\u4f53
+#5.21.0 \u65b0\u589e\u53c2\u6570 ,2016.06.23 \u8f66\u6811\u708e add
+activiti.diagram.annotationFontName=\u5b8b\u4f53
+#activiti\u5916\u90e8\u8868\u5355\u6839\u5730\u5740\u914d\u7f6e
 activiti.form.server.url=
 
-#上传文件绝对路径, 路径中不允许包含“userfiles”
+#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d
 
-#工程路径,在代码生成时获取不到工程路径时,可再此指定绝对路径。
+#\u5de5\u7a0b\u8def\u5f84\uff0c\u5728\u4ee3\u7801\u751f\u6210\u65f6\u83b7\u53d6\u4e0d\u5230\u5de5\u7a0b\u8def\u5f84\u65f6\uff0c\u53ef\u518d\u6b64\u6307\u5b9a\u7edd\u5bf9\u8def\u5f84\u3002
 #projectPath=D\:\\workspace\\jeesite
 
-#上传文件绝对路径, 路径中不允许包含“userfiles” 和api端 upload.base.path配置一致
+#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d \u548capi\u7aef upload.base.path\u914d\u7f6e\u4e00\u81f4
 userfiles.basedir=/data/uploadfiles/test/
 upload.path.image=images/
 upload.path.html=htmls/
@@ -141,15 +141,16 @@ upload.path.file=files/
 imgbaseurl=https://test.menduner.com/
 
 import.size=5M
-#发件人邮箱地址
+#\u53d1\u4ef6\u4eba\u90ae\u7bb1\u5730\u5740
 send_email_address=services@menduner.com
 send_email_password=I2x6hZzeWHOXptpR
-#系统发件人邮箱地址
-email.addr.sys.send=门墩儿 Menduner <invitations@system-mail.menduner.com>
-#发送审核邮件
+#\u7cfb\u7edf\u53d1\u4ef6\u4eba\u90ae\u7bb1\u5730\u5740
+email.addr.sys.send=\u95e8\u58a9\u513f Menduner <invitations@system-mail.menduner.com>
+#\u53d1\u9001\u5ba1\u6838\u90ae\u4ef6
 send_verify_email_address=services@menduner.com
 send_verify_email_password=I2x6hZzeWHOXptpR
 
 
-#广告轮播图配置(上传图片不做数量限制-最后的 , 一定要加)
-ad_img_broadcast=2,3,22,23,24,
+#\u5e7f\u544a\u8f6e\u64ad\u56fe\u914d\u7f6e(\u4e0a\u4f20\u56fe\u7247\u4e0d\u505a\u6570\u91cf\u9650\u5236-\u6700\u540e\u7684 , \u4e00\u5b9a\u8981\u52a0)
+ad_img_broadcast=2,3,22,23,24,
+

+ 1 - 1
src/main/resources/log4j.properties

@@ -5,7 +5,7 @@ log4j.rootLogger=WARN, Console, RollingFile
 log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
 log4j.appender.Console.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
-log4j.appender.Console.Encoding=GBK
+
 #RollingFile
 log4j.appender.RollingFile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RollingFile.File=../logs/jeesite/jeesite.log

+ 3 - 3
src/main/resources/mybatis-refresh.properties

@@ -1,8 +1,8 @@
 # enabled
 enabled=true
-# project start time[项目启动时间]
+# project start time[\u9879\u76ee\u542f\u52a8\u65f6\u95f4]
 delaySeconds=5
-# xml scanning interval time[扫描间隔时长]
+# xml scanning interval time[\u626b\u63cf\u95f4\u9694\u65f6\u957f]
 sleepSeconds=2
-# xml file's path[xml文件的路径]
+# xml file's path[xml\u6587\u4ef6\u7684\u8def\u5f84]
 mappingPath=mappings