power2.0
/
power_fs3
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

初始化

Browse Source
master
linjj 1 year ago
parent 12cd3e63f9
commit 9152a3ad0d
10 changed files with 224 additions and 245 deletions
Show Stats Download Patch File Download Diff File

53
power-admin/src/main/java/com/manage/controller/FontController.java
Unescape Escape View File

@ -598,28 +598,19 @@ public class FontController {
@RequestMapping(value="getQRcode") @RequestMapping(value="getQRcode")
@ResponseBody @ResponseBody
public QrBean getQRcode(QRcode qRcode, HttpServletRequest request){ public QrBean getQRcode(QRcode qRcode, HttpServletRequest request){
// 获得Http客户端 // 获得Http客户端
CloseableHttpClient httpClient = HttpClientBuilder.create().build(); CloseableHttpClient httpClient = HttpClientBuilder.create().build();
// 创建Post请求 // 创建Post请求
HttpPost httpPost = new HttpPost("http://192.168.1.212:8080/cloudkeyserver/api/login/qrcode/nostatus/2CKV1"); HttpPost httpPost = new HttpPost("http://192.168.1.212:8080/cloudkeyserver/api/login/qrcode/nostatus/2CKV1");
// qRcode.setLoginTypeBitValue(16);
// qRcode.setType(3);
// qRcode.setProjectUid("cloudkey-fstth");
// qRcode.setApplicationId("fstth-wzh");
System.out.println("qRcode:::::"+qRcode.getApplicationId());
//json格式转换 //json格式转换
String jsonString = JSON.toJSONString(qRcode); String jsonString = JSON.toJSONString(qRcode);
System.out.println("jsonString1::::"+jsonString);
StringEntity entity = new StringEntity(jsonString, "UTF-8"); StringEntity entity = new StringEntity(jsonString, "UTF-8");
System.out.println("jsonString::::"+jsonString);
// post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中 // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中
httpPost.setEntity(entity); httpPost.setEntity(entity);
httpPost.setHeader("Content-Type", "application/json;charset=utf8"); httpPost.setHeader("Content-Type", "application/json;charset=utf8");
// 响应模型 // 响应模型
CloseableHttpResponse response = null; CloseableHttpResponse response = null;
HttpEntity responseEntity=null; HttpEntity responseEntity=null;
String s ="";
QrBean qrBean=new QrBean(); QrBean qrBean=new QrBean();
try { try {
// 由客户端执行(发送)Post请求 // 由客户端执行(发送)Post请求
@ -635,11 +626,8 @@ public class FontController {
String qrCodeIdentity = contentsObject.getString("qrCodeIdentity"); String qrCodeIdentity = contentsObject.getString("qrCodeIdentity");
JSONArray qrCodes = contentsObject.getJSONArray("qrCodes"); JSONArray qrCodes = contentsObject.getJSONArray("qrCodes");
String qrCodeBase64 = qrCodes.getJSONObject(0).get("qrCodeBase64").toString(); String qrCodeBase64 = qrCodes.getJSONObject(0).get("qrCodeBase64").toString();
qrBean.setQrCodeBase64(qrCodeBase64); qrBean.setQrCodeBase64(qrCodeBase64);
qrBean.setQrCodeIdentity(qrCodeIdentity); qrBean.setQrCodeIdentity(qrCodeIdentity);
System.out.println("qrBean::::"+qrBean.getQrCodeIdentity());
} }
} catch (ClientProtocolException e) { } catch (ClientProtocolException e) {
e.printStackTrace(); e.printStackTrace();
@ -671,7 +659,6 @@ public class FontController {
@RequestMapping(value="getScanCode") @RequestMapping(value="getScanCode")
@ResponseBody @ResponseBody
public ScanCodeRes getQRcode(ScanCode scanCode, HttpServletRequest request){ public ScanCodeRes getQRcode(ScanCode scanCode, HttpServletRequest request){
System.out.println("scanCode123::::"+scanCode.getQrCodeIdentity());
// 获得Http客户端 // 获得Http客户端
CloseableHttpClient httpClient = HttpClientBuilder.create().build(); CloseableHttpClient httpClient = HttpClientBuilder.create().build();
// 创建Post请求 // 创建Post请求
@ -739,18 +726,18 @@ public class FontController {
//json格式转换 //json格式转换
String jsonString = JSON.toJSONString(userCode); String jsonString = JSON.toJSONString(userCode);
StringEntity entity = new StringEntity(jsonString, "UTF-8"); StringEntity entity = new StringEntity(jsonString, "UTF-8");
// post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中 // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中
httpPost.setEntity(entity); httpPost.setEntity(entity);
httpPost.setHeader("Content-Type", "application/json;charset=utf8"); httpPost.setHeader("Content-Type", "application/json;charset=utf8");
// 响应模型 // 响应模型
CloseableHttpResponse response = null; CloseableHttpResponse response = null;
HttpEntity responseEntity=null; HttpEntity responseEntity=null;
UserCodeRes userCodeRes =new UserCodeRes(); UserCodeRes userCodeRes =new UserCodeRes();
try { try {
// 由客户端执行(发送)Post请求 // 由客户端执行(发送)Post请求
response = httpClient.execute(httpPost); response = httpClient.execute(httpPost);
// 从响应模型中获取响应实体 // 从响应模型中获取响应实体
responseEntity = response.getEntity(); responseEntity = response.getEntity();
System.out.println("responseEntity::::"+responseEntity); System.out.println("responseEntity::::"+responseEntity);
System.out.println("响应状态为:" + response.getStatusLine()); System.out.println("响应状态为:" + response.getStatusLine());
if (responseEntity != null) { if (responseEntity != null) {
@ -797,23 +784,11 @@ public class FontController {
public Msg qRCodeLogin(Power_User powerUser, HttpServletResponse response, HttpServletRequest request, Model model){ public Msg qRCodeLogin(Power_User powerUser, HttpServletResponse response, HttpServletRequest request, Model model){
try { try {
Power_UserVo user = power_userService.findUserName(powerUser); Power_UserVo user = power_userService.findUserName(powerUser);
System.out.println("user:::::"+user);
//添加进操作日志 //添加进操作日志
Power_Log log = new Power_Log(); Power_Log log = new Power_Log();
if(user != null){ if(user != null){
// //存session密码置空
//// //是否记住密码功能
//// MyCookieUtil.remember(request, response);
//设置token缓存
String token = UUID.randomUUID().toString(); String token = UUID.randomUUID().toString();
//查询归属医院 //查询归属医院
/*long start5 = System.currentTimeMillis();
Power_User_Dict powerUserDict = powerUserDictMapper.selectDictIdByUserId(user.getUserId());
long end5 = System.currentTimeMillis();
System.out.println("查询医院时间="+(end5-start5)/1000.0+"s");
user.setDictId(powerUserDict.getDictId());*/
//设置用户登录次数缓存
//CacheManager.addloginUserCount(fmt.format(new Date()),user.getUserName());
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
List<Power_Menu> list = null; List<Power_Menu> list = null;
List<User_Dept_Menu> menuList = new ArrayList<>(); List<User_Dept_Menu> menuList = new ArrayList<>();
@ -867,10 +842,6 @@ public class FontController {
url = "http://"+ip+":"+POWER_PORT+"/power/gatewayPage"; url = "http://"+ip+":"+POWER_PORT+"/power/gatewayPage";
} }
//request.getRequestDispatcher(url).forward(request, response);
//response.sendRedirect(url);
//return "redirect:gatewayPage";
return Msg.success().add("url",url); return Msg.success().add("url",url);
}else{ }else{
//登录失败 //登录失败

15
power-admin/src/main/java/com/manage/controller/LoginController.java
Unescape Escape View File

@ -69,7 +69,13 @@ public class LoginController {
@ResponseBody @ResponseBody
public Msg login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){ public Msg login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){
try { try {
String userName = powerUser.getUserName();
if (!userName.equals("admin")){
String s ="00" + userName;
powerUser.setUserName(s);
}
Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser); Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser);
//添加进操作日志 //添加进操作日志
Power_Log log = new Power_Log(); Power_Log log = new Power_Log();
if(user != null){ if(user != null){
@ -78,14 +84,6 @@ public class LoginController {
MyCookieUtil.remember(request, response); MyCookieUtil.remember(request, response);
//设置token缓存 //设置token缓存
String token = UUID.randomUUID().toString(); String token = UUID.randomUUID().toString();
//查询归属医院
/*long start5 = System.currentTimeMillis();
Power_User_Dict powerUserDict = powerUserDictMapper.selectDictIdByUserId(user.getUserId());
long end5 = System.currentTimeMillis();
System.out.println("查询医院时间="+(end5-start5)/1000.0+"s");
user.setDictId(powerUserDict.getDictId());*/
//设置用户登录次数缓存
//CacheManager.addloginUserCount(fmt.format(new Date()),user.getUserName());
CacheManager.addExcCount("noExc"); CacheManager.addExcCount("noExc");
List<Power_Menu> list = null; List<Power_Menu> list = null;
List<User_Dept_Menu> menuList = new ArrayList<>(); List<User_Dept_Menu> menuList = new ArrayList<>();
@ -162,6 +160,7 @@ public class LoginController {
log.setRemark("已错误【"+wrongNum+"】次"); log.setRemark("已错误【"+wrongNum+"】次");
logService.insert(log); logService.insert(log);
request.setAttribute("msg", "用户名或密码不正确"); request.setAttribute("msg", "用户名或密码不正确");
return Msg.failUser();
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

228
power-admin/src/main/java/com/manage/controller/SsoLogin.java
Unescape Escape View File

@ -114,139 +114,137 @@ public class SsoLogin {
* 单点登录 * 单点登录
* author xuhx * author xuhx
* */ * */
@RequestMapping(value = "login",method = RequestMethod.GET,produces = "text/html;charset=utf-8") @RequestMapping(value = "login", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
@ResponseBody @ResponseBody
public String login(HttpServletRequest request,HttpServletResponse response,String code,String state) throws Exception { public String login(HttpServletRequest request, HttpServletResponse response, String code, String state) throws Exception {
String result = ""; String result = "";
CloseableHttpResponse responseNew = null; CloseableHttpResponse responseNew = null;
CloseableHttpClient httpClient = null; CloseableHttpClient httpClient = null;
JSONObject jsonResultToken = null; JSONObject jsonResultToken = null;
String url=oidcAddress+tokenEendpoint; String url = oidcAddress + tokenEendpoint;
String StringUrl = URLEncoder.encode(urlAddress, "GBK"); String StringUrl = URLEncoder.encode(urlAddress, "GBK");
Map paramMap = new HashMap(); Map paramMap = new HashMap();
paramMap.put("client_id",clientId); paramMap.put("client_id", clientId);
paramMap.put("client_secret",clientSecret); paramMap.put("client_secret", clientSecret);
paramMap.put("code",code); paramMap.put("code", code);
paramMap.put("grant_type","authorization_code"); paramMap.put("grant_type", "authorization_code");
paramMap.put("redirect_uri",urlAddress); paramMap.put("redirect_uri", urlAddress);
String param="client_id="+clientId+"&client_secret="+clientSecret+"&code="+code+"&grant_type=authorization_code&redirect_uri="+StringUrl; String param = "client_id=" + clientId + "&client_secret=" + clientSecret + "&code=" + code + "&grant_type=authorization_code&redirect_uri=" + StringUrl;
String returnObject =doPost(url,paramMap,null); String returnObject = doPost(url, paramMap, null);
String userName=""; String userName = "";
if(returnObject!=null){ if (returnObject != null) {
// 把json字符串转换成json对象 // 把json字符串转换成json对象
jsonResultToken = JSONObject.parseObject(returnObject); jsonResultToken = JSONObject.parseObject(returnObject);
String accessToken=jsonResultToken.getString("access_token"); String accessToken = jsonResultToken.getString("access_token");
// 通过址默认配置创建一个httpClient实例 // 通过址默认配置创建一个httpClient实例
httpClient = HttpClients.createDefault(); httpClient = HttpClients.createDefault();
// 创建httpGet远程连接实例 // 创建httpGet远程连接实例
String userUrl=oidcAddress+userinfoEndpoint; String userUrl = oidcAddress + userinfoEndpoint;
HttpGet httpGet = new HttpGet(userUrl); HttpGet httpGet = new HttpGet(userUrl);
// 设置请求头信息，鉴权 // 设置请求头信息，鉴权
httpGet.setHeader("Authorization", "Bearer "+accessToken); httpGet.setHeader("Authorization", "Bearer " + accessToken);
httpGet.setConfig(requestConfig); httpGet.setConfig(requestConfig);
// 执行get请求得到返回对象 // 执行get请求得到返回对象
responseNew = httpClient.execute(httpGet); responseNew = httpClient.execute(httpGet);
// 通过返回对象获取返回数据 // 通过返回对象获取返回数据
HttpEntity entity = responseNew.getEntity(); HttpEntity entity = responseNew.getEntity();
// 通过EntityUtils中的toString方法将结果转换为字符串 // 通过EntityUtils中的toString方法将结果转换为字符串
String returnResult = EntityUtils.toString(entity); String returnResult = EntityUtils.toString(entity);
// 把json字符串转换成json对象 // 把json字符串转换成json对象
JSONObject jsonResult = JSONObject.parseObject(returnResult); JSONObject jsonResult = JSONObject.parseObject(returnResult);
if(jsonResult!=null){ if (jsonResult != null) {
/*if((jsonResult.getString("username"))!=null&&!"".equals(jsonResult.getString("username"))) { if ((jsonResult.getString("name")) != null && !"".equals(jsonResult.getString("name"))) {
userName=jsonResult.getString("username"); //接口返回的登录名为4位，我们系统为6位，接口登录名前追加两个0变成我们的6位
}*/ userName = "00" + jsonResult.getString("name");
if((jsonResult.getString("name"))!=null&&!"".equals(jsonResult.getString("name"))) { //根据登录名获取用户（需要确保用户登录名唯一）
//接口返回的登录名为4位，我们系统为6位，接口登录名前追加两个0变成我们的6位 Power_UserVo user = powerUserService.selectByUserName(userName);
userName="00"+jsonResult.getString("name"); if (user != null) {
//根据登录名获取用户（需要确保用户登录名唯一） String password = MD5.JM(Base64.decode(user.getUserPwd()));
Power_UserVo user = powerUserService.selectByUserName(userName); if (password != null && !"".equals(password)) {
if (user != null) { //加密（此部分代码来自FontController的getToken方法，用来获取token及相关操作）
String password = MD5.JM(Base64.decode(user.getUserPwd())); String token = UUID.randomUUID().toString();
if (password != null && !"".equals(password)) { List<Power_Menu> list = null;
//加密（此部分代码来自FontController的getToken方法，用来获取token及相关操作） List<User_Dept_Menu> menuList = new ArrayList<>();
String token = UUID.randomUUID().toString(); Set<String> menus = new TreeSet<>();
List<Power_Menu> list = null; if (user.getRoleId().equals(0) || user.getRoleId().equals(-100)) {
List<User_Dept_Menu> menuList = new ArrayList<>(); list = powerMenuService.queryAllPowerMenu(null, user.getRoleId());
Set<String> menus = new TreeSet<>(); } else {
if (user.getRoleId().equals(0) || user.getRoleId().equals(-100)) { list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(), null);
list = powerMenuService.queryAllPowerMenu(null,user.getRoleId()); }
} else { if (null != list && !list.isEmpty()) {
list = powerMenuService.selectUserAndRoleMenuListPower(user.getUserId(),null); for (Power_Menu power_menu : list) {
} User_Dept_Menu deptMenu = new User_Dept_Menu();
if(null != list && !list.isEmpty()){ String menuUrl = power_menu.getMenuUrl();
for (Power_Menu power_menu : list) { if (StringUtils.isNotBlank(menuUrl)) {
User_Dept_Menu deptMenu = new User_Dept_Menu(); BeanUtils.copyProperties(power_menu, deptMenu);
String menuUrl = power_menu.getMenuUrl(); deptMenu.setMethodParent(power_menu.getParentId());
if (StringUtils.isNotBlank(menuUrl)) { menuList.add(deptMenu);
BeanUtils.copyProperties(power_menu, deptMenu);
deptMenu.setMethodParent(power_menu.getParentId());
menuList.add(deptMenu);
}
if (StringUtils.isNotBlank(power_menu.getMethod())) {
menus.add(power_menu.getMenuUrl());
}
}
} }
user.setMenuList(menuList); if (StringUtils.isNotBlank(power_menu.getMethod())) {
user.setMenus(menus); menus.add(power_menu.getMenuUrl());
//设置科室
StringBuilder powerDepts = new StringBuilder();
List<Power_Dept> powerDeptsList = power_deptService.selectByPrimaryKeys(user.getDeptId());
for(int j=0;j<powerDeptsList.size();j++){
if(j<powerDeptsList.size()-1){
powerDepts.append(powerDeptsList.get(j).getDeptName()).append(",");
}else{
powerDepts.append(powerDeptsList.get(j).getDeptName());
}
} }
user.setRemark(powerDepts.toString()); }
}
user.setMenuList(menuList);
user.setMenus(menus);
//设置科室
StringBuilder powerDepts = new StringBuilder();
List<Power_Dept> powerDeptsList = power_deptService.selectByPrimaryKeys(user.getDeptId());
for (int j = 0; j < powerDeptsList.size(); j++) {
if (j < powerDeptsList.size() - 1) {
powerDepts.append(powerDeptsList.get(j).getDeptName()).append(",");
} else {
powerDepts.append(powerDeptsList.get(j).getDeptName());
}
}
user.setRemark(powerDepts.toString());
//移除缓存 //移除缓存
/*CacheManager.removeCacheByObject(user); /*CacheManager.removeCacheByObject(user);
CacheManager.putCache(date,new Cache(date,user,TOKEN_EXPIRE_TIME));*/ CacheManager.putCache(date,new Cache(date,user,TOKEN_EXPIRE_TIME));*/
ActionScopeUtils.setSessionAttribute("token",token,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))); ActionScopeUtils.setSessionAttribute("token", token, Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME)));
ActionScopeUtils.setSessionAttribute("CURRENT_USER",user,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))); ActionScopeUtils.setSessionAttribute("CURRENT_USER", user, Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME)));
CacheManager.putCache(token,new Cache(user,System.currentTimeMillis(),TOKEN_EXPIRE_TIME*1000)); CacheManager.putCache(token, new Cache(user, System.currentTimeMillis(), TOKEN_EXPIRE_TIME * 1000));
if (!"".equals(token)&&token!=null) { if (!"".equals(token) && token != null) {
//返回跳转url //返回跳转url
result="http://"+ip+":"+port+"/emr_medical_record/login?token=" + token + "&userName="+userName; result = "http://" + ip + ":" + port + "/emr_medical_record/login?token=" + token + "&userName=" + userName;
//request.getRequestDispatcher(result).forward(request, response); //request.getRequestDispatcher(result).forward(request, response);
response.sendRedirect(result); response.sendRedirect(result);
} else {
result = "获取登录token失败，请检查数据!!";
}
} else {
result = "无法获取用户密码!!";
}
} else { } else {
result = "登录用户不存在!!"; result = "获取登录token失败，请检查数据!!";
} }
} else {
result = "无法获取用户密码!!";
} }
}else{ } else {
result = "SSO平台未成功返回用户信息!!"; result = "登录用户不存在!!";
} }
}
} else {
result = "SSO平台未成功返回用户信息!!";
} }
return result;
} }
@RequestMapping(value = "into",method = RequestMethod.GET,produces = "text/html;charset=utf-8") return result;
}
@RequestMapping(value = "into", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
@ResponseBody @ResponseBody
public void in(HttpServletRequest request, HttpServletResponse response){ public void in(HttpServletRequest request, HttpServletResponse response) {
//本项目中接收返回数据的地址 //本项目中接收返回数据的地址
String StringUrl = null; String StringUrl = null;
try { try {
StringUrl = URLEncoder.encode(urlAddress, "GBK"); StringUrl = URLEncoder.encode(urlAddress, "GBK");
try { try {
response.sendRedirect(oidcAddress+authorizationEndpoint+"?client_id="+clientId+"&redirect_uri="+StringUrl+"&response_type=code&state="+1+"&scope=openid%20profile"); response.sendRedirect(oidcAddress + authorizationEndpoint + "?client_id=" + clientId + "&redirect_uri=" + StringUrl + "&response_type=code&state=" + 1 + "&scope=openid%20profile");
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
public static String doPost(String url, Map<String, Object> paramMap, Map<String, String> headerMap) { public static String doPost(String url, Map<String, Object> paramMap, Map<String, String> headerMap) {
@ -268,7 +266,7 @@ public class SsoLogin {
// 为httpPost实例设置配置 // 为httpPost实例设置配置
//httpPost.setConfig(requestConfig); //httpPost.setConfig(requestConfig);
// 设置请求头 // 设置请求头
if (headerMap == null){ if (headerMap == null) {
httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded");// "application/json" httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded");// "application/json"
} else { } else {
for (String key : headerMap.keySet()) { for (String key : headerMap.keySet()) {
@ -329,9 +327,9 @@ public class SsoLogin {
* @MethodName sendMessage * @MethodName sendMessage
* @Description: 获取用户信息 * @Description: 获取用户信息
*/ */
@RequestMapping(value ="getUser",method = RequestMethod.GET) @RequestMapping(value = "getUser", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public Power_UserVo sendMessage(String userName) throws Exception{ public Power_UserVo sendMessage(String userName) throws Exception {
return powerUserService.selectByUserName(userName); return powerUserService.selectByUserName(userName);
} }

4
power-admin/src/main/resources/config/config.properties
Unescape Escape View File

@ -23,11 +23,11 @@ POWER_PORT = ${SERVER_PORT}
#\u75C5\u6848\u5F52\u6863\u7CFB\u7EDFip #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDFip
EMRMEDICALRECORD_IP = ${SERVER_IP} EMRMEDICALRECORD_IP = ${SERVER_IP}
#\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3 #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3
EMRMEDICALRECORD_PORT = ${SERVER_PORT} EMRMEDICALRECORD_PORT = 8084
#\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip
EMRRECORD_IP = ${SERVER_IP} EMRRECORD_IP = ${SERVER_IP}
#\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDF\u7AEF\u53E3 #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDF\u7AEF\u53E3
EMRRECORD_PORT = ${SERVER_PORT} EMRRECORD_PORT = 8083
#\u75C5\u6848\u590D\u5370\u9884\u7EA6ip #\u75C5\u6848\u590D\u5370\u9884\u7EA6ip
EMRAPPLYCOPY_IP = ${SERVER_IP} EMRAPPLYCOPY_IP = ${SERVER_IP}

16
power-admin/src/main/resources/config/jdbc.properties
Unescape Escape View File

@ -1,11 +1,17 @@
#jdbc.url=jdbc\:mysql\://200.100.104.40\:3306/power?useUnicode\=true&characterEncoding\=utf-8 #jdbc.url=jdbc\:mysql\://200.100.104.40\:3306/power?useUnicode\=true&characterEncoding\=utf-8
#jdbc.password=AbcXyz123 #jdbc.password=AbcXyz123
jdbc.url=jdbc\:mysql\://localhost\:3306/gmpower?useUnicode\=true&characterEncoding\=utf-8 dataBaseIp=10.100.23.103
jdbc.password=docus702 #\u6570\u636E\u5E93\u540D\u79F0
dataBaseName=power
jdbc.driver=com.mysql.jdbc.Driver \u6570\u636E\u5E93\u8D26\u53F7
jdbc.username=root dataBaseUserName=power
#\u6570\u636E\u5E93\u5BC6\u7801
dataBasePassword=power@fstth
jdbc.url=jdbc\:mysql\://${dataBaseIp}\:3346/${dataBaseName}?useUnicode\=true&characterEncoding\=utf-8&useSSL\=false&serverTimeZone\=Shanghai
jdbc.username=${dataBaseUserName}
jdbc.password=${dataBasePassword}
jdbc.driver=com.mysql.cj.jdbc.Driver
filters: stat filters: stat
maxActive: 20 maxActive: 20

1
power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp
Unescape Escape View File

@ -83,7 +83,6 @@
</div> </div>
<div class="inputDiv"> <div class="inputDiv">
<button class="btn btn-success btn-block" onclick="handoffLogin2()">账号密码登录</button> <button class="btn btn-success btn-block" onclick="handoffLogin2()">账号密码登录</button>
<p class="text-danger">${msg}</p>
</div> </div>
</div> </div>
</div> </div>

8
power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js vendored
Unescape Escape View File

@ -218,7 +218,7 @@
return item[field]; return item[field];
} }
var props = field.split('.'); var props = field.split('.');
// 在IE8 中 for...in 会将方法也枚举出来 使用 for loop // <EFBFBD><EFBFBD>IE8 <20><> for...in <20>Ὣ<EFBFBD><E1BDAB><EFBFBD><EFBFBD>Ҳö<D2B2>ٳ<EFBFBD><D9B3><EFBFBD> ʹ<><CAB9> for loop
// for (var p in props) { // for (var p in props) {
// value = value[props[p]]; // value = value[props[p]];
// } // }
@ -1247,8 +1247,8 @@
html.push('</span>'); html.push('</span>');
html.push( html.push(
'<div class="goPage"><input type="button" value="跳转" class="pageBtn" onclick="toPage();"></div>', '<div class="goPage"><input type="button" value="<EFBFBD><EFBFBD>ת" class="pageBtn" onclick="toPage();"></div>',
'<div class="goPage">跳转到第<input id="pageNum" class="pageNum" type="number">页</div>', '<div class="goPage"><EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD><input id="pageNum" class="pageNum" type="number">ҳ</div>',
'</div>', '</div>',
'<div class="pull-' + this.options.paginationHAlign + ' pagination">', '<div class="pull-' + this.options.paginationHAlign + ' pagination">',
'<ul class="pagination' + (this.options.iconSize === undefined ? '' : ' pagination-' + this.options.iconSize) + '">', '<ul class="pagination' + (this.options.iconSize === undefined ? '' : ' pagination-' + this.options.iconSize) + '">',
@ -2087,7 +2087,7 @@
if (this.options.showHeader && this.options.height) { if (this.options.showHeader && this.options.height) {
this.$tableHeader.show(); this.$tableHeader.show();
// // bootstrap-table 表头数据展示错位问题 // // bootstrap-table <EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>չʾ<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
this.resetHeader(); this.resetHeader();
// padding += this.$header.outerHeight(); // padding += this.$header.outerHeight();
} else { } else {

134
power-admin/src/main/webapp/static/js/login.js
Unescape Escape View File

@ -1,10 +1,7 @@
/** /**
* Created by ljx on 2019/4/25. * Created by ljx on 2019/4/25.
*/ */
$(function(){ $(function () {
//cookie数据保存格式是key=value;key=value;形式，loginInfo为保存在cookie中的key值，具体看controller代码 //cookie数据保存格式是key=value;key=value;形式，loginInfo为保存在cookie中的key值，具体看controller代码
/*if(str != ""){ /*if(str != ""){
var userName = str.split("#")[0]; var userName = str.split("#")[0];
@ -15,7 +12,7 @@ $(function(){
//并且选中复选框 //并且选中复选框
$("#rememberMe").attr("checked", true); $("#rememberMe").attr("checked", true);
}*/ }*/
//获取cookie //获取cookie
/*function getCookie(cname) { /*function getCookie(cname) {
var name = cname + "="; var name = cname + "=";
@ -28,38 +25,38 @@ $(function(){
return ""; return "";
}*/ }*/
$("#forgetPwd").on("click",function(){ $("#forgetPwd").on("click", function () {
alert("请联系管理员进行修改密码！"); alert("请联系管理员进行修改密码！");
}); });
}); });
function login(){ function login() {
var userName = $("#userName").val(); var userName = $("#userName").val();
var userPwd = $("#userPwd").val(); var userPwd = $("#userPwd").val();
userPwd = hex_hmac_md5(userPwd,userPwd); userPwd = hex_hmac_md5(userPwd, userPwd);
var rememberMeChecked = $("input[type='checkbox']").is(':checked'); var rememberMeChecked = $("input[type='checkbox']").is(':checked');
var rememberMe = ''; var rememberMe = '';
if(rememberMeChecked){ if (rememberMeChecked) {
rememberMe = 'yes'; rememberMe = 'yes';
} }
if(userName == ''){ if (userName == '') {
toastr.warning("用户名不能为空!"); toastr.warning("用户名不能为空!");
}else{ } else {
if(userPwd == ''){ if (userPwd == '') {
toastr.warning("密码不能为空!"); toastr.warning("密码不能为空!");
}else{ } else {
$.ajax({ $.ajax({
type : "POST", type: "POST",
url : path+"/login", url: path + "/login",
data: {userName:userName, userPwd:userPwd,rememberMe:rememberMe}, data: {userName: userName, userPwd: userPwd, rememberMe: rememberMe},
dataType:'json', dataType: 'json',
success : function(data) { success: function (data) {
if(data.code == 100){ if (data.code == 100) {
window.location.href = data.extend.url; window.location.href = data.extend.url;
}else{ } else {
$("#msg").text(data.msg); alert(data.msg)
} }
} }
}) })
@ -68,58 +65,62 @@ function login(){
} }
var interval =""; var interval = "";
var qrCodeIdentity =""; var qrCodeIdentity = "";
function handoffLogin(){
//获取扫码登录二维码
function handoffLogin() {
$.ajax({ $.ajax({
type : "POST", type: "POST",
data:{loginTypeBitValue:16,type:3,projectUid:"cloudkey-fstth",ApplicationId:"fstth-wzh"}, data: {loginTypeBitValue: 16, type: 3, projectUid: "cloudkey-fstth", ApplicationId: "fstth-wzh"},
url : path+'/font/getQRcode', url: path + '/font/getQRcode',
success : function(data) { success: function (data) {
qrCodeIdentity = data.qrCodeIdentity; qrCodeIdentity = data.qrCodeIdentity;
$("#QRcordImg").prop("src","data:image/jpeg;base64,"+data.qrCodeBase64); $("#QRcordImg").prop("src", "data:image/jpeg;base64," + data.qrCodeBase64);
interval = setInterval(scanCodeLogin, 1000,qrCodeIdentity); //轮询监听用户扫码
interval = setInterval(scanCodeLogin, 1000, qrCodeIdentity);
} }
}) })
$("#switchHandoff").css("display","none"); $("#switchHandoff").css("display", "none");
$("#switchHandoff2").css("display","block"); $("#switchHandoff2").css("display", "block");
} }
function scanCodeLogin() { function scanCodeLogin() {
$.ajax({ $.ajax({
type:"POST", type: "POST",
data:{qrCodeIdentity:qrCodeIdentity}, data: {qrCodeIdentity: qrCodeIdentity},
url : path+'/font/getScanCode', url: path + '/font/getScanCode',
success : function (body) { success: function (body) {
if (body.verifyStatus ==0) { if (body.verifyStatus == 0) {
//扫码认证成功后撤销监听
clearInterval(interval); clearInterval(interval);
$.ajax({ $.ajax({
type:"POST", type: "POST",
data:{userToken:body.userToken}, data: {userToken: body.userToken},
url : path+'/font/getUserInfo', url: path + '/font/getUserInfo',
success : function (tlte) { success: function (tlte) {
if (tlte.msgType==1){ if (tlte.msgType == 1) {
$.ajax({ $.ajax({
type:"POST", type: "POST",
data:{userName:tlte.uid }, data: {userName: tlte.uid},
url : path+'/font/qRCodeLogin', url: path + '/font/qRCodeLogin',
success:function (tltel) { success: function (tltel) {
if(tltel.code == 100){ if (tltel.code == 100) {
window.location.href = tltel.extend.url; window.location.href = tltel.extend.url;
}else{ } else {
$("#msg").text(tltel.msg); $("#msg").text(tltel.msg);
}
} }
}) }
}else { })
alert("登录失败请重新登录") } else {
} alert("登录失败请重新登录")
} }
}) }
})
} }
} }
}) })
@ -127,27 +128,24 @@ function scanCodeLogin() {
} }
function handoffLogin2() {
$("#switchHandoff").css("display", "block");
$("#switchHandoff2").css("display", "none");
function handoffLogin2(){
$("#switchHandoff").css("display","block");
$("#switchHandoff2").css("display","none");
clearInterval(interval); clearInterval(interval);
} }
$('body').keydown(function () { $('body').keydown(function () {
if(event.keyCode == '13'){ if (event.keyCode == '13') {
login(); login();
} }
}) })
/** /**
* 判断是iframe框架跳出iframe框架使用top链接 * 判断是iframe框架跳出iframe框架使用top链接
*/ */
if (top.location != location){ if (top.location != location) {
top.location.href = location.href; top.location.href = location.href;
} }

2
power-dao/src/main/resources/config/gennerator.properties
Unescape Escape View File

@ -1,4 +1,4 @@
jdbc.driver=com.mysql.jdbc.Driver jdbc.driver=com.mysql.jdbc.Driver
#jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8 #jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8
jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/power?useUnicode\=true&characterEncoding\=utf-8 jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/power?useUnicode\=true&characterEncoding\=utf-8
jdbc.username=root jdbc.username=root

8
power-foundaton/src/main/java/com/manage/util/Msg.java
Unescape Escape View File

@ -35,6 +35,14 @@ public class Msg {
return result; return result;
} }
public static Msg failUser(){
Msg result=new Msg();
result.setCode(200);
result.setMsg("账号或密码错误");
return result;
}
public static Msg fail(String msg){ public static Msg fail(String msg){
Msg result=new Msg(); Msg result=new Msg();
result.setCode(200); result.setCode(200);

Write Preview
Loading…
Cancel
Save