优化maven结构，删除run模块。

hsweb-web-bean/pom.xml

@@ -15,7 +15,10 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate.validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webbuilder</groupId>
+            <artifactId>wb-utils</artifactId>
         </dependency>
     </dependencies>
 </project>

hsweb-web-controller/pom.xml

@@ -18,6 +18,13 @@
         <commons.collections.version>3.2.1</commons.collections.version>
     </properties>
     <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.hsweb</groupId>
             <artifactId>hsweb-web-service-interface</artifactId>
@@ -28,11 +35,15 @@
             <artifactId>hsweb-web-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>${commons.fileupload.version}</version>
         </dependency>
-
     </dependencies>
 </project>

hsweb-web-controller/src/main/java/org/hsweb/web/controller/FastJsonHttpMessageConverter.java

@@ -57,7 +57,7 @@ public class FastJsonHttpMessageConverter extends AbstractHttpMessageConverter<O
     }
 
     @Override
-    protected Object readInternal(Class<? extends Object> clazz, HttpInputMessage inputMessage) throws IOException,
+    protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage) throws IOException,
             HttpMessageNotReadableException {
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();

hsweb-web-controller/src/main/java/org/hsweb/web/controller/PageViewController.java

@@ -1,29 +0,0 @@
-package org.hsweb.web.controller;
-
-import org.hsweb.web.authorize.annotation.Authorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Created by zhouhao on 16-4-8.
- */
-@Controller
-@Authorize
-public class PageViewController {
-
-    @RequestMapping(value = "/**/*.html")
-    public ModelAndView view(HttpServletRequest request) {
-        String path = request.getRequestURI();
-        String content = request.getContextPath();
-        if (path.startsWith(content)) {
-            path = path.substring(content.length() + 1);
-        }
-        if (path.contains("."))
-            path = path.split("[.]")[0];
-        ModelAndView modelAndView = new ModelAndView(path);
-        return modelAndView;
-    }
-}

hsweb-web-core/pom.xml

@@ -15,6 +15,13 @@
             <groupId>org.hsweb</groupId>
             <artifactId>hsweb-web-bean</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+
     </dependencies>
 
 </project>

hsweb-web-core/src/main/java/org/hsweb/web/authorize/annotation/Authorize.java

@@ -47,12 +47,6 @@ public @interface Authorize {
      */
     String expressionLanguage() default "spel";
 
-    /**
-     * 根据ip地址进行权限控制，支持ip段如:  192.168.1.*; 192.168.2.1-10;192.168.2-5.1-10
-     * @return ip表
-     */
-    String[] ip() default {};
-
     /**
      * 是否为api接口，为true时，不使用用户登录策略。
      *

hsweb-web-run/Dockerfile

@@ -1,5 +0,0 @@
-FROM hsweb/java8
-
-COPY target/hsweb-web-run-1.0-SNAPSHOT.jar /app.jar
-EXPOSE 8088
-ENTRYPOINT ["java","-Xdebug","-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005","-jar","/app.jar"]

hsweb-web-run/README.md

@@ -1,5 +0,0 @@
-# 部署到docker
-```bash
-   $ mvn package -Pprod
-   $ ./run-in-docker.sh
-```

hsweb-web-run/pom.xml

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hsweb-framework</artifactId>
-        <groupId>org.hsweb</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>hsweb-web-run</artifactId>
-
-    <!--配置信息-->
-    <properties>
-        <app.name>hsweb-run</app.name>
-        <app.version>${project.version}</app.version>
-    </properties>
-
-    <!--环境配置-->
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <environment.package>develop</environment.package>
-                <jdbc.url>jdbc:oracle:thin:@127.0.0.1:1521:XE</jdbc.url>
-                <jdbc.username>cyjg</jdbc.username>
-                <jdbc.password>cyjg</jdbc.password>
-                <jdbc.driverClassName>oracle.jdbc.driver.OracleDriver</jdbc.driverClassName>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <environment.package>product</environment.package>
-                <logging.path>/var/logger/hsweb/</logging.path>
-                <jdbc.url>jdbc:oracle:thin:@oracle:1521:XE</jdbc.url>
-                <jdbc.username>cyjg</jdbc.username>
-                <jdbc.password>cyjg</jdbc.password>
-                <jdbc.driverClassName>oracle.jdbc.driver.OracleDriver</jdbc.driverClassName>
-            </properties>
-        </profile>
-    </profiles>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>
-                    true
-                </filtering>
-            </resource>
-            <resource>
-                <directory>src/main/environment/${environment.package}</directory>
-                <filtering>
-                    true
-                </filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>org.hsweb.web.boot.Run</mainClass>
-                    <layout>ZIP</layout>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>springloaded</artifactId>
-                        <version>1.2.5.RELEASE</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.5</version>
-                <configuration>
-                    <imageName>${project.artifactId}</imageName>
-                    <baseImage>hsweb/java8</baseImage>
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.hsweb</groupId>
-            <artifactId>hsweb-web-controller</artifactId>
-        </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-devtools</artifactId>-->
-        <!--</dependency>-->
-        <dependency>
-            <groupId>org.hsweb</groupId>
-            <artifactId>hsweb-web-service-impl-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hsweb</groupId>
-            <artifactId>hsweb-web-dao-impl-mybatis</artifactId>
-        </dependency>
-
-        <!--<dependency>-->
-        <!--<groupId>org.springframework</groupId>-->
-        <!--<artifactId>springloaded</artifactId>-->
-        <!--</dependency>-->
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc14</artifactId>
-        </dependency>
-    </dependencies>
-</project>

hsweb-web-run/run-in-docker.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-#mvn clean package -Pprod
-container_name=hsweb-web-run
-image_name=hsweb/web-run
-link_oracle=oracle11g
-server_port=9888
-if [ -f "target/hsweb-web-run-1.0-SNAPSHOT.jar" ]; then
-        container_id=$(docker ps | grep "${container_name}" | awk '{print $1}')
-        if [ "${container_id}" != "" ];then
-            docker stop ${container_name}
-            docker rm ${container_name}
-            docker rmi  ${image_name}
-        fi
-            docker build -t ${image_name} .
-            docker run -d --link ${link_oracle}:oracle -p ${server_port}:8088 -p 5005:5005 --name ${container_name} ${image_name}
-           # docker run -it --rm --link oracle11gxe:oracle -p ${server_port}:8088 -p 5005:5005 --name ${container_name} ${image_name}
-    else
-        echo "build error!"
-        exit -1
-fi

hsweb-web-run/src/main/environment/develop/config/logback.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!-- 控制台输出日志 -->
-    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} > %-5level %logger{35} - %m%n</pattern>
-        </encoder>
-    </appender>
-    <logger name="org.springframework" level="ERROR" />
-    <logger name="org.springframework.web" level="ERROR" />
-    <logger name="org.apache.tomcat" level="ERROR" />
-    <logger name="org.hsweb" level="ERROR" />
-    <root level="ERROR">
-        <appender-ref ref="Console"/>
-    </root>
-</configuration>

hsweb-web-run/src/main/environment/product/config/logback.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!-- 控制台输出日志 -->
-    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} > %-5level %logger{35} - %m%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 日志输出 到文件-->
-    <appender name="File" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${logging.path}/%d{yyyy-MM-dd}.log.zip</fileNamePattern>
-            <maxHistory>270</maxHistory><!--日志最大保存时间-->
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} > %-5level %logger{35} - %m%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="ERROR">
-        <appender-ref ref="Console"/>
-        <appender-ref ref="File"/>
-    </root>
-</configuration>

hsweb-web-run/src/main/java/org/hsweb/web/boot/Run.java

@@ -1,22 +0,0 @@
-package org.hsweb.web.boot;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-/**
- * Created by 浩 on 2016-01-16 0016.
- */
-@Configuration
-@EnableAutoConfiguration
-@ComponentScan(basePackages = {"org.hsweb.web"})
-@MapperScan(basePackages = {"org.hsweb.web.dao"})
-@EnableTransactionManagement(proxyTargetClass = true)
-public class Run {
-    public static void main(String[] args) {
-        SpringApplication.run(Run.class,args);
-    }
-}

hsweb-web-run/src/main/resources/application.yml

@@ -1,44 +0,0 @@
-#LOGGING
-logging:
-    config: classpath:config/logback.xml
-server:
-    port: 8088
-
-#spring config
-spring:
-    devtools:
-        remote:
-            secret: hsweb
-    application:
-        name: ${app.name}
-        index: index.html
-        version: ${app.version}
-    datasource:
-        name: core
-        url: ${jdbc.url}
-        driverClassName: ${jdbc.driverClassName}
-        username: ${jdbc.username}
-        password: ${jdbc.password}
-        type: com.alibaba.druid.pool.DruidDataSource
-        filters: stat
-        maxActive: 20
-        initialSize: 1
-        maxWait: 60000
-        minIdle: 1
-        timeBetweenEvictionRunsMillis: 60000
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: select 'x'
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        poolPreparedStatements: true
-        maxOpenPreparedStatements: 20
-    freemarker :
-        suffix : .ftl
-        request-context-attribute : request
-        expose-request-attributes : true
-# MyBatis
-mybatis:
-    type-aliases-package: org.hsweb.web.bean.po
-    mapper-locations: classpath*:org/hsweb/web/dao/impl/mybatis/mapper/oracle/**/*.xml
-    config: classpath:config/mybatis-config.xml

hsweb-web-run/src/main/resources/banner.txt

@@ -1,3 +0,0 @@
-${AnsiColor.YELLOW}------------------------------------------------------
-${AnsiColor.YELLOW}:: Running ${AnsiColor.RED}${app.name} ${AnsiColor.YELLOW}(${app.version})
-${AnsiColor.YELLOW}-------------------------------------------------------${AnsiColor.WHITE}

hsweb-web-run/src/main/resources/config/logback.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!-- 控制台输出日志 -->
-    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} > %-5level %logger{35} - %m%n</pattern>
-        </encoder>
-    </appender>
-    <logger name="org.springframework" level="ERROR" />
-    <logger name="org.springframework.web" level="DEBUG" />
-    <logger name="org.apache.tomcat" level="ERROR" />
-    <logger name="org.hsweb" level="DEBUG" />
-    <root level="ERROR">
-        <appender-ref ref="Console"/>
-    </root>
-</configuration>

hsweb-web-run/src/main/resources/config/mybatis-config.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-    <!-- 配置mybatis的缓存，延迟加载等等一系列属性 -->
-    <settings>
-        <!-- 全局映射器启用缓存 -->
-        <setting name="cacheEnabled" value="true"/>
-
-        <!-- 查询时，关闭关联对象即时加载以提高性能 -->
-        <setting name="lazyLoadingEnabled" value="true"/>
-
-        <!-- 对于未知的SQL查询，允许返回不同的结果集以达到通用的效果 -->
-        <setting name="multipleResultSetsEnabled" value="true"/>
-
-        <!-- 允许使用列标签代替列名 -->
-        <setting name="useColumnLabel" value="true"/>
-
-        <!-- 不允许使用自定义的主键值(比如由程序生成的UUID 32位编码作为键值)，数据表的PK生成策略将被覆盖 -->
-        <setting name="useGeneratedKeys" value="false"/>
-
-        <!-- 给予被嵌套的resultMap以字段-属性的映射支持 FULL,PARTIAL -->
-        <setting name="autoMappingBehavior" value="PARTIAL"/>
-
-        <!-- 对于批量更新操作缓存SQL以提高性能 BATCH,SIMPLE -->
-        <!-- <setting name="defaultExecutorType" value="BATCH" /> -->
-
-        <!-- 数据库超过25000秒仍未响应则超时 -->
-        <!-- <setting name="defaultStatementTimeout" value="25000" /> -->
-
-        <!-- Allows using RowBounds on nested statements -->
-        <setting name="safeRowBoundsEnabled" value="false"/>
-
-        <!-- Enables automatic mapping from classic database column names A_COLUMN to camel case classic Java property names aColumn. -->
-        <setting name="mapUnderscoreToCamelCase" value="true"/>
-
-        <!-- MyBatis uses local cache to prevent circular references and speed up repeated nested queries. By default (SESSION) all queries executed during a session are cached. If localCacheScope=STATEMENT
-            local session will be used just for statement execution, no data will be shared between two different calls to the same SqlSession. -->
-        <setting name="localCacheScope" value="SESSION"/>
-
-        <!-- Specifies the JDBC type for null values when no specific JDBC type was provided for the parameter. Some drivers require specifying the column JDBC type but others work with generic values
-            like NULL, VARCHAR or OTHER. -->
-        <setting name="jdbcTypeForNull" value="OTHER"/>
-
-        <!-- Specifies which Object's methods trigger a lazy load -->
-        <setting name="lazyLoadTriggerMethods" value="equals,clone,hashCode,toString"/>
-
-        <!-- 设置关联对象加载的形态，此处为按需加载字段(加载字段由SQL指 定)，不会加载关联表的所有字段，以提高性能 -->
-        <setting name="aggressiveLazyLoading" value="false"/>
-        <setting name="proxyFactory" value="CGLIB"/>
-    </settings>
-
-</configuration>

hsweb-web-run/src/main/resources/static/1.txt

@@ -1 +0,0 @@
-test2 sdd

hsweb-web-run/src/main/resources/templates/error.ftl

@@ -1 +0,0 @@
-${status}:${error}</br>

hsweb-web-run/src/main/resources/templates/index.ftl

@@ -1 +0,0 @@
-2222

hsweb-web-service-impl-common/pom.xml

@@ -12,6 +12,10 @@
     <artifactId>hsweb-web-service-impl-common</artifactId>
     <dependencies>
 
+        <dependency>
+            <groupId>org.webbuilder</groupId>
+            <artifactId>wb-sql-util</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.hsweb</groupId>

hsweb-web-websocket/src/test/java/org/hsweb/web/socket/WebSocketClientTest.java

@@ -6,6 +6,8 @@ import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.client.WebSocketClient;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 import org.springframework.web.socket.handler.AbstractWebSocketHandler;
+import org.webbuilder.utils.storage.counter.Counter;
+import org.webbuilder.utils.storage.counter.support.local.LocalCounter;
 
 import java.io.IOException;
 
@@ -15,7 +17,7 @@ import java.io.IOException;
  */
 public class WebSocketClientTest {
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) throws Exception {
         WebSocketClient client = new StandardWebSocketClient();
         String url = "ws://localhost:8080/socket";
         client.doHandshake(new AbstractWebSocketHandler() {

pom.xml

@@ -16,7 +16,6 @@
         <module>hsweb-web-bean</module>
         <module>hsweb-web-core</module>
         <module>hsweb-web-websocket</module>
-        <module>hsweb-web-run</module>
     </modules>
 
     <properties>
@@ -87,63 +86,50 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.webbuilder</groupId>
-            <artifactId>wb-sql-util</artifactId>
-            <version>${webbuilder.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!--json-->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>${fastjson.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.webbuilder</groupId>
+                <artifactId>wb-sql-util</artifactId>
+                <version>${webbuilder.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-classic</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.webbuilder</groupId>
+                <artifactId>wb-utils</artifactId>
+                <version>${webbuilder.version}</version>
+            </dependency>
+
+            <!--<dependency>-->
+                <!--<groupId>com.vaadin</groupId>-->
+                <!--<artifactId>vaadin-bom</artifactId>-->
+                <!--<version>7.6.4</version>-->
+                <!--<type>pom</type>-->
+                <!--<scope>import</scope>-->
+            <!--</dependency>-->
+
             <dependency>
                 <groupId>com.oracle</groupId>
                 <artifactId>ojdbc14</artifactId>
@@ -201,7 +187,7 @@
     </dependencyManagement>
     <repositories>
         <repository>
-            <id>releases</id>
+            <id>hsweb-nexus</id>
             <name>Nexus Release Repository</name>
             <url>http://121.199.3.43:8889/nexus/content/repositories/public/</url>
             <snapshots>