Merge remote-tracking branch 'origin/master'

src/main/java/com/thmodel/servlet/MemberInfoServlet.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.thmodel.dbconnection.DbConnection;
 import com.thmodel.entity.*;
 import com.thmodel.service.CashRecordService;
 import com.thmodel.constants.Constants;
@@ -32,6 +33,10 @@ import com.thmodel.service.NimserverService;
 
 import net.sf.json.JSONObject;
 import com.thmodel.page.Page;
+import org.jooq.DSLContext;
+import org.jooq.impl.DSL;
+
+import static com.thmodel.jooq.tables.Settings.SETTINGS;
 
 /**
  * 会员信息接口请求名：memberInfo
@@ -560,6 +565,15 @@ public class MemberInfoServlet extends HttpServlet {
                 resultJson.put("msg", Constants.success);
                 resultJson.put("data", JSONObject.fromObject(memberinfoService.getAppVersion()));
             }
+
+            //审核状态
+            else if (action.equalsIgnoreCase("auditStatus")) {
+                DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
+                String status = ctx.select().from(SETTINGS).where(SETTINGS.NAME.equal("audit")).fetchOne(SETTINGS.VALUE);
+                resultJson.put("msg", Constants.success);
+                resultJson.put("data", status);
+                ctx.close();
+            }
         } catch (Exception e) {
             e.printStackTrace();
             resultJson.put("msg", Constants.error);

src/test/java/MemberTest.java

@@ -51,7 +51,7 @@ public class MemberTest {
 
         Map<String, String> map = new HashMap<>();
         map.put("name", "千模小助手");
-        map.put("icon", "http://app.chmo.net/thmodel/upload/hphoto/system_icon.png");
+        map.put("icon", "http://thmodel.izouma.com/thmodel/upload/hphoto/system_icon.png");
         nimserver.updateUinfo("system", map);
 
         String info = nimserver.getUinfos(new String[]{"system"});