Merge branch 'dev-oldTables-20180918' into release-oldTables

# Conflicts:
#	server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/service/impl/CoreServiceImpl.java

server/src/main/java/com/pica/cloud/wechat/yunqueyilian/server/service/impl/MenuManagerServiceImpl.java

@@ -24,7 +24,7 @@ public class MenuManagerServiceImpl {
 
     public static void main(String[] args) throws IOException {
 //        CloudPropertiesUtil.read("dev");
-        CloudPropertiesUtil.read("pro");
+        CloudPropertiesUtil.read("test1");
         AccessToken accessToken = WeChatToolUtil.getAccessToken(CloudPropertiesUtil.getValue("AppID"), CloudPropertiesUtil.getValue("AppSecret"));
         Boolean flag = WeChatToolUtil.createMenu(getMenu(), accessToken.getAccess_token());
         if (flag) {
@@ -42,11 +42,11 @@ public class MenuManagerServiceImpl {
      */
     private static Menu getMenu() throws UnsupportedEncodingException {
         //test1
-        String btn11Url = "https://uat-yunqueyilian.yunqueyi.com/message";
+        String btn11Url = "https://test1-yunqueyilian.yunqueyi.com/message";
         String btn21Url = "http://mp.weixin.qq.com/mp/homepage?__biz=MzIzNjM5NDA1OQ==&hid=2&sn=f52aa8659aa75f32aae5ea62d23e64ca&scene=18#wechat_redirect";
-        String btn31Url = "https://uat-yunqueyilian.yunqueyi.com/goBind";
-        String btn32Url = "https://uat-yunqueyilian.yunqueyi.com/applyIndex";
-        String btn33Url = "https://uat-yunqueyilian.yunqueyi.com/followUp";
+        String btn31Url = "https://test1-yunqueyilian.yunqueyi.com/goBind";
+        String btn32Url = "https://test1-yunqueyilian.yunqueyi.com/applyIndex";
+        String btn33Url = "https://test1-yunqueyilian.yunqueyi.com/followUp";
 
         //pro
 //        String btn11Url = "https://yunqueyilian.yunqueyi.com/message";

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

@@ -21,25 +21,25 @@
         <result column="groupid" property="groupid" jdbcType="VARCHAR"/>
         <result column="tagid_list" property="tagidList" jdbcType="VARCHAR"/>
         <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER"/>
-        <result column="creat_id" property="creatId" jdbcType="INTEGER"/>
-        <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP"/>
-        <result column="modify_id" property="modifyId" jdbcType="INTEGER"/>
-        <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP"/>
+        <result column="created_id" property="creatId" jdbcType="INTEGER"/>
+        <result column="created_time" property="creatTime" jdbcType="TIMESTAMP"/>
+        <result column="modified_id" property="modifyId" jdbcType="INTEGER"/>
+        <result column="modified_time" property="modifyTime" jdbcType="TIMESTAMP"/>
     </resultMap>
     <sql id="Base_Column_List">
     id, openid, patient_id, type, sex, nickname, province, city, country, headimgurl,
     privilege, unionid, subscribe, language, subscribe_time, remark, groupid, tagid_list,
-    delete_flag, creat_id, creat_time, modify_id, modify_time
+    delete_flag, created_id, created_time, modified_id, modified_time
   </sql>
     <insert id="insert" parameterType="com.pica.cloud.wechat.yunqueyilian.server.entity.PWechatUser">
-    insert into p_wechat_user (openid, patient_id,
+    insert into pat_wechat_user (openid, patient_id,
       type, sex, nickname,
       province, city, country,
       headimgurl, privilege, unionid,
       subscribe, language, subscribe_time,
       remark, groupid, tagid_list,
-      delete_flag, creat_id, creat_time,
-      modify_id, modify_time)
+      delete_flag, created_id, created_time,
+      modified_id, modified_time)
     values (#{openid,jdbcType=VARCHAR}, #{patientId,jdbcType=INTEGER},
       #{type,jdbcType=INTEGER}, #{sex,jdbcType=INTEGER}, #{nickname,jdbcType=VARCHAR},
       #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{country,jdbcType=VARCHAR},
@@ -50,7 +50,7 @@
       #{modifyId,jdbcType=INTEGER},  SYSDATE())
   </insert>
     <update id="updateById" parameterType="com.pica.cloud.wechat.yunqueyilian.server.entity.PWechatUser">
-        update p_wechat_user
+        update pat_wechat_user
         <set>
             <if test="openid != null">
                 openid = #{openid,jdbcType=VARCHAR},
@@ -107,26 +107,26 @@
                 delete_flag = #{deleteFlag,jdbcType=INTEGER},
             </if>
             <if test="creatId != null">
-                creat_id = #{creatId,jdbcType=INTEGER},
+                created_id = #{creatId,jdbcType=INTEGER},
             </if>
             <if test="creatTime != null">
-                creat_time = #{creatTime,jdbcType=TIMESTAMP},
+                created_time = #{creatTime,jdbcType=TIMESTAMP},
             </if>
             <if test="modifyId != null">
-                modify_id = #{modifyId,jdbcType=INTEGER},
+                modified_id = #{modifyId,jdbcType=INTEGER},
             </if>
-                modify_time = SYSDATE()
+                modified_time = SYSDATE()
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
     <select id="queryByOpenId" resultMap="BaseResultMap" parameterType="java.util.Map">
         select
         <include refid="Base_Column_List"/>
-        from p_wechat_user
+        from pat_wechat_user
         where type = #{type} and openid = #{openId}
     </select>
 
     <update id="updateSubscribeById" parameterType="com.pica.cloud.wechat.yunqueyilian.server.entity.PWechatUser">
-        update p_wechat_user set subscribe = #{subscribe},modify_time = SYSDATE() where id = #{id,jdbcType=INTEGER}
+        update pat_wechat_user set subscribe = #{subscribe},modify_time = SYSDATE() where id = #{id,jdbcType=INTEGER}
     </update>
 </mapper>
\ No newline at end of file