Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!18

mp-admin/src/main/java/com/qs/mp/web/controller/system/SysProfileController.java

@@ -42,42 +42,37 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 个人信息 业务处理
- * 
+ *
  * @author ygp
  */
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController
 {
-	
+
 	private static final Logger log = LoggerFactory.getLogger(FileUploadController.class);
-	
+
     @Autowired
     private ISysUserService userService;
 
     @Autowired
     private TokenService tokenService;
-    
+
     @Autowired
     protected HostHolder hostHolder;
-    
+
     /**
      * 文件上传路径
      */
     @Value("${mp.profile}")
     public String filePath;
-    
+
     /**
      * 公开
      */
     @Value("${cloud.public-bucket-name}")
     private String publicBucketName;
-    
-    /**
-     * 模板原稿文件目录
-     */
-    @Value("${cloud.template-dir}")
-    private String tempSrcDir;
+
 
     /**
      * 个人信息
@@ -137,8 +132,8 @@ public class SysProfileController extends BaseController
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();
-        
-    
+
+
         if (!SecurityUtils.matchesPassword(oldPassword, password))
         {
             return AjaxResult.error("修改密码失败，旧密码错误");
@@ -156,7 +151,7 @@ public class SysProfileController extends BaseController
         }
         return AjaxResult.error("修改密码异常，请联系管理员");
     }
-    
+
     /**
      * 重置密码
      */
@@ -167,7 +162,7 @@ public class SysProfileController extends BaseController
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();
-        
+
         //校验短信验证码
         ValidSMSResult res = JSMSUtils.sendValidSMSCode(
         		messageId, authCode);
@@ -175,7 +170,7 @@ public class SysProfileController extends BaseController
         if(res == null || !res.getIsValid()){
             throw new CaptchaExpireException();
         }
-        
+
         if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
         {
             // 更新缓存用户密码
@@ -210,8 +205,8 @@ public class SysProfileController extends BaseController
         }
         return AjaxResult.error("上传图片异常，请联系管理员");
     }
-    
-    
+
+
     private AjaxResult uploadAvatar(MultipartFile file) {
         try {
             if (null == file) {
@@ -237,7 +232,7 @@ public class SysProfileController extends BaseController
                 LogUtil.error(logger, "头像上传失败.");
                 return AjaxResult.error("头像上传失败.");
             }
-            
+
             if (userService.updateUserAvatar(loginUser.getUsername(), name))
             {
                 AjaxResult ajax = AjaxResult.success();
@@ -253,7 +248,7 @@ public class SysProfileController extends BaseController
             return AjaxResult.error("头像上传失败.");
         }
     }
-    
+
     private String commpressPicAndUpLoadOSS(String userId,MultipartFile file,String mimeType,int width,int height,String bucketName) {
         String fileName = file.getOriginalFilename();
         int idx = fileName.lastIndexOf('.');

mp-admin/src/test/java/com/qs/mp/api/ChannelControllerTest.java

@@ -0,0 +1,27 @@
+package com.qs.mp.api;
+
+import org.junit.jupiter.api.Test;
+
+import com.qs.mp.common.BaseControllerTest;
+
+/**
+ * @auther duota
+ * @create 2021 2021/9/7 6:36 下午
+ * @describe
+ */
+public class ChannelControllerTest extends BaseControllerTest {
+
+  @Test
+  public void testGetChannelDetail(){
+//    String mobile  = "15658078136";
+//    int identity = 1;
+//    String custId ="2099122220001234";
+//    String id = "88230664881373184134";
+//    String params = "{\"identity\":\""+identity+"\",\"custId\":\""+custId+"\",\"id\":\""+id+"\"}";
+//    String url = "http://localhost:8080/api/v1/qs/user/getLoginUserinfo?";
+//    System.out.println(request(url, params));
+  }
+
+
+  
+}

mp-admin/src/test/java/com/qs/mp/common/BaseControllerTest.java

@@ -0,0 +1,69 @@
+package com.qs.mp.common;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.qs.mp.common.utils.RandomUtils;
+import com.qs.mp.common.utils.http.OkHttpUtil;
+import com.qs.mp.common.utils.sign.Md5Utils;
+
+/**
+ * @auther duota
+ * @create 2021 2021/9/3 11:57 上午
+ * @describe
+ */
+public class BaseControllerTest {
+
+  protected String request(String url, String params) {
+    String nonce = RandomUtils.generateString(20);
+    Date nowTime = new Date();
+    String timestamp = String.valueOf(nowTime.getTime());
+
+    String md5key = "3Jr8S1K18rcC1wAfv8";
+    String l = params + "nonce" + timestamp + md5key;
+    System.out.println("sign str:" + l);
+    String sign = Md5Utils.hash(l);
+    System.out.println("sign rst:" + sign);
+    Map<String, String> headers = new HashMap<String, String>();
+    headers.put("content-type", "application/json; charset=UTF-8");
+    headers.put("x-zz-timestamp", timestamp);
+    // 本地登录状态
+    String token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjZmZDZjYmU1LTIzYjItNDY3ZS1hYWRlLWExMjAwOWUwZDAyZSJ9.7AQ5wEBV9qr0YMXy9L0e1UvwEriU4u4WZeufCfvrXsj3nuEkHnxjEpy_6LOcDBAB88e_SZY3P2vLhL4seWkcHA";
+
+    if (!StringUtils.isBlank(token)) {
+      headers.put("Authorization", "Bearer "+token);
+    }
+    String reqUrl = url + "sign=" + sign + "&nonce=" + nonce;
+    return OkHttpUtil.post(reqUrl, params, headers);
+  }
+
+  protected String upload(String url, String params, String filePath, String fileName) {
+    String nonce = RandomUtils.generateString(20);
+    Date nowTime = new Date();
+    String timestamp = String.valueOf(nowTime.getTime());
+
+    String md5key = "3Jr8S1K18rcC1wAfv8";
+    String l = params + "nonce" + timestamp + md5key;
+    System.out.println("sign str:" + l);
+    String sign = Md5Utils.hash(l);
+
+    Map<String, String> headers = new HashMap<String, String>();
+    headers.put("x-zz-timestamp", timestamp);
+    String token = "eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE1OTE3NTIwOTQsInVzZXJJZCI6IkU1TDNTUUs2NDlVSUhJVVpDRURLIiwibWdyQ3VsbElkcyI6WyJFNU05V1lRQlkySUs3OVgyQ1QwUyIsIkU1TURLVFowSU0xVFc3N0FXNFFFIiwiRTVPUVJHUkRQQURSMTRYUDYzVTgiLCJFNVFNQUpPSjQ5MkZDQ1M3TkJGSyIsIkU1VUZIRU80UVlWNzYzUVBZOURIIl0sIm93bmVyQ29sbElkIjoiRTVVRkhFTzRRWVY3NjNRUFk5REgifQ.DslDTpM2CELG9BqKr55flZLyS06I8V8RfY3CSUCm12uQAt1mHd3ImpzrXDpHcFdVpyf2_za_JFRVXJ7tv4MstQ"; // 本地登录状态
+    if (!StringUtils.isBlank(token)) {
+      headers.put("b2b-authorization", token);
+    }
+    String reqUrl = url + "sign=" + sign + "&nonce=" + nonce;
+    //String reqUrl = url;
+    try {
+      //  return OkHttpUtil.upload(reqUrl, filePath, fileName, headers);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return "";
+
+  }
+}