适配FineKit

.gitignore

@@ -0,0 +1,6 @@
+*.iml
+.idea/
+.DS_Store
+.classpath
+lib/report/*.jar
+target/

pom.xml

@@ -11,5 +11,28 @@
 
     <artifactId>decision-user-language</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.fanruan.api</groupId>
+            <artifactId>finekit</artifactId>
+            <version>10.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/finekit-10.0.jar</systemPath>
+        </dependency>
+    </dependencies>
+    <build>
+        <!---如果要更改调试插件，改这里的配置就可以了-->
+        <outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.decision.user.language-1.0/classes</outputDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

readme.md

@@ -0,0 +1,3 @@
+# 语言偏好设置插件
+
+个人用户可以在账号设置的地方，选择自己的偏好语言。

src/main/java/com/fr/plugin/decision/user/language/UserLanguageUrlAliasProvider.java

@@ -1,8 +1,8 @@
 package com.fr.plugin.decision.user.language;
 
+import com.fanruan.api.net.URLAliasKit;
 import com.fr.decision.fun.impl.AbstractURLAliasProvider;
 import com.fr.decision.webservice.url.alias.URLAlias;
-import com.fr.decision.webservice.url.alias.URLAliasFactory;
 
 /**
  * @Author: Elijah
@@ -12,10 +12,10 @@ import com.fr.decision.webservice.url.alias.URLAliasFactory;
 public class UserLanguageUrlAliasProvider extends AbstractURLAliasProvider {
     @Override
     public URLAlias[] registerAlias() {
-        return new URLAlias[] {
-                URLAliasFactory.createPluginAlias("/languages", "/languages", false),
-                URLAliasFactory.createPluginAlias("/language", "/language", false),
-                URLAliasFactory.createPluginAlias("/i18n", "/i18n", true)
+        return new URLAlias[]{
+                URLAliasKit.createPluginAlias("/languages", "/languages", false),
+                URLAliasKit.createPluginAlias("/language", "/language", false),
+                URLAliasKit.createPluginAlias("/i18n", "/i18n", true)
         };
     }
 }

src/main/java/com/fr/plugin/decision/user/language/action/AllLanguagesAction.java

@@ -1,12 +1,13 @@
 package com.fr.plugin.decision.user.language.action;
 
+import com.fanruan.api.web.FlushKit;
+import com.fanruan.api.web.ResponseKit;
 import com.fr.decision.fun.impl.BaseHttpHandler;
-import com.fr.decision.webservice.Response;
 import com.fr.plugin.decision.user.language.bean.LanguageBean;
+import com.fr.plugin.transform.ExecuteFunctionRecord;
 import com.fr.plugin.transform.FunctionRecorder;
 import com.fr.third.fasterxml.jackson.databind.ObjectMapper;
 import com.fr.third.springframework.web.bind.annotation.RequestMethod;
-import com.fr.web.utils.WebUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,7 +46,8 @@ public class AllLanguagesAction extends BaseHttpHandler {
     }
 
     @Override
+    @ExecuteFunctionRecord
     public void handle(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        WebUtils.printAsString(response, new ObjectMapper().writeValueAsString(Response.ok(LANGUAGES)));
+        FlushKit.printAsString(response, new ObjectMapper().writeValueAsString(ResponseKit.ok(LANGUAGES)));
     }
 }

src/main/java/com/fr/plugin/decision/user/language/action/GetUserLanguageAction.java

@@ -1,11 +1,11 @@
 package com.fr.plugin.decision.user.language.action;
 
+import com.fanruan.api.decision.user.UserKit;
+import com.fanruan.api.web.FlushKit;
+import com.fanruan.api.web.ResponseKit;
 import com.fr.decision.fun.impl.BaseHttpHandler;
-import com.fr.decision.webservice.Response;
-import com.fr.decision.webservice.v10.user.UserService;
 import com.fr.third.fasterxml.jackson.databind.ObjectMapper;
 import com.fr.third.springframework.web.bind.annotation.RequestMethod;
-import com.fr.web.utils.WebUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,6 +33,6 @@ public class GetUserLanguageAction extends BaseHttpHandler {
 
     @Override
     public void handle(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        WebUtils.printAsString(response, new ObjectMapper().writeValueAsString(Response.ok(UserService.getInstance().getUserByRequest(request).getLanguage())));
+        FlushKit.printAsString(response, new ObjectMapper().writeValueAsString(ResponseKit.ok(UserKit.getUserByRequest(request).getLanguage())));
     }
 }

src/main/java/com/fr/plugin/decision/user/language/action/I18nAction.java

@@ -1,13 +1,12 @@
 package com.fr.plugin.decision.user.language.action;
 
+import com.fanruan.api.i18n.I18nKit;
+import com.fanruan.api.net.NetworkKit;
+import com.fanruan.api.web.FlushKit;
+import com.fanruan.api.web.ResponseKit;
 import com.fr.decision.fun.impl.BaseHttpHandler;
-import com.fr.decision.web.i18n.I18nTextGenerator;
-import com.fr.decision.webservice.Response;
-import com.fr.decision.webservice.utils.WebServiceUtils;
-import com.fr.locale.InterProviderFactory;
 import com.fr.third.fasterxml.jackson.databind.ObjectMapper;
 import com.fr.third.springframework.web.bind.annotation.RequestMethod;
-import com.fr.web.utils.WebUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -35,7 +34,6 @@ public class I18nAction extends BaseHttpHandler {
 
     @Override
     public void handle(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        I18nTextGenerator generator = new I18nTextGenerator();
-        WebUtils.printAsString(response, new ObjectMapper().writeValueAsString(Response.ok(InterProviderFactory.getClientProvider().getEntireKV(WebServiceUtils.getLocale(request)))));
+        FlushKit.printAsString(response, new ObjectMapper().writeValueAsString(ResponseKit.ok(I18nKit.getEntireKV(NetworkKit.getLocale(request)))));
     }
 }

src/main/java/com/fr/plugin/decision/user/language/action/SetUserLanguageAction.java

@@ -1,13 +1,13 @@
 package com.fr.plugin.decision.user.language.action;
 
-import com.fr.decision.authority.AuthorityContext;
-import com.fr.decision.authority.data.User;
+import com.fanruan.api.decision.user.OpenUser;
+import com.fanruan.api.decision.user.UserKit;
+import com.fanruan.api.net.NetworkKit;
+import com.fanruan.api.web.FlushKit;
+import com.fanruan.api.web.ResponseKit;
 import com.fr.decision.fun.impl.BaseHttpHandler;
-import com.fr.decision.webservice.Response;
-import com.fr.decision.webservice.v10.user.UserService;
 import com.fr.third.fasterxml.jackson.databind.ObjectMapper;
 import com.fr.third.springframework.web.bind.annotation.RequestMethod;
-import com.fr.web.utils.WebUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -35,9 +35,9 @@ public class SetUserLanguageAction extends BaseHttpHandler {
 
     @Override
     public void handle(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        User user = UserService.getInstance().getUserByRequest(request);
-        user.setLanguage(WebUtils.getHTTPRequestParameter(request, "language"));
-        AuthorityContext.getInstance().getUserController().update(user);
-        WebUtils.printAsString(response, new ObjectMapper().writeValueAsString(Response.success()));
+        OpenUser user = UserKit.getUserByRequest(request);
+        user.setLanguage(NetworkKit.getHTTPRequestParameter(request, "language"));
+        UserKit.update(user);
+        FlushKit.printAsString(response, new ObjectMapper().writeValueAsString(ResponseKit.success()));
     }
 }