111

minigame/WebContent/index.html

@@ -28,20 +28,22 @@
 
     (function() {
         if (!!navigator.userAgent.match(/AppleWebKit.*Mobile.*/)) {
-            var ua = navigator.userAgent.toLowerCase() , url = "";
-            // if (ua.match(/MicroMessenger/i) == "micromessenger") {
+            var ua = navigator.userAgent.toLowerCase() , url = "" , type = 0;
+            if (ua.match(/MicroMessenger/i) == "micromessenger") {
                 alert("微信浏览器中打开");
+                type = 0;
                 url = "https://open.weixin.qq.com/connect/oauth2/authorize?"
                         +"appid=wx749c84daac654e1e&"
-                        +"redirect_uri=wx.ttkuaiban.com&"
+                        +"redirect_uri=http://wx.ttkuaiban.com/minigame&"
                         +"response_type=code&"
                         +"scope=snsapi_base&"
                         +"state=STATE#wechat_redirect";
                 //https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx749c84daac654e1e&redirect_uri=wx.ttkuaiban.com&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
-            // }
+            }
 
             if (ua.match(/WeiBo/i) == "weibo") {
                 alert("在新浪微博客户端打开");
+                type = 1;
                 url = "https://api.weibo.cn/oauth2/authorize?"
                     +"client_id=2141531565&"
                     +"display=mobile&"
@@ -49,14 +51,30 @@
                     +"redirect_uri=code&"
                     +"scope=snsapi_base";
             }
-
-            window.location.href = url;
-            $.get(url ,function(data,status){
+            var URLParams = new Array();  
+        	var params = document.location.search.substr(1).split('&');   
+        	for (i=0; i < params.length ; i++){  
+        		var aParam = params[i].split('=');   
+        		URLParams[aParam[0]] = aParam[1];   
+        	}
+        	if(URLParams['code']){
+        		var code = URLParams['code'];
+        		$.post("https://http://118.190.47.230/minigame/user/weiXinLogin.do",{
+        			code:code,
+        			type:type
+       			},function(result){
+                    console.log(result)
+                });
+        	}else{
+        		window.location.href = url;
+        	}
+            
+            /* $.get(url ,function(data,status){
                 console.log("Data: " + data + "nStatus: " + status);
                 $.post("demo_ajax_gethint.html",{suggest:txt},function(result){
                     $("span").html(result);
                 });
-            });
+            }); */
         }
     })()
 </script>

minigame/src/applicationContext.xml

@@ -44,9 +44,9 @@
 
 	<!-- Mapper接口所在包名，Spring会自动查找其下的Mapper -->
 	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.estates.mapper" />
+		<property name="basePackage" value="com.hssx.mapper" />
 	</bean>
 	<context:component-scan
-		base-package="com.estates.task" />
+		base-package="com.hssx" />
 	<task:annotation-driven />
 </beans>

minigame/src/com/hhsx/constant/Constant.java

@@ -1,5 +1,5 @@
 
-package com.hhsx.constant;
+package com.hssx.constant;
 /**
  * Author: 吴涛涛
  * Date : 2019 - 07 - 24 16:00

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

@@ -1,22 +1,20 @@
-package com.hhsx.controller;
+package com.hssx.controller;
 
 
-import com.estates.entity.vo.NewsVO;
-import com.estates.mapper.NewsMapper;
-import com.estates.service.NewsService;
-import com.hhsx.utils.HttpRespMsg;
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
+import com.hssx.entity.vo.NewsVO;
+import com.hssx.mapper.NewsMapper;
+import com.hssx.service.NewsService;
+import com.hssx.utils.HttpRespMsg;
 
 /**
  * @author 吴涛涛
@@ -30,7 +28,6 @@ public class NewsController {
     NewsMapper newsMapper;
     @Autowired
     NewsService newsService;
-    @Autowired
     
 
     /**

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

@@ -1,4 +1,4 @@
-package com.hhsx.controller;
+package com.hssx.controller;
 
 import java.io.IOException;
 import java.security.KeyManagementException;
@@ -16,12 +16,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.estates.mapper.UserMapper;
-import com.estates.model.User;
-import com.estates.model.UserExample;
-import com.hhsx.constant.Constant;
-import com.hhsx.utils.HttpKit;
-import com.hhsx.utils.HttpRespMsg;
+import com.hssx.constant.Constant;
+import com.hssx.entity.User;
+import com.hssx.entity.UserExample;
+import com.hssx.mapper.UserMapper;
+import com.hssx.utils.HttpKit;
+import com.hssx.utils.HttpRespMsg;
 
 @Controller
 @RequestMapping("/user")
@@ -38,7 +38,6 @@ public class UserController {
      * @return
      */
     @RequestMapping(value = "weiXinLogin")
-    @ResponseBody
     public Object weiXinLogin(@RequestParam String code, Integer type,
                               HttpServletResponse response) throws Exception, KeyManagementException, NoSuchAlgorithmException, NoSuchProviderException, IOException {
         HttpRespMsg msg = new HttpRespMsg();
@@ -80,9 +79,9 @@ public class UserController {
 //            String url = "https://api.weibo.com/oauth2/authorize?client_id="+Constant.MICROBLOG_APPKEY +"&response_type=code&redirect_uri="+callbackURL;
 
         }
-
         response.setContentType("application/json");
         response.setCharacterEncoding("UTF-8");
+        response.getWriter().println(msg.toJSONStr());
         return msg;
     }
 	

minigame/src/com/estates/model/News.java

@@ -1,4 +1,4 @@
-package com.estates.model;
+package com.hssx.entity;
 
 import java.util.Date;
 
@@ -8,7 +8,7 @@ public class News {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_news.id
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     private Integer id;
 
@@ -17,7 +17,7 @@ public class News {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_news.nick_name
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     private String nickName;
 
@@ -26,7 +26,7 @@ public class News {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_news.header_pic
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     private String headerPic;
 
@@ -35,7 +35,7 @@ public class News {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_news.indate
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     private Date indate;
 
@@ -44,7 +44,7 @@ public class News {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_news.type
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     private Integer type;
 
@@ -53,7 +53,7 @@ public class News {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_news.message
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     private String message;
 
@@ -63,7 +63,7 @@ public class News {
      *
      * @return the value of mini_news.id
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public Integer getId() {
         return id;
@@ -75,7 +75,7 @@ public class News {
      *
      * @param id the value for mini_news.id
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void setId(Integer id) {
         this.id = id;
@@ -87,7 +87,7 @@ public class News {
      *
      * @return the value of mini_news.nick_name
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public String getNickName() {
         return nickName;
@@ -99,7 +99,7 @@ public class News {
      *
      * @param nickName the value for mini_news.nick_name
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void setNickName(String nickName) {
         this.nickName = nickName;
@@ -111,7 +111,7 @@ public class News {
      *
      * @return the value of mini_news.header_pic
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public String getHeaderPic() {
         return headerPic;
@@ -123,7 +123,7 @@ public class News {
      *
      * @param headerPic the value for mini_news.header_pic
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void setHeaderPic(String headerPic) {
         this.headerPic = headerPic;
@@ -135,7 +135,7 @@ public class News {
      *
      * @return the value of mini_news.indate
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public Date getIndate() {
         return indate;
@@ -147,7 +147,7 @@ public class News {
      *
      * @param indate the value for mini_news.indate
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void setIndate(Date indate) {
         this.indate = indate;
@@ -159,7 +159,7 @@ public class News {
      *
      * @return the value of mini_news.type
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public Integer getType() {
         return type;
@@ -171,7 +171,7 @@ public class News {
      *
      * @param type the value for mini_news.type
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void setType(Integer type) {
         this.type = type;
@@ -183,7 +183,7 @@ public class News {
      *
      * @return the value of mini_news.message
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public String getMessage() {
         return message;
@@ -195,7 +195,7 @@ public class News {
      *
      * @param message the value for mini_news.message
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void setMessage(String message) {
         this.message = message;

minigame/src/com/estates/model/NewsExample.java

@@ -1,4 +1,4 @@
-package com.estates.model;
+package com.hssx.entity;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -9,7 +9,7 @@ public class NewsExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     protected String orderByClause;
 
@@ -17,7 +17,7 @@ public class NewsExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     protected boolean distinct;
 
@@ -25,7 +25,7 @@ public class NewsExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     protected List<Criteria> oredCriteria;
 
@@ -33,7 +33,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public NewsExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -43,7 +43,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -53,7 +53,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -63,7 +63,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -73,7 +73,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public boolean isDistinct() {
         return distinct;
@@ -83,7 +83,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -93,7 +93,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -103,7 +103,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -115,7 +115,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -129,7 +129,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -140,7 +140,7 @@ public class NewsExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public void clear() {
         oredCriteria.clear();
@@ -152,7 +152,7 @@ public class NewsExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -590,7 +590,7 @@ public class NewsExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table mini_news
      *
-     * @mbg.generated do_not_delete_during_merge Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated do_not_delete_during_merge Wed Sep 18 17:29:20 CST 2019
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -603,7 +603,7 @@ public class NewsExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     public static class Criterion {
         private String condition;

minigame/src/com/estates/model/User.java

@@ -1,4 +1,4 @@
-package com.estates.model;
+package com.hssx.entity;
 
 import java.util.Date;
 
@@ -8,7 +8,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_user.id
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     private Integer id;
 
@@ -17,7 +17,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_user.type
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     private Integer type;
 
@@ -26,7 +26,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_user.voucher_id
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     private String voucherId;
 
@@ -35,7 +35,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_user.indate
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     private Date indate;
 
@@ -44,7 +44,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_user.header_pic
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     private String headerPic;
 
@@ -53,7 +53,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column mini_user.nick_name
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     private String nickName;
 
@@ -63,7 +63,7 @@ public class User {
      *
      * @return the value of mini_user.id
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public Integer getId() {
         return id;
@@ -75,7 +75,7 @@ public class User {
      *
      * @param id the value for mini_user.id
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void setId(Integer id) {
         this.id = id;
@@ -87,7 +87,7 @@ public class User {
      *
      * @return the value of mini_user.type
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public Integer getType() {
         return type;
@@ -99,7 +99,7 @@ public class User {
      *
      * @param type the value for mini_user.type
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void setType(Integer type) {
         this.type = type;
@@ -111,7 +111,7 @@ public class User {
      *
      * @return the value of mini_user.voucher_id
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public String getVoucherId() {
         return voucherId;
@@ -123,7 +123,7 @@ public class User {
      *
      * @param voucherId the value for mini_user.voucher_id
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void setVoucherId(String voucherId) {
         this.voucherId = voucherId;
@@ -135,7 +135,7 @@ public class User {
      *
      * @return the value of mini_user.indate
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public Date getIndate() {
         return indate;
@@ -147,7 +147,7 @@ public class User {
      *
      * @param indate the value for mini_user.indate
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void setIndate(Date indate) {
         this.indate = indate;
@@ -159,7 +159,7 @@ public class User {
      *
      * @return the value of mini_user.header_pic
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public String getHeaderPic() {
         return headerPic;
@@ -171,7 +171,7 @@ public class User {
      *
      * @param headerPic the value for mini_user.header_pic
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void setHeaderPic(String headerPic) {
         this.headerPic = headerPic;
@@ -183,7 +183,7 @@ public class User {
      *
      * @return the value of mini_user.nick_name
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public String getNickName() {
         return nickName;
@@ -195,7 +195,7 @@ public class User {
      *
      * @param nickName the value for mini_user.nick_name
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void setNickName(String nickName) {
         this.nickName = nickName;

minigame/src/com/estates/model/UserExample.java

@@ -1,4 +1,4 @@
-package com.estates.model;
+package com.hssx.entity;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -9,7 +9,7 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     protected String orderByClause;
 
@@ -17,7 +17,7 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     protected boolean distinct;
 
@@ -25,7 +25,7 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     protected List<Criteria> oredCriteria;
 
@@ -33,7 +33,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public UserExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -43,7 +43,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -53,7 +53,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -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 Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -73,7 +73,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public boolean isDistinct() {
         return distinct;
@@ -83,7 +83,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -93,7 +93,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -103,7 +103,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -115,7 +115,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -129,7 +129,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -140,7 +140,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public void clear() {
         oredCriteria.clear();
@@ -152,7 +152,7 @@ public class UserExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -590,7 +590,7 @@ public class UserExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table mini_user
      *
-     * @mbg.generated do_not_delete_during_merge Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated do_not_delete_during_merge Wed Sep 18 17:26:25 CST 2019
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -603,7 +603,7 @@ public class UserExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     public static class Criterion {
         private String condition;

minigame/src/com/estates/entity/vo/NewsVO.java

@@ -1,6 +1,6 @@
-package com.estates.entity.vo;
+package com.hssx.entity.vo;
 
-import com.estates.model.News;
+import com.hssx.entity.News;
 
 public class NewsVO extends News{
 	

minigame/src/com/estates/mapper/NewsMapper.java

@@ -1,7 +1,7 @@
-package com.estates.mapper;
+package com.hssx.mapper;
 
-import com.estates.model.News;
-import com.estates.model.NewsExample;
+import com.hssx.entity.News;
+import com.hssx.entity.NewsExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,7 +10,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     long countByExample(NewsExample example);
 
@@ -18,7 +18,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     int deleteByExample(NewsExample example);
 
@@ -26,7 +26,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     int deleteByPrimaryKey(Integer id);
 
@@ -34,7 +34,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     int insert(News record);
 
@@ -42,7 +42,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     int insertSelective(News record);
 
@@ -50,7 +50,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     List<News> selectByExample(NewsExample example);
 
@@ -58,7 +58,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     News selectByPrimaryKey(Integer id);
 
@@ -66,7 +66,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     int updateByExampleSelective(@Param("record") News record, @Param("example") NewsExample example);
 
@@ -74,7 +74,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     int updateByExample(@Param("record") News record, @Param("example") NewsExample example);
 
@@ -82,7 +82,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     int updateByPrimaryKeySelective(News record);
 
@@ -90,7 +90,7 @@ public interface NewsMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_news
      *
-     * @mbg.generated Wed Sep 18 15:21:50 CST 2019
+     * @mbg.generated Wed Sep 18 17:29:20 CST 2019
      */
     int updateByPrimaryKey(News record);
 }

minigame/src/com/estates/mapper/NewsMapper.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.estates.mapper.NewsMapper">
-  <resultMap id="BaseResultMap" type="com.estates.model.News">
+<mapper namespace="com.hssx.mapper.NewsMapper">
+  <resultMap id="BaseResultMap" type="com.hssx.entity.News">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="nick_name" jdbcType="VARCHAR" property="nickName" />
@@ -18,7 +18,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -52,7 +52,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -86,15 +86,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     id, nick_name, header_pic, indate, type, message
   </sql>
-  <select id="selectByExample" parameterType="com.estates.model.NewsExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.hssx.entity.NewsExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     select
     <if test="distinct">
@@ -113,7 +113,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -124,27 +124,27 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     delete from mini_news
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.estates.model.NewsExample">
+  <delete id="deleteByExample" parameterType="com.hssx.entity.NewsExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     delete from mini_news
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.estates.model.News">
+  <insert id="insert" parameterType="com.hssx.entity.News">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -154,11 +154,11 @@
     values (#{nickName,jdbcType=VARCHAR}, #{headerPic,jdbcType=VARCHAR}, #{indate,jdbcType=TIMESTAMP}, 
       #{type,jdbcType=INTEGER}, #{message,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.estates.model.News">
+  <insert id="insertSelective" parameterType="com.hssx.entity.News">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -199,11 +199,11 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.estates.model.NewsExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.hssx.entity.NewsExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     select count(*) from mini_news
     <if test="_parameter != null">
@@ -214,7 +214,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     update mini_news
     <set>
@@ -245,7 +245,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     update mini_news
     set id = #{record.id,jdbcType=INTEGER},
@@ -258,11 +258,11 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.estates.model.News">
+  <update id="updateByPrimaryKeySelective" parameterType="com.hssx.entity.News">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     update mini_news
     <set>
@@ -284,11 +284,11 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.estates.model.News">
+  <update id="updateByPrimaryKey" parameterType="com.hssx.entity.News">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:21:50 CST 2019.
+      This element was generated on Wed Sep 18 17:29:20 CST 2019.
     -->
     update mini_news
     set nick_name = #{nickName,jdbcType=VARCHAR},

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

@@ -1,7 +1,7 @@
-package com.estates.mapper;
+package com.hssx.mapper;
 
-import com.estates.model.User;
-import com.estates.model.UserExample;
+import com.hssx.entity.User;
+import com.hssx.entity.UserExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,7 +10,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     long countByExample(UserExample example);
 
@@ -18,7 +18,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     int deleteByExample(UserExample example);
 
@@ -26,7 +26,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     int deleteByPrimaryKey(Integer id);
 
@@ -34,7 +34,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     int insert(User record);
 
@@ -42,7 +42,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     int insertSelective(User record);
 
@@ -50,7 +50,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     List<User> selectByExample(UserExample example);
 
@@ -58,7 +58,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     User selectByPrimaryKey(Integer id);
 
@@ -66,7 +66,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
 
@@ -74,7 +74,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
@@ -82,7 +82,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     int updateByPrimaryKeySelective(User record);
 
@@ -90,7 +90,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table mini_user
      *
-     * @mbg.generated Wed Sep 18 15:23:03 CST 2019
+     * @mbg.generated Wed Sep 18 17:26:25 CST 2019
      */
     int updateByPrimaryKey(User record);
 }

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.estates.mapper.UserMapper">
-  <resultMap id="BaseResultMap" type="com.estates.model.User">
+<mapper namespace="com.hssx.mapper.UserMapper">
+  <resultMap id="BaseResultMap" type="com.hssx.entity.User">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="type" jdbcType="INTEGER" property="type" />
@@ -18,7 +18,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -52,7 +52,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -86,15 +86,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     id, type, voucher_id, indate, header_pic, nick_name
   </sql>
-  <select id="selectByExample" parameterType="com.estates.model.UserExample" resultMap="BaseResultMap">
+  <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 Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     select
     <if test="distinct">
@@ -113,7 +113,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -124,27 +124,27 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     delete from mini_user
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.estates.model.UserExample">
+  <delete id="deleteByExample" parameterType="com.hssx.entity.UserExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     delete from mini_user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.estates.model.User">
+  <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 Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -154,11 +154,11 @@
     values (#{type,jdbcType=INTEGER}, #{voucherId,jdbcType=VARCHAR}, #{indate,jdbcType=TIMESTAMP}, 
       #{headerPic,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.estates.model.User">
+  <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 Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -199,11 +199,11 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.estates.model.UserExample" resultType="java.lang.Long">
+  <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 Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     select count(*) from mini_user
     <if test="_parameter != null">
@@ -214,7 +214,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     update mini_user
     <set>
@@ -245,7 +245,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     update mini_user
     set id = #{record.id,jdbcType=INTEGER},
@@ -258,11 +258,11 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.estates.model.User">
+  <update id="updateByPrimaryKeySelective" parameterType="com.hssx.entity.User">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     update mini_user
     <set>
@@ -284,11 +284,11 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.estates.model.User">
+  <update id="updateByPrimaryKey" parameterType="com.hssx.entity.User">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Sep 18 15:23:03 CST 2019.
+      This element was generated on Wed Sep 18 17:26:25 CST 2019.
     -->
     update mini_user
     set type = #{type,jdbcType=INTEGER},

minigame/src/com/estates/service/NewsService.java

@@ -1,4 +1,4 @@
-package com.estates.service;
+package com.hssx.service;
 
 
 import java.io.IOException;
@@ -6,8 +6,8 @@ import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
-import com.estates.entity.vo.NewsVO;
-import com.hhsx.utils.HttpRespMsg;
+import com.hssx.entity.vo.NewsVO;
+import com.hssx.utils.HttpRespMsg;
 
 /**
  * <p>

minigame/src/com/estates/service/UserService.java

@@ -1,6 +1,5 @@
-package com.estates.service;
+package com.hssx.service;
 
-import com.estates.model.User;
 
 /**
  * <p>

minigame/src/com/estates/service/impl/NewsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.estates.service.impl;
+package com.hssx.service.impl;
 
 import java.io.IOException;
 import java.security.KeyManagementException;
@@ -12,16 +12,16 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.estates.entity.vo.NewsVO;
-import com.estates.mapper.NewsMapper;
-import com.estates.model.News;
-import com.estates.service.NewsService;
-import com.hhsx.constant.Constant;
-import com.hhsx.utils.AccessToken;
-import com.hhsx.utils.HttpKit;
-import com.hhsx.utils.HttpRespMsg;
-import com.hhsx.utils.WechatAndMicroblogUtil;
-import com.hhsx.utils.WechatUserNews;
+import com.hssx.constant.Constant;
+import com.hssx.entity.News;
+import com.hssx.entity.vo.NewsVO;
+import com.hssx.mapper.NewsMapper;
+import com.hssx.service.NewsService;
+import com.hssx.utils.AccessToken;
+import com.hssx.utils.HttpKit;
+import com.hssx.utils.HttpRespMsg;
+import com.hssx.utils.WechatAndMicroblogUtil;
+import com.hssx.utils.WechatUserNews;
 
 /**
  * <p>
@@ -31,7 +31,7 @@ import com.hhsx.utils.WechatUserNews;
  * @author 吴涛涛
  * @since 2019-09-17
  */
-@Service
+@Service("NewsService")
 public class NewsServiceImpl  implements NewsService {
 
     @Resource

minigame/src/com/hhsx/minigame/service/impl/UserServiceImpl.java

@@ -1,8 +1,8 @@
-package com.hhsx.minigame.service.impl;
+package com.hssx.service.impl;
 
 import org.springframework.stereotype.Service;
 
-import com.estates.service.UserService;
+import com.hssx.service.UserService;
 
 /**
  * <p>
@@ -12,7 +12,7 @@ import com.estates.service.UserService;
  * @author 吴涛涛
  * @since 2019-09-18
  */
-@Service
+@Service("UserService")
 public class UserServiceImpl  implements UserService {
 
 }

minigame/src/com/hhsx/utils/AccessToken.java

@@ -1,8 +1,8 @@
-package com.hhsx.utils;
+package com.hssx.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.hhsx.constant.Constant;
+import com.hssx.constant.Constant;
 
 import java.io.IOException;
 import java.security.KeyManagementException;

minigame/src/com/hhsx/utils/HttpKit.java

@@ -1,4 +1,4 @@
-package com.hhsx.utils;
+package com.hssx.utils;
 
 
 import javax.net.ssl.*;

minigame/src/com/hhsx/utils/HttpRespMsg.java

@@ -1,4 +1,4 @@
-package com.hhsx.utils;
+package com.hssx.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonInclude;

minigame/src/com/hhsx/utils/MicroblogUsersNews.java

@@ -1,4 +1,4 @@
-package com.hhsx.utils;
+package com.hssx.utils;
 
 
 import java.util.List;

minigame/src/com/hhsx/utils/WechatAndMicroblogUtil.java

@@ -1,4 +1,4 @@
-package com.hhsx.utils;
+package com.hssx.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

minigame/src/com/hhsx/utils/WechatUserNews.java

@@ -1,4 +1,4 @@
-package com.hhsx.utils;
+package com.hssx.utils;
 
 
 import java.util.List;

minigame/src/context-dispatcher.xml

@@ -15,11 +15,12 @@
 
 	<!-- 使用注解的包，包括子集 -->
 	<context:component-scan
-		base-package="com.estates" />
+		base-package="com.hssx" />
 	<!-- 通过注解，把URL映射到Controller上，该标签默认注册DefaultAnnotationHandlerMapping和AnnotationMethodHandlerAdapter -->
 	<!-- <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" 
 		/> -->
 	<mvc:annotation-driven />
+	
 	<!-- 视图解析器 -->
 	<bean id="viewResolver"
 		class="org.springframework.web.servlet.view.InternalResourceViewResolver">