4.5.6更新

src/main/java/com/mingsoft/base/action/BaseAction.java

@@ -455,7 +455,7 @@ public abstract class BaseAction {
 	 * @param list 记录集合
 	 */
 	protected void outJson(HttpServletResponse response, List list) {
-		JSONObject.toJSONString(list);
+		this.outJson(response, JSONObject.toJSONString(list));
 	}
 	
 	

src/main/java/com/mingsoft/basic/dao/IAppDao.xml

@@ -20,62 +20,15 @@
 	</resultMap>
 	<!-- 字段绑定结束 -->
 
-	<!-- 添加website信息开始 -->
-	<insert id="saveEntity" parameterType="com.mingsoft.base.entity.BaseEntity" flushCache="true">
-		insert into app
-
-		<!-- 添加表字段 -->
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="appName!= null">APP_NAME,</if>
-			<if test="appDescription!= null">APP_DESCRIPTION,</if>
-			<if test="appLogo!= null">APP_LOGO,</if>
-			<if test="appDatetime!=null">APP_DATETIME,</if>
-			<if test="appKeyword!= null">APP_KEYWORD,</if><!-- 添加关键字 -->
-			<if test="appCopyright!= null">APP_COPYRIGHT,</if><!-- 添加版权信息 -->
-			<if test="appStyle!= null">APP_STYLE,</if><!-- 添加模板风格 -->
-			<if test="appUrl!= null">APP_URL,</if><!-- 添加域名 -->
-			<if test="appManagerId &gt;0 ">APP_MANAGERID,</if><!-- 添加管理员id -->
-			<if test="appMobileStyle != null">APP_MOBILE_STYLE,</if><!-- 添加手机端模版 -->
-			<if test="appPayDate != null">APP_PAY_DATE,</if><!-- 应用续费时间 -->
-			<if test="appPay != null">APP_PAY,</if><!-- 应用费用清单 -->
-		</trim>
-
-		<!-- 注入控制层字段 -->
-		<trim prefix="values (" suffix=")" suffixOverrides=",">
-			<if test="appName !=  null">#{appName},</if>
-			<if test="appDescription != null">#{appDescription},</if>
-			<if test="appLogo != null">#{appLogo},</if>
-			<if test="appDatetime !=null">#{appDatetime},</if>
-			<if test="appKeyword != null">#{appKeyword},</if><!-- 添加内容 -->
-			<if test="appCopyright != null">#{appCopyright},</if><!-- 添加版权信息 -->
-			<if test="appStyle != null">#{appStyle},</if><!-- 添加模板风格 -->
-			<if test="appUrl != null">#{appUrl},</if><!-- 添加域名 -->
-			<if test="appManagerId &gt;0 ">#{appManagerId},</if><!-- 添加管理员id -->
-			<if test="appMobileStyle != null">#{appMobileStyle},</if>
-			<if test="appPayDate != null">#{appPayDate},</if>
-			<if test="appPay != null">#{appPay},</if>
-		</trim>
-
-	</insert>
-	<!-- 添加website信息结束 -->
-
-	<!-- 删除website开始 -->
-	<delete id="deleteEntity" parameterType="int" flushCache="true">
-		delete from app
-		where
-		APP_id = #{appId}
-	</delete>
-	<!-- 删除website结束 -->
-
 	<!-- 更新website开始 -->
-	<update id="updateEntity" parameterType="com.mingsoft.base.entity.BaseEntity" flushCache="true">
+	<update id="updateEntity" parameterType="com.mingsoft.base.entity.BaseEntity"
+		flushCache="true">
 		update app
 		<set>
 		<if test="appName != null">APP_NAME =#{appName},</if>
 		<if test="appDescription != null">APP_DESCRIPTION =#{appDescription},</if>
 		<if test="appLogo != null">APP_LOGO =#{appLogo},</if>
 		<if test="appDatetime != null">APP_DATETIME =#{appDatetime},</if>
-
 		<if test="appKeyword != null">APP_keyword =#{appKeyword},</if>
 		<if test="appCopyright != null">APP_copyright =#{appCopyright},</if>
 		<if test="appStyle != null">APP_style =#{appStyle},</if>
@@ -89,29 +42,6 @@
 	</update>
 	<!-- 更新website结束 -->
 
-	<!-- 查询所有website开始 -->
-	<select id="queryAll" resultMap="resultMap">
-		select * from app order by
-		app_id desc
-	</select>
-	<!-- 查询所有website结束 -->
-
-	<!-- 对website进行分页查询开始 -->
-	<select id="queryByPage" resultMap="resultMap">
-		<!--shiahbasic和 basic间进行连接查询 -->
-		select *
-		from app
-		order by app_id desc
-		limit ${pageNo*pageSize},#{pageSize}
-	</select>
-	<!-- 查询所有website结束 -->
-
-	<!-- 查询记录总数 开始 -->
-	<select id="queryCount" resultType="int">
-		select count(app_id) from app
-	</select>
-	<!-- 查询记录总数 结束 -->
-
 	<!-- 根据ID查询开始 -->
 	<select id="getEntity" resultMap="resultMap" parameterType="int">
 		select * from app

src/main/java/com/mingsoft/cms/parser/impl/ArticleHitParser.java

+package com.mingsoft.cms.parser.impl;
+
+import com.mingsoft.parser.IParser;
+
+/**
+ * 内容标题(单标签)
+ * 文章点击数标签
+ * {ms:field.hit/}
+ * 技术支持：景德镇铭飞科技
+ * 官网：www.ming-soft.com
+ */
+public class ArticleHitParser extends IParser {
+	
+	/**
+	 * 文章标题标签
+	 */
+	private final static String ARTICLE_HIT_FIELD="\\{ms:field.hit/\\}";
+	
+	/**
+	 * 构造标签的属性
+	 * @param htmlContent原HTML代码
+	 * @param newContent替换的内容
+	 */
+	public ArticleHitParser(String htmlContent,String newContent){
+		super.htmlCotent = htmlContent;
+		super.newCotent = newContent;
+	}
+	
+	@Override
+	public String parse() {
+		// TODO Auto-generated method stub
+		return super.replaceAll(ARTICLE_HIT_FIELD);
+	}
+
+}

src/main/java/com/mingsoft/parser/IGeneralParser.java

@@ -114,7 +114,8 @@ public abstract class IGeneralParser extends IParser {
 		htmlContent = new GlobalNameParser(htmlContent, app.getAppName()).parse();
 
 		// 替换模版链接地址标签：{ms: globalskin.url/}
-		String tmpSkinUrl = app.getAppHostUrl() +  StringUtil.removeRepeatStr(File.separator + IParserRegexConstant.REGEX_SAVE_TEMPLATE + File.separator + app.getAppId() + File.separator + app.getAppStyle(), File.separator)+File.separator;
+		String tmpSkinUrl = app.getAppHostUrl() +  File.separator + IParserRegexConstant.REGEX_SAVE_TEMPLATE + File.separator + app.getAppId() + File.separator + app.getAppStyle()+File.separator;
+		
 		// 替换网站链接地址标签:{ms:global.url/}
 		String linkUrl = app.getAppHostUrl() + File.separator + IParserRegexConstant.HTML_SAVE_PATH + File.separator + app.getAppId()+File.separator;
 		//如果论坛模板不为空，模板连接地址=原有地址+"/"+论坛模板

src/main/java/com/mingsoft/people/action/PeopleUserAction.java

@@ -127,6 +127,7 @@ public class PeopleUserAction extends BaseAction{
 	public String add(ModelMap mode,HttpServletRequest request){
 		int appId = this.getAppId(request);
 		mode.addAttribute("appId", appId);
+		mode.addAttribute("peopleUser",new PeopleUserEntity());
 		return "/manager/people/user/people_user";
 	}
 	

src/main/java/com/mingsoft/people/dao/IPeopleUserDao.xml

@@ -10,7 +10,7 @@
 	
 	<sql id="column_people_list">
 	 	PU.PU_PEOPLE_ID,PU.PU_REAL_NAME,PU.PU_ADDRESS,PU.PU_ICON,PU.PU_NICKNAME,PU.PU_SEX,PU.PU_BIRTHDAY,PU.PU_APP_ID,PU.PU_CARD,
-		P.PEOPLE_ID,P.PEOPLE_PHONE,P.PEOPLE_NAME,P.PEOPLE_PASSWORD,P.PEOPLE_DATETIME,P.PEOPLE_APP_ID,P.PEOPLE_MAIL	 		
+		P.PEOPLE_ID,P.PEOPLE_PHONE,P.PEOPLE_NAME,P.PEOPLE_PASSWORD,P.PEOPLE_DATETIME,P.PEOPLE_APP_ID,P.PEOPLE_MAIL,P.PEOPLE_PHONECHECK,P.PEOPLE_MAILLCHECK	 		
 	</sql>
 	<!-- 表字段结束 -->
 	
@@ -32,6 +32,8 @@
 		<result column="PEOPLE_DATETIME" property="peopleDateTime"/><!-- 将实体的peopleDateTime属性与表的peopleDateTime字段对接 -->
 		<result column="PEOPLE_APP_ID" property="peopleAppId"/><!-- 用户所属的应用ID -->
 		<result column="PEOPLE_MAIL" property="peopleMail"/><!-- 用户邮箱 -->	
+		<result column="PEOPLE_MAILLCHECK" property="peopleMailCheck"/><!-- 用户邮箱 -->	
+		<result column="PEOPLE_PHONECHECK" property="peoplePhoneCheck"/><!-- 用户邮箱 -->	
 	</resultMap>
 	<!-- 将实体属性与表字段对接结束 -->