`fix`

src/cas_v0.2.0.1/src/main/resources/config-lsp.properties

@@ -13,16 +13,16 @@ project.status=debug
 
 #------------------------- 访问domain配置begin -------------------------
 #本服务domain
-local.domain=http://cas.jscts.org.cn
+local.domain=http://localhost:8080/cas
 #------------------------- 访问domain配置begin -------------------------
 
 #------------------------- file config begin-------------------------
 #文件的储存地址
-file.path=/file
+file.path=./file
 #文件访问方式：默认为应用处理debug,图片服务处理distributed
 file.response.type=debug
 #图片服务访问地址,需要配置404图片
-file.distributed.domain=http://cas.jscts.org.cn/res
+file.distributed.domain=http://localhost:8080/res
 #------------------------- file config end-------------------------
 
 #------------------------- jdbc config begin-------------------------
@@ -31,7 +31,7 @@ jdbc.db.alias=postgresql
 jdbc.driverClassName=org.postgresql.Driver
 jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 jdbc.username=postgres
-jdbc.password=tw20gj150Me803
+jdbc.password=postgres
 
 #jdbc.db.alias=mysql
 #jdbc.driverClassName=com.mysql.jdbc.Driver

src/cas_v0.2.0.1/src/main/resources/log4j.properties

@@ -33,7 +33,7 @@ log4j.appender.CONSOLE.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
 #FileAppender
 log4j.appender.D=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.D.Threshold=DEBUG
-log4j.appender.D.File=/deploy/logs/cas/debug.log
+log4j.appender.D.File=./deploy/logs/cas/debug.log
 log4j.appender.D.Append=true
 log4j.appender.D.layout=org.apache.log4j.PatternLayout
 log4j.appender.R.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n

src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/cas_personnel.jsp

@@ -152,7 +152,7 @@
 						<div class="line" style="height: inherit">
 							<div class="left">荣誉图片：</div>
 							<div class="right webuploader honor_files">
-								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="5" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
+								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="500" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 								<span style="color:red;line-height: 43px">最多5张，单张大小2M以内</span>
 							</div>
 							<input type-value="1125,1126" value="1123,1124" type="hidden" id="cas_user_honor_files" type-name="cas_user.honor_files">
@@ -307,7 +307,7 @@
 						<div class="line" style="height: inherit">
 							<div class="left">荣誉图片：</div>
 							<div class="right webuploader honor_files">
-								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="5" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
+								<lg:upload  isList="true" buttonName="选择图片" domId="upload_honor_files" limitNum="500" limitSize="2097152" maxHeight="100" maxWidth="80"  type="<%=Code.UPLOAD_TAG_FILE_TYPE.IMG %>" layout="<%=Code.UPLOAD_TAG_LAYOUT.ABOVE %>"/>
 								<span style="color:red;line-height: 43px">最多5张，单张大小2M以内</span>
 							</div>
 							<input type-value="1123,1124" value="1123,1124" type="hidden" id="cas_user_honor_files" type-name="cas_user.honor_files">

src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/member.jsp

@@ -16,7 +16,8 @@
     <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
     <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
     <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
+    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script>
+	<script type="text/javascript" src="<%=basePath%>/js/cas/ljc_0.2.js?<%=new Date().getTime()%>"></script>
 	<link type="text/css" href="<%=basePath%>/css/cas/oss/member.css?<%=version%>" rel="stylesheet" />
 	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/member.js?<%=(new Date().getTime())%>"></script>
 	<script type="text/javascript">
@@ -187,6 +188,7 @@
 				{'name':'序号','type':'seq','width':'40px'}, 
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
+				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/member_list.jsp

@@ -16,7 +16,8 @@
     <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
     <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
     <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
+	<script type="text/javascript" src="<%=basePath%>/js/cas/ljc_0.2.js?<%=new Date().getTime()%>"></script>
+	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script>
 	<link type="text/css" href="<%=basePath%>/css/cas/oss/member_list.css?<%=version%>" rel="stylesheet" />
 	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/member_list.js?<%=new Date().getTime()%>"></script>
 	<script type="text/javascript">
@@ -198,6 +199,7 @@
 				{'name':'序号','type':'seq','width':'40px'}, 
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
+				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/user_apply.jsp

@@ -115,7 +115,7 @@
 					</c:if>
 				</c:if>
 				<p class="title">申请个人基本信息</p>
-				<c:if test="${cas_user.cas_user_approval_status != 202501 && cas_user.cas_user_approval_status != 202504  && cas_user.lsp_user_id == user.id}">
+				<c:if test="${cas_user.cas_user_approval_status == 202503 && cas_user.cas_user_approval_status_manage==202503  && cas_user.lsp_user_id == user.id}">
 				<button class="lg-fashion-button-normal float_right margin_right perfect_info" style="position: absolute;right: 10px;top:10px" onclick="downloadc()">查看证书</button>
 				</c:if>
 					<table class="lg-fession-tab personnel">

src/cas_v0.2.0.1/src/main/webapp/js/cas/ljc_0.2.js

@@ -555,6 +555,20 @@ jQuery.fn.tableAdaptor = function (){
 	}
 	
 	var getTypeValue = function getTypeValueFunc(val,type,i,name,timeformat,obj){
+
+		if(type == 'aid'){
+
+			if(aobj.data("obj_loygra")[val]==1){
+				return "'学生会员'" ;
+			}
+			if(aobj.data("obj_loygra")[val]==2){
+				return "'普通会员'" ;
+			}
+			if(aobj.data("obj_loygra")[val]==3){
+				return "'高级会员'" ;
+			}
+			return "'未设置'" ;
+		}else
 		if(type == 'fix'){
 			return "'"+val+"'";
 		}else if(type == 'category'){
@@ -948,6 +962,9 @@ function detail_get_restall(selector,_config){
 		}
 	})
 }
+window.upsuccess = function (file, data){
+   return true;
+}
 
 
 //------------------------------------------------------------------------------------------
@@ -1026,10 +1043,11 @@ function UploadInit(imgUrl,ukey,func,id,domId,thumbnailWidth, thumbnailHeight,ac
     });
     // 当有文件添加进来的时候
     uploader.on('fileQueued', function(file) {
+		// debugger
     	$("#"+domId).css("width","0%");
     	$("#"+domId).attr("ids","");
     	$("#"+domId).css("display","inherit");
-    	uploader.options.formData={'uki':"ukey:" + getVal(ukey,"")};
+		uploader.options.formData={'uki':"ukey:" + getVal(ukey,"")};
     	uploader.makeThumb( file, function( error, src ) {
            $("#back_"+domId).css("background","url("+src+")");
            
@@ -1040,7 +1058,17 @@ function UploadInit(imgUrl,ukey,func,id,domId,thumbnailWidth, thumbnailHeight,ac
     	$("#all_"+domId).text(parseInt(percentage*100)+"%");
     	$("#"+domId).css("width",parseInt(100-percentage*100)+"%");
     });
-    uploader.on('uploadSuccess', func);
+    uploader.on('uploadSuccess', function (file, data) {
+		  if(domId=='upload_honor_files'){
+			  if(window.upsuccess(file,data)){
+				  func(file,data);
+			  }
+		  }else{
+			  func(file,data);
+		  }
+		}
+
+	);
     uploader.on('uploadError', function(file) {
     	console.log("文件上传出错");
     });

src/cas_v0.2.0.1/src/main/webapp/js/cas/oss/cas_personnel.js

@@ -90,6 +90,16 @@ $(document).ready(function(){
 	$("#downloadExcel").click(function(){
 		window.location.href = localUrl + "/oss/down/xls?cas_user_type="+cas_user_type;
 	})
+
+	window.upsuccess = function (file,data){
+		if($(".back_list_upload_honor_files").size()>=5){
+			showTip("超出限制的图片数量！")
+			return false;
+		}else{
+			return true;
+		}
+
+	}
 })
 /**
  * 修改初始化表单
@@ -135,9 +145,9 @@ function init_form(user_id){
 				$("#cas_service_require").val(data.data.cas_user.cas_service_require);
 				//设置头像
 				if(gdv(data.data.cas_user.portrait_id)){
-					$("#back_upload_prove_file").css({"background": 'url(/cas/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
+					$("#back_upload_prove_file").css({"background": 'url(/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 				}else{
-					$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
+					$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 				}
 
 				$(".prove_file  .upload_file_list").html(get_attach_img(data.data.cas_user.portrait_id));//上传图片页面渲染出来
@@ -161,7 +171,7 @@ function init_form(user_id){
 			}
 		})
 	}else{
-		$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
+		$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 	}
 	$("#back_upload_prove_file").css({"background-size": '100% 100%'});
 }
@@ -185,9 +195,9 @@ function get_attach_img(portrait_id){
 	var html="";
 	if (portrait_id!="" && portrait_id!=undefined && portrait_id!='undefined') {
 		html+="<div style='width:56px;border-radius: 3px;padding:3px;border: 1px solid #ccc;float:left;margin-top:0px;margin-right:5px;cursor: pointer;margin-bottom: 5px;'>\
-			    	<img class='min_img_"+portrait_id+"' id='image_upload_prove_file2'  src='/cas/service/attach?param="+portrait_id+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
-			    	<img class='delete_img' src='/cas/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
-			    	<div tag='"+portrait_id+"' class='back_list_upload_prove_file' id='back_list_upload_prove_file2' style='width:100%;height: 30px;background: url(/cas/service/attach?param="+portrait_id+"&amp;target=brower);background-size: 100% 100%;'>\
+			    	<img class='min_img_"+portrait_id+"' id='image_upload_prove_file2'  src='/service/attach?param="+portrait_id+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
+			    	<img class='delete_img' src='/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
+			    	<div tag='"+portrait_id+"' class='back_list_upload_prove_file' id='back_list_upload_prove_file2' style='width:100%;height: 30px;background: url(/service/attach?param="+portrait_id+"&amp;target=brower);background-size: 100% 100%;'>\
 			     		<span id='upload_prove_file' style='display: block;color:#fff;height: 30px;line-height: 30px;text-align: right;font-size: 12px;width:0%;float:right;background-color: rgba(221, 221, 221, 0.4);'></span>\
 			    	</div>\
 			   </div>";
@@ -203,9 +213,9 @@ function get_attach_imgs(honor_fileids){
 			if(honor_fileids.split(",")[key]==""||honor_fileids.split(",")[key]==undefined ||key=='remove' ) continue;
 			var keyid = honor_fileids.split(",")[key];
 			html+="<div style='width:56px;border-radius: 3px;padding:3px;border: 1px solid #ccc;float:left;margin-top:0px;margin-right:5px;cursor: pointer;margin-bottom: 5px;'>\
-			    	<img class='min_img_"+keyid+"' id='image_upload_honor_files2'  src='/cas/service/attach?param="+keyid+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
-			    	<img class='delete_img' src='/cas/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
-			    	<div tag='"+keyid+"' class='back_list_upload_honor_files' id='back_list_upload_honor_files2' style='width:100%;height: 30px;background: url(/cas/service/attach?param="+keyid+"&amp;target=brower);background-size: 100% 100%;'>\
+			    	<img class='min_img_"+keyid+"' id='image_upload_honor_files2'  src='/service/attach?param="+keyid+"&amp;target=brower' style='display:none;width:100%;height: 100%;' />\
+			    	<img class='delete_img' src='/img/cas/common/delete.png' style='width:10px;height: 10px;position: absolute;margin-left:35px;margin-top:3px;' />\
+			    	<div tag='"+keyid+"' class='back_list_upload_honor_files' id='back_list_upload_honor_files2' style='width:100%;height: 30px;background: url(/service/attach?param="+keyid+"&amp;target=brower);background-size: 100% 100%;'>\
 			     		<span id='upload_honor_files"+keyid+"' style='display: block;color:#fff;height: 30px;line-height: 30px;text-align: right;font-size: 12px;width:0%;float:right;background-color: rgba(221, 221, 221, 0.4);'></span>\
 			    	</div>\
 			   </div>";
@@ -253,7 +263,13 @@ function beforefunc(){
 	//证件照
 	$("#cas_user_portrait_id").val($("#upload_prove_file").attr("ids"));
 
-	$("#cas_user_honor_files").val($("#upload_honor_files").attr("ids"));
+	var ids = "";
+	$(".back_list_upload_honor_files").each(function (e){
+		ids+=$(this).attr("tag")+","
+	})
+
+	$("#cas_user_honor_files").val(ids);
+    debugger
 	return true ;
 }
 
@@ -306,9 +322,9 @@ function load_information(data){
 	$("#cas_service_require").val(data.data.cas_user.cas_service_require);
 	//设置头像
 	if(gdv(data.data.cas_user.portrait_id)){
-		$("#back_upload_prove_file").css({"background": 'url(/cas/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
+		$("#back_upload_prove_file").css({"background": 'url(/service/attach?param='+data.data.cas_user.portrait_id+'&target=brower)100% 100%'});
 	}else{
-		$("#back_upload_prove_file").css({"background": 'url(/cas/img/cas/common/default.png)'});
+		$("#back_upload_prove_file").css({"background": 'url(/img/cas/common/default.png)'});
 	}
 	$(".prove_file  .upload_file_list").html(get_attach_img(data.data.cas_user.portrait_id));//上传图片页面渲染出来
 

src/lsp/src/src/main/resources/config-lsp.properties

@@ -31,7 +31,7 @@ jdbc.db.alias=postgresql
 jdbc.driverClassName=org.postgresql.Driver
 jdbc.url=jdbc:postgresql://127.0.0.1:5432/cas
 jdbc.username=postgres
-jdbc.password=tw20gj150Me803
+jdbc.password=postgres
 
 #jdbc.db.alias=sqlserver
 #jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver