diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b4af582
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.iml
+.idea/
+.DS_Store
+.classpath
+lib/report/*.jar
+target/
\ No newline at end of file
diff --git a/lib/finekit-10.0.jar b/lib/finekit-10.0.jar
new file mode 100644
index 0000000..6323280
Binary files /dev/null and b/lib/finekit-10.0.jar differ
diff --git a/lib/report/.gitkeep b/lib/report/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index 6f95fcf..bcbc70d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,5 +11,28 @@
decision-user-language
+
+
+ com.fanruan.api
+ finekit
+ 10.0
+ system
+ ${project.basedir}/lib/finekit-10.0.jar
+
+
+
+
+ ${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.decision.user.language-1.0/classes
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 8
+ 8
+
+
+
+
\ No newline at end of file
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..6b83ff2
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,3 @@
+# 语言偏好设置插件
+
+个人用户可以在账号设置的地方,选择自己的偏好语言。
\ No newline at end of file
diff --git a/src/main/java/com/fr/plugin/decision/user/language/UserLanguageUrlAliasProvider.java b/src/main/java/com/fr/plugin/decision/user/language/UserLanguageUrlAliasProvider.java
index 62c1fd4..1506039 100644
--- a/src/main/java/com/fr/plugin/decision/user/language/UserLanguageUrlAliasProvider.java
+++ b/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)
};
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fr/plugin/decision/user/language/action/AllLanguagesAction.java b/src/main/java/com/fr/plugin/decision/user/language/action/AllLanguagesAction.java
index 45dd95a..b211a55 100644
--- a/src/main/java/com/fr/plugin/decision/user/language/action/AllLanguagesAction.java
+++ b/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)));
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fr/plugin/decision/user/language/action/GetUserLanguageAction.java b/src/main/java/com/fr/plugin/decision/user/language/action/GetUserLanguageAction.java
index 1569bc9..1d63028 100644
--- a/src/main/java/com/fr/plugin/decision/user/language/action/GetUserLanguageAction.java
+++ b/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())));
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fr/plugin/decision/user/language/action/I18nAction.java b/src/main/java/com/fr/plugin/decision/user/language/action/I18nAction.java
index 63a9295..5c74e7c 100644
--- a/src/main/java/com/fr/plugin/decision/user/language/action/I18nAction.java
+++ b/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)))));
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fr/plugin/decision/user/language/action/SetUserLanguageAction.java b/src/main/java/com/fr/plugin/decision/user/language/action/SetUserLanguageAction.java
index 04b97d2..2727716 100644
--- a/src/main/java/com/fr/plugin/decision/user/language/action/SetUserLanguageAction.java
+++ b/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()));
}
}
\ No newline at end of file