Commit c98a22bf by chongli

测试环境图片路径修改;修复会员续费送券的bug

parent a8e941f0
......@@ -1077,11 +1077,11 @@ public class VoucherService {
JSONObject jsobj = JSONObject.parseObject(clientConfigDao.getByType("chongzhiren_voucher_send_360").getMessage());
JSONArray config_360 = jsobj.getJSONArray("rules");
for(int i=0;i<config_360.size();i++){
rule_String = config_360.get(i).toString();
JSONObject json_rule = JSONObject.parseObject(rule_String);
JSONObject json_rule = JSONObject.parseObject(config_360.get(i).toString());
Date communeEnd_start = DateUtil.parseDateTime(json_rule.getString("communeEnd_start"));
Date communeEnd_end = DateUtil.parseDateTime(json_rule.getString("communeEnd_end"));
if(communeEnd_start.getTime()<communeEnd.getTime()&&communeEnd.getTime()<communeEnd_end.getTime()){
rule_String=config_360.get(i).toString();
break;
}
}
......
imageServer=http://7x2w1g.com1.z0.glb.clouddn.com/
imageServer=http://img.iwanoutdoor.com/
sms.canSend=false
swagger.config=<bean class\="com.ctrip.fun.golf.swagger.DefaultSwaggerConfig" /><mvc\:resources location\="css/" mapping\="/css/**" /><mvc\:resources location\="fonts/" mapping\="/fonts/**" /><mvc\:resources location\="images/" mapping\="/images/**" /><mvc\:resources location\="lib/" mapping\="/lib/**" /><mvc\:interceptors><mvc\:interceptor><mvc\:mapping path\="/**" /><mvc\:exclude-mapping path\="/css/**" /><mvc\:exclude-mapping path\="/fonts/**" /><mvc\:exclude-mapping path\="/images/**" /><mvc\:exclude-mapping path\="/lib/**" /><bean class\="com.ctrip.fun.golf.filter.GlobalHandlerInterceptor" /></mvc\:interceptor></mvc\:interceptors><context\:component-scan base-package\="com.ctrip.fun.golf.swagger" />
......
imageServer=http://7x2w1g.com1.z0.glb.clouddn.com/
imageServer=http://img.iwanoutdoor.com/
sms.canSend=false
swagger.config=
#<bean class\="com.ctrip.fun.golf.swagger.DefaultSwaggerConfig" /><mvc\:resources location\="css/" mapping\="/css/**" /><mvc\:resources location\="fonts/" mapping\="/fonts/**" /><mvc\:resources location\="images/" mapping\="/images/**" /><mvc\:resources location\="lib/" mapping\="/lib/**" /><mvc\:interceptors><mvc\:interceptor><mvc\:mapping path\="/**" /><mvc\:exclude-mapping path\="/css/**" /><mvc\:exclude-mapping path\="/fonts/**" /><mvc\:exclude-mapping path\="/images/**" /><mvc\:exclude-mapping path\="/lib/**" /><bean class\="com.ctrip.fun.golf.filter.GlobalHandlerInterceptor" /></mvc\:interceptor></mvc\:interceptors><context\:component-scan base-package\="com.ctrip.fun.golf.swagger" />
......
imageServer=http://7x2w1g.com1.z0.glb.clouddn.com/
imageServer=http://img.iwanoutdoor.com/
sms.canSend=false
swagger.config=<bean class\="com.ctrip.fun.golf.swagger.DefaultSwaggerConfig" /><mvc\:resources location\="css/" mapping\="/css/**" /><mvc\:resources location\="fonts/" mapping\="/fonts/**" /><mvc\:resources location\="images/" mapping\="/images/**" /><mvc\:resources location\="lib/" mapping\="/lib/**" /><mvc\:interceptors><mvc\:interceptor><mvc\:mapping path\="/**" /><mvc\:exclude-mapping path\="/css/**" /><mvc\:exclude-mapping path\="/fonts/**" /><mvc\:exclude-mapping path\="/images/**" /><mvc\:exclude-mapping path\="/lib/**" /><bean class\="com.ctrip.fun.golf.filter.GlobalHandlerInterceptor" /></mvc\:interceptor></mvc\:interceptors><context\:component-scan base-package\="com.ctrip.fun.golf.swagger" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment