优化代码

java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java

@@ -665,6 +665,7 @@ public class AuthenticationFactory {
 //        System.out.println("私钥：" + new String(Base64.getEncoder().encode(privateKey.getEncoded())));
 
         System.out.printf("passwdMd5 " + passwdMd5("V1TAj91GZXNNMlAR"));
+        System.out.printf("passwdMd5 " + md5("5616d148-c941-4873-9c1f-b59a08b4068320240108140611992020061452450002page=1&row=1123"));
 
     }
 

java110-db/src/main/resources/mapper/user/QuestionAnswerV1ServiceDaoImplMapper.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="questionAnswerV1ServiceDaoImpl">
 
+
     <!-- 保存问卷投票信息 add by wuxw 2018-07-03 -->
     <insert id="saveQuestionAnswerInfo" parameterType="Map">
-        insert into question_answer(qa_name, qa_type, start_time, remark, end_time, community_id, content, qa_id, state,
-                                    obj_type, obj_id)
-        values (#{qaName}, #{qaType}, #{startTime}, #{remark}, #{endTime}, #{communityId}, #{content}, #{qaId},
-                #{state}, #{objType}, #{objId})
+        insert into question_answer(
+        qa_name,qa_type,start_time,remark,end_time,community_id,content,qa_id,state
+        ) values (
+        #{qaName},#{qaType},#{startTime},#{remark},#{endTime},#{communityId},#{content},#{qaId},#{state}
+        )
     </insert>
 
+
     <!-- 查询问卷投票信息 add by wuxw 2018-07-03 -->
     <select id="getQuestionAnswerInfo" parameterType="Map" resultType="Map">
         select t.qa_name,t.qa_name qaName,t.qa_type,t.qa_type qaType,t.start_time,t.start_time
         startTime,t.remark,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.content,t.qa_id,t.qa_id qaId,t.create_time createTime,t.state,t.obj_type,t.obj_type objType,
-        t.obj_id,t.obj_id objId, count(uqa1.user_qa_id) voteCount,td.name qaTypeName
+        communityId,t.content,t.qa_id,t.qa_id qaId,t.create_time createTime,t.state,count(uqa1.user_qa_id) voteCount
         from question_answer t
         left join user_question_answer uqa1 on t.qa_id = uqa1.qa_id and uqa1.status_cd = '0'
-        left join t_dict td on t.qa_type = td.status_cd and td.table_name = 'question_answer' and td.table_columns =
-        'qa_type'
         where 1 =1
         <if test="qaName !=null and qaName != ''">
             and t.qa_name= #{qaName}
@@ -52,20 +53,15 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
-        <if test="objType !=null and objType != ''">
-            and t.obj_type= #{objType}
-        </if>
-        <if test="objId !=null and objId != ''">
-            and t.obj_id= #{objId}
-        </if>
-        group by
-        t.qa_name,t.qa_type,t.start_time,t.remark,t.status_cd,t.end_time,t.community_id,t.content,t.qa_id,t.create_time,t.state
+        group by t.qa_name,t.qa_type,t.start_time,t.remark,t.status_cd,t.end_time,t.community_id,t.content,t.qa_id,t.create_time,t.state
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
+
     </select>
 
+
     <!-- 修改问卷投票信息 add by wuxw 2018-07-03 -->
     <update id="updateQuestionAnswerInfo" parameterType="Map">
         update question_answer t set t.status_cd = #{statusCd}
@@ -93,12 +89,6 @@
         <if test="content !=null and content != ''">
             , t.content= #{content}
         </if>
-        <if test="objType !=null and objType != ''">
-            , t.obj_type= #{objType}
-        </if>
-        <if test="objId !=null and objId != ''">
-            , t.obj_id= #{objId}
-        </if>
         where 1=1
         <if test="qaId !=null and qaId != ''">
             and t.qa_id= #{qaId}
@@ -106,6 +96,7 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+
     </update>
 
     <!-- 查询问卷投票数量 add by wuxw 2018-07-03 -->
@@ -143,14 +134,11 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
-        <if test="objType !=null and objType != ''">
-            and t.obj_type= #{objType}
-        </if>
-        <if test="objId !=null and objId != ''">
-            and t.obj_id= #{objId}
-        </if>
+
+
     </select>
 
+
     <select id="queryVotedCountAndScore" parameterType="Map" resultType="Map">
         select qa_id qaId, count(1) votedCount,SUM(t.score) score
         from user_question_answer t

service-user/src/main/java/com/java110/user/cmd/user/UserSendSmsCmd.java

@@ -19,6 +19,7 @@ import com.java110.utils.lock.DistributedLock;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
 import com.java110.utils.util.ValidatorUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -105,8 +106,7 @@ public class UserSendSmsCmd extends Cmd {
                 smsDto.setMsg("您的验证码为" + msgCode);
             }
 
-            ResponseEntity<String> sendMessageResult = new ResponseEntity<String>(smsDto.getMsg(), smsDto.isSuccess() ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
-            context.setResponseEntity(sendMessageResult);
+            context.setResponseEntity(ResultVo.createResponseEntity(smsDto.getMsg()));
         } finally {
             //清理事务信息
             DistributedLock.releaseDistributedLock(key, requestId);