Explorar o código

去除所有指定站点参数,针对站点缺省进行统一处理

沈静伟 %!s(int64=4) %!d(string=hai) anos
pai
achega
d8300bd55f

+ 1 - 1
src/dsb/com/cnd3b/common/Controller.java

@@ -100,7 +100,7 @@ public class Controller extends BaseClass {
             fisadministrator = row.getBoolean("fisadministrator");
             createRequestLog();
         } else if ($method.contains("publicmethod")) {
-            siteid = (String) content.getOrDefault("siteid", "BWJ");
+            siteid = (String) content.getOrDefault("siteid", parameter.defultsiteid);
         }
     }
 

+ 2 - 0
src/dsb/com/cnd3b/common/parameter/parameter.java

@@ -24,6 +24,8 @@ public class parameter {
     //userid:usermsg
     public static HashMap<Long, Row> userIdList = new HashMap<>(16);
 
+    public static String defultsiteid = "BWJ";
+
     /**
      * µÇ¼-ÊÖ»úºÅ¡¢ÑéÖ¤Âë
      */

+ 1 - 1
src/dsb/com/cnd3b/common/restful/WebClientRest.java

@@ -368,7 +368,7 @@ public class WebClientRest {
                 //登陆时,如果验证码验证成功,但是手机号未注册过,则自动进行注册!
                 if (connect.runSqlQuery("select * from tenterprise_users where fisused=1 and fphonenumber='" + phonenumber + "'").isEmpty()) {
                     Users users = new Users(requestcontent);
-                    users.register_usersByLogin(phonenumber);
+                    users.register_usersByLogin(phonenumber,parameter.defultsiteid);
                     isnewregister = 1;
                 }
             }

+ 1 - 1
src/dsb/com/cnd3b/restcontroller/enterprise/tagents/tagents.java

@@ -186,7 +186,7 @@ public class tagents extends Controller {
             if (tagentsid == 0) {
                 PaoSetRemote tagentsSet = tagents_msgchangeapp.getPaoSet("$tagents", "tagents");
                 PaoRemote tagents = tagentsSet.addAtEnd();
-                tagents.setValue("siteid", "BWJ", 11L);//ÆóÒµID
+                tagents.setValue("siteid", siteid, 11L);//ÆóÒµID
                 tagents.setValue("createdate", getDateTime(), 11L);//¼Èëʱ¼ä
                 tagents.setValue("fphonenumber", fchangemsgObject.getString("fphonenumber"), 11L);
                 tagents.setValue("fjoindate", getDateTime(), 11L);

+ 4 - 4
src/dsb/com/cnd3b/restcontroller/publicmethod/users/Users.java

@@ -25,12 +25,12 @@ public class Users extends Controller {
      *
      * @return
      */
-    public void register_usersByLogin(String fphonenumber) {
+    public void register_usersByLogin(String fphonenumber, String siteid) {
         PaoSetRemote tagentsSet = null;
         try {
             tagentsSet = getP2ServerSystemPaoSet("tagents");
             PaoRemote tagents = tagentsSet.addAtEnd();
-            tagents.setValue("siteid", "BWJ", 11L);//企业ID
+            tagents.setValue("siteid", siteid, 11L);//企业ID
             tagents.setValue("createdate", getDateTime(), 11L);//录入时间
             tagents.setValue("fphonenumber", fphonenumber, 11L);
             tagents.setValue("fjoindate", getDateTime(), 11L);
@@ -75,7 +75,7 @@ public class Users extends Controller {
         if (resultcode == 0) {
             PaoSetRemote tagentsSet = getP2ServerSystemPaoSet("tagents");
             PaoRemote tagents = tagentsSet.addAtEnd();
-            tagents.setValue("siteid", "BWJ", 11L);//企业ID
+            tagents.setValue("siteid", siteid, 11L);//企业ID
             tagents.setValue("createdate", getDateTime(), 11L);//录入时间
             tagents.setValue("fphonenumber", fphonenumber, 11L);
             tagents.setValue("fjoindate", getDateTime(), 11L);
@@ -116,7 +116,7 @@ public class Users extends Controller {
      */
     public String getPassword() throws D3bException, P2Exception {
         String fphonenumber = content.getString("fphonenumber");//注册手机号
-        PaoSetRemote tagentsSet = getP2ServerSystemPaoSet("tagents", "fphonenumber='" + fphonenumber + "' and siteid='BWJ'");
+        PaoSetRemote tagentsSet = getP2ServerSystemPaoSet("tagents", "fphonenumber='" + fphonenumber + "' and siteid='" + siteid + "'");
         if (!tagentsSet.isEmpty()) {
             return getErrReturnObject().setErrMsg("该手机号已注册!").toString();
         }