From 6514d0f24e1b80a999ba8977cc1cd9a1e4229f74 Mon Sep 17 00:00:00 2001 From: aa1214761728 Date: Sun, 10 Oct 2021 21:55:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=89=94=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 760a8e1..3eee630 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -99,8 +99,6 @@ contentType: "application/json;charset=UTF-8", data: JSON.stringify({username:username,password:password}), success: function (data) { - alert($("#ReturnUrl").val()) - alert($("#eip").val()) if(data.code == "200"){ var j=0 ,len=0; setCookie("token",data.data.token,2*60*60*1000); -- Gitee From f1908bd77c383b72aa704a47d3107b4e20e01e88 Mon Sep 17 00:00:00 2001 From: aa1214761728 Date: Mon, 11 Oct 2021 19:56:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?md5=E7=AE=97=E6=B3=95=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E4=B8=BA=E5=9B=9B=E7=BB=B4md5=E7=AE=97=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=AA=8C=E8=AF=81=E6=8E=A5=E5=8F=A3=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=8F=8D=E9=A6=88=E5=AF=86=E7=A0=81md5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cetc32/dh/beans/ResultUserInfo.java | 10 +- .../cetc32/dh/common/utils/DigestUtils.java | 5 +- .../cetc32/dh/common/utils/MD5Encrypter.java | 135 ++++++++++++++++++ .../dh/controller/rest/AuthController.java | 6 +- .../dh/controller/views/IndexController.java | 2 +- .../dh/listener/ContainerStartedListener.java | 4 + src/main/resources/application-xwy.yml | 8 +- .../static/js/selectTree/selectTree.js | 3 +- src/main/resources/templates/index.html | 7 +- src/main/resources/templates/register.html | 1 + 10 files changed, 167 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/cetc32/dh/common/utils/MD5Encrypter.java diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java index 16bbf75..a2140f1 100644 --- a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java +++ b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java @@ -2,7 +2,6 @@ package com.cetc32.dh.beans; import com.cetc32.dh.entity.NumberS; -import javax.persistence.Column; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -24,6 +23,7 @@ public class ResultUserInfo extends NumberS { private List permissions; private String userBD; private String realDepartment; + private String pwd; /** * 用户状态 @@ -346,4 +346,12 @@ public class ResultUserInfo extends NumberS { public void setRealDepartment(String realDepartment) { this.realDepartment = realDepartment; } + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + } } diff --git a/src/main/java/com/cetc32/dh/common/utils/DigestUtils.java b/src/main/java/com/cetc32/dh/common/utils/DigestUtils.java index 4ab5ded..0d0a359 100644 --- a/src/main/java/com/cetc32/dh/common/utils/DigestUtils.java +++ b/src/main/java/com/cetc32/dh/common/utils/DigestUtils.java @@ -28,7 +28,8 @@ public class DigestUtils { * @return 返回md5hash */ public static String Md5(String userName,String password){ - Md5Hash hash = new Md5Hash(password, ByteSource.Util.bytes(userName), 2); - return hash.toString(); + //Md5Hash hash = new Md5Hash(password, ByteSource.Util.bytes(userName), 2); + //return hash.toString(); + return MD5Encrypter.encrypt(password); } } diff --git a/src/main/java/com/cetc32/dh/common/utils/MD5Encrypter.java b/src/main/java/com/cetc32/dh/common/utils/MD5Encrypter.java new file mode 100644 index 0000000..873fe52 --- /dev/null +++ b/src/main/java/com/cetc32/dh/common/utils/MD5Encrypter.java @@ -0,0 +1,135 @@ +package com.cetc32.dh.common.utils; +import java.security.MessageDigest; +import java.security.Security; +import java.security.NoSuchAlgorithmException; +import java.security.Provider; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +/** + * Title: MD5加密算法,推荐使用 + * + * Description: SUN官方实现,比较经典,性能较好,已经集成到了Java2 SDK标准版版本1.4中。 + * + */ +public class MD5Encrypter { + + private static String DEFAULT_JCE = "com.sun.crypto.provider.SunJCE"; + + private static String IBM_JCE = "com.ibm.crypto.provider.IBMJCE"; + + protected static final Log log = LogFactory.getLog(MD5Encrypter.class); + /** + * 初始化系统加密算法提供者 + */ + static { + + try { + Security.addProvider((Provider) Class.forName(DEFAULT_JCE) + .newInstance()); + } catch (Exception e) { + log.info(e); + try { + Security.addProvider((Provider) Class.forName(IBM_JCE) + .newInstance()); + } catch (Exception ex) { + log.info(ex); + } + } + } + + /** + * 产生16进制字符串 + * + * @param x + * @return + */ + private static String hexDigit(byte x) { + StringBuffer sb = new StringBuffer(); + char c; + // First nibble + c = (char) ((x >> 4) & 0xf); + if (c > 9) { + c = (char) ((c - 10) + 'a'); + } else { + c = (char) (c + '0'); + } + sb.append(c); + // Second nibble + c = (char) (x & 0xf); + if (c > 9) { + c = (char) ((c - 10) + 'a'); + } else { + c = (char) (c + '0'); + } + sb.append(c); + return sb.toString(); + } + + /** + * MD5加密算法实现,产生128位的大整数字符串,过程不可逆 + * + * @param content + * 加密内容 + * @return 加密串 + */ + public static String encrypt(String content) { + try { + MessageDigest algorithm = null; + algorithm = MessageDigest.getInstance("MD5"); + algorithm.reset(); + if (content != null) { + algorithm.reset(); + algorithm.update(content.getBytes()); + byte digest[] = algorithm.digest(); + StringBuffer hexString = new StringBuffer(); + int digestLength = digest.length; + for (int i = 0; i < digestLength; i++) { + hexString.append(hexDigit(digest[i])); + } + return hexString.toString(); + } else { + return ""; + } + } catch (NoSuchAlgorithmException ex) { + // 加密过程中出现异常,采用原始的的内容串 + return content; + } + } + + /** + * @param args + */ + public static void main(String[] args) { + /** + * 基本测试 + */ + + System.out.println("MD5 Test suite:"); + System.out.println("MD5(\"\"):" + MD5Encrypter.encrypt("")); + System.out.println("MD5(\"a\"):" + MD5Encrypter.encrypt("a")); + System.out.println("MD5(\"abc\"):" + MD5Encrypter.encrypt("abc")); + System.out.println("MD5(\"123\"):" + MD5Encrypter.encrypt("123")); + System.out.println("MD5(\"password\"):" + MD5Encrypter.encrypt("password")); + System.out.println("MD5(\"message digest\"):" + + MD5Encrypter.encrypt("message digest")); + System.out.println("MD5(\"abcdefghijklmnopqrstuvwxyz\"):" + + MD5Encrypter.encrypt("abcdefghijklmnopqrstuvwxyz")); + System.out + .println("MD5(\"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\"):" + + MD5Encrypter + .encrypt("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789")); + + /** + * 性能测试 + */ + // long start = System.currentTimeMillis(); + // for (int i = 0; i < 10000; i++) { + // System.out.println("MD5 Encrpt " + i + " is :" + // + MD5Encrypter.encrypt("" + i)); + // } + // long end = System.currentTimeMillis(); + // System.err.println("Using time is===" + (end - start) + "ms"); + } + +} diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index 2aeb0ae..c952b37 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -113,7 +113,7 @@ public class AuthController { @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), @ApiImplicitParam(name = "password", value = "密码", paramType = "String") }) - @PostMapping("/e") + @PostMapping("/applogin") @LoginSkipped public ResponseData applogin2(@RequestBody LoginParameter loginParameter, HttpServletRequest request, HttpServletResponse response){ String username=loginParameter.getUsername(); @@ -134,7 +134,7 @@ public class AuthController { userService.updateLogin(user); long currentTimeMillis = System.currentTimeMillis(); String jwtToken = JWTUtil.createToken(username, currentTimeMillis); - List zqPoints =userService.getZQPoints(user.getAreaCodeList()); + List zqPoints = null;//userService.getZQPoints(user.getAreaCodeList()); LoginResult data = new LoginResult(jwtToken, user.getDepartment(), username, @@ -233,6 +233,7 @@ public class AuthController { user.setUserStatus(-1); user.setSysUserName(userInfo.getUsername()); user.setRegTime(new Date()); + user.setRealName(userInfo.getRealName()); if(userService.insertUser(user)>0) { @@ -620,6 +621,7 @@ public class AuthController { data.setSecurity(user.getSecurity()); data.setAreacode(user.getAreacode()); data.setDepartment(user.getDepartment()); + data.setPwd(user.getSysUserPwd()); if(resultUserRole!=null){ for(ResultUserRole r :resultUserRole) data.addPermissions(r.getSystemMenu()); diff --git a/src/main/java/com/cetc32/dh/controller/views/IndexController.java b/src/main/java/com/cetc32/dh/controller/views/IndexController.java index e3d1bb1..76949b6 100644 --- a/src/main/java/com/cetc32/dh/controller/views/IndexController.java +++ b/src/main/java/com/cetc32/dh/controller/views/IndexController.java @@ -30,7 +30,7 @@ public class IndexController { @Autowired AdminUserService adminUserService; @Value("${eip}") - String eip="http://www.baidu.com/"; + String eip = "http://www.baidu.com/"; private Logger logger = LoggerFactory.getLogger(this.getClass()); @RequestMapping({"/index","/"}) diff --git a/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java b/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java index 85e35fe..f52161b 100644 --- a/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java +++ b/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java @@ -33,8 +33,12 @@ public class ContainerStartedListener implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { + try{ if(areaCommonService !=null){ areas =areaCommonService.selectAll(); } + }catch (Exception e){ + e.printStackTrace(); + } } } diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml index f321b69..cbd0e20 100644 --- a/src/main/resources/application-xwy.yml +++ b/src/main/resources/application-xwy.yml @@ -7,9 +7,9 @@ spring: application: name: dhManager datasource: - url: jdbc:postgresql://192.168.1.60:5432/dhmanage + url: jdbc:postgresql://180.184.65.203:5432/dhmanage username: postgres - password: 123456 + password: Zdk@824. driver-class-name: org.postgresql.Driver # datasource: @@ -61,12 +61,12 @@ eip: http://192.168.1.209:8080/ #passportUrl: ${sso.authcenter}/?ReturnUrl= #defaultLoginRequiredEnable: false sso: - authcenter: http://192.168.1.206:8081 + authcenter: http://192.168.43.138:8081 verifyUrl: ${sso.authcenter}/rest/auth/verify?token= passportUrl: ${sso.authcenter}/?ReturnUrl= defaultLoginRequiredEnable: false permission: S000^接口用户@/rest/auth/**;*权限管理@/**; - sysurl : http://192.168.1.206:${server.port} + sysurl : http://192.168.43.138:${server.port} sysname : 用户中心 registerUrl : ${sso.authcenter}/rest/api/sys/sync #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/** diff --git a/src/main/resources/static/js/selectTree/selectTree.js b/src/main/resources/static/js/selectTree/selectTree.js index 6faad4f..8b70641 100644 --- a/src/main/resources/static/js/selectTree/selectTree.js +++ b/src/main/resources/static/js/selectTree/selectTree.js @@ -104,6 +104,7 @@ function registor(){ var security = $("#security").val(); var areacode = $("#areacode").val(); var passwordC = $("#passwordC").val(); + var realname = $("#realname").val(); if(!!!username //|| !!!areacode || !!!security @@ -138,7 +139,7 @@ function registor(){ type: "POST", dataType: "json", contentType: "application/json;charset=UTF-8", - data: JSON.stringify({username:username,password:password,security:security,areacode:areacode}), + data: JSON.stringify({username:username,password:password,security:security,areacode:areacode,realName:realname}), success: function (data) { if(data.code == "200"){ //window.location.href=$("#ReturnUrl").val()+"?token="+data.data.token; diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 3eee630..6981169 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -57,6 +57,7 @@ +
@@ -72,7 +73,7 @@ - +