fixed

PCS/src/main/java/cn/cslg/permission/controller/LoginController.java

@@ -87,15 +87,15 @@ public class LoginController {
         return loginService.functionByEncryption(vo);
     }
 
-//    @Operation(summary = "获取手机验证码")
-//    @PostMapping("/getPhoneCode")
-//    public String getPhoneCode(@RequestBody @Valid SendCodeDTO vo) {
-//        return loginService.getPhoneCode(vo);
-//    }
-//
-//    @Operation(summary = "手机号登录")
-//    @PostMapping(value = "/loginByPhone")
-//    public String loginByPhone(@Valid @RequestBody PhoneLoginDTO vo) throws Exception {
-//        return loginService.loginByPhone(vo);
-//    }
+    @Operation(summary = "获取手机验证码")
+    @PostMapping("/getPhoneCode")
+    public String getPhoneCode(@RequestBody @Valid SendCodeDTO vo) {
+        return loginService.getPhoneCode(vo);
+    }
+
+    @Operation(summary = "手机号登录")
+    @PostMapping(value = "/loginByPhone")
+    public String loginByPhone(@Valid @RequestBody PhoneLoginDTO vo) throws Exception {
+        return loginService.loginByPhone(vo);
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/LoginService.java

@@ -380,6 +380,9 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
         if (ObjectUtils.isEmpty(personnel)) {
             return Response.error(ResponseEnum.USERNAME_ERROR);
         }
+        if (personnel.getPersonnelStatus().equals(0)) {
+            return Response.error(ResponseEnum.THE_PERSONNEL_IS_FORBIDDEN);
+        }
         //校验密码是否正确
         boolean isPassword = personnel.getPersonnelPassword().equals(SecureUtil.md5(password));
         if (!isPassword) {

PCS/src/test/java/cn/cslg/permission/EncryptionPersonTest.java

@@ -99,7 +99,7 @@ public class EncryptionPersonTest {
     public void loginByPhone() throws Exception {
         PhoneLoginDTO vo = new PhoneLoginDTO();
         vo.setPhoneNum("15705220533");
-        vo.setPhoneCode("228405");
+        vo.setPhoneCode("687897");
         vo.setAppKey("4e95e3d926a2a4befa5d913acc0aa9f5");
         vo.setMachineCode("BFEBFBFF000A0654");
         final long timeMillis = System.currentTimeMillis();

PCS/src/test/java/cn/cslg/permission/WritingAidTest.java

@@ -0,0 +1,100 @@
+package cn.cslg.permission;
+
+import cn.cslg.permission.common.model.dto.EncryptionLoginDTO;
+import cn.cslg.permission.common.model.personnel.UploadPersonnelConfigDTO;
+import cn.hutool.crypto.SecureUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class WritingAidTest {
+
+//    public String uploadPersonnelConfigPCSTest2(UploadPersonnelConfigDTO vo) throws IOException {
+//        String param = new Gson().toJson(vo);
+//        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+//        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+//                .connectTimeout(60, TimeUnit.SECONDS)
+//                .writeTimeout(60, TimeUnit.SECONDS)
+//                .readTimeout(60, TimeUnit.SECONDS)
+//                .build();
+//        Request request = new Request.Builder()
+//                .url("http://47.116.194.135:8085" + "/api/permission/api/personnel/uploadPersonnelConfig")
+//                .post(requestBody)
+//                .build();
+//        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+//    }
+
+    @Test
+    public void AccountLoginPCSTest2() throws Exception {
+        String appKey = "4e95e3d926a2a4befa5d913acc0aa9f5";
+        EncryptionLoginDTO encryptionLoginDTO = new EncryptionLoginDTO();
+        encryptionLoginDTO.setAppKey(appKey);
+        //登录账号
+        encryptionLoginDTO.setUsername("admin");
+//        encryptionLoginDTO.setUsername("zhuhao");
+        //登录密码
+        encryptionLoginDTO.setPassword("xiaoshi221101");
+//        encryptionLoginDTO.setPassword("xiaoshi221101");
+        //本机器的机器码，此处为伪造
+        encryptionLoginDTO.setMachineCode("BFEBFBFF000A0654");
+        long currentTimeMillis = System.currentTimeMillis();
+        encryptionLoginDTO.setCurrentTimeMillis(currentTimeMillis);
+        String appSecret = appKey + currentTimeMillis / 1000;
+        //md5加密标识
+        String md5Sign = SecureUtil.md5(appSecret);
+        encryptionLoginDTO.setSign(md5Sign);
+        String param = new Gson().toJson(encryptionLoginDTO);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
+        Request request = new Request.Builder()
+                .url("http://47.116.194.135:8085" + "/api/permission/api/admin/loginByEncryption")
+                .post(requestBody)
+                .build();
+        String res = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+        System.out.println(res);
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        JSONObject jsonObject1 = jsonObject.getJSONObject("data");
+
+        String token = jsonObject1.getObject("token", String.class);
+        System.out.println(token);
+    }
+
+    @Test
+    public void uploadPersonnelConfigPCSTest2() throws IOException {
+        String token = "89_9iJkukncP5zspe_8EuigjI7tPxllFKk__";
+        UploadPersonnelConfigDTO vo = new UploadPersonnelConfigDTO();
+        vo.setPersonnelConfig("{\"124544845641532132\"}");
+        String param = new Gson().toJson(vo);
+
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
+        Request request = new Request.Builder()
+                .url("http://47.116.194.135:8085" + "/api/permission/api/personnel/uploadPersonnelConfig")
+                .addHeader("Cookie", "token="+token)
+                .post(requestBody)
+                .build();
+        String res = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+        System.out.println(res);
+    }
+}