Merge branch 'tall3' of dd.tall.wiki:ccsens_wiki/ccsenscloud into tall3

cloudutil/src/main/java/com/ccsens/cloudutil/aspect/CacheMd5Aspect.java

@@ -33,9 +33,9 @@ public class CacheMd5Aspect {
         HttpServletRequest request = ((ServletRequestAttributes)
                 RequestContextHolder.getRequestAttributes()).getRequest();
         //获取入参的md5值
-        final String inMd5 = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
+        final String inMd5 = request.getHeader(WebConstant.HEADER_KEY_MD5);
         //获取返回值
-        JsonResponse<? extends Object> proceed = (JsonResponse<? extends Object>) joinPoint.proceed(args);
+        JsonResponse proceed = (JsonResponse) joinPoint.proceed(args);
         //入参没有md5直接返回
         if(inMd5 == null){
             log.info("cache---入参md5为空");
@@ -58,7 +58,28 @@ public class CacheMd5Aspect {
             return proceed;
         }
         //将date转成json并加密
-        String outMd5 = Md5Util.stringTo(JSONObject.toJSONString(proceed.getData()));
+        String data;
+        // 判断是否基本类型或字符串
+        String type = "TYPE";
+        if (proceed.getData() instanceof String ) {
+            data = (String)proceed.getData();
+        } else if (proceed.getData() instanceof StringBuilder || proceed.getData() instanceof StringBuffer) {
+            data = proceed.getData().toString();
+        } else if (proceed.getData().getClass().getField(type) != null &&
+                ((Class)proceed.getData().getClass().getField(type).get(null)).isPrimitive()) {
+            // 基本类型
+            data = String.valueOf(proceed.getData());
+        } else {
+            try {
+                data = JSONObject.toJSONString(proceed.getData());
+            } catch (Exception e) {
+                log.error("md5转换json异常：{}", e);
+                data = proceed.getData().toString();
+            }
+        }
+
+
+        String outMd5 = Md5Util.stringTo(data);
         log.info("md5:{}",outMd5);
         if(inMd5.equalsIgnoreCase(outMd5)){
             log.info("md5相同则返回空");

signin/src/main/java/com/ccsens/signin/api/DebugController.java

@@ -1,5 +1,7 @@
 package com.ccsens.wisdomcar.api;
 
+import com.ccsens.cloudutil.annotation.CacheMd5;
+import com.ccsens.signin.service.IUserService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.WebConstant;
 import io.swagger.annotations.Api;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 @Api(tags = "DEBUG" , description = "DebugController | ")
@@ -20,6 +23,10 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 public class DebugController {
 
+    @Resource
+    private IUserService userService;
+
+    @CacheMd5
     @ApiOperation(value = "/测试",notes = "")
     @ApiImplicitParams({
     })
@@ -28,7 +35,7 @@ public class DebugController {
 //    @CacheEvict(cacheNames = "signin",key = "#clientType+'-'+#identifyType+'-'+#identifier+'-'+#credential")
     public JsonResponse debug(WebConstant.CLIENT_TYPE clientType, WebConstant.IDENTIFY_TYPE identifyType,
                               String identifier, String credential) throws Exception {
-
+//        String name = userService.getUserNameByUserId(1218025249493356544L);
         return JsonResponse.newInstance().ok("测试");
     }
 

signin/src/main/java/com/ccsens/signin/persist/dao/SysAuthDao.java

@@ -3,6 +3,7 @@ package com.ccsens.signin.persist.dao;
 
 import com.ccsens.signin.bean.vo.UserVo;
 import com.ccsens.signin.persist.mapper.SysAuthMapper;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

signin/src/main/resources/mapper_dao/SysAuthDao.xml

@@ -2,9 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccsens.signin.persist.dao.SysAuthDao">
 
-    <cache type="com.ccsens.util.mybatis.MybatisRedisCache"/>
-    <cache-ref namespace="com.ccsens.signin.persist.mapper.SysAuthMapper"/>
-
+    <!--<cache type="com.ccsens.util.mybatis.MybatisRedisCache"/>
+    <cache-ref namespace="com.ccsens.signin.persist.mapper.SysAuthMapper"/>-->
     <select id="queryOauth2WX" resultType="com.ccsens.signin.bean.vo.UserVo$Oauth2WX">
         select identifier as openid, user_id as userId
         from t_sys_auth

signin/src/main/resources/mapper_dao/SysUserDao.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccsens.signin.persist.dao.SysUserDao">
-    <cache type="com.ccsens.util.mybatis.MybatisRedisCache"/>
     <resultMap id="getTokenBeanByUserId" type="com.ccsens.signin.bean.vo.UserVo$TokenBean">
         <id column="id" property="id"/>
         <result column="account" property="account"/>

signin/src/main/resources/mapper_raw/SysAuthMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccsens.signin.persist.mapper.SysAuthMapper">
-  <cache type="com.ccsens.util.mybatis.MybatisRedisCache"/>
   <resultMap id="BaseResultMap" type="com.ccsens.signin.bean.po.SysAuth">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />

signin/src/main/resources/mapper_raw/SysUserInfoMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccsens.signin.persist.mapper.SysUserInfoMapper">
-  <cache type="com.ccsens.util.mybatis.MybatisRedisCache"/>
   <resultMap id="BaseResultMap" type="com.ccsens.signin.bean.po.SysUserInfo">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />

signin/src/main/resources/mapper_raw/SysUserMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccsens.signin.persist.mapper.SysUserMapper">
-  <cache type="com.ccsens.util.mybatis.MybatisRedisCache"/>
   <resultMap id="BaseResultMap" type="com.ccsens.signin.bean.po.SysUser">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="grade_id" jdbcType="BIGINT" property="gradeId" />

util/src/main/java/com/ccsens/util/WebConstant.java

@@ -183,6 +183,7 @@ public class WebConstant {
 
     public static final String PARAMETER_KEY_TOKEN = "token";
     public static final String HEADER_KEY_TOKEN = "Authorization";
+    public static final String HEADER_KEY_MD5 = "md5";
     public static final String HEADER_KEY_TOKEN_PREFIX = "Bearer ";
     public static final String REQUEST_KEY_CLAIMS = "claims";
     public static final String REQUEST_KEY_TOKEN_USERS = "Token_User";

util/src/test/java/com/ccsens/util/Base64Test.java

@@ -107,4 +107,15 @@ public class Base64Test {
 
     }
 
+    @Test
+    public void test03() throws NoSuchFieldException, IllegalAccessException {
+        Object a = 1;
+        Integer b = 1;
+        String c = "hello";
+//        ((Class) clz.getField("TYPE").get(null)).isPrimitive()
+        System.out.println(((Class)a.getClass().getField("TYPE").get(null)).isPrimitive());
+        System.out.println(((Class)b.getClass().getField("TYPE").get(null)).isPrimitive());
+        System.out.println(((Class)c.getClass().getField("TYPE").get(null)).isPrimitive());
+    }
+
 }