Skip to content

F
foc_manage
Commit 3f43a184 by java-李谡
Options

代码规范

parent 012cd898
Showing with 19 additions and 75 deletions
resources/jdbc.properties
......@@ -3,8 +3,8 @@ db.table.prefix=foc_
jdbc.type=mysql
jdbc.driver.class=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://106.75.105.96:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
jdbc.username=sms_develop
jdbc.password=Develop2018!@#
jdbc.username=jd_foc
jdbc.password=FOC@sh2018
#\u521d\u59cb\u5316\u8fde\u63a5
jdbc.initialSize=0
#\u8fde\u63a5\u6c60\u7684\u6700\u5927\u6d3b\u52a8\u4e2a\u6570
......
src/com/ejweb/core/service/BaseService.java
......@@ -68,14 +68,9 @@ public abstract class BaseService {
sqlString.append(" OR " + oa + ".id = '" + user.getOffice().getId() + "'");
}
else if (Role.DATA_SCOPE_CUSTOM.equals(r.getDataScope())){
// String officeIds = StringUtils.join(r.getOfficeIdList(), "','");
// if (StringUtils.isNotEmpty(officeIds)){
// sqlString.append(" OR " + oa + ".id IN ('" + officeIds + "')");
// }
sqlString.append(" OR EXISTS (SELECT 1 FROM sys_role_office WHERE role_id = '" + r.getId() + "'");
sqlString.append(" AND office_id = " + oa +".id)");
}
//else if (Role.DATA_SCOPE_SELF.equals(r.getDataScope())){
dataScope.add(r.getDataScope());
}
}
......@@ -88,7 +83,6 @@ public abstract class BaseService {
}
}else {
for (String oa : StringUtils.split(officeAlias, ",")){
//sqlString.append(" OR " + oa + ".id = " + user.getOffice().getId());
sqlString.append(" OR " + oa + ".id IS NULL");
}
}
......@@ -184,8 +178,6 @@ public abstract class BaseService {
}
}
// System.out.println("dataScopeFilter: " + sqlString.toString());
// 设置到自定义SQL对象
entity.getSqlMap().put(sqlMapKey, sqlString.toString());
......
src/com/ejweb/core/web/CKFinderConfig.java
......@@ -3,9 +3,6 @@
*/
package com.ejweb.core.web;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import com.ckfinder.connector.configuration.Configuration;
import com.ckfinder.connector.data.AccessControlLevel;
import com.ckfinder.connector.utils.AccessControlUtil;
......@@ -13,26 +10,30 @@ import com.ejweb.core.conf.GConstants;
import com.ejweb.modules.sys.security.SystemAuthorizingRealm.Principal;
import com.ejweb.modules.sys.utils.UserUtils;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
/**
* CKFinder配置
*
* @author ThinkGem
* @version 2014-06-25
*/
public class CKFinderConfig extends Configuration {
public CKFinderConfig(ServletConfig servletConfig) {
super(servletConfig);
super(servletConfig);
}
@Override
protected Configuration createConfigurationInstance() {
Principal principal = (Principal) UserUtils.getPrincipal();
if (principal == null){
if (principal == null) {
return new CKFinderConfig(this.servletConf);
}
boolean isView = true;//UserUtils.getSubject().isPermitted("cms:ckfinder:view");
boolean isUpload = true;//UserUtils.getSubject().isPermitted("cms:ckfinder:upload");
boolean isEdit = true;//UserUtils.getSubject().isPermitted("cms:ckfinder:edit");
boolean isView = true;
boolean isUpload = true;
boolean isEdit = true;
AccessControlLevel alc = this.getAccessConrolLevels().get(0);
alc.setFolderView(isView);
alc.setFolderCreate(isEdit);
......@@ -42,30 +43,19 @@ public class CKFinderConfig extends Configuration {
alc.setFileUpload(isUpload);
alc.setFileRename(isEdit);
alc.setFileDelete(isEdit);
// for (AccessControlLevel a : this.getAccessConrolLevels()){
// System.out.println(a.getRole()+", "+a.getResourceType()+", "+a.getFolder()
// +", "+a.isFolderView()+", "+a.isFolderCreate()+", "+a.isFolderRename()+", "+a.isFolderDelete()
// +", "+a.isFileView()+", "+a.isFileUpload()+", "+a.isFileRename()+", "+a.isFileDelete());
// }
AccessControlUtil.getInstance(this).loadACLConfig();
try {
// Principal principal = (Principal)SecurityUtils.getSubject().getPrincipal();
// this.baseURL = ServletContextFactory.getServletContext().getContextPath()+"/userfiles/"+principal+"/";
this.baseURL = GConstants.IMAGE_BASE_URL;//GConstants.getBaseUrl(Servlets.getRequest());// 图片前缀//FileUtils.path(Servlets.getRequest().getContextPath() + GConstants.USERFILES_BASE_URL + principal + "/");
this.baseDir = GConstants.getUserfilesBaseDir();// 文件地址根目录//FileUtils.path(GConstants.getUserfilesBaseDir() + Global.USERFILES_BASE_URL + principal + "/");
// System.out.println("==================================================================");
// System.out.println(" CKFinderConfig.createConfigurationInstance.baseURL:"+baseURL+" ");
// System.out.println(" CKFinderConfig.createConfigurationInstance.baseDir:"+baseDir+" ");
// System.out.println("==================================================================");
this.baseURL = GConstants.IMAGE_BASE_URL;
this.baseDir = GConstants.getUserfilesBaseDir();
} catch (Exception e) {
throw new RuntimeException(e);
}
return new CKFinderConfig(this.servletConf);
}
@Override
@Override
public boolean checkAuthentication(final HttpServletRequest request) {
return UserUtils.getPrincipal()!=null;
return UserUtils.getPrincipal() != null;
}
}
src/com/ejweb/modules/contact/service/AirportService.java
......@@ -84,8 +84,9 @@ public class AirportService extends CrudService<AirportDao, AirportEntity> {
e.printStackTrace();
}
// 如果c不是汉字，toHanyuPinyinStringArray会返回null
if (pinyin == null)
if (pinyin == null) {
return String.valueOf(c).toUpperCase();
}
// 只取一个发音，如果是多音字，仅取第一个发音
return pinyin[0];
}
......
src/com/ejweb/modules/sys/entity/Area.java
......@@ -15,11 +15,7 @@ import com.ejweb.core.persistence.TreeEntity;
public class Area extends TreeEntity<Area> {
private static final long serialVersionUID = 1L;
// private Area parent; // 父级编号
// private String parentIds; // 所有父级编号
private String code; // 区域编码
// private String name; // 区域名称
// private Integer sort; // 排序
private String type; // 区域类型（1：国家；2：省份、直辖市；3：地市；4：区县）
public Area(){
......@@ -31,8 +27,6 @@ public class Area extends TreeEntity<Area> {
super(id);
}
// @JsonBackReference
// @NotNull
public Area getParent() {
return parent;
}
......@@ -40,32 +34,6 @@ public class Area extends TreeEntity<Area> {
public void setParent(Area parent) {
this.parent = parent;
}
//
// @Length(min=1, max=2000)
// public String getParentIds() {
// return parentIds;
// }
//
// public void setParentIds(String parentIds) {
// this.parentIds = parentIds;
// }
//
// @Length(min=1, max=100)
// public String getName() {
// return name;
// }
//
// public void setName(String name) {
// this.name = name;
// }
//
// public Integer getSort() {
// return sort;
// }
//
// public void setSort(Integer sort) {
// this.sort = sort;
// }
@Length(min=1, max=1)
public String getType() {
......@@ -84,11 +52,7 @@ public class Area extends TreeEntity<Area> {
public void setCode(String code) {
this.code = code;
}
//
// public String getParentId() {
// return parent != null && parent.getId() != null ? parent.getId() : "0";
// }
@Override
public String toString() {
return name;
......
src/com/ejweb/modules/sys/service/AreaService.java
......@@ -28,9 +28,6 @@ public class AreaService extends TreeService<AreaDao, Area> {
@Transactional(readOnly = false)
public void save(Area area) {
// if(area !=null && StringUtils.isBlank(area.getId())){
// area.preInsert();
// }
super.save(area);
UserUtils.removeCache(UserUtils.CACHE_AREA_LIST);
}
......
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 to comment