git-svn-id: https://192.168.57.71/svn/jsgkj@1871 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/index/indexmain.jsp

@@ -129,13 +129,22 @@
 									</tr> --%>
 									
 					</table>
+					<br>
+					<br>
 						<!-- 列表 -->
 						
 					<!-- 下载用户操作手册：
 						市级：经营人，行政人员
 						省级：行政人员 -->
 					<div style="margin-bottom:0px;height: 35px;">
-						<a href='${app }/index/downloadUserOperationFile?userId=0'>操作手册下载</a>
+						<table>
+   								<tr>
+   									<th><span style="color:red;">操作指南(点击下载)：</span></th>
+   									<td>
+   										<a href='${app }/index/downloadUserOperationFile?userId=0'><B>系统操作手册下载</B></a>
+   									</td>
+   								</tr>
+   						</table>
 				     </div>
 						
 				</div>
@@ -192,18 +201,36 @@
 			
 			<!-- 图表 -->
 			<div id="gridData" align="center" style="display: none;">
-				<div>
+				<div style="margin-top:1%;">
 					<c:choose>
    						<c:when test="${isJyr}">  
-					       <a href='${app }/index/downloadUserOperationFile?userId=2'>操作手册下载</a>
+   							<table style="float:left;margin-left:5%;">
+   								<tr>
+   									<th><span style="color:red;">操作指南(点击下载)：</span></th>
+   									<td>
+   										<a href='${app }/index/downloadUserOperationFile?userId=2'><B>经营人系统操作手册下载</B></a>
+   									</td>
+   								</tr>
+   							</table>
 					    </c:when>
 					    <c:otherwise> 
-					    	<a href='${app }/index/downloadUserOperationFile?userId=2'>经营人操作手册下载</a>
-					 	    <a href='${app }/index/downloadUserOperationFile?userId=1'>行政人员操作手册下载</a>
+					    	<table style="float:left;margin-left:5%;">
+   								<tr>
+   									<th><span style="color:red;">操作指南(点击下载)：&nbsp;&nbsp;</span></th>
+   									<td>
+   										<a href='${app }/index/downloadUserOperationFile?userId=2'><B>经营人系统操作手册下载</B></a>
+   									</td>
+   									<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+   									<td>
+   										<a href='${app }/index/downloadUserOperationFile?userId=1'><B>行政人员系统操作手册下载<B></a>
+   									</td>
+   								</tr>
+   							</table>
 					    </c:otherwise>
 					</c:choose>
-					
 				</div>
+				<br>
+				<br>
 				<table class="main_table" style="width:90%;" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="3%">序号</th>

gkjsjy/trunk/resources/spring/application.properties

@@ -1,7 +1,7 @@
 #***************************************  jdbc info  ********************************************#
 #jdbc.driver                 = oracle.jdbc.driver.OracleDriver
 jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
-jdbc.username           = gk_wx
+jdbc.username           = gk
 #jdbc.password            = gk
 #hibernate.dialect        = com.xtframe.sec.common.MyOracleDialect
 
@@ -60,8 +60,4 @@ sjyh.url=http://192.168.57.74:8090/xtdsp/task/run/
 90025=\u5357\u901a\u5185\u6cb3
 
 wsname=admin
-wspasswd=8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92
-
-shengj.xzry.czsc=G:/userOperationFile/\u6C5F\u82CF\u7701\u6E2F\u53E3\u5EFA\u8BBE\u4E0E\u7ECF\u8425\u7BA1\u7406\u4FE1\u606F\u7CFB\u7EDF\u5EFA\u8BBE(\u8F6F\u4EF6\u90E8\u5206)\u9879\u76EE\u4F7F\u7528\u624B\u518C\uFF08\u7701\u7EA7\u884C\u653F\u7BA1\u7406\u4EBA\u5458\uFF09V2.1.doc
-shij.xzry.czsc=G:/userOperationFile/\u6C5F\u82CF\u7701\u6E2F\u53E3\u5EFA\u8BBE\u4E0E\u7ECF\u8425\u7BA1\u7406\u4FE1\u606F\u7CFB\u7EDF\u5EFA\u8BBE(\u8F6F\u4EF6\u90E8\u5206)\u9879\u76EE\u4F7F\u7528\u624B\u518C\uFF08\u5E02\u7EA7\u884C\u653F\u7BA1\u7406\u4EBA\u5458\uFF09V2.1.doc
-shij.jyr.czsc=G:/userOperationFile/\u6C5F\u82CF\u7701\u6E2F\u53E3\u5EFA\u8BBE\u4E0E\u7ECF\u8425\u7BA1\u7406\u4FE1\u606F\u7CFB\u7EDF\u5EFA\u8BBE(\u8F6F\u4EF6\u90E8\u5206)\u9879\u76EE\u4F7F\u7528\u624B\u518C\uFF08\u7ECF\u8425\u4EBA\uFF09V2.1.doc
+wspasswd=8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92

gkjsjy/trunk/src/com/xt/jygl/common/GlobalData.java

@@ -46,16 +46,6 @@ public class GlobalData {
 	public static String WEIXIN_PORT = "";
 	public static String SECRET = "SPW4uWGVp7TvscIiNxnMzSilJXRe8yvftS1FCji1aDUDL-hdjMs5KopiVPqnQqLs";
 	public static String SJYH_URL = "";
-	
-	/*下载用户操作手册：
-		*市级： 经营人    SHIJ_JYR_CZSC
-			   行政人员 SHIJ_XZRY_CZSC
-		*省级：行政人员 SHENGJ_XZRY_CZSC
-	*/
-	public static String SHENGJ_XZRY_CZSC = "";
-	public static String SHIJ_XZRY_CZSC = "";
-	public static String SHIJ_JYR_CZSC = "";
-	
 
 	public static void init(ServletContext sc) {
 		String ftp_xk_user = sc.getInitParameter("ftp_xk_user");
@@ -188,20 +178,6 @@ public class GlobalData {
 		if (StringUtils.hasLength(prop)) {
 			SJYH_URL = prop;
 		}
-		prop = String.valueOf(p.get("shengj.xzry.czsc"));
-		if (StringUtils.hasLength(prop)) {
-			SHENGJ_XZRY_CZSC = prop;
-		}
-		
-		prop = String.valueOf(p.get("shij.xzry.czsc"));
-		if (StringUtils.hasLength(prop)) {
-			SHIJ_XZRY_CZSC = prop;
-		}
-		
-		prop = String.valueOf(p.get("shij.jyr.czsc"));
-		if (StringUtils.hasLength(prop)) {
-			SHIJ_JYR_CZSC = prop;
-		}
 		
 	}
 }

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/IndexCtl.java

@@ -290,16 +290,17 @@ public class IndexCtl extends BaseWebCtl {
 	public WebJsonResult downloadUserOperationFile(String userId, HttpServletRequest request,HttpServletResponse response) {
 		// path是指欲下载的文件的路径。
 		String path = "";
-		String fileNameTemp = "";
+		String fileName = "";
 		if(userId.equals("0")){
-			path = GlobalData.SHENGJ_XZRY_CZSC;
+			path = GlobalData.UPLOAD_FILE_PATH + "\\userOperationFile\\江苏省港口建设与经营管理信息系统建设(软件部分)项目使用手册（省级行政管理人员）V2.1.doc";
+			fileName = "省厅行政人员系统操作手册.doc";
 		}else if(userId.equals("1")){
-			path = GlobalData.SHIJ_XZRY_CZSC;
+			path = GlobalData.UPLOAD_FILE_PATH + "\\userOperationFile\\江苏省港口建设与经营管理信息系统建设(软件部分)项目使用手册（市级行政管理人员）V2.1.doc";
+			fileName = "市级行政人员系统操作手册.doc";
 		}else{
-			path = GlobalData.SHIJ_JYR_CZSC;
+			path = GlobalData.UPLOAD_FILE_PATH + "\\userOperationFile\\江苏省港口建设与经营管理信息系统建设(软件部分)项目使用手册（经营人）V2.1.doc";
+			fileName = "市级经营人系统操作手册.doc";
 		}
-		//从文件路径中获取文件名称
-		fileNameTemp = path.substring(path.lastIndexOf("/")+1, path.length());
 		try {
 				// 以流的形式下载文件。
 				InputStream fis = new BufferedInputStream(new FileInputStream(path));
@@ -309,7 +310,7 @@ public class IndexCtl extends BaseWebCtl {
 				// 设置response的Header
 				response.setCharacterEncoding("utf-8");
 				response.setContentType("multipart/form-data");
-				String fileName = URLEncoder.encode(fileNameTemp, "UTF-8");
+				fileName = URLEncoder.encode(fileName, "UTF-8");
 				response.setHeader("Content-Disposition", "attachment;fileName=" + fileName);
 				response.getOutputStream().write(buffer);
 		} catch (IOException e) {