Skip to content

F
foc_manage
Commit 1ba13285 by java-李谡
Options

修改jdbc连接，代码review

parent 18c2ff27
Showing with 4 additions and 175 deletions
resources/jdbc.properties
......@@ -3,7 +3,7 @@ db.table.prefix=foc_
jdbc.type=mysql
jdbc.driver.class=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://123.56.146.7:3306/jd_foc?useUnicode=true&characterEncoding=utf-8
jdbc.url=jdbc:mysql://106.75.97.50/jd_foc?useUnicode=true&characterEncoding=utf-8
jdbc.username=focuser
jdbc.password=FOC@2016
......
src/com/ejweb/modules/sys/service/SystemService.java
......@@ -68,17 +68,11 @@ public class SystemService extends BaseService implements InitializingBean {
private MenuDao menuDao;
@Autowired
private SessionDAO sessionDao;
// @Autowired
// private SystemAuthorizingRealm systemRealm;
public SessionDAO getSessionDao() {
return sessionDao;
}
// @Autowired
// private IdentityService identityService;
// -- User Service --//
/**
* 获取用户
......@@ -133,7 +127,7 @@ public class SystemService extends BaseService implements InitializingBean {
/**
* 通过部门ID获取用户列表，仅返回用户id和name（树查询用户时用）
*
* @param user
* @param officeId
* @return
*/
@SuppressWarnings("unchecked")
......@@ -178,8 +172,6 @@ public class SystemService extends BaseService implements InitializingBean {
saveActivitiUser(user);
// 清除用户缓存
UserUtils.clearCache(user);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
}
}
......@@ -203,8 +195,6 @@ public class SystemService extends BaseService implements InitializingBean {
userDao.updateUserInfo(user);
// 清除用户缓存
UserUtils.clearCache(user);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
}
@Transactional(readOnly = false)
......@@ -214,8 +204,6 @@ public class SystemService extends BaseService implements InitializingBean {
deleteActivitiUser(user);
// 清除用户缓存
UserUtils.clearCache(user);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
}
@Transactional(readOnly = false)
......@@ -226,8 +214,6 @@ public class SystemService extends BaseService implements InitializingBean {
// 清除用户缓存
user.setLoginName(loginName);
UserUtils.clearCache(user);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
}
@Transactional(readOnly = false)
......@@ -337,8 +323,6 @@ public class SystemService extends BaseService implements InitializingBean {
saveActivitiGroup(role);
// 清除用户角色缓存
UserUtils.removeCache(UserUtils.CACHE_ROLE_LIST);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
}
@Transactional(readOnly = false)
......@@ -348,8 +332,6 @@ public class SystemService extends BaseService implements InitializingBean {
deleteActivitiGroup(role);
// 清除用户角色缓存
UserUtils.removeCache(UserUtils.CACHE_ROLE_LIST);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
}
@Transactional(readOnly = false)
......@@ -420,8 +402,6 @@ public class SystemService extends BaseService implements InitializingBean {
}
// 清除用户菜单缓存
UserUtils.removeCache(UserUtils.CACHE_MENU_LIST);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
// 清除日志相关缓存
CacheUtils.remove(LogUtils.CACHE_MENU_NAME_PATH_MAP);
}
......@@ -431,8 +411,6 @@ public class SystemService extends BaseService implements InitializingBean {
menuDao.updateSort(menu);
// 清除用户菜单缓存
UserUtils.removeCache(UserUtils.CACHE_MENU_LIST);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
// 清除日志相关缓存
CacheUtils.remove(LogUtils.CACHE_MENU_NAME_PATH_MAP);
}
......@@ -442,8 +420,6 @@ public class SystemService extends BaseService implements InitializingBean {
menuDao.delete(menu);
// 清除用户菜单缓存
UserUtils.removeCache(UserUtils.CACHE_MENU_LIST);
// // 清除权限缓存
// systemRealm.clearAllCachedAuthorizationInfo();
// 清除日志相关缓存
CacheUtils.remove(LogUtils.CACHE_MENU_NAME_PATH_MAP);
}
......@@ -453,12 +429,6 @@ public class SystemService extends BaseService implements InitializingBean {
public boolean validateServerPasswordBack(String loginName, String password) {
HCFetcher fetcher = null;
try {
// 先默认写死URL，后期通过配置读取
// {"result":{"message":"succ","viewMessage":"成功","resultCode":"1000"},"data":{"messageCount":0,"mess":"用户chl.zhou登录成功"}}
// StringBuilder buf = new StringBuilder(GConstants.JDAIR_BASE_API+"/flightinterface/uss/json/mobile/messSend.json?"+GConstants.JDAIR_BASE_PARAM+"&loginId=");
// DESPlus desPlus = new DESPlus();
// buf.append(loginBean.getLoginName()).append("&password=").append(desPlus.encrypt(loginBean.getPassword()));
StringBuilder buf = new StringBuilder(GConstants.JDAIR_BASE_API+"/flightinterface/uss/json/hnauser/hnauserLogin.json?"+GConstants.JDAIR_BASE_PARAM);
DESPlus des = new DESPlus( );//定义密钥
......@@ -470,28 +440,16 @@ public class SystemService extends BaseService implements InitializingBean {
if (entity.isSuccess()) {
JSONObject response = JSON.parseObject(entity.getContent("UTF-8"));
if (response.get("result") == null) {
// long endTime = System.nanoTime();
// long duration = endTime - startTime;
// LOG.debug("[UserService validateServerPassword][FAILD]总共用时:" + Util.getDurationTime(duration));
return false;
}
// @SuppressWarnings("unchecked")
// Map<String, String> result = (Map<String, String>) response.get("result");
JSONObject result = response.getJSONObject("result");
if ("1000".equals(result.getString("resultCode"))) { // 远程服务器登陆成功，更改数据库密码
/* String plain = Encodes.unescapeHtml(loginBean.getPassword());
byte[] salt = Digests.generateSalt(SALT_SIZE);
byte[] hashPassword = Digests.sha1(plain.getBytes(), salt, HASH_INTERATIONS);
loginBean.setPassword(Encodes.encodeHex(salt) + Encodes.encodeHex(hashPassword));
dao.updatePwd(loginBean);*/
return true;
}
}
} catch (Exception e) {
} finally {
// if (fetcher != null) {fetcher.shutdown();}
e.printStackTrace();
}
return false;
}
......@@ -574,126 +532,18 @@ public class SystemService extends BaseService implements InitializingBean {
// 已废弃，同步见：ActGroupEntityServiceFactory.java、ActUserEntityServiceFactory.java
public void afterPropertiesSet() throws Exception {
/*
* if (!GConstants.isSynActivitiIndetity()){ return; } if
* (isSynActivitiIndetity){ isSynActivitiIndetity = false; // 同步角色数据
* List<Group> groupList = identityService.createGroupQuery().list(); if
* (groupList.size() == 0){ Iterator<Role> roles =
* roleDao.findAllList(new Role()).iterator(); while(roles.hasNext()) {
* Role role = roles.next(); saveActivitiGroup(role); } } // 同步用户数据
* List<org.activiti.engine.identity.User> userList =
* identityService.createUserQuery().list(); if (userList.size() == 0){
* Iterator<User> users = userDao.findAllList(new User()).iterator();
* while(users.hasNext()) { saveActivitiUser(users.next()); } } }
*/
}
private void saveActivitiGroup(Role role) {
// if (!GConstants.isSynActivitiIndetity()){
// return;
// }
// String groupId = role.getEnname();
//
// // 如果修改了英文名，则删除原Activiti角色
// if (StringUtils.isNotBlank(role.getOldEnname()) &&
// !role.getOldEnname().equals(role.getEnname())){
// identityService.deleteGroup(role.getOldEnname());
// }
//
// Group group =
// identityService.createGroupQuery().groupId(groupId).singleResult();
// if (group == null) {
// group = identityService.newGroup(groupId);
// }
// group.setName(role.getName());
// group.setType(role.getRoleType());
// identityService.saveGroup(group);
//
// // 删除用户与用户组关系
// List<org.activiti.engine.identity.User> activitiUserList =
// identityService.createUserQuery().memberOfGroup(groupId).list();
// for (org.activiti.engine.identity.User activitiUser :
// activitiUserList){
// identityService.deleteMembership(activitiUser.getId(), groupId);
// }
//
// // 创建用户与用户组关系
// List<User> userList = findUser(new User(new Role(role.getId())));
// for (User e : userList){
// String userId =
// e.getLoginName();//ObjectUtils.toString(user.getId());
// // 如果该用户不存在，则创建一个
// org.activiti.engine.identity.User activitiUser =
// identityService.createUserQuery().userId(userId).singleResult();
// if (activitiUser == null){
// activitiUser = identityService.newUser(userId);
// activitiUser.setFirstName(e.getName());
// activitiUser.setLastName(StringUtils.EMPTY);
// activitiUser.setEmail(e.getEmail());
// activitiUser.setPassword(StringUtils.EMPTY);
// identityService.saveUser(activitiUser);
// }
// identityService.createMembership(userId, groupId);
// }
}
public void deleteActivitiGroup(Role role) {
/*
* if (!GConstants.isSynActivitiIndetity()){ return; } if(role!=null) {
* String groupId = role.getEnname();
* identityService.deleteGroup(groupId); }
*/
}
private void saveActivitiUser(User user) {
/*
* if (!GConstants.isSynActivitiIndetity()){ return; } String userId =
* user.getLoginName();//ObjectUtils.toString(user.getId());
* org.activiti.engine.identity.User activitiUser =
* identityService.createUserQuery().userId(userId).singleResult(); if
* (activitiUser == null) { activitiUser =
* identityService.newUser(userId); }
* activitiUser.setFirstName(user.getName());
* activitiUser.setLastName(StringUtils.EMPTY);
* activitiUser.setEmail(user.getEmail());
* activitiUser.setPassword(StringUtils.EMPTY);
* identityService.saveUser(activitiUser);
*
* // 删除用户与用户组关系 List<Group> activitiGroups =
* identityService.createGroupQuery().groupMember(userId).list(); for
* (Group group : activitiGroups) {
* identityService.deleteMembership(userId, group.getId()); } //
* 创建用户与用户组关系 for (Role role : user.getRoleList()) { String groupId =
* role.getEnname(); // 如果该用户组不存在，则创建一个 Group group =
* identityService.createGroupQuery().groupId(groupId).singleResult();
* if(group == null) { group = identityService.newGroup(groupId);
* group.setName(role.getName()); group.setType(role.getRoleType());
* identityService.saveGroup(group); }
* identityService.createMembership(userId, role.getEnname()); }
*/
}
private void deleteActivitiUser(User user) {
/*
* if (!GConstants.isSynActivitiIndetity()){ return; } if(user!=null) {
* String userId =
* user.getLoginName();//ObjectUtils.toString(user.getId());
* identityService.deleteUser(userId); }
*/
}
///////////////// Synchronized to the Activiti end //////////////////
// public static void main(String[] args) throws Exception{
//
// String password = "Qaz.123";
// String loginName= "chl.zhou";
//
// StringBuilder buf = new StringBuilder(GConstants.JDAIR_BASE_API+"/flightinterface/uss/json/hnauser/hnauserLogin.json?"+GConstants.JDAIR_BASE_PARAM);
//
// DESPlus des = new DESPlus( );//定义密钥
// String encrypt = des.encrypt(password);
// buf.append("&loginId=").append(loginName).append("&password=").append(encrypt);
//
// System.out.println(buf.toString());
// }
}
src/com/ejweb/modules/sys/web/UserController.java
......@@ -402,25 +402,4 @@ public class UserController extends BaseController {
return mapList;
}
// @InitBinder
// public void initBinder(WebDataBinder b) {
// b.registerCustomEditor(List.class, "roleList", new PropertyEditorSupport(){
// @Autowired
// private SystemService systemService;
// @Override
// public void setAsText(String text) throws IllegalArgumentException {
// String[] ids = StringUtils.split(text, ",");
// List<Role> roles = new ArrayList<Role>();
// for (String id : ids) {
// Role role = systemService.getRole(Long.valueOf(id));
// roles.add(role);
// }
// setValue(roles);
// }
// @Override
// public String getAsText() {
// return Collections3.extractToString((List) getValue(), "id", ",");
// }
// });
// }
}
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