增加城市获取

minigame/src/com/hssx/controller/NewsController.java

@@ -12,11 +12,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.log4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -39,7 +39,7 @@ import com.hssx.utils.HttpRespMsg;
 @Controller
 @RequestMapping("/news")
 public class NewsController {
-
+	Logger log = Logger.getLogger(NewsController.class);
     @Autowired
     NewsMapper newsMapper;
     @Autowired
@@ -59,7 +59,9 @@ public class NewsController {
     @RequestMapping("/addNews")
     public void addUserNews(NewsVO newsVO,HttpServletResponse response) throws IOException{
         HttpRespMsg msg =  new HttpRespMsg();
+        log.info("addNews 接收到参数newsVo UserId="+newsVO.getUserId());
         User user = usermapper.selectByPrimaryKey(newsVO.getUserId());
+        log.info("用户是否存在:="+(user != null));
 		// 微信授权的链接
 		try {
 			//过滤掉表情

minigame/src/com/hssx/controller/UserController.java

@@ -14,6 +14,7 @@ import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,6 +44,7 @@ import com.hssx.utils.WechatAndMicroblogUtil;
 @Controller
 @RequestMapping("/user")
 public class UserController {
+	Logger log = Logger.getLogger(UserController.class);
 	@Autowired
 	UserMapper usermapper;
 	@Autowired
@@ -77,6 +79,8 @@ public class UserController {
 			if (!json.containsKey("errcode")) {
 				String openId = json.getString("openid");
 				String accessToken = json.getString("access_token");
+				
+				
 				user.setVoucherId(openId);
 				String url1 = "https://api.weixin.qq.com/sns/userinfo?access_token=" + accessToken + "&openid=" + openId
 						+ "&lang=zh_CN";
@@ -88,6 +92,10 @@ public class UserController {
 				if (!json.containsKey("errcode")) {
 					user.setNickName(EmojiHttpServletRequestWraper.filterEmoji(json.getString("nickname")));
 					user.setHeaderPic(json.getString("headimgurl"));
+					String city = json.getString("city");
+					System.out.println("获取到城市:"+city);
+					log.info("获取到城市:"+city);
+					user.setCity(city);
 				}
 				System.out.println(user + "user");
 				example.createCriteria().andVoucherIdEqualTo(openId).andTypeEqualTo(type);
@@ -101,6 +109,13 @@ public class UserController {
 						user.setNickName(json.getString("nickname"));
 						user.setHeaderPic(json.getString("headimgurl"));
 						usermapper.updateByPrimaryKeySelective(user);
+					} 
+					//更新已有用户的城市
+					if (null == user.getCity() && (json.getString("city") != null || !"".equals(json.getString("city")))) {
+						String city = json.getString("city");
+						log.info("更新城市:"+city);
+						user.setCity(city);
+						usermapper.updateByPrimaryKeySelective(user);
 					}
 				}
 				msg.data = user;

minigame/src/com/hssx/entity/User.java

@@ -5,39 +5,44 @@ import java.util.Date;
 public class User {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mini_user.id
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mini_user.type
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mini_user.voucher_id
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	private String voucherId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mini_user.indate
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	private Date indate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mini_user.header_pic
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	private String headerPic;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mini_user.nick_name
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	private String nickName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column mini_user.city
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
+	 */
+	private String city;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mini_user.id
 	 * @return  the value of mini_user.id
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public String getId() {
 		return id;
@@ -46,7 +51,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mini_user.id
 	 * @param id  the value for mini_user.id
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -55,7 +60,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mini_user.type
 	 * @return  the value of mini_user.type
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public Integer getType() {
 		return type;
@@ -64,7 +69,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mini_user.type
 	 * @param type  the value for mini_user.type
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -73,7 +78,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mini_user.voucher_id
 	 * @return  the value of mini_user.voucher_id
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public String getVoucherId() {
 		return voucherId;
@@ -82,7 +87,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mini_user.voucher_id
 	 * @param voucherId  the value for mini_user.voucher_id
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void setVoucherId(String voucherId) {
 		this.voucherId = voucherId;
@@ -91,7 +96,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mini_user.indate
 	 * @return  the value of mini_user.indate
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public Date getIndate() {
 		return indate;
@@ -100,7 +105,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mini_user.indate
 	 * @param indate  the value for mini_user.indate
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void setIndate(Date indate) {
 		this.indate = indate;
@@ -109,7 +114,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mini_user.header_pic
 	 * @return  the value of mini_user.header_pic
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public String getHeaderPic() {
 		return headerPic;
@@ -118,7 +123,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mini_user.header_pic
 	 * @param headerPic  the value for mini_user.header_pic
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void setHeaderPic(String headerPic) {
 		this.headerPic = headerPic;
@@ -127,7 +132,7 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mini_user.nick_name
 	 * @return  the value of mini_user.nick_name
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public String getNickName() {
 		return nickName;
@@ -136,12 +141,30 @@ public class User {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mini_user.nick_name
 	 * @param nickName  the value for mini_user.nick_name
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void setNickName(String nickName) {
 		this.nickName = nickName;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column mini_user.city
+	 * @return  the value of mini_user.city
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
+	 */
+	public String getCity() {
+		return city;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column mini_user.city
+	 * @param city  the value for mini_user.city
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
+	 */
+	public void setCity(String city) {
+		this.city = city;
+	}
+
 	@Override
 	public String toString() {
 		return "User [id=" + id + ", type=" + type + ", voucherId=" + voucherId + ", indate=" + indate + ", headerPic="

minigame/src/com/hssx/entity/UserExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class UserExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public UserExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class UserExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class UserExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -562,11 +562,81 @@ public class UserExample {
 			addCriterion("nick_name not between", value1, value2, "nickName");
 			return (Criteria) this;
 		}
+
+		public Criteria andCityIsNull() {
+			addCriterion("city is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityIsNotNull() {
+			addCriterion("city is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityEqualTo(String value) {
+			addCriterion("city =", value, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityNotEqualTo(String value) {
+			addCriterion("city <>", value, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityGreaterThan(String value) {
+			addCriterion("city >", value, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityGreaterThanOrEqualTo(String value) {
+			addCriterion("city >=", value, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityLessThan(String value) {
+			addCriterion("city <", value, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityLessThanOrEqualTo(String value) {
+			addCriterion("city <=", value, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityLike(String value) {
+			addCriterion("city like", value, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityNotLike(String value) {
+			addCriterion("city not like", value, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityIn(List<String> values) {
+			addCriterion("city in", values, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityNotIn(List<String> values) {
+			addCriterion("city not in", values, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityBetween(String value1, String value2) {
+			addCriterion("city between", value1, value2, "city");
+			return (Criteria) this;
+		}
+
+		public Criteria andCityNotBetween(String value1, String value2) {
+			addCriterion("city not between", value1, value2, "city");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

minigame/src/com/hssx/mapper/UserMapper.java

@@ -9,67 +9,67 @@ public interface UserMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	long countByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	int deleteByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	int insert(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	int insertSelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	List<User> selectByExample(UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	User selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	int updateByPrimaryKeySelective(User record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mini_user
-	 * @mbg.generated  Mon Sep 23 16:09:39 CST 2019
+	 * @mbg.generated  Fri Sep 27 16:35:37 CST 2019
 	 */
 	int updateByPrimaryKey(User record);
 

minigame/src/com/hssx/mapper/UserMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="type" jdbcType="INTEGER" property="type" />
@@ -13,12 +13,13 @@
     <result column="indate" jdbcType="TIMESTAMP" property="indate" />
     <result column="header_pic" jdbcType="VARCHAR" property="headerPic" />
     <result column="nick_name" jdbcType="VARCHAR" property="nickName" />
+    <result column="city" jdbcType="VARCHAR" property="city" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -52,7 +53,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -86,15 +87,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
-    id, type, voucher_id, indate, header_pic, nick_name
+    id, type, voucher_id, indate, header_pic, nick_name, city
   </sql>
   <select id="selectByExample" parameterType="com.hssx.entity.UserExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     select
     <if test="distinct">
@@ -113,7 +114,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -124,7 +125,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     delete from mini_user
     where id = #{id,jdbcType=VARCHAR}
@@ -133,39 +134,37 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     delete from mini_user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.hssx.entity.User"  keyProperty="id"
-     keyColumn="ID" useGeneratedKeys="true">
+  <insert id="insert" parameterType="com.hssx.entity.User">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
-    <!-- <selectKey keyProperty="id" order="AFTER" resultType="java.lang.String">
-      SELECT LAST_INSERT_ID()
-    </selectKey> -->
-    insert into mini_user (id,type, voucher_id, indate, 
-      header_pic, nick_name)
-    values (#{id,jdbcType=VARCHAR},#{type,jdbcType=INTEGER}, #{voucherId,jdbcType=VARCHAR}, #{indate,jdbcType=TIMESTAMP}, 
-      #{headerPic,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR})
+    insert into mini_user (id, type, voucher_id, 
+      indate, header_pic, nick_name, 
+      city)
+    values (#{id,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{voucherId,jdbcType=VARCHAR}, 
+      #{indate,jdbcType=TIMESTAMP}, #{headerPic,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR}, 
+      #{city,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hssx.entity.User">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.String">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into mini_user
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
       <if test="type != null">
         type,
       </if>
@@ -181,8 +180,14 @@
       <if test="nickName != null">
         nick_name,
       </if>
+      <if test="city != null">
+        city,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
       <if test="type != null">
         #{type,jdbcType=INTEGER},
       </if>
@@ -198,13 +203,16 @@
       <if test="nickName != null">
         #{nickName,jdbcType=VARCHAR},
       </if>
+      <if test="city != null">
+        #{city,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hssx.entity.UserExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     select count(*) from mini_user
     <if test="_parameter != null">
@@ -215,7 +223,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     update mini_user
     <set>
@@ -237,6 +245,9 @@
       <if test="record.nickName != null">
         nick_name = #{record.nickName,jdbcType=VARCHAR},
       </if>
+      <if test="record.city != null">
+        city = #{record.city,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -246,7 +257,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     update mini_user
     set id = #{record.id,jdbcType=VARCHAR},
@@ -254,7 +265,8 @@
       voucher_id = #{record.voucherId,jdbcType=VARCHAR},
       indate = #{record.indate,jdbcType=TIMESTAMP},
       header_pic = #{record.headerPic,jdbcType=VARCHAR},
-      nick_name = #{record.nickName,jdbcType=VARCHAR}
+      nick_name = #{record.nickName,jdbcType=VARCHAR},
+      city = #{record.city,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -263,7 +275,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     update mini_user
     <set>
@@ -282,6 +294,9 @@
       <if test="nickName != null">
         nick_name = #{nickName,jdbcType=VARCHAR},
       </if>
+      <if test="city != null">
+        city = #{city,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -289,14 +304,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 23 16:09:39 CST 2019.
+      This element was generated on Fri Sep 27 16:35:37 CST 2019.
     -->
     update mini_user
     set type = #{type,jdbcType=INTEGER},
       voucher_id = #{voucherId,jdbcType=VARCHAR},
       indate = #{indate,jdbcType=TIMESTAMP},
       header_pic = #{headerPic,jdbcType=VARCHAR},
-      nick_name = #{nickName,jdbcType=VARCHAR}
+      nick_name = #{nickName,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>