.

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.system.controller;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -629,6 +630,7 @@ public class UserInfoController {
 				String md5_pwd = userInfoService.getMD5(newPassword);
 				String sha1_pwd = SHA1Util.encode(md5_pwd);
 				userInfo.setPassword(sha1_pwd);
+				userInfo.setUpdateTime(new Date());
 				//userInfo.setPassword(userInfoService.getMD5(newPassword));
 				userInfoService.update(userInfo);
 				

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.xml

@@ -35,6 +35,7 @@
     <result column="rzrq" jdbcType="TIMESTAMP" property="rzrq" />
     <result column="gwxz" property="gwxz" jdbcType="VARCHAR" />
     <result column="qdzgzchzyzgsj" property="qdzgzchzyzgsj" jdbcType="TIMESTAMP" />
+    <result column="zy" property="zy" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -97,7 +98,7 @@
   <sql id="Base_Column_List">
     user_id, username, password, org_id, real_name, user_alias, sex, telphone, mobile, address, email, 
     qq_number, img_url, signature, create_time, create_user_id, update_time, update_user_id, 
-    status, del_flag, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, xl, zw, rzrq, gwxz, qdzgzchzyzgsj
+    status, del_flag, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, xl, zw, rzrq, gwxz, qdzgzchzyzgsj, zy
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.system.model.UserInfoExample" resultMap="BaseResultMap">
     select
@@ -153,7 +154,8 @@
       email, qq_number, img_url, 
       signature, create_time, create_user_id, 
       update_time, update_user_id, status, 
-      del_flag, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, xl, zw, rzrq, gwxz, qdzgzchzyzgsj)
+      del_flag, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, 
+      xl, zw, rzrq, gwxz, qdzgzchzyzgsj, zy)
     values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{orgId,jdbcType=INTEGER}, #{realName,jdbcType=VARCHAR}, #{userAlias,jdbcType=VARCHAR}, #{sex,jdbcType=INTEGER}, 
       #{telphone,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
@@ -163,7 +165,7 @@
       #{delFlag,jdbcType=INTEGER}, #{bmmc,jdbcType=VARCHAR}, #{zgzt,jdbcType=VARCHAR}, #{lzrq,jdbcType=TIMESTAMP},
       #{mz,jdbcType=INTEGER}, #{rylb,jdbcType=INTEGER}, #{sfzhm,jdbcType=VARCHAR}, #{zzmm,jdbcType=INTEGER},
       #{zc,jdbcType=VARCHAR}, #{xl,jdbcType=INTEGER}, #{zw,jdbcType=VARCHAR}, #{rzrq,jdbcType=TIMESTAMP},
-      #{gwxz,jdbcType=VARCHAR}, #{qdzgzchzyzgsj,jdbcType=TIMESTAMP})
+      #{gwxz,jdbcType=VARCHAR}, #{qdzgzchzyzgsj,jdbcType=TIMESTAMP}, #{zy,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserInfo" useGeneratedKeys="true" keyProperty="userId">
     insert into user_info
@@ -267,6 +269,9 @@
       <if test="qdzgzchzyzgsj != null">
         qdzgzchzyzgsj,
       </if>
+      <if test="zy != null">
+        zy,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="userId != null">
@@ -368,6 +373,9 @@
       <if test="qdzgzchzyzgsj != null">
         #{qdzgzchzyzgsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="zy != null">
+        #{zy,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.UserInfoExample" resultType="java.lang.Integer">
@@ -478,6 +486,9 @@
       <if test="record.qdzgzchzyzgsj != null">
         qdzgzchzyzgsj = #{record.qdzgzchzyzgsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.zy != null">
+        zy = #{record.zy,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -517,7 +528,8 @@
       zw = #{record.zw,jdbcType=VARCHAR},
       rzrq = #{record.rzrq,jdbcType=TIMESTAMP},
       gwxz = #{record.gwxz,jdbcType=VARCHAR},
-      qdzgzchzyzgsj = #{record.qdzgzchzyzgsj,jdbcType=TIMESTAMP}
+      qdzgzchzyzgsj = #{record.qdzgzchzyzgsj,jdbcType=TIMESTAMP},
+      zy = #{record.zy,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -621,6 +633,9 @@
       <if test="qdzgzchzyzgsj != null">
         qdzgzchzyzgsj = #{qdzgzchzyzgsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="zy != null">
+        zy = #{zy,jdbcType=VARCHAR},
+      </if>
     </set>
     where user_id = #{userId,jdbcType=INTEGER}
   </update>
@@ -657,7 +672,8 @@
       zw = #{zw,jdbcType=VARCHAR},
       rzrq = #{rzrq,jdbcType=TIMESTAMP},
       gwxz = #{gwxz,jdbcType=VARCHAR},
-      qdzgzchzyzgsj = #{qdzgzchzyzgsj,jdbcType=TIMESTAMP}
+      qdzgzchzyzgsj = #{qdzgzchzyzgsj,jdbcType=TIMESTAMP},
+      zy = #{zy,jdbcType=VARCHAR}
     where user_id = #{userId,jdbcType=INTEGER}
   </update>
    <resultMap id="UserRoleOrgMap" type="com.chinaitop.depot.system.model.UserInfo">
@@ -692,7 +708,7 @@
                      #{item}
                    </foreach>
                  </if>
-                 and length(ui.real_name) &lt; 12
+                 and length(ui.real_name) &lt; 13
 		 </where>
     ) A LEFT JOIN (
 		 SELECT

src/main/java/com/chinaitop/depot/system/model/UserInfo.java

@@ -5,10 +5,10 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 public class UserInfo implements Serializable{
-    /**
-	 * 
-	 */
+
 	private static final long serialVersionUID = 1L;
 
 	private Integer userId;
@@ -39,10 +39,12 @@ public class UserInfo implements Serializable{
 
     private String signature;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     private Integer createUserId;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     private Integer updateUserId;
@@ -76,7 +78,9 @@ public class UserInfo implements Serializable{
     private String gwxz;
 
     private Date qdzgzchzyzgsj;
-    
+
+    private String zy;
+
     private List<String> roleIds = new ArrayList<String>();
     
     //业务字段
@@ -541,4 +545,20 @@ public class UserInfo implements Serializable{
     public void setQdzgzchzyzgsj(Date qdzgzchzyzgsj) {
         this.qdzgzchzyzgsj = qdzgzchzyzgsj;
     }
+
+    /**
+     * 专业
+     * @return
+     */
+	public String getZy() {
+		return zy;
+	}
+
+	/**
+	 * 专业
+	 * @param zy
+	 */
+	public void setZy(String zy) {
+		this.zy = zy;
+	}
 }

src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.system.service.impl;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -94,6 +95,8 @@ public class UserInfoServiceImpl implements UserInfoService {
 		//把密码再用SHA1加密一次
 		String sha1_pwd = SHA1Util.encode(userInfo.getPassword());
 		userInfo.setPassword(sha1_pwd);
+		userInfo.setCreateTime(new Date());
+		userInfo.setUpdateTime(userInfo.getCreateTime());
 		UserInfoMapper.insert(userInfo);
 		// 添加用户角色信息
 		for (String roleId : userInfo.getRoleIds()) {
@@ -182,6 +185,7 @@ public class UserInfoServiceImpl implements UserInfoService {
 		//再用SHA1加密一次
 		String sha1_pwd = SHA1Util.encode(userPwd);
 	    userInfo.setPassword(sha1_pwd);
+	    userInfo.setUpdateTime(new Date());
 	    UserInfoMapper.updateByPrimaryKey(userInfo);
     }
 
@@ -277,6 +281,7 @@ public class UserInfoServiceImpl implements UserInfoService {
 			UserInfo newuser = UserInfoMapper.selectByPrimaryKey(userid);
 			//谷歌浏览器在修改当前登录用户的时候传到后台的密码是明文，所以这个地方用原来的密码重新赋值一下，避免修改用户信息后密码成了明文
 			userInfo.setPassword(newuser.getPassword());
+			userInfo.setUpdateTime(new Date());
 			this.update(userInfo);
 			userRoleMapper.deleteById(userInfo.getUserId());
 		}

src/main/resources/application.properties

@@ -2,24 +2,26 @@
 server.port=9023
 
 #gbase8s的数据库配置
+spring.application.name=depot-system
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.url=jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
 spring.datasource.username=gbasedbt
 spring.datasource.password=cDbK2S0go8
+#spring.datasource.url=jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+#spring.datasource.username=gbasedbt
+#spring.datasource.password=GBase123
 spring.datasource.driverClassName=com.gbasedbt.jdbc.IfxDriver
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
 
-
-eureka.client.serviceUrl.defaultZone=http://172.16.0.16:9001/eureka/
-
+eureka.instance.ip-address=172.16.0.16
 # 每隔10s发送一次心跳(默认30s)
 eureka.instance.lease-renewal-interval-in-seconds=10
 # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
 eureka.instance.lease-expiration-duration-in-seconds=30
+eureka.client.serviceUrl.defaultZone=http://${eureka.instance.ip-address}:${server.port}/eureka/
+eureka.instance.status-page-url=http://${eureka.instance.ip-address}:${server.port}/swagger-ui.html
 
-spring.application.name=depot-system
 
-eureka.instance.status-page-url=http://localhost:${server.port}/swagger-ui.html
 
 # Redis数据库索引（默认为0）
 spring.redis.database=3