Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/bos/BOSClientUtil.java

@@ -10,13 +10,17 @@ import org.junit.Test;
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 public class BOSClientUtil {
-    private final static String accessKey= Global.getConfig("bos_access_key");
-    private final static String secretKey= Global.getConfig("bos_secret_key");
-    private final static String endpoint= Global.getConfig("bos_endpoint");
-    private final static String bucketName= Global.getConfig("bos_buck_name");
-    private static BosClient bosClient;
+    private final  String accessKey= Global.getConfig("bos_access_key");
+    private final  String secretKey= Global.getConfig("bos_secret_key");
+    private final  String endpoint= Global.getConfig("bos_endpoint");
+    private final  String bucketName= Global.getConfig("bos_buck_name");
+    private final  String urlTem = "https://BUCKNAME.su.bcebos.comKEY";
+    private  BosClient bosClient;
+
 
     public BOSClientUtil() {
         BosClientConfiguration config = new BosClientConfiguration();
@@ -30,7 +34,7 @@ public class BOSClientUtil {
      * 获取BosClient对象
      * @return
      */
-    public static BosClient getBosClient() {
+    public  BosClient getBosClient() {
         BosClientConfiguration config = new BosClientConfiguration();
         config.setMaxConnections(10);
         config.setCredentials(new DefaultBceCredentials(accessKey, secretKey));
@@ -44,7 +48,7 @@ public class BOSClientUtil {
      * @param objectKey 文件路径/文件名（可以用“/”来创建多层文件夹）
      * @return
      */
-    public static PutObjectResponse uploadFileToBos(File file,
+    public  PutObjectResponse uploadFileToBos(File file,
                                                     String objectKey) {
         return bosClient.putObject(bucketName, objectKey, file);
     }
@@ -55,7 +59,7 @@ public class BOSClientUtil {
      * @param objectKey 文件路径/文件名（可以用“/”来创建多层文件夹）
      * @return
      */
-    public static PutObjectResponse uploadInputStreamToBos(InputStream inputStream,
+    public  PutObjectResponse uploadInputStreamToBos(InputStream inputStream,
                                                            String objectKey) {
         return bosClient.putObject(bucketName, objectKey, inputStream);
     }
@@ -67,7 +71,7 @@ public class BOSClientUtil {
      * @param objectKey  文件路径/文件名（可以用“/”来创建多层文件夹）
      * @return 上传成功后的tag
      */
-    public static void deleteObject(String objectKey) {
+    public  void deleteObject(String objectKey) {
         bosClient.deleteObject(bucketName, objectKey);
     }
 
@@ -77,45 +81,96 @@ public class BOSClientUtil {
      * @param objectKey           文件夹和文件名
      * @return 目标文件的下载url
      */
-    public static String generatePresignedUrl(String objectKey) {
+    public  String generatePresignedUrl(String objectKey) {
         URL url = bosClient.generatePresignedUrl(bucketName, objectKey, -1);
         return url.toString();
     }
 
 
-    public static String upload(String path,File file){
+    public  String upload(String path,File file){
         String objectKey = path+file.getName();
         bosClient.putObject(bucketName, objectKey, file);
-        URL url = bosClient.generatePresignedUrl(bucketName, objectKey, -1);
-        return url.toString();
+        String url = urlTem.replace("BUCKNAME",bucketName).replace("KEY",objectKey);
+//        URL url = bosClient.generatePresignedUrl(bucketName, objectKey, -1);
+        return url;
     }
 
-    public static String upload(String path,InputStream inputStream){
-        String objectKey = path;
-        bosClient.putObject(bucketName, objectKey, inputStream);
-        URL url = bosClient.generatePresignedUrl(bucketName, objectKey, -1);
-        return url.toString();
+    public  String upload(String path,InputStream inputStream){
+        bosClient.putObject(bucketName, path, inputStream);
+        String url = urlTem.replace("BUCKNAME",bucketName).replace("KEY",path);
+//        URL url = bosClient.generatePresignedUrl(bucketName, objectKey, -1);
+        return url;
     }
 
+//    @Test
+//    public void testPut(){
+//        File file = new File("E:/bk1.png");
+//        String name = file.getName();
+//        BOSClientUtil.uploadFileToBos(file,"/test/"+name);
+//    }
+//
+//
+//    @Test
+//    public void testDel(){
+//        BOSClientUtil.deleteObject("/test/1.txt");
+//    }
+//
+//    @Test
+//    public void testUrl(){
+//        File file = new File("E:/bk1.png");
+//        String upload = BOSClientUtil.upload("/text1/", file);
+//        System.out.println(upload);
+//    }
+
     @Test
-    public void testPut(){
-        File file = new File("E:/bk1.png");
-        String name = file.getName();
-        BOSClientUtil.uploadFileToBos(file,"/test/"+name);
+    public void uploadAll(){
+        ArrayList<String> listFileName = new ArrayList<String>();
+        String filePath = "D:/IDEA workspace/total_process/src/main/webapp/static/";
+       getAllFileName(filePath,listFileName);
+       int count = 1;
+       int total = listFileName.size();
+       System.out.println(total);
+     for(String name : listFileName){
+           if(name != null) {
+               int statice = name.indexOf("static");
+               String name1 = name.substring(statice + 6, name.length());
+               File file = new File(name);
+//               System.out.println("/static"+name1);
+               bosClient.putObject(bucketName, "/static"+name1, file);
+//               BOSClientUtil.upload("/static"+name1,file);
+               System.out.println("---------正在上传   "+file.getName()+"-------");
+               System.out.println("上传第"+count+"个资源,共"+total+"个资源");
+               count++;
+//               try {
+//                   bosClient.deleteObject(bucketName, " /static" + name1);
+//               }catch (Exception e){
+//                   e.printStackTrace();
+//               }
+           }
+       }
     }
 
 
-    @Test
-    public void testDel(){
-        BOSClientUtil.deleteObject("/test/1.txt");
-    }
+public  void getAllFileName(String path, ArrayList<String> listFileName){
+     File file = new File(path);
+     File [] files = file.listFiles();
+    String [] names = file.list();
+    if(names != null){
+    String [] completNames = new String[names.length];
+   for(int i=0;i<names.length;i++){
+       if(files[i].isFile()) {
+           completNames[i] = path + names[i];
+       }
+   }
+   listFileName.addAll(Arrays.asList(completNames));
+  }
+  for(File a:files){
+    if(a.isDirectory()){//如果文件夹下有子文件夹，获取子文件夹下的所有文件全路径。
+           getAllFileName(a.getAbsolutePath().replaceAll("\\\\","/")+"/",listFileName);
+  }
+ }
+ }
 
-    @Test
-    public void testUrl(){
-        File file = new File("E:/bk1.png");
-        String upload = BOSClientUtil.upload("/text1/", file);
-        System.out.println(upload);
-    }
 
 
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -100,6 +100,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 	private OfficeService officeService;
 	@Autowired
 	private WorkReviewAuditDao workReviewAuditDao;
+	@Autowired
+	private SerialNumTplService serialNumTplService;
 
 	public ProjectReportData get(String id) {
 		ProjectReportData projectReportData = super.get(id);
@@ -297,6 +299,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 			projectReportData.preInsert();
 			insert = true;
 		}
+		projectReportData.setNumber(serialNumTplService.genSerialNum(user.getCompany(),"10"));
 		ProjectRecords projectRecords = projectRecordsService.get(projectReportData.getProject());
 		Office recordsOffice =officeService.get(projectRecords.getOffice());
 		String title = "报告名称:"+projectReportData.getName();

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -240,7 +240,8 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
             //有合同状态
 			workContractInfo = workContractInfoDao.get(projectRecords.getWorkContractInfo().getId());
 			company.setId(workContractInfo.getCompanyId());
-			office.setId(workContractInfo.getChargeCompany());
+//			office.setId(workContractInfo.getChargeCompany());
+			office.setId(UserUtils.getUser().getOffice().getId());
         }else{
         	//无合同
 			company.setId(UserUtils.getUser().getCompany().getId());

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -385,6 +385,8 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 		workContractInfo.setPage(page);
 		List<WorkContractInfo> list = Lists.newArrayList();
+		String companyId = UserUtils.getUser().getComId();
+		workContractInfo.setCompanyId(companyId);
 		List<WorkContractInfo> workContractInfos = workContractInfoDao.findListReceipts(workContractInfo);
 		page.setList(workContractInfos);
 		return page;

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -433,10 +433,13 @@
 			<if test="contractState != null and contractState != ''">
 				AND a.contract_state = #{contractState}
 			</if>
-			<if test="createBy != null and createBy.id != null and createBy.id != '' and
-			 chargeCompany != null and chargeCompany != ''
-			">
-				AND (a.create_by = #{createBy.id}  or a.office_id= #{chargeCompany})
+			<!--<if test="createBy != null and createBy.id != null and createBy.id != '' and-->
+			 <!--chargeCompany != null and chargeCompany != ''-->
+			<!--">-->
+				<!--AND (a.create_by = #{createBy.id}  or a.office_id= #{chargeCompany})-->
+			<!--</if>-->
+			<if test="companyId != null and companyId != ''">
+				AND a.company_id = #{companyId}
 			</if>
 		</where>
 		<choose>

src/main/webapp/static/common/css/style.css

@@ -89,7 +89,9 @@ label{
 
 .navbar-default .nav > li > a:hover,
 .navbar-default .nav > li > a:focus {
-    /*background-color: #293846;*/background-color: #3ca0ec;
+    /*background-color: #293846;*/
+    background-color: #3ca0ec;
+    background: linear-gradient(to right,#1ebbe2, #72dbf5);
     color: white;
 }
 .skin-1
@@ -272,7 +274,8 @@ body.mini-navbar .nav li a{
 }
 
 .nav-item-bg{
-    background-color: #3ca0ec;
+    background: #3ca0ec;
+    background: linear-gradient(to right,#1ebbe2, #72dbf5);
     color:#ffffff;
 }
 .nav-item2-bg{
@@ -492,7 +495,9 @@ body.mini-navbar .navbar-default .nav > li > .nav-second-level li a {
 
 .navbar-fixed-top,
 .navbar-static-top {
-    /*background: #f3f3f4;*/ background: #0f92fb;
+    /*background: #f3f3f4;*/
+    background: #0f92fb;
+    background: linear-gradient(to bottom right,#1ebbe2, #72dbf5);
     /*height:70px;*/
     height: 55px;
 }
@@ -8593,43 +8598,43 @@ th .layui-table-cell{
 
 #schedule-bord .bord-left{
     background:#91d7e9; /* 一些不支持背景渐变的浏览器 */
-    background: -ms-linear-gradient(left,#91d7e9,#59c0da);
+    background: -ms-linear-gradient(left,#d00912,#f46703);
     filter:alpha(opacity=100 finishopacity=100 style=1 startx=0,starty=0,finishx=200,finishy=0) progid:DXImageTransform.Microsoft.gradient(startcolorstr=#91d7e9,endcolorstr=#59c0da,gradientType=1);
-    background:-moz-linear-gradient(left,  #91d7e9, #59c0da);
-    background:-webkit-gradient(linear, left top, right top, from(#91d7e9), to(#59c0da));
-    background:-o-linear-gradient(left, #91d7e9, #59c0da);
-    background: linear-gradient(to right,#91d7e9, #59c0da);
+    background:-moz-linear-gradient(left,  #d00912, #f46703);
+    background:-webkit-gradient(linear, left top, right top, from(#d00912), to(#f46703));
+    background:-o-linear-gradient(left, #d00912, #f46703);
+    background: linear-gradient(to right,#1ebbe2, #72dbf5);
 
 }
 #notify-bord .bord-left{
     background: #86cf9f; /* 一些不支持背景渐变的浏览器 */
-    background: -ms-linear-gradient(left,#86cf9f,#6ebf6e);
+    background: -ms-linear-gradient(left,#058832,#6ebf6e);
     filter:alpha(opacity=100 finishopacity=100 style=1 startx=0,starty=0,finishx=200,finishy=0) progid:DXImageTransform.Microsoft.gradient(startcolorstr=#86cf9f,endcolorstr=#6ebf6e,gradientType=1);
-    background:-moz-linear-gradient(left, #86cf9f, #6ebf6e);
-    background:-webkit-gradient(linear, left top, right top, from(#86cf9f), to(#6ebf6e));
-    background:-o-linear-gradient(left, #86cf9f, #6ebf6e);
-    background: linear-gradient(to right,#86cf9f, #6ebf6e);
+    background:-moz-linear-gradient(left, #058832, #6ebf6e);
+    background:-webkit-gradient(linear, left top, right top, from(#058832), to(#6ebf6e));
+    background:-o-linear-gradient(left, #058832, #6ebf6e);
+    background: linear-gradient(to right,#1ebbe2, #72dbf5);
 
 }
 #msg-bord .bord-left{
     background:#e49de0; /* 一些不支持背景渐变的浏览器 */
-    background: -ms-linear-gradient(left,#e49de0,#a488e4);
+    background: -ms-linear-gradient(left,#011180,#01c3ba);
     filter:alpha(opacity=100 finishopacity=100 style=1 startx=0,starty=0,finishx=200,finishy=0) progid:DXImageTransform.Microsoft.gradient(startcolorstr=#e49de0,endcolorstr=#a488e4,gradientType=1);
-    background:-moz-linear-gradient(left,  #e49de0, #a488e4);
-    background:-webkit-gradient(linear, left top, right top, from(#e49de0), to(#a488e4));
-    background:-o-linear-gradient(left, #e49de0, #a488e4);
-    background: linear-gradient(to right,#e49de0, #a488e4);
+    background:-moz-linear-gradient(left,  #011180, #01c3ba);
+    background:-webkit-gradient(linear, left top, right top, from(#011180), to(#01c3ba));
+    background:-o-linear-gradient(left, #011180, #01c3ba);
+    background: linear-gradient(to right,#1ebbe2, #72dbf5);
 
 }
 #email-bord .bord-left,
 #statistics-bord .bord-left{
     background:#dada6a; /* 一些不支持背景渐变的浏览器 */
-    background: -ms-linear-gradient(left,#dada6a,#dbbc66);
+    background: -ms-linear-gradient(left,#824800,#f1c240);
     filter:alpha(opacity=100 finishopacity=100 style=1 startx=0,starty=0,finishx=200,finishy=0) progid:DXImageTransform.Microsoft.gradient(startcolorstr=#dada6a,endcolorstr=#dbbc66,gradientType=1);
-    background:-moz-linear-gradient(left,  #dada6a, #dbbc66);
-    background:-webkit-gradient(linear, left top, right top, from(#dada6a), to(#dbbc66));
-    background:-o-linear-gradient(left, #dada6a, #dbbc66);
-    background: linear-gradient(to right,#dada6a, #dbbc66);
+    background:-moz-linear-gradient(left,  #824800, #dbbc66);
+    background:-webkit-gradient(linear, left top, right top, from(#824800), to(#f1c240));
+    background:-o-linear-gradient(left, #824800, #f1c240);
+    background: linear-gradient(to right,#1ebbe2, #72dbf5);
 
 }
 .bord-more{

src/main/webapp/static/common/css/style_bg.css

@@ -1,20 +0,0 @@
-html, body {
-  overflow: hidden;
-  margin: 0;
-  background-color: #000;
-}
-
-.instructions {
-  position: absolute;
-  z-index: 1;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  color: #fff;
-  letter-spacing: 2px;
-  pointer-events: none;
-}
-
-canvas {
-  width: 100%;
-}

src/main/webapp/static/common/js/script_bj.js

@@ -1,154 +0,0 @@
-const canvas = document.querySelector('canvas');
-const ctx = canvas.getContext('2d');
-
-const RESOLUTION = 1;
-
-let w = canvas.width = window.innerWidth * RESOLUTION;
-let h = canvas.height = window.innerHeight * RESOLUTION;
-
-const PARTICLE_COUNT = 400;
-const CONNECT_DISTANCE = w * 0.05;
-const FORCE_DISTANCE = w * 0.1;
-
-const r = (n = 1) => Math.random() * n;
-const PI = Math.PI;
-const TAU = PI * 2;
-
-let time = new Date();
-
-const lerp = (start, end, amt) => {
-  return (1 - amt) * start + amt * end;
-};
-
-const distance = (x1, y1, x2, y2) => {
-  const a = x1 - x2;
-  const b = y1 - y2;
-  return Math.sqrt(a * a + b * b);
-};
-
-const angle = (cx, cy, ex, ey) => {
-  return Math.atan2(ey - cy, ex - cx);
-};
-
-const particlePrototype = () => ({
-  x: w * 0.5 + Math.cos(r(TAU)) * r(w * 0.5),
-  y: h * 0.5 + Math.sin(r(TAU)) * r(h * 0.5),
-  angle: r(TAU),
-  speed: r(0.15),
-  normalSpeed: r(0.15),
-  oscAmplitudeX: r(2),
-  oscSpeedX: 0.001 + r(0.008),
-  oscAmplitudeY: r(2),
-  oscSpeedY: 0.001 + r(0.008),
-  connectDistance: r(CONNECT_DISTANCE),
-  color: {
-    r: Math.round(200 + r(55)),
-    g: Math.round(150 + r(105)),
-    b: Math.round(200 + r(55)) } });
-
-
-
-const particles = new Array(PARTICLE_COUNT).
-fill({}).
-map(particlePrototype);
-
-const update = () => {
-  particles.forEach(p1 => {
-    p1.x += (Math.cos(p1.angle) + Math.cos(time * p1.oscSpeedX) * p1.oscAmplitudeX) * p1.speed;
-    p1.y += (Math.sin(p1.angle) + Math.cos(time * p1.oscSpeedY) * p1.oscAmplitudeY) * p1.speed;
-
-    p1.speed = lerp(p1.speed, p1.normalSpeed * RESOLUTION, 0.1);
-
-    if (p1.x > w || p1.x < 0) {
-      p1.angle = PI - p1.angle;
-    }
-    if (p1.y > h || p1.y < 0) {
-      p1.angle = -p1.angle;
-    }
-
-    if (r() < 0.005)
-    p1.oscAmplitudeX = r(2);
-    if (r() < 0.005)
-    p1.oscSpeedX = 0.001 + r(0.008);
-    if (r() < 0.005)
-    p1.oscAmplitudeY = r(2);
-    if (r() < 0.005)
-    p1.oscSpeedY = 0.001 + r(0.008);
-
-    p1.x = Math.max(-0.01, Math.min(p1.x, w + 0.01));
-    p1.y = Math.max(-0.01, Math.min(p1.y, h + 0.01));
-  });
-};
-
-const render = () => {
-
-  ctx.clearRect(0, 0, w, h);
-
-  particles.map(p1 => {
-    particles.
-    filter(p2 => {
-      if (p1 == p2)
-      return false;
-      if (distance(p1.x, p1.y, p2.x, p2.y) > p1.connectDistance)
-      return false;
-      return true;
-    }).
-    map(p2 => {
-      const dist = distance(p1.x, p1.y, p2.x, p2.y);
-      p1.speed = lerp(p1.speed, p1.speed + 0.05 / p1.connectDistance * dist, 0.2);
-      return {
-        p1,
-        p2,
-        color: p1.color,
-        opacity: Math.floor(100 / p1.connectDistance * (p1.connectDistance - dist)) / 100 };
-
-    }).
-    forEach((line, i) => {
-      const colorSwing = Math.sin(time * line.p1.oscSpeedX);
-      ctx.beginPath();
-      ctx.globalAlpha = line.opacity;
-      ctx.moveTo(line.p1.x, line.p1.y);
-      ctx.lineTo(line.p2.x, line.p2.y);
-      ctx.strokeStyle = `rgb(
-					${Math.floor(line.color.r * colorSwing)},
-					${Math.floor(line.color.g * 0.5 + line.color.g * 0.5 * colorSwing)},
-					${line.color.b}
-				)`;
-      ctx.lineWidth = line.opacity * 4;
-      ctx.stroke();
-      ctx.closePath();
-    });
-  });
-
-};
-
-const loop = () => {
-  time = new Date();
-  update();
-  render();
-  window.requestAnimationFrame(loop);
-};
-
-loop();
-
-window.addEventListener('mousemove', e => {
-
-  const mouseX = e.layerX * RESOLUTION;
-  const mouseY = e.layerY * RESOLUTION;
-
-  particles.forEach(p => {
-    const dist = distance(mouseX, mouseY, p.x, p.y);
-
-    if (dist < FORCE_DISTANCE && dist > 0) {
-      p.angle = angle(mouseX, mouseY, p.x, p.y);
-      const force = (FORCE_DISTANCE - dist) * 0.1;
-      p.speed = lerp(p.speed, force, 0.2);
-    }
-  });
-
-});
-
-window.addEventListener('resize', e => {
-  w = canvas.width = window.innerWidth * RESOLUTION;
-  h = canvas.height = window.innerHeight * RESOLUTION;
-});

src/main/webapp/webpage/include/head.jsp

@@ -89,13 +89,17 @@
         else
         {
             document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
+            <%--document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');--%>
             document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js"><\/script>');
+            <%--document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');--%>
         }
     }
     else
     {
         document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
+        <%--document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');--%>
         document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js"><\/script>');
+        <%--document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');--%>
     }
 
     jQuery.validator.addMethod("isPhone", function(value, element) {

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -461,7 +461,7 @@
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -1077,7 +1077,8 @@
     function resizeWindow(){
         var bordHeight = document.getElementById("schedule-bord").clientHeight;
         var h = parseInt((bordHeight - padding) );
-        $(".bord-right .bord-contents ul").attr("style","height:" + h + "px");
+
+        $(".bord-right .bord-contents ul").attr("style","height:" + (h-10) + "px");
         if(hasSchedule)
             initScroll( "schedule-bord" );
         if(hasNotify)

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -401,7 +401,7 @@
                         <sys:treeselect id="area" name="area.id" value="${workClientInfo.area.id}" labelName="area.name"
                                         labelValue="${workClientInfo.area.name}"
                                         title="区域" url="/sys/area/treeData" cssClass="form-control required layui-input"
-                                        allowClear="true" notAllowSelectParent="true"/>
+                                        allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">