update: 为了提交到maven中央库..

pom.xml

@@ -93,6 +93,48 @@
                     <useIncrementalCompilation>false</useIncrementalCompilation>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <charset>UTF-8</charset>
+                    <docencoding>UTF-8</docencoding>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <repositories>

wk-app/wk-common/pom.xml

@@ -34,5 +34,39 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
+                    <useIncrementalCompilation>false</useIncrementalCompilation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
+                <configuration>
+                    <forkMode>once</forkMode>
+                    <argLine>-Dfile.encoding=UTF-8</argLine>
+                </configuration>
+            </plugin>
 
+        </plugins>
+    </build>
 </project>

wk-app/wk-model/pom.xml

@@ -31,7 +31,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.0</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                 </configuration>
@@ -52,7 +52,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>2.22.0</version>
                 <configuration>
                     <forkMode>once</forkMode>
                     <argLine>-Dfile.encoding=UTF-8</argLine>

wk-app/wk-nb-service-cms/pom.xml

@@ -110,7 +110,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>

wk-app/wk-nb-service-sys/pom.xml

@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>

wk-app/wk-nb-service-wx/pom.xml

@@ -110,7 +110,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>

wk-app/wk-nb-task/pom.xml

@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>

wk-app/wk-nb-web-api/pom.xml

@@ -107,7 +107,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>

wk-app/wk-nb-web-platform/pom.xml

@@ -143,7 +143,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>

wk-app/wk-nb-web-platform/src/main/java/cn/wizzer/app/web/commons/shiro/pam/AnySuccessfulStrategy.java

@@ -26,7 +26,7 @@ public AuthenticationInfo beforeAllAttempts(Collection<? extends Realm> realms,
      * Returns the specified {@code aggregate} instance if is non null and valid
      * (that is, has principals and they are not empty) immediately, or, if it
      * is null or not valid, the {@code info} argument is returned instead.
-     * <p/>
+     * <p>
      * This logic ensures that the first valid info encountered is the one
      * retained and all subsequent ones are ignored, since this strategy
      * mandates that only the info from the first successfully authenticated

wk-app/wk-nb-web-platform/src/main/java/cn/wizzer/app/web/commons/utils/ShiroUtil.java

@@ -22,7 +22,7 @@ public class ShiroUtil {
     private static final Logger logger = LoggerFactory.getLogger(ShiroUtil.class);
 
     /**
-     * 验证是否为已认证通过的用户，不包含已记住的用户，这是与 isUser 标签方法的区别所在。
+     * 验证是否为已认证通过的用户，不包含已记住的用户，这是与 isUser 标签方法的区别所在
      *
      * @return 用户是否已通过认证
      */
@@ -32,7 +32,7 @@ public boolean isAuthenticated() {
     }
 
     /**
-     * 验证是否为未认证通过用户，与 isAuthenticated 标签相对应，与 isGuest 标签的区别是，该标签包含已记住用户。
+     * 验证是否为未认证通过用户，与 isAuthenticated 标签相对应，与 isGuest 标签的区别是，该标签包含已记住用户
      *
      * @return 用户是否未通过认证
      */
@@ -42,17 +42,17 @@ public boolean isNotAuthenticated() {
     }
 
     /**
-     * 验证用户是否为 <访客>，即未认证（包含未记住）的用户。
+     * 验证用户是否为访客，即未认证（包含未记住）的用户
      *
-     * @return 用户是否为 <访客>
+     * @return 用户是否为访客
      */
     public boolean isGuest() {
         Subject subject = SecurityUtils.getSubject();
         return subject == null || subject.getPrincipal() == null;
     }
 
     /**
-     * 验证用户是否认证通过或已记住的用户。
+     * 验证用户是否认证通过或已记住的用户
      *
      * @return 用户是否认证通过或已记住的用户
      */
@@ -62,7 +62,7 @@ public boolean isUser() {
     }
 
     /**
-     * 返回用户 Principal。
+     * 返回用户 Principal
      *
      * @return 用户 Principal
      */
@@ -72,7 +72,7 @@ public Object getPrincipal() {
     }
 
     /**
-     * 返回用户属性。
+     * 返回用户属性
      *
      * @param property 属性名称
      * @return 用户属性

wk-app/wk-nb-web-platform/src/main/java/cn/wizzer/app/web/modules/controllers/platform/sys/SysLoginController.java

@@ -98,8 +98,6 @@ public void noPermission() {
      *
      * @param theme
      * @param req
-     * @RequiresUser 记住我有效
-     * @RequiresAuthentication 就算记住我也需要重新验证身份
      */
     @At("/theme")
     @RequiresAuthentication
@@ -120,8 +118,6 @@ public void theme(@Param("loginTheme") String theme, HttpServletRequest req) {
      * @param p
      * @param v
      * @param req
-     * @RequiresUser 记住我有效
-     * @RequiresAuthentication 就算记住我也需要重新验证身份
      */
     @At("/layout")
     @RequiresAuthentication

wk-app/wk-nb-web-platform/src/main/java/cn/wizzer/app/web/modules/controllers/platform/sys/SysUserController.java

@@ -378,7 +378,7 @@ public Object customDo(@Param("ids") String ids, HttpServletRequest req) {
     public Object doChangePassword(@Param("oldPassword") String oldPassword, @Param("newPassword") String newPassword, HttpServletRequest req) {
         Subject subject = SecurityUtils.getSubject();
         Sys_user user = (Sys_user) subject.getPrincipal();
-        String old = new Sha256Hash(oldPassword, user.getSalt(), 1024).toBase64();
+        String old = new Sha256Hash(oldPassword, user.getSalt(), 1024).toHex();
         if (old.equals(user.getPassword())) {
             String salt = R.UU32();
             String hashedPasswordBase64 = new Sha256Hash(newPassword, ByteSource.Util.bytes(salt), 1024).toHex();

wk-framework/pom.xml

@@ -38,15 +38,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.0</version>
                 <configuration>
                     <archive>
                         <manifest>

wk-framework/src/main/java/cn/wizzer/framework/base/service/BaseService.java

@@ -144,7 +144,7 @@ public interface BaseService<T> {
 
     /**
      * 将一个对象按FieldFilter过滤后,插入到一个数据源。
-     * <p/>
+     * <p>
      * <code>dao.insert(pet, FieldFilter.create(Pet.class, FieldMatcher.create(false)));</code>
      *
      * @param obj    要被插入的对象
@@ -320,9 +320,9 @@ public interface BaseService<T> {
 
     /**
      * 乐观锁, 以特定字段的值作为限制条件,更新对象,并自增该字段.
-     * <p/>
+     * <p>
      * 执行的sql如下:
-     * <p/>
+     * <p>
      * <code>update t_user set age=30, city="广州", version=version+1 where name="wendal" and version=124;</code>
      *
      * @param obj         需要更新的对象, 必须带@Id/@Name/@Pk中的其中一种.

wk-framework/src/main/java/cn/wizzer/framework/base/service/BaseServiceImpl.java

@@ -189,7 +189,7 @@ public <T> T insert(T obj) {
 
     /**
      * 将一个对象按FieldFilter过滤后,插入到一个数据源。
-     * <p/>
+     * <p>
      * <code>dao.insert(pet, FieldFilter.create(Pet.class, FieldMatcher.create(false)));</code>
      *
      * @param obj    要被插入的对象
@@ -399,9 +399,9 @@ public int updateWithVersion(Object obj, FieldFilter fieldFilter) {
 
     /**
      * 乐观锁, 以特定字段的值作为限制条件,更新对象,并自增该字段.
-     * <p/>
+     * <p>
      * 执行的sql如下:
-     * <p/>
+     * <p>
      * <code>update t_user set age=30, city="广州", version=version+1 where name="wendal" and version=124;</code>
      *
      * @param obj         需要更新的对象, 必须带@Id/@Name/@Pk中的其中一种.

wk-framework/src/main/java/cn/wizzer/framework/page/SimplePage.java

@@ -16,7 +16,7 @@ public List<Integer> getSegment() {
      * 检查页码 checkPageNo
      *
      * @param pageNo
-     * @return if pageNo==null or pageNo<1 then return 1 else return pageNo
+     * @return if pageNo==null or pageNo 小于 1 then return 1 else return pageNo
      */
     public static int cpn(Integer pageNo) {
         return (pageNo == null || pageNo < 1) ? 1 : pageNo;
@@ -131,7 +131,7 @@ public int getPrePage() {
     protected int pageNo = 1;
 
     /**
-     * if totalCount<0 then totalCount=0
+     * if totalCount 小于 0 then totalCount=0
      *
      * @param totalCount
      */
@@ -144,7 +144,7 @@ public void setTotalCount(int totalCount) {
     }
 
     /**
-     * if pageSize< 1 then pageSize=DEF_COUNT
+     * if pageSize 小于 1 then pageSize=DEF_COUNT
      *
      * @param pageSize
      */
@@ -157,7 +157,7 @@ public void setPageSize(int pageSize) {
     }
 
     /**
-     * if pageNo < 1 then pageNo=1
+     * if pageNo 小于 1 then pageNo=1
      *
      * @param pageNo
      */