Merge branch 'master' of http://imingsoft.cn:3000/mingsoft/ms-mcms

src/main/java/net/mingsoft/cms/action/CategoryAction.java

@@ -249,10 +249,10 @@ public class CategoryAction extends BaseAction{
 		 CategoryEntity categoryEntity=new CategoryEntity();
 		 categoryEntity.setCategoryPinyin(pingYin);
 		 categoryEntity.setAppId(BasicUtil.getAppId());
-		 Object categoryBizEntity = categoryBiz.getEntity(categoryEntity);
+		 CategoryEntity categoryBizEntity = (CategoryEntity)categoryBiz.getEntity(categoryEntity);
 		 category.setCategoryPinyin(pingYin);
 		 //如果存在此拼音栏目则拼接上id
-		 if(categoryBizEntity!=null){
+		 if(categoryBizEntity!=null&&!categoryBizEntity.getId().equals(category.getId())){
 			 category.setCategoryPinyin(pingYin+category.getId());
 		 }
 		//判断是否选择子级为所属栏目

src/main/java/net/mingsoft/cms/action/web/MCmsAction.java

@@ -193,13 +193,13 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
 		//参数文章编号
 		ContentEntity article = (ContentEntity) contentBiz.getEntity(BasicUtil.getInt(ParserUtil.ID));
 		if(ObjectUtil.isNull(article)){
-			this.outJson(resp, null,false,getResString("err.empty", this.getResString("id")));
+			this.outJson(resp,false,getResString("err.empty", this.getResString("id")));
 			return;
 		}
 		if(StringUtils.isNotBlank(order)){
 			//防注入
 			if(!order.toLowerCase().equals("asc")&&!order.toLowerCase().equals("desc")){
-				this.outJson(resp, null,false,getResString("err.error", this.getResString("order")));
+				this.outJson(resp,false,getResString("err.error", this.getResString("order")));
 				return;
 			}
 		}

src/main/java/net/mingsoft/cms/dao/IContentDao.xml

@@ -207,7 +207,6 @@
 			<if test="updateBy &gt; 0"> and ct.update_by=#{updateBy} </if>
 			<if test="updateDate != null"> and update_date=#{updateDate} </if>
 			<if test="del != null"> and ct.del=#{del} </if>
-			<include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include>
 		</where>
 		order by id desc
 	</select>

src/main/resources/application-dev.yml

 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.8:3316/mcms-5.1-3000?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
-    username: mcms
-    password: mcms
+    url: jdbc:mysql://localhost:3306/wx-5.1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: root
     filters: wall,mergeStat
     type: com.alibaba.druid.pool.DruidDataSource

src/main/resources/application.yml

 server:
   port: 8080
-  servlet.context-path: /ms-mcms
   servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱
 
 logging: