Kezdőlap Felfedezés Súgó
Regisztráció Bejelentkezés
limeng
/
cetdz
Figyelés 1
Kedvenc 0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

修复栏目新增主键会出现重复的BUG;
修复了后台栏目新增后列表页不刷新的BUG;
优化了部分冗余代码和样式缩进;

limeng 2 éve
szülő
c405be5026
commit
ee816e0f79
12 módosított fájl, 1417 hozzáadás és 1779 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 0 7
      WebRoot/WEB-INF/hbm/YHB.hbm.xml
  2. 0 10
      WebRoot/main/nw-index.jsp
  3. 15 11
      WebRoot/manage/columns/columnsAdd.jsp
  4. 9 0
      WebRoot/manage/columns/columnsList.jsp
  5. 7 6
      WebRoot/manage/news/newsList.jsp
  6. 1 12
      src/com/ccgj/database/beans/YHB.java
  7. 715 873
      src/com/ccgj/database/manager/LMBManager.java
  8. 2 4
      src/com/ccgj/database/manager/YHBManager.java
  9. 0 25
      src/com/ccgj/platform/admin/WZBAction.java
  10. 5 14
      src/com/ccgj/platform/admin/YHBAction.java
  11. 652 809
      src/com/ccgj/platform/columns/LMBAction.java
  12. 11 8
      src/com/ccgj/platform/interceptor/LoginAction.java

+ 0 - 7
WebRoot/WEB-INF/hbm/YHB.hbm.xml
Fájl Megtekintése 

@@ -166,13 +166,6 @@
 
 		not-null="false"
 
 		length="64"
 
 	/>
 
-	<property
 
-		name="key"
 
-		type="java.lang.String"
 
-		column="KEY"
 
-		not-null="false"
 
-		length="128"
 
-	/>
 
 </class>
 
 </hibernate-mapping>

+ 0 - 10
WebRoot/main/nw-index.jsp
Fájl Megtekintése 

@@ -18,16 +18,6 @@
 
 	%>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 	<title>长春经济技术开发区内网</title>
 
-	<style type="text/css">
 
-		html{
 
-			-webkit-filter: grayscale(100%);
 
-			-moz-filter: grayscale(100%);
 
-			-ms-filter: grayscale(100%);
 
-			-o-filter: grayscale(100%);
 
-			filter: grayscale(100%);
 
-			filter: gray;
 
-		}
 
-	</style>
 
 </head>
 
 <body>
 
 <!--头部开始-->

+ 15 - 11
WebRoot/manage/columns/columnsAdd.jsp
Fájl Megtekintése 

@@ -140,17 +140,21 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 
 					document.columnsForm.lmlx.value = $("#lmlx").val();
 
                     // 副栏目ID
 
                     document.columnsForm.flmid.value = flmid;
 
-                    document.columnsForm.submit();
 
-                    alert("添加成功!")
 
-                    // 关闭弹出窗
 
-                    parent.$.ligerDialog.close(); 
-                    // 去除列表阴影
 
-					parent.$(".l-dialog,.l-window-mask").css("display","none");
 
-                    if(flmid != null && flmid > 1){
 
-                    	parent.window.location.href="../columns/columns!columnsList?flmid=" + flmid;
 
-                    }else{
 
-                    	parent.window.location.href="../columns/columns!columnsList?flmid=1";
 
-                    }
 
+
 
+					let form = $("#columnsForm");
 
+					$.post(form.attr("action"),form.serialize(),function (data) {
 
+						parent.window.callback();
 
+						// if(flmid != null &amp;&amp; flmid > 1){
 
+						// 	parent.window.location.href="../columns/columns!columnsList?flmid=" + flmid;
 
+						// }else{
 
+						// 	parent.window.location.href="../columns/columns!columnsList?flmid=1";
 
+						// }
 
+						// 关闭弹出窗
 
+						// parent.$.ligerDialog.close();
 
+						// 去除列表阴影
 
+						// parent.$(".l-dialog,.l-window-mask").css("display","none");
 
+
 
+					});
 
                 }
 
             });
 
             $("form").ligerForm();

+ 9 - 0
WebRoot/manage/columns/columnsList.jsp
Fájl Megtekintése 

@@ -113,6 +113,15 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 
            	document.columnsForm.searchLmmc.value = lmmc;
 
             document.columnsForm.submit();
 
         }
 
+
 
+        function callback() {
 
+            let flmid = '<%=request.getParameter("flmid") %>';
 
+            // 关闭弹出窗
 
+            $.ligerDialog.close();
 
+            // 去除列表阴影
 
+            $(".l-dialog,.l-window-mask").css("display","none");
 
+            location.href="../columns/columns!columnsList?flmid=" + flmid;
 
+        }
 
         function itemclick(item)
 
         { 
             if(item.id)

+ 7 - 6
WebRoot/manage/news/newsList.jsp
Fájl Megtekintése 

@@ -69,12 +69,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 
             //表格
 
             $("#maingrid").ligerGrid({
 
                 columns: [
 
-                { display: '标题', name: 'wzbt', align: 'left', width: '35%', minWidth: 350 },
 
-                { display: '添加时间', name: 'tjsj', align: 'center', minWidth: '20%' ,width: 200},
 
-                { display: '排序', name: 'wzpx', align: 'center', minWidth: '15%' ,width: 130},
 
-                { display: '状态', name: 'wzzt', align: 'center',width: '15%',minWidth: 130},
 
-		{ display: '点击量', name: 'fwcs', align: 'center',width: '15%',minWidth: 130}
 
-                ], dataAction: 'server', sortName: 'id', //data: datas,
 
+                    { display: '标题111', name: 'wzbt', align: 'left', width: '35%', minWidth: 350 },
 
+                    { display: '添加时间', name: 'tjsj', align: 'center', minWidth: '20%' ,width: 200},
 
+                    { display: '排序', name: 'wzpx', align: 'center', minWidth: '15%' ,width: 130},
 
+                    { display: '状态', name: 'wzzt', align: 'center',width: '15%',minWidth: 130},
 
+                    { display: '点击量', name: 'fwcs', align: 'center',width: '15%',minWidth: 130}
 
+                ],
 
+                dataAction: 'server', sortName: 'id', //data: datas,
 
                 width: '100%', height: '100%', pageSize: 30,rownumbers:true,
 
                 url:'wzb/wzb!listpage?lmid=<%=lmid%>',usePager:true,async:false,
 
                 checkbox : true,

+ 1 - 12
src/com/ccgj/database/beans/YHB.java
Fájl Megtekintése 

@@ -31,11 +31,10 @@ public class YHB
 
   private String by1;
 
   private String by2;
 
   private String by3;
 
-  private String key;
 
 
   public YHB() {}
 
 
-  public YHB(Long id, String yhmc, String yhzh, String yhmm, String passd, int yhzt, int yhsx, String sjid, String zdmc, String zdbs, int zdpx, String zdmb, String yhqx, String yhsm, String tjsj, String tjyh, String bgsj, int dlcs, String by1, String by2, String by3, String key)
 
+  public YHB(Long id, String yhmc, String yhzh, String yhmm, String passd, int yhzt, int yhsx, String sjid, String zdmc, String zdbs, int zdpx, String zdmb, String yhqx, String yhsm, String tjsj, String tjyh, String bgsj, int dlcs, String by1, String by2, String by3)
 
   {
 
     this.id = id;
 
     this.yhmc = yhmc;
 
@@ -58,7 +57,6 @@ public class YHB
 
     this.by1 = by1;
 
     this.by2 = by2;
 
     this.by3 = by3;
 
-    this.key = key;
 
   }
 
 
   public Long getId()
 
@@ -281,15 +279,6 @@ public class YHB
 
     this.by3 = by3;
 
   }
 
 
-  public String getKey() {
 
-    return key;
 
-  }
 
-
 
-  public void setKey(String key) {
 
-    this.key = key;
 
-  }
 
-
 
-
 
   public String toString()
 
   {
 
     return

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 715 - 873
src/com/ccgj/database/manager/LMBManager.java


+ 2 - 4
src/com/ccgj/database/manager/YHBManager.java
Fájl Megtekintése 

@@ -336,7 +336,7 @@ public class YHBManager
 
     int result = 0;
 
     try
 
     {
 
-      String sql = "insert into W_YHB(id,yhmc,yhzh,yhmm,passd,yhzt,yhsx,sjid,zdmc,zdbs,zdpx,yhqx,yhsm,tjsj,tjyh,bgsj,by1,by2,by3,key) values(CETDZ.SEQ_W_YHB.nextval,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
 
+      String sql = "insert into W_YHB(id,yhmc,yhzh,yhmm,passd,yhzt,yhsx,sjid,zdmc,zdbs,zdpx,yhqx,yhsm,tjsj,tjyh,bgsj,by1,by2,by3) values(CETDZ.SEQ_W_YHB.nextval,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
 
 
 
       this.ps = this.dbc.prepareStatement(sql);
 
@@ -361,7 +361,6 @@ public class YHBManager
 
       this.ps.setString(16, yhb.getBy1());
 
       this.ps.setString(17, yhb.getBy2());
 
       this.ps.setString(18, yhb.getBy3());
 
-      this.ps.setString(19, yhb.getKey());
 
 
       result = this.ps.executeUpdate();
 
     }
 
@@ -381,7 +380,7 @@ public class YHBManager
 
     int recode = 0;
 
     try
 
     {
 
-      String sql = "update W_YHB set yhmc=?,yhzh=?,yhmm=?,passd=?,yhzt=?,yhsx=?,sjid=?,zdmc=?,zdbs=?,zdpx=?,yhsm=?,tjyh=?,bgsj=?,by1=?,by2=?,by3=?,key=? where id = ? ";
 
+      String sql = "update W_YHB set yhmc=?,yhzh=?,yhmm=?,passd=?,yhzt=?,yhsx=?,sjid=?,zdmc=?,zdbs=?,zdpx=?,yhsm=?,tjyh=?,bgsj=?,by1=?,by2=?,by3=? where id = ? ";
 
 
 
       this.ps = this.dbc.prepareStatement(sql);
 
@@ -402,7 +401,6 @@ public class YHBManager
 
       this.ps.setString(14, yhb.getBy1());
 
       this.ps.setString(15, yhb.getBy2());
 
       this.ps.setString(16, yhb.getBy3());
 
-      this.ps.setString(17, yhb.getKey());
 
       this.ps.setLong(18, yhb.getId().longValue());
 
 
       recode = this.ps.executeUpdate();

+ 0 - 25
src/com/ccgj/platform/admin/WZBAction.java
Fájl Megtekintése 

@@ -483,7 +483,6 @@ public class WZBAction
 
 
   public String list()
 
   {
 
-    System.out.println(this.page + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
 
     try
 
     {
 
       this.lmb = ((LMB)this.lmbIf.getLMBService().getLmbManager().searchByID(Long.valueOf(this.lmid)));
 
@@ -528,35 +527,11 @@ public class WZBAction
 
     try
 
     {
 
       this.lmb = ((LMB)this.lmbIf.getLMBService().getLmbManager().searchByID(Long.valueOf(this.lmid)));
 
-
 
       this.news = this.wzbIf.getWZBService().getWzbManager().getAllWzbForPage(this.lmid, new String[] { "1", "2", "3", "4" }, (Integer.parseInt(this.page) - 1) * 30, 30);
 
       int count = this.wzbIf.getWZBService().getWzbManager().getAllWzbCount(this.lmid, new String[] { "1", "2", "3", "4" });
 
-
 
-      List<WZB> list = new ArrayList<WZB>();
 
-      if ((this.news != null) && (this.news.size() > 0)) {
 
-        for (WZB wzb : this.news)
 
-        {
 
-          wzb.setWznr("");
 
-          if ("1".equals(wzb.getWzzt())) {
 
-            wzb.setWzzt("已发布");
 
-          } else if ("2".equals(wzb.getWzzt())) {
 
-            wzb.setWzzt("待发布");
 
-          } else if ("3".equals(wzb.getWzzt())) {
 
-            wzb.setWzzt("退回状态");
 
-          } else if ("4".equals(wzb.getWzzt())) {
 
-            wzb.setWzzt("草稿");
 
-          } else if ("5".equals(wzb.getWzzt())) {
 
-            wzb.setWzzt("删除状态");
 
-          } else if ("11".equals(wzb.getWzzt())) {
 
-            wzb.setWzzt("已上报");
 
-          }
 
-          list.add(wzb);
 
-        }
 
-      }
 
       HttpServletResponse response = ServletActionContext.getResponse();
 
       response.setContentType("text/html;charset=UTF-8");
 
       PrintWriter out = response.getWriter();
 
-      System.out.println(this.news.size() + "~~~~~~~~~~~~~~" + count);
 
       out.print(JsonResult.listByLigerUI(this.news, Integer.valueOf(count)));
 
     }
 
     catch (Exception e)

+ 5 - 14
src/com/ccgj/platform/admin/YHBAction.java
Fájl Megtekintése 

@@ -433,7 +433,7 @@ public class YHBAction
 
           if ((this.newPwd != null) && (this.newPwds != null) && (this.newPwd.equals(this.newPwds)))
 
           {
 
             if ((this.oldPass != null) && (this.oldPass.length() > 0)) {
 
-              String decodePwd = Sm4Util.decodeText(yhbBean.getYhmm(),yhbBean.getKey());
 
+              String decodePwd = StringCode.decrypt(yhbBean.getYhmm());
 
               if (decodePwd.equals(this.oldPass))
 
               {
 
                 /**确认旧密码正确后，判断新密码强度**/
 
@@ -441,9 +441,7 @@ public class YHBAction
 
                   setJsondata(JsonResult.ajax(Boolean.valueOf(true), "4"));
 
                   return "data";
 
                 }
 
-                String key = Sm4Util.generateSm4Key();
 
-                yhbBean.setYhmm(Sm4Util.encodeText(this.newPwd,key));
 
-                yhbBean.setKey(key);
 
+                yhbBean.setYhmm(StringCode.encrypt(this.newPwd));
 
                 yhbBean.setTjsj(DateFormat.shortDate(date));
 
                 yhbIF.getYHBService().updateYHB(yhbBean);
 
                 setJsondata(JsonResult.ajax(Boolean.valueOf(true), "3"));
 
@@ -590,7 +588,6 @@ public class YHBAction
 
     String returnType = null;
 
     try
 
     {
 
-      String key = Sm4Util.generateSm4Key();
 
       Date data = new Date();
 
       YHBIF yhbIF = DatabaseFactory.getYHBIF();
 
       ZQBIF zqbIF = DatabaseFactory.getZQBIF();
 
@@ -600,8 +597,7 @@ public class YHBAction
 
       bean.setYhmc(this.yhmc);
 
       bean.setYhzh(this.yhzh);
 
       bean.setYhzt(this.yhzt);
 
-      bean.setYhmm(Sm4Util.encodeText("123456",key));
 
-      bean.setKey(key);
 
+      bean.setYhmm(StringCode.encrypt("123456"));
 
       if ((this.type != null) && (this.type.length() > 0))
 
       {
 
         if (this.type.equals("wzgl")) {
 
@@ -661,10 +657,8 @@ public class YHBAction
 
         if (searchbean != null)
 
         {
 
           String mm = searchbean.getYhmm();
 
-          String key = searchbean.getKey();
 
-          String pwd = Sm4Util.decodeText(mm,key);
 
+          String pwd = StringCode.decrypt(mm);
 
           searchbean.setYhmm(pwd);
 
-//          searchbean.setYhmm(StringCode.decrypt(searchbean.getYhmm()));
 
           setYhb(searchbean);
 
           getRequest().setAttribute("yhb", searchbean);
 
 
@@ -707,7 +701,6 @@ public class YHBAction
 
     {
 
       if (this.id != null)
 
       {
 
-        String key = Sm4Util.generateSm4Key();
 
         YHBIF yhbIF = DatabaseFactory.getYHBIF();
 
         ZQBIF tZqbIF = DatabaseFactory.getZQBIF();
 
         YHB searchbean = yhbIF.getYHBService().searchYHBByID(this.id);
 
@@ -715,11 +708,9 @@ public class YHBAction
 
         {
 
           searchbean.setYhmc(this.yhmc);
 
           searchbean.setYhzh(this.yhzh);
 
-          searchbean.setYhmm(Sm4Util.encodeText(this.yhmm,key));
 
-//          searchbean.setYhmm(StringCode.encrypt(this.yhmm));
 
+          searchbean.setYhmm(StringCode.encrypt(this.yhmm));
 
           searchbean.setYhzt(this.yhzt);
 
           searchbean.setYhsm(this.yhsm);
 
-          searchbean.setKey(key);
 
           searchbean.setTjsj(DateFormat.shortDate(data));
 
           if (this.zqbId != null)
 
           {

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 652 - 809
src/com/ccgj/platform/columns/LMBAction.java


+ 11 - 8
src/com/ccgj/platform/interceptor/LoginAction.java
Fájl Megtekintése 

@@ -9,6 +9,7 @@ import com.ccgj.platform.common.CommonAction;
 
 import com.ccgj.platform.util.GlobalDefine;
 
 import com.ccgj.platform.util.JsonResult;
 
 import com.ccgj.platform.util.Sm4Util;
 
+import com.ccgj.platform.util.StringCode;
 
 import com.opensymphony.xwork2.ActionContext;
 
 import net.sf.ehcache.Cache;
 
 import net.sf.ehcache.CacheManager;
 
@@ -124,9 +125,10 @@ public class LoginAction
 
       if ((yhbList != null) && (yhbList.size() > 0))
 
       {
 
         YHB bean = yhbList.get(0);
 
-        /** 改为SM4加密 **/
 
-        String decodePwd = Sm4Util.decodeText(bean.getYhmm(),bean.getKey());
 
-        if ((this.loginPwd != null) && (this.loginPwd.equals(decodePwd)))
 
+        // 加密后的MD5
 
+        //String pwd = md5.getMD5ofStr(loginPwd);
 
+        String pwd = StringCode.encrypt(loginPwd);
 
+        if ((this.loginPwd != null) && (pwd.equals(bean.getYhmm())))
 
         {
 
           HttpServletRequest request = getRequest();
 
           String ip_address = request.getRemoteAddr();
 
@@ -134,12 +136,12 @@ public class LoginAction
 
           ActionContext.getContext().getSession().put("ip_address", ip_address);
 
           /**添加日志 用户登入**/
 
           yhrzbManager.setUserLogin(bean);
 
-          if ((yhbList.get(0)).getYhsx() == 1)
 
+          if (bean.getYhsx() == 1)
 
           {
 
             setJsondata(JsonResult.ajax(Boolean.valueOf(true), "1"));
 
             return "data";
 
           }
 
-          if ((yhbList.get(0)).getYhsx() == 2)
 
+          if (bean.getYhsx() == 2)
 
           {
 
             setJsondata(JsonResult.ajax(Boolean.valueOf(true), "2"));
 
             return "data";
 
@@ -188,9 +190,10 @@ public class LoginAction
 
       if ((yhbList != null) && (yhbList.size() > 0))
 
       {
 
         YHB bean = (YHB)yhbList.get(0);
 
-        /** 改为SM4加密 **/
 
-        String decodePwd = Sm4Util.decodeText(bean.getYhmm(),bean.getKey());
 
-        if ((this.loginPwd != null) && (this.loginPwd.equals(decodePwd)))
 
+        // 加密后的MD5
 
+        //String pwd = md5.getMD5ofStr(loginPwd);
 
+        String pwd = StringCode.encrypt(loginPwd);
 
+        if ((this.loginPwd != null) && (pwd.equals(bean.getYhmm())))
 
         {
 
           if (((YHB)yhbList.get(0)).getYhsx() == 1)
 
           {