20191125 姓名修复

server/pom.xml

@@ -84,6 +84,12 @@
             <artifactId>netty-socketio</artifactId>
             <version>1.7.17</version>
         </dependency>
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+
 
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
@@ -183,6 +189,7 @@
             </dependency>
 
 
+
         </dependencies>
     </dependencyManagement>
 

server/src/main/java/com/pica/cloud/account/account/server/Test.java

@@ -81,27 +81,14 @@ public class Test {
 
         System.out.println("--------------------登录接口-------------");
         String publicKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCa6j3SJwXr/pLLwb6Pq8pi9StPq+Wvm6vu+LWQB1hNqClWk0jQm5GnF6Kj0ac2gqgsMsutc3hhMaaX2QZvLX+gFQHC/ufGBdBbpPtDeGWsQItsMf/xqqlkLPkc7eVTyfsmrpQM7BG9LVvaPVXPVUcZfJNBaYuR4+Sf6Zi2ayI/hQIDAQAB";
-
-
-
         BaseRequest login = new BaseRequest();
         login.setMobile("13024112588");
         login.setPassword("d0dcbf0d12a6b1e7fbfa2ce5848f3eff");
-
-
-
-
         String con = JSONObject.toJSONString(login);
 
-
         String contentResult = AESUtil.aesEncrypt(con, "YCPQPx4qpQjEjDea");
 
-
-
         String keyResult = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
-
-
-
         EncryptEntity encryptTest = new EncryptEntity();
         encryptTest.setContent(contentResult);
         encryptTest.setKey(keyResult);
@@ -150,15 +137,22 @@ public class Test {
 
         System.out.println("--------------------一键登录接口-------------");
         BaseRequest loginRegister = null;
+
         loginRegister = new BaseRequest();
         loginRegister.setMobile("13024112081");
         loginRegister.setAuthCode("163173");
         String registerString4 = JSONObject.toJSONString(loginRegister);
+        //AES   CONTENT
         String contentResult4 = AESUtil.aesEncrypt(registerString4, "YCPQPx4qpQjEjDea");
+
+        //RSA   KEY
         String keyResult4 = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
+
+
         EncryptEntity encryptTest4 = new EncryptEntity();
         encryptTest4.setContent(contentResult4);
         encryptTest4.setKey(keyResult4);
+
         System.out.println(JSONObject.toJSONString(encryptTest4));
 
 

server/src/main/java/com/pica/cloud/account/account/server/controller/AccountBaseController.java

@@ -32,6 +32,10 @@ import java.util.*;
  */
 public abstract class AccountBaseController extends BaseController {
 
+
+
+
+
     private static final String KEY_PREFIX = "token-doctor-";
     private Logger logger = LoggerFactory.getLogger(AccountBaseController.class);
     @Autowired

server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java

@@ -168,7 +168,7 @@ public class AESUtil {
     public static void main(String[] args) throws Exception {
         String KEY="zJJ$c5md3$yuuhWW";
         System.out.println("-------------加密---------");
-        String content = "13893035796";
+        String content = "101617721";
         System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
 

server/src/main/java/com/pica/cloud/account/account/server/util/TokenUtils.java

@@ -70,44 +70,47 @@ public class TokenUtils {
             //用户数据放入redis缓存
 //            String userData = cacheClient.hget(value, "id");
 //            if (org.apache.commons.lang3.StringUtils.isEmpty(userData)) {
-                Map<String, String> data = new HashMap<>();
-                data.put("token", newToken);
-                data.put("id", account.getId() + "");
-                data.put("acctId", account.getAcctId() + "");
-                if (!StringUtils.isBlank(account.getMobilePhone())) {
-                    data.put("mobile", AESUtil.encryptV0(account.getMobilePhone()));
-                } else {
-                    data.put("mobile", "");
-                }
-                data.put("name", account.getMobilePhone().replaceAll("(\\d{3})\\d{4}(\\w{4})", "$1****$2"));
-                data.put("created_time", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(account.getCreatTime()));
-                data.put("sysCode", sourceType);
-                if (account.getId()!=null){
-                    Doctor doctor = doctorMapper.selectByPrimaryKey(account.getId().intValue());
-                    data.put("town_id", doctor.getTown() + "");
-                    data.put("town_name", doctor.getTownName()+"");
-                    data.put("county_id", doctor.getCounty() + "");
-                    data.put("county_name", doctor.getCountyName()+"");
-                    data.put("city_id", doctor.getCity() + "");
-                    data.put("city_name", doctor.getCityName()+"");
-                    data.put("province_id", doctor.getProvince() + "");
-                    data.put("province_name", doctor.getProvinceName() + "");
-                    data.put("hospital", doctor.getHospital()+"");
-                    data.put("hospital_id", doctor.getHospitalId() + "");
-                    data.put("department", doctor.getDepartment()+"");
-                    data.put("department_id", doctor.getDepartmentId() + "");
-                    data.put("title", doctor.getTitle()+"");
-                    data.put("title_id", doctor.getTitleId() + "");
-                    data.put("status", doctor.getStatus() + "");
-                }
-                Iterator<Map.Entry<String, String>> iterator = data.entrySet().iterator();
-                while (iterator.hasNext()) {
-                    Map.Entry<String, String> map = iterator.next();
-                    String key = map.getKey();
-                    String valueInfo = map.getValue();
-                    //存储token：(token-doctor-1：用户数据)
-                    cacheClient.hset(value, key, valueInfo);
+            Map<String, String> data = new HashMap<>();
+            data.put("token", newToken);
+            data.put("id", account.getId() + "");
+            data.put("acctId", account.getAcctId() + "");
+            if (!StringUtils.isBlank(account.getMobilePhone())) {
+                data.put("mobile", AESUtil.encryptV0(account.getMobilePhone()));
+            } else {
+                data.put("mobile", "");
+            }
+            data.put("name", account.getMobilePhone().replaceAll("(\\d{3})\\d{4}(\\w{4})", "$1****$2"));
+            data.put("created_time", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(account.getCreatTime()));
+            data.put("sysCode", sourceType);
+            if (account.getId() != null) {
+                Doctor doctor = doctorMapper.selectByPrimaryKey(account.getId().intValue());
+                data.put("town_id", doctor.getTown() + "");
+                data.put("town_name", doctor.getTownName() + "");
+                data.put("county_id", doctor.getCounty() + "");
+                data.put("county_name", doctor.getCountyName() + "");
+                data.put("city_id", doctor.getCity() + "");
+                data.put("city_name", doctor.getCityName() + "");
+                data.put("province_id", doctor.getProvince() + "");
+                data.put("province_name", doctor.getProvinceName() + "");
+                data.put("hospital", doctor.getHospital() + "");
+                data.put("hospital_id", doctor.getHospitalId() + "");
+                data.put("department", doctor.getDepartment() + "");
+                data.put("department_id", doctor.getDepartmentId() + "");
+                data.put("title", doctor.getTitle() + "");
+                data.put("title_id", doctor.getTitleId() + "");
+                data.put("status", doctor.getStatus() + "");
+                if (!StringUtils.isBlank(doctor.getName())){
+                    data.put("data", doctor.getName() + "");
                 }
+            }
+            Iterator<Map.Entry<String, String>> iterator = data.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<String, String> map = iterator.next();
+                String key = map.getKey();
+                String valueInfo = map.getValue();
+                //存储token：(token-doctor-1：用户数据)
+                cacheClient.hset(value, key, valueInfo);
+            }
 //            } else {
 //                cacheClient.hset(value, "token", newToken);
 //            }

server/src/main/resources/mybatis/DoctorMapper.xml

@@ -90,7 +90,6 @@
     </update>
 
 
-
     <!--通过手机号查询用户id-->
     <select id="selectDoctorIdByMobile" parameterType="java.lang.String" resultType="java.lang.Long">
 		SELECT id