diff --git a/power-admin/power-admin.iml b/power-admin/power-admin.iml deleted file mode 100644 index f57c0a3..0000000 --- a/power-admin/power-admin.iml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties index 493ea36..e492373 100644 --- a/power-admin/src/main/resources/config/config.properties +++ b/power-admin/src/main/resources/config/config.properties @@ -13,7 +13,7 @@ TOKEN_EXPIRE_TIME = 1200000 #SERVER_PORT = 8080 SERVER_IP = localhost -SERVER_PORT = 8080 +SERVER_PORT = 8084 #power权限系统ip POWER_IP = ${SERVER_IP} @@ -23,12 +23,12 @@ POWER_PORT = ${SERVER_PORT} #病案归档系统ip EMRMEDICALRECORD_IP = ${SERVER_IP} #病案归档系统端口 -EMRMEDICALRECORD_PORT = 8082 +EMRMEDICALRECORD_PORT = 8085 #病案管理系统ip EMRRECORD_IP = ${SERVER_IP} #病案管理系统端口 -EMRRECORD_PORT = 8083 +EMRRECORD_PORT = 8086 #病案复印预约ip EMRAPPLYCOPY_IP = ${SERVER_IP} diff --git a/power-admin/src/main/resources/config/jdbc.properties b/power-admin/src/main/resources/config/jdbc.properties index 7254100..d9ba29d 100644 --- a/power-admin/src/main/resources/config/jdbc.properties +++ b/power-admin/src/main/resources/config/jdbc.properties @@ -1,8 +1,8 @@ -#jdbc.url=jdbc\:mysql\://localhost\:3306/ydpower?useUnicode\=true&characterEncoding\=utf-8 -#jdbc.password=docus702 +#jdbc.url=jdbc\:mysql\://200.100.104.40\:3306/power?useUnicode\=true&characterEncoding\=utf-8 +#jdbc.password=AbcXyz123 -jdbc.url=jdbc\:mysql\://10.36.116.108\:3306/power?useUnicode\=true&characterEncoding\=utf-8 -jdbc.password=docus@702 +jdbc.url=jdbc\:mysql\://localhost\:3306/gm_power?useUnicode\=true&characterEncoding\=utf-8 +jdbc.password=root jdbc.driver=com.mysql.jdbc.Driver jdbc.username=root @@ -22,7 +22,6 @@ maxOpenPreparedStatements: 20 removeAbandoned: true removeAbandonedTimeout: 1800 logAbandoned: true - #\uFFFD\uFFFD\uFFFD\u013F\u00BC targetProject=src/main/java #modelPackage,sqlMapperPackage,daoMapperPackage \u0368\uFFFD\uFFFD\u04BB\uFFFD\uFFFD?? diff --git a/power-dao/power-dao.iml b/power-dao/power-dao.iml deleted file mode 100644 index 6bdc60c..0000000 --- a/power-dao/power-dao.iml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java index e63e3a4..f6d6089 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java +++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java @@ -1,6 +1,7 @@ package com.manage.dao; import com.manage.entity.Power_User; +import com.manage.vo.Login; import com.manage.vo.Power_UserVo; import com.manage.vo.User; import org.apache.ibatis.annotations.Param; @@ -20,6 +21,8 @@ public interface Power_UserMapper { int updateByPrimaryKey(Power_User record); + String getUserName(Login login); + public List checkUserName(String userName); public Power_UserVo findPowerUserByUserNameAndUserPwd(Power_User powerUser); diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapperImpl.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapperImpl.java index 364d06c..4a0f788 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_UserMapperImpl.java +++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapperImpl.java @@ -1,6 +1,7 @@ package com.manage.dao; import com.manage.entity.Power_User; +import com.manage.vo.Login; import com.manage.vo.Power_UserVo; import com.manage.vo.User; @@ -43,6 +44,11 @@ public class Power_UserMapperImpl implements Power_UserMapper{ return this.updateByPrimaryKey(record); } + @Override + public String getUserName(Login login) { + return null; + } + @Override public List checkUserName(String userName) { return this.checkUserName(userName); diff --git a/power-dao/src/main/java/com/manage/vo/Login.java b/power-dao/src/main/java/com/manage/vo/Login.java new file mode 100644 index 0000000..920d45f --- /dev/null +++ b/power-dao/src/main/java/com/manage/vo/Login.java @@ -0,0 +1,29 @@ +package com.manage.vo; + +/** + * @ClassName login + * @Author linjj + * @Date 2024/5/7 9:26 + * @Version 1.0 + */ +public class Login { + private String password; + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + private String username; +} diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml index 3ddce22..fd3a1b0 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -679,4 +679,7 @@ WHERE FIND_IN_SET(#{deptId},dept_id) + \ No newline at end of file diff --git a/power-foundaton/power-foundaton.iml b/power-foundaton/power-foundaton.iml deleted file mode 100644 index 80a44bb..0000000 --- a/power-foundaton/power-foundaton.iml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/power-foundaton/src/main/java/com/manage/encrypt/MD5.java b/power-foundaton/src/main/java/com/manage/encrypt/MD5.java index 91a810e..273b572 100644 --- a/power-foundaton/src/main/java/com/manage/encrypt/MD5.java +++ b/power-foundaton/src/main/java/com/manage/encrypt/MD5.java @@ -1,9 +1,13 @@ /** - * + * */ package com.manage.encrypt; +import org.springframework.util.DigestUtils; + +import java.math.BigInteger; import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; /** *

Title:MD5

@@ -13,64 +17,84 @@ import java.security.MessageDigest; * @date */ public class MD5 { - // MD5加码。32位 - public static String MD5(String inStr) { - MessageDigest md5 = null; - try { - md5 = MessageDigest.getInstance("MD5"); - } catch (Exception e) { - System.out.println(e.toString()); - e.printStackTrace(); - return ""; - } - char[] charArray = inStr.toCharArray(); - byte[] byteArray = new byte[charArray.length]; - - for (int i = 0; i < charArray.length; i++) - byteArray[i] = (byte) charArray[i]; - - byte[] md5Bytes = md5.digest(byteArray); - - StringBuffer hexValue = new StringBuffer(); - - for (int i = 0; i < md5Bytes.length; i++) { - int val = ((int) md5Bytes[i]) & 0xff; - if (val < 16) - hexValue.append("0"); - hexValue.append(Integer.toHexString(val)); - } - - return hexValue.toString(); - } - - // 可逆的加密算法 - public static String KL(String inStr) { - // String s = new String(inStr); - char[] a = inStr.toCharArray(); - for (int i = 0; i < a.length; i++) { - a[i] = (char) (a[i] ^ 't'); - } - String s = new String(a); - return s; - } - - // 加密后解密 - public static String JM(String inStr) { - char[] a = inStr.toCharArray(); - for (int i = 0; i < a.length; i++) { - a[i] = (char) (a[i] ^ 't'); - } - String k = new String(a); - return k; - } - - // 测试主函数 - public static void main(String args[]) { - String s = new String("a"); - System.out.println("原始：" + s); - System.out.println("MD5后：" + MD5(s)); - System.out.println("MD5后再加密：" + KL(MD5(s))); - System.out.println("解密为MD5后的：" + JM(KL(MD5(s)))); - } + // MD5加码。32位 + public static String MD5(String inStr) { + MessageDigest md5 = null; + try { + md5 = MessageDigest.getInstance("MD5"); + } catch (Exception e) { + System.out.println(e.toString()); + e.printStackTrace(); + return ""; + } + char[] charArray = inStr.toCharArray(); + byte[] byteArray = new byte[charArray.length]; + + for (int i = 0; i < charArray.length; i++) + byteArray[i] = (byte) charArray[i]; + + byte[] md5Bytes = md5.digest(byteArray); + + StringBuffer hexValue = new StringBuffer(); + + for (int i = 0; i < md5Bytes.length; i++) { + int val = ((int) md5Bytes[i]) & 0xff; + if (val < 16) + hexValue.append("0"); + hexValue.append(Integer.toHexString(val)); + } + + return hexValue.toString(); + } + + // 可逆的加密算法 + public static String KL(String inStr) { + // String s = new String(inStr); + char[] a = inStr.toCharArray(); + for (int i = 0; i < a.length; i++) { + a[i] = (char) (a[i] ^ 't'); + } + String s = new String(a); + return s; + } + + // 加密后解密 + public static String JM(String inStr) { + char[] a = inStr.toCharArray(); + for (int i = 0; i < a.length; i++) { + a[i] = (char) (a[i] ^ 't'); + } + String k = new String(a); + return k; + } + + // 测试主函数 + public static void main(String args[]) { + String s = new String("lin123"); + + MessageDigest md = null; + try { + md = MessageDigest.getInstance("MD5"); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + // 对原始字符串进行MD5加密 + md.update(s.getBytes()); + // 获取加密后的字节数组 + byte[] digest = md.digest(); + // 将字节数组转换成十六进制字符串 + StringBuilder sb = new StringBuilder(); + for (byte b : digest) { + sb.append(String.format("%02x", b)); + } + String s1 = sb.toString(); + String encode = Base64.encode(MD5.KL(s)); + System.out.println("encode：" + encode); + System.out.println("sb：" + sb.toString()); + System.out.println("原始：" + s); + System.out.println("MD5后：" + MD5(s)); + System.out.println("MD5后再加密：" + KL(MD5(s))); + System.out.println("解密为MD5后的：" + JM(KL(MD5(s)))); + } } diff --git a/power-foundaton/target/classes/com/manage/encrypt/MD5.class b/power-foundaton/target/classes/com/manage/encrypt/MD5.class index c4d7c90..943eab5 100644 Binary files a/power-foundaton/target/classes/com/manage/encrypt/MD5.class and b/power-foundaton/target/classes/com/manage/encrypt/MD5.class differ diff --git a/power-service/power-service.iml b/power-service/power-service.iml deleted file mode 100644 index 337cfe3..0000000 --- a/power-service/power-service.iml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file