fanxw 2 years ago
parent
commit
8afebeaf1e

+ 2 - 0
src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

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

+ 22 - 6
src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.xml

@@ -35,6 +35,7 @@
35
     <result column="rzrq" jdbcType="TIMESTAMP" property="rzrq" />
35
     <result column="rzrq" jdbcType="TIMESTAMP" property="rzrq" />
36
     <result column="gwxz" property="gwxz" jdbcType="VARCHAR" />
36
     <result column="gwxz" property="gwxz" jdbcType="VARCHAR" />
37
     <result column="qdzgzchzyzgsj" property="qdzgzchzyzgsj" jdbcType="TIMESTAMP" />
37
     <result column="qdzgzchzyzgsj" property="qdzgzchzyzgsj" jdbcType="TIMESTAMP" />
38
+    <result column="zy" property="zy" jdbcType="VARCHAR" />
38
   </resultMap>
39
   </resultMap>
39
   <sql id="Example_Where_Clause">
40
   <sql id="Example_Where_Clause">
40
     <where>
41
     <where>
@@ -97,7 +98,7 @@
97
   <sql id="Base_Column_List">
98
   <sql id="Base_Column_List">
98
     user_id, username, password, org_id, real_name, user_alias, sex, telphone, mobile, address, email, 
99
     user_id, username, password, org_id, real_name, user_alias, sex, telphone, mobile, address, email, 
99
     qq_number, img_url, signature, create_time, create_user_id, update_time, update_user_id, 
100
     qq_number, img_url, signature, create_time, create_user_id, update_time, update_user_id, 
100
-    status, del_flag, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, xl, zw, rzrq, gwxz, qdzgzchzyzgsj
101
+    status, del_flag, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, xl, zw, rzrq, gwxz, qdzgzchzyzgsj, zy
101
   </sql>
102
   </sql>
102
   <select id="selectByExample" parameterType="com.chinaitop.depot.system.model.UserInfoExample" resultMap="BaseResultMap">
103
   <select id="selectByExample" parameterType="com.chinaitop.depot.system.model.UserInfoExample" resultMap="BaseResultMap">
103
     select
104
     select
@@ -153,7 +154,8 @@
153
       email, qq_number, img_url, 
154
       email, qq_number, img_url, 
154
       signature, create_time, create_user_id, 
155
       signature, create_time, create_user_id, 
155
       update_time, update_user_id, status, 
156
       update_time, update_user_id, status, 
156
-      del_flag, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, xl, zw, rzrq, gwxz, qdzgzchzyzgsj)
157
+      del_flag, bmmc, zgzt, lzrq, mz, rylb, sfzhm, zzmm, zc, 
158
+      xl, zw, rzrq, gwxz, qdzgzchzyzgsj, zy)
157
     values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
159
     values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
158
       #{orgId,jdbcType=INTEGER}, #{realName,jdbcType=VARCHAR}, #{userAlias,jdbcType=VARCHAR}, #{sex,jdbcType=INTEGER}, 
160
       #{orgId,jdbcType=INTEGER}, #{realName,jdbcType=VARCHAR}, #{userAlias,jdbcType=VARCHAR}, #{sex,jdbcType=INTEGER}, 
159
       #{telphone,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
161
       #{telphone,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
@@ -163,7 +165,7 @@
163
       #{delFlag,jdbcType=INTEGER}, #{bmmc,jdbcType=VARCHAR}, #{zgzt,jdbcType=VARCHAR}, #{lzrq,jdbcType=TIMESTAMP},
165
       #{delFlag,jdbcType=INTEGER}, #{bmmc,jdbcType=VARCHAR}, #{zgzt,jdbcType=VARCHAR}, #{lzrq,jdbcType=TIMESTAMP},
164
       #{mz,jdbcType=INTEGER}, #{rylb,jdbcType=INTEGER}, #{sfzhm,jdbcType=VARCHAR}, #{zzmm,jdbcType=INTEGER},
166
       #{mz,jdbcType=INTEGER}, #{rylb,jdbcType=INTEGER}, #{sfzhm,jdbcType=VARCHAR}, #{zzmm,jdbcType=INTEGER},
165
       #{zc,jdbcType=VARCHAR}, #{xl,jdbcType=INTEGER}, #{zw,jdbcType=VARCHAR}, #{rzrq,jdbcType=TIMESTAMP},
167
       #{zc,jdbcType=VARCHAR}, #{xl,jdbcType=INTEGER}, #{zw,jdbcType=VARCHAR}, #{rzrq,jdbcType=TIMESTAMP},
166
-      #{gwxz,jdbcType=VARCHAR}, #{qdzgzchzyzgsj,jdbcType=TIMESTAMP})
168
+      #{gwxz,jdbcType=VARCHAR}, #{qdzgzchzyzgsj,jdbcType=TIMESTAMP}, #{zy,jdbcType=VARCHAR})
167
   </insert>
169
   </insert>
168
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserInfo" useGeneratedKeys="true" keyProperty="userId">
170
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserInfo" useGeneratedKeys="true" keyProperty="userId">
169
     insert into user_info
171
     insert into user_info
@@ -267,6 +269,9 @@
267
       <if test="qdzgzchzyzgsj != null">
269
       <if test="qdzgzchzyzgsj != null">
268
         qdzgzchzyzgsj,
270
         qdzgzchzyzgsj,
269
       </if>
271
       </if>
272
+      <if test="zy != null">
273
+        zy,
274
+      </if>
270
     </trim>
275
     </trim>
271
     <trim prefix="values (" suffix=")" suffixOverrides=",">
276
     <trim prefix="values (" suffix=")" suffixOverrides=",">
272
       <if test="userId != null">
277
       <if test="userId != null">
@@ -368,6 +373,9 @@
368
       <if test="qdzgzchzyzgsj != null">
373
       <if test="qdzgzchzyzgsj != null">
369
         #{qdzgzchzyzgsj,jdbcType=TIMESTAMP},
374
         #{qdzgzchzyzgsj,jdbcType=TIMESTAMP},
370
       </if>
375
       </if>
376
+      <if test="zy != null">
377
+        #{zy,jdbcType=VARCHAR},
378
+      </if>
371
     </trim>
379
     </trim>
372
   </insert>
380
   </insert>
373
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.UserInfoExample" resultType="java.lang.Integer">
381
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.UserInfoExample" resultType="java.lang.Integer">
@@ -478,6 +486,9 @@
478
       <if test="record.qdzgzchzyzgsj != null">
486
       <if test="record.qdzgzchzyzgsj != null">
479
         qdzgzchzyzgsj = #{record.qdzgzchzyzgsj,jdbcType=TIMESTAMP},
487
         qdzgzchzyzgsj = #{record.qdzgzchzyzgsj,jdbcType=TIMESTAMP},
480
       </if>
488
       </if>
489
+      <if test="record.zy != null">
490
+        zy = #{record.zy,jdbcType=VARCHAR},
491
+      </if>
481
     </set>
492
     </set>
482
     <if test="_parameter != null">
493
     <if test="_parameter != null">
483
       <include refid="Update_By_Example_Where_Clause" />
494
       <include refid="Update_By_Example_Where_Clause" />
@@ -517,7 +528,8 @@
517
       zw = #{record.zw,jdbcType=VARCHAR},
528
       zw = #{record.zw,jdbcType=VARCHAR},
518
       rzrq = #{record.rzrq,jdbcType=TIMESTAMP},
529
       rzrq = #{record.rzrq,jdbcType=TIMESTAMP},
519
       gwxz = #{record.gwxz,jdbcType=VARCHAR},
530
       gwxz = #{record.gwxz,jdbcType=VARCHAR},
520
-      qdzgzchzyzgsj = #{record.qdzgzchzyzgsj,jdbcType=TIMESTAMP}
531
+      qdzgzchzyzgsj = #{record.qdzgzchzyzgsj,jdbcType=TIMESTAMP},
532
+      zy = #{record.zy,jdbcType=VARCHAR}
521
     <if test="_parameter != null">
533
     <if test="_parameter != null">
522
       <include refid="Update_By_Example_Where_Clause" />
534
       <include refid="Update_By_Example_Where_Clause" />
523
     </if>
535
     </if>
@@ -621,6 +633,9 @@
621
       <if test="qdzgzchzyzgsj != null">
633
       <if test="qdzgzchzyzgsj != null">
622
         qdzgzchzyzgsj = #{qdzgzchzyzgsj,jdbcType=TIMESTAMP},
634
         qdzgzchzyzgsj = #{qdzgzchzyzgsj,jdbcType=TIMESTAMP},
623
       </if>
635
       </if>
636
+      <if test="zy != null">
637
+        zy = #{zy,jdbcType=VARCHAR},
638
+      </if>
624
     </set>
639
     </set>
625
     where user_id = #{userId,jdbcType=INTEGER}
640
     where user_id = #{userId,jdbcType=INTEGER}
626
   </update>
641
   </update>
@@ -657,7 +672,8 @@
657
       zw = #{zw,jdbcType=VARCHAR},
672
       zw = #{zw,jdbcType=VARCHAR},
658
       rzrq = #{rzrq,jdbcType=TIMESTAMP},
673
       rzrq = #{rzrq,jdbcType=TIMESTAMP},
659
       gwxz = #{gwxz,jdbcType=VARCHAR},
674
       gwxz = #{gwxz,jdbcType=VARCHAR},
660
-      qdzgzchzyzgsj = #{qdzgzchzyzgsj,jdbcType=TIMESTAMP}
675
+      qdzgzchzyzgsj = #{qdzgzchzyzgsj,jdbcType=TIMESTAMP},
676
+      zy = #{zy,jdbcType=VARCHAR}
661
     where user_id = #{userId,jdbcType=INTEGER}
677
     where user_id = #{userId,jdbcType=INTEGER}
662
   </update>
678
   </update>
663
    <resultMap id="UserRoleOrgMap" type="com.chinaitop.depot.system.model.UserInfo">
679
    <resultMap id="UserRoleOrgMap" type="com.chinaitop.depot.system.model.UserInfo">
@@ -692,7 +708,7 @@
692
                      #{item}
708
                      #{item}
693
                    </foreach>
709
                    </foreach>
694
                  </if>
710
                  </if>
695
-                 and length(ui.real_name) &lt; 12
711
+                 and length(ui.real_name) &lt; 13
696
 		 </where>
712
 		 </where>
697
     ) A LEFT JOIN (
713
     ) A LEFT JOIN (
698
 		 SELECT
714
 		 SELECT

+ 24 - 4
src/main/java/com/chinaitop/depot/system/model/UserInfo.java

@@ -5,10 +5,10 @@ import java.util.ArrayList;
5
 import java.util.Date;
5
 import java.util.Date;
6
 import java.util.List;
6
 import java.util.List;
7
 
7
 
8
+import com.fasterxml.jackson.annotation.JsonFormat;
9
+
8
 public class UserInfo implements Serializable{
10
 public class UserInfo implements Serializable{
9
-    /**
10
-	 * 
11
-	 */
11
+
12
 	private static final long serialVersionUID = 1L;
12
 	private static final long serialVersionUID = 1L;
13
 
13
 
14
 	private Integer userId;
14
 	private Integer userId;
@@ -39,10 +39,12 @@ public class UserInfo implements Serializable{
39
 
39
 
40
     private String signature;
40
     private String signature;
41
 
41
 
42
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
42
     private Date createTime;
43
     private Date createTime;
43
 
44
 
44
     private Integer createUserId;
45
     private Integer createUserId;
45
 
46
 
47
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
46
     private Date updateTime;
48
     private Date updateTime;
47
 
49
 
48
     private Integer updateUserId;
50
     private Integer updateUserId;
@@ -76,7 +78,9 @@ public class UserInfo implements Serializable{
76
     private String gwxz;
78
     private String gwxz;
77
 
79
 
78
     private Date qdzgzchzyzgsj;
80
     private Date qdzgzchzyzgsj;
79
-    
81
+
82
+    private String zy;
83
+
80
     private List<String> roleIds = new ArrayList<String>();
84
     private List<String> roleIds = new ArrayList<String>();
81
     
85
     
82
     //业务字段
86
     //业务字段
@@ -541,4 +545,20 @@ public class UserInfo implements Serializable{
541
     public void setQdzgzchzyzgsj(Date qdzgzchzyzgsj) {
545
     public void setQdzgzchzyzgsj(Date qdzgzchzyzgsj) {
542
         this.qdzgzchzyzgsj = qdzgzchzyzgsj;
546
         this.qdzgzchzyzgsj = qdzgzchzyzgsj;
543
     }
547
     }
548
+
549
+    /**
550
+     * 专业
551
+     * @return
552
+     */
553
+	public String getZy() {
554
+		return zy;
555
+	}
556
+
557
+	/**
558
+	 * 专业
559
+	 * @param zy
560
+	 */
561
+	public void setZy(String zy) {
562
+		this.zy = zy;
563
+	}
544
 }
564
 }

+ 5 - 0
src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

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

+ 7 - 5
src/main/resources/application.properties

@@ -2,24 +2,26 @@
2
 server.port=9023
2
 server.port=9023
3
 
3
 
4
 #gbase8s的数据库配置
4
 #gbase8s的数据库配置
5
+spring.application.name=depot-system
5
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
6
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
6
 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;
7
 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;
7
 spring.datasource.username=gbasedbt
8
 spring.datasource.username=gbasedbt
8
 spring.datasource.password=cDbK2S0go8
9
 spring.datasource.password=cDbK2S0go8
10
+#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;
11
+#spring.datasource.username=gbasedbt
12
+#spring.datasource.password=GBase123
9
 spring.datasource.driverClassName=com.gbasedbt.jdbc.IfxDriver
13
 spring.datasource.driverClassName=com.gbasedbt.jdbc.IfxDriver
10
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
14
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
11
 
15
 
12
-
13
-eureka.client.serviceUrl.defaultZone=http://172.16.0.16:9001/eureka/
14
-
16
+eureka.instance.ip-address=172.16.0.16
15
 # 每隔10s发送一次心跳(默认30s)
17
 # 每隔10s发送一次心跳(默认30s)
16
 eureka.instance.lease-renewal-interval-in-seconds=10
18
 eureka.instance.lease-renewal-interval-in-seconds=10
17
 # 告知服务端30秒还未收到心跳的话,就将该服务移除列表(默认90s)
19
 # 告知服务端30秒还未收到心跳的话,就将该服务移除列表(默认90s)
18
 eureka.instance.lease-expiration-duration-in-seconds=30
20
 eureka.instance.lease-expiration-duration-in-seconds=30
21
+eureka.client.serviceUrl.defaultZone=http://${eureka.instance.ip-address}:${server.port}/eureka/
22
+eureka.instance.status-page-url=http://${eureka.instance.ip-address}:${server.port}/swagger-ui.html
19
 
23
 
20
-spring.application.name=depot-system
21
 
24
 
22
-eureka.instance.status-page-url=http://localhost:${server.port}/swagger-ui.html
23
 
25
 
24
 # Redis数据库索引(默认为0)
26
 # Redis数据库索引(默认为0)
25
 spring.redis.database=3
27
 spring.redis.database=3